From a27e38b33a322bc1848ba2566477f8ad60dcc6f8 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Mon, 12 Jun 2023 12:15:54 +0000
Subject: [PATCH] publish: Merge branch
'499-conso-chargement-des-elements-de-la-page-en-decale' into 'dev'
generated from commit 40adb1ffb63e2e2e08020b5535127749bc53c31d
---
...d188.js => ecolyo.1739814e9eca9809999d.js} | 34 ++++++-------------
...aa30.js => ecolyo.6ed99e17d40cae490df8.js} | 22 ++++++------
index.html | 2 +-
3 files changed, 23 insertions(+), 35 deletions(-)
rename 5/{ecolyo.2c5979fe74e28dddd188.js => ecolyo.1739814e9eca9809999d.js} (99%)
rename app/{ecolyo.98dcce2ac3ba05daaa30.js => ecolyo.6ed99e17d40cae490df8.js} (99%)
diff --git a/5/ecolyo.2c5979fe74e28dddd188.js b/5/ecolyo.1739814e9eca9809999d.js
similarity index 99%
rename from 5/ecolyo.2c5979fe74e28dddd188.js
rename to 5/ecolyo.1739814e9eca9809999d.js
index 1f8b24873..15d58daa7 100644
--- a/5/ecolyo.2c5979fe74e28dddd188.js
+++ b/5/ecolyo.1739814e9eca9809999d.js
@@ -3812,7 +3812,6 @@ var DataloadConsumptionVisualizer = function DataloadConsumptionVisualizer(_ref)
var _useSelector = (0, _reactRedux.useSelector)(function (state) {
return state.ecolyo.chart;
}),
- loading = _useSelector.loading,
showCompare = _useSelector.showCompare;
var _useState = (0, _react.useState)(false),
@@ -3826,7 +3825,7 @@ var DataloadConsumptionVisualizer = function DataloadConsumptionVisualizer(_ref)
});
}, []);
- if (loading || !dataload) {
+ if (!dataload) {
return /*#__PURE__*/_react.default.createElement("div", {
className: "dataloadvisualizer-root"
});
@@ -5240,8 +5239,7 @@ var FluidChartSwipe = function FluidChartSwipe(_ref) {
}),
currentIndex = _useSelector.currentIndex,
currentTimeStep = _useSelector.currentTimeStep,
- selectedDate = _useSelector.selectedDate,
- loading = _useSelector.loading;
+ selectedDate = _useSelector.selectedDate;
var swipe = (0, _react.useRef)(null);
@@ -5266,7 +5264,7 @@ var FluidChartSwipe = function FluidChartSwipe(_ref) {
dispatch((0, _chart.setCurrentIndex)(updatedIndex));
};
- var _useChartResize = (0, _useChartResize2.useChartResize)(swipe, 300, 940, loading),
+ var _useChartResize = (0, _useChartResize2.useChartResize)(swipe),
height = _useChartResize.height,
width = _useChartResize.width;
@@ -5705,18 +5703,12 @@ var FluidChart = function FluidChart(_ref) {
var _useExploration = (0, _useExploration3.default)(),
_useExploration2 = (0, _slicedToArray2.default)(_useExploration, 2),
- setValidExploration = _useExploration2[1]; // TODO use chart.loading ?
-
+ setValidExploration = _useExploration2[1];
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
- isLoaded = _useState2[0],
- setIsLoaded = _useState2[1];
-
- var _useState3 = (0, _react.useState)(false),
- _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
- containsHalfHourData = _useState4[0],
- setContainsHalfHourData = _useState4[1];
+ containsHalfHourData = _useState2[0],
+ setContainsHalfHourData = _useState2[1];
var lowercaseTimeStep = _timeStep.TimeStep[currentTimeStep].toLowerCase();
@@ -5770,13 +5762,12 @@ var FluidChart = function FluidChart(_ref) {
while (1) {
switch (_context2.prev = _context2.next) {
case 0:
- consumptionService = new _consumption.default(client);
-
if (!(fluidType === _fluid.FluidType.ELECTRICITY)) {
_context2.next = 6;
break;
}
+ consumptionService = new _consumption.default(client);
_context2.next = 4;
return consumptionService.checkDoctypeEntries(_fluid.FluidType.ELECTRICITY, _timeStep.TimeStep.HALF_AN_HOUR);
@@ -5788,11 +5779,6 @@ var FluidChart = function FluidChart(_ref) {
}
case 6:
- if (subscribed) {
- setIsLoaded(true);
- }
-
- case 7:
case "end":
return _context2.stop();
}
@@ -5802,7 +5788,7 @@ var FluidChart = function FluidChart(_ref) {
return _loadData.apply(this, arguments);
}
- loadData();
+ subscribed && loadData();
return function () {
subscribed = false;
};
@@ -5870,7 +5856,7 @@ var FluidChart = function FluidChart(_ref) {
}, t("auth.".concat((0, _utils.getKonnectorSlug)(fluidType), ".connect"))));
};
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isLoaded && /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "fluidchart-root"
}, !isFluidConnected && /*#__PURE__*/_react.default.createElement(LastDataValid, null), currentTimeStep === _timeStep.TimeStep.HALF_AN_HOUR && !containsHalfHourData ? /*#__PURE__*/_react.default.createElement(_HalfHourNoData.default, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
className: "fluidchart-content"
@@ -5892,7 +5878,7 @@ var FluidChart = function FluidChart(_ref) {
}
}), /*#__PURE__*/_react.default.createElement("span", {
className: "fluidchart-footer-label graph-switch-text"
- }, t("timestep.".concat(lowercaseTimeStep, ".comparelabel")))))));
+ }, t("timestep.".concat(lowercaseTimeStep, ".comparelabel"))))));
};
var _default = FluidChart;
diff --git a/app/ecolyo.98dcce2ac3ba05daaa30.js b/app/ecolyo.6ed99e17d40cae490df8.js
similarity index 99%
rename from app/ecolyo.98dcce2ac3ba05daaa30.js
rename to app/ecolyo.6ed99e17d40cae490df8.js
index 6a62f2bc3..272563b72 100644
--- a/app/ecolyo.98dcce2ac3ba05daaa30.js
+++ b/app/ecolyo.6ed99e17d40cae490df8.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"eff4cc1e75bcc37e8fed","4":"4bdc1836bb506dfd5fea","5":"2c5979fe74e28dddd188","6":"b09b697935df908fb69c","7":"1850b6ce28566211a509","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"eff4cc1e75bcc37e8fed","4":"4bdc1836bb506dfd5fea","5":"1739814e9eca9809999d","6":"b09b697935df908fb69c","7":"1850b6ce28566211a509","8":"5a104e5906433ba909f2","9":"d4e0f8345c64c54574af"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -34380,28 +34380,30 @@ var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
var _react = __webpack_require__("q1tI");
+/**
+ * Update the width and height of the chart when the window is resized
+ */
var useChartResize = function useChartResize(ref) {
+ var _ref$current, _ref$current2;
+
var maxHeight = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 300;
var maxWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 940;
- var loading = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
- var _useState = (0, _react.useState)(0),
+ var _useState = (0, _react.useState)(maxWidth),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
width = _useState2[0],
setWidth = _useState2[1];
- var _useState3 = (0, _react.useState)(0),
+ var _useState3 = (0, _react.useState)(maxHeight),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
height = _useState4[0],
setHeight = _useState4[1];
(0, _react.useEffect)(function () {
function handleResize() {
- if (!loading) {
- var _ref$current$offsetWi, _ref$current, _ref$current$offsetHe, _ref$current2;
-
- var chartContainerWidth = (_ref$current$offsetWi = ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.offsetWidth) !== null && _ref$current$offsetWi !== void 0 ? _ref$current$offsetWi : 400;
- var chartContainerHeight = (_ref$current$offsetHe = ref === null || ref === void 0 ? void 0 : (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.offsetHeight) !== null && _ref$current$offsetHe !== void 0 ? _ref$current$offsetHe : 200;
+ if (ref.current) {
+ var chartContainerWidth = ref.current.offsetWidth;
+ var chartContainerHeight = ref.current.offsetHeight;
var _width = Math.min(chartContainerWidth, maxWidth);
@@ -34417,7 +34419,7 @@ var useChartResize = function useChartResize(ref) {
return function () {
return window.removeEventListener('resize', handleResize);
};
- }, [loading]);
+ }, [maxHeight, maxWidth, ref, (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.offsetHeight, (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.offsetWidth]);
return {
width: width,
height: height
diff --git a/index.html b/index.html
index 050b747db..3bf62c6f0 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.69beab954af56959f24c.js"></script><script src="app/ecolyo.98dcce2ac3ba05daaa30.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.69beab954af56959f24c.js"></script><script src="app/ecolyo.6ed99e17d40cae490df8.js"></script></div></body></html>
\ No newline at end of file
--
GitLab