From 713db6b6b0d42fc5de740e7e7af5d3c0a12b4bce Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Tue, 26 Mar 2024 13:40:51 +0000
Subject: [PATCH] publish: Merge branch 'fix/types-error' into 'dev'
generated from commit 89a65fa3975eab6604753e5e097f7784f623310d
---
...4e50bc.js => ecolyo.11cfc25145ad25979886.js} | 17 +++++++----------
...25d313.js => ecolyo.2623d2320e50a7e86ab6.js} | 10 ++++++----
...ca30fd.js => ecolyo.d987e285282b73bd9c6e.js} | 5 ++---
index.html | 2 +-
services/aggregatorUsageEvents/ecolyo.js | 2 +-
5 files changed, 17 insertions(+), 19 deletions(-)
rename 4/{ecolyo.e7a0f11764f2cb4e50bc.js => ecolyo.11cfc25145ad25979886.js} (99%)
rename 6/{ecolyo.b549e39487087f25d313.js => ecolyo.2623d2320e50a7e86ab6.js} (99%)
rename app/{ecolyo.4764c2bd1d5a3bca30fd.js => ecolyo.d987e285282b73bd9c6e.js} (99%)
diff --git a/4/ecolyo.e7a0f11764f2cb4e50bc.js b/4/ecolyo.11cfc25145ad25979886.js
similarity index 99%
rename from 4/ecolyo.e7a0f11764f2cb4e50bc.js
rename to 4/ecolyo.11cfc25145ad25979886.js
index dee998c8b..59a2cf74b 100644
--- a/4/ecolyo.e7a0f11764f2cb4e50bc.js
+++ b/4/ecolyo.11cfc25145ad25979886.js
@@ -87,16 +87,14 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
return !prev;
});
}, []);
- var toggleOpenModal = (0, _react.useCallback)(function () {
+ var toggleInfoModal = (0, _react.useCallback)(function () {
setOpenInfoModal(function (prev) {
return !prev;
});
}, []);
var isDataFullyComplete = (0, _react.useCallback)(function (monthDataloads) {
var _monthDataloads$weeke, _monthDataloads$week$;
- if (monthDataloads !== null && monthDataloads !== void 0 && monthDataloads.weekend && monthDataloads.week && ((_monthDataloads$weeke = monthDataloads.weekend[0]) === null || _monthDataloads$weeke === void 0 ? void 0 : _monthDataloads$weeke.value) !== null && ((_monthDataloads$week$ = monthDataloads.week[0]) === null || _monthDataloads$week$ === void 0 ? void 0 : _monthDataloads$week$.value) !== null) {
- return true;
- } else return false;
+ return (monthDataloads === null || monthDataloads === void 0 ? void 0 : monthDataloads.weekend) && monthDataloads.week && ((_monthDataloads$weeke = monthDataloads.weekend[0]) === null || _monthDataloads$weeke === void 0 ? void 0 : _monthDataloads$weeke.value) !== null && ((_monthDataloads$week$ = monthDataloads.week[0]) === null || _monthDataloads$week$ === void 0 ? void 0 : _monthDataloads$week$.value) !== null;
}, []);
var getPowerChart = (0, _react.useCallback)(function () {
if (monthDataloads && isDataFullyComplete(monthDataloads)) {
@@ -104,11 +102,10 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
dataLoad: isWeekend ? monthDataloads.weekend : monthDataloads.week,
isWeekend: isWeekend
});
- } else {
- return /*#__PURE__*/_react.default.createElement("p", {
- className: "text-20-bold no_data"
- }, t('analysis.no_data'));
}
+ return /*#__PURE__*/_react.default.createElement("p", {
+ className: "text-20-bold no_data"
+ }, t('analysis.no_data'));
}, [isDataFullyComplete, isWeekend, monthDataloads, t]);
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -342,11 +339,11 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
className: "text-18-normal"
}, " \u20AC"))) : /*#__PURE__*/_react.default.createElement("span", null, "----"))), /*#__PURE__*/_react.default.createElement(_core.Button, {
className: "btnText",
- onClick: toggleOpenModal
+ onClick: toggleInfoModal
}, t('special_elec.showModal'))))), /*#__PURE__*/_react.default.createElement(_ElecInfoModal.default, {
open: openInfoModal,
offPeakHours: offPeakHours,
- handleCloseClick: toggleOpenModal
+ handleCloseClick: toggleInfoModal
}));
};
var _default = ElecHalfHourMonthlyAnalysis;
diff --git a/6/ecolyo.b549e39487087f25d313.js b/6/ecolyo.2623d2320e50a7e86ab6.js
similarity index 99%
rename from 6/ecolyo.b549e39487087f25d313.js
rename to 6/ecolyo.2623d2320e50a7e86ab6.js
index 5b0e4648e..449c4eeb1 100644
--- a/6/ecolyo.b549e39487087f25d313.js
+++ b/6/ecolyo.2623d2320e50a7e86ab6.js
@@ -996,6 +996,7 @@ exports.default = void 0;
var _regenerator = _interopRequireDefault(__webpack_require__("hJxD"));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
+var _core = __webpack_require__("rMFn");
var _StyledSwitch = _interopRequireDefault(__webpack_require__("3IgR"));
var _cozyClient = __webpack_require__("xEu0");
var _I18n = __webpack_require__("nUfk");
@@ -1006,7 +1007,6 @@ var _consumption = _interopRequireDefault(__webpack_require__("zET3"));
var _hooks = __webpack_require__("6FOS");
var _profile = __webpack_require__("quVB");
__webpack_require__("z5Xe");
-var _core = __webpack_require__("rMFn");
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
var ReportOptions = function ReportOptions() {
@@ -1121,13 +1121,15 @@ var ReportOptions = function ReportOptions() {
className: "text-16-normal"
}, t('profile.report.input_label_alert')), /*#__PURE__*/_react.default.createElement("div", {
className: "switch-container-alert"
- }, /*#__PURE__*/_react.default.createElement(_core.TextField, {
- variant: "outlined",
+ }, /*#__PURE__*/_react.default.createElement(_core.OutlinedInput, {
className: "inputNumber text-18",
type: "number",
defaultValue: profile.waterDailyConsumptionLimit === 0 ? '' : profile.waterDailyConsumptionLimit,
onBlur: setWaterLimit,
- label: t('profile.accessibility.input_water_alert_report'),
+ inputProps: {
+ min: 0
+ },
+ "aria-label": t('profile.accessibility.input_water_alert_report'),
inputMode: "numeric"
}), /*#__PURE__*/_react.default.createElement("span", {
className: "switch-label text-16-normal"
diff --git a/app/ecolyo.4764c2bd1d5a3bca30fd.js b/app/ecolyo.d987e285282b73bd9c6e.js
similarity index 99%
rename from app/ecolyo.4764c2bd1d5a3bca30fd.js
rename to app/ecolyo.d987e285282b73bd9c6e.js
index 66bee8e2a..62fff20b9 100644
--- a/app/ecolyo.4764c2bd1d5a3bca30fd.js
+++ b/app/ecolyo.d987e285282b73bd9c6e.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"175d1078d8b45557fca0","4":"e7a0f11764f2cb4e50bc","5":"3dd251dda8d60e42ff53","6":"b549e39487087f25d313","7":"0aa5f5c57c463f74cbec","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"175d1078d8b45557fca0","4":"11cfc25145ad25979886","5":"3dd251dda8d60e42ff53","6":"2623d2320e50a7e86ab6","7":"0aa5f5c57c463f74cbec","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -5312,7 +5312,6 @@ var ProfileTypeService = /*#__PURE__*/function () {
if (profileType.heating === _enums.IndividualOrCollective.COLLECTIVE) {
profileType.warmingFluid = null;
profileType.individualInsulationWork = [];
- profileType.facilitiesInstallation = [];
}
if (profileType.hotWater === _enums.IndividualOrCollective.COLLECTIVE) {
profileType.hotWaterFluid = null;
@@ -24110,7 +24109,7 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
/***/ "faa1":
/***/ (function(module) {
-module.exports = JSON.parse("[{\"profileType\":{\"updateDate\":\"0000-01-01T00:00:00.000Z\",\"housingType\":\"individual_house\",\"constructionYear\":\"between_1975_and_1989\",\"area\":\"100\",\"occupantsNumber\":4,\"outsideFacingWalls\":\"2\",\"floor\":\"not_applicable\",\"heating\":\"individual\",\"coldWater\":\"individual\",\"hotWater\":\"individual\",\"individualInsulationWork\":[\"window_replacement\"],\"facilitiesInstallation\":\"none\",\"hotWaterEquipment\":\"solar\",\"hasInstalledVentilation\":\"unknown\",\"hasReplacedHeater\":\"unknown\",\"warmingFluid\":0,\"hotWaterFluid\":0,\"cookingFluid\":0}}]");
+module.exports = JSON.parse("[{\"profileType\":{\"updateDate\":\"0000-01-01T00:00:00.000Z\",\"housingType\":\"individual_house\",\"constructionYear\":\"between_1975_and_1989\",\"area\":\"100\",\"occupantsNumber\":4,\"outsideFacingWalls\":\"2\",\"floor\":\"not_applicable\",\"heating\":\"individual\",\"coldWater\":\"individual\",\"hotWater\":\"individual\",\"individualInsulationWork\":[\"window_replacement\"],\"hotWaterEquipment\":\"solar\",\"hasInstalledVentilation\":\"unknown\",\"hasReplacedHeater\":\"unknown\",\"warmingFluid\":0,\"hotWaterFluid\":0,\"cookingFluid\":0}}]");
/***/ }),
diff --git a/index.html b/index.html
index 2a50b2d7f..8f3927bd0 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.4764c2bd1d5a3bca30fd.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.d987e285282b73bd9c6e.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 6171beac2..4d6f9a88d 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -117769,7 +117769,7 @@ exports.default = ProfileTypeEntityService;
/* 1174 */
/***/ (function(module) {
-module.exports = JSON.parse("[{\"profileType\":{\"updateDate\":\"0000-01-01T00:00:00.000Z\",\"housingType\":\"individual_house\",\"constructionYear\":\"between_1975_and_1989\",\"area\":\"100\",\"occupantsNumber\":4,\"outsideFacingWalls\":\"2\",\"floor\":\"not_applicable\",\"heating\":\"individual\",\"coldWater\":\"individual\",\"hotWater\":\"individual\",\"individualInsulationWork\":[\"window_replacement\"],\"facilitiesInstallation\":\"none\",\"hotWaterEquipment\":\"solar\",\"hasInstalledVentilation\":\"unknown\",\"hasReplacedHeater\":\"unknown\",\"warmingFluid\":0,\"hotWaterFluid\":0,\"cookingFluid\":0}}]");
+module.exports = JSON.parse("[{\"profileType\":{\"updateDate\":\"0000-01-01T00:00:00.000Z\",\"housingType\":\"individual_house\",\"constructionYear\":\"between_1975_and_1989\",\"area\":\"100\",\"occupantsNumber\":4,\"outsideFacingWalls\":\"2\",\"floor\":\"not_applicable\",\"heating\":\"individual\",\"coldWater\":\"individual\",\"hotWater\":\"individual\",\"individualInsulationWork\":[\"window_replacement\"],\"hotWaterEquipment\":\"solar\",\"hasInstalledVentilation\":\"unknown\",\"hasReplacedHeater\":\"unknown\",\"warmingFluid\":0,\"hotWaterFluid\":0,\"cookingFluid\":0}}]");
/***/ }),
/* 1175 */
--
GitLab