From cb139a95a22e89f4a3c9a5c08d11e623bd39fbd9 Mon Sep 17 00:00:00 2001
From: build-token <build-token>
Date: Mon, 14 Oct 2024 07:55:21 +0000
Subject: [PATCH] publish: Merge branch 'lint/eslint-react' into 'dev'
generated from commit 5a99a4cf231466c8a80ad94f1f8b829feadbdf95
---
...c329.js => ecolyo.aecdd010d6bceac73698.js} | 34 +++++++++----------
...427d.js => ecolyo.7f1b6b6905ffdbd47ccd.js} | 4 ++-
...dc12.js => ecolyo.12531e837defae7e9cb1.js} | 20 +++++++----
index.html | 2 +-
4 files changed, 34 insertions(+), 26 deletions(-)
rename 3/{ecolyo.b1a5d3f3abe225f5c329.js => ecolyo.aecdd010d6bceac73698.js} (99%)
rename 6/{ecolyo.29f85a0dbdcb4c98427d.js => ecolyo.7f1b6b6905ffdbd47ccd.js} (99%)
rename app/{ecolyo.29a80defcbcff4f0dc12.js => ecolyo.12531e837defae7e9cb1.js} (99%)
diff --git a/3/ecolyo.b1a5d3f3abe225f5c329.js b/3/ecolyo.aecdd010d6bceac73698.js
similarity index 99%
rename from 3/ecolyo.b1a5d3f3abe225f5c329.js
rename to 3/ecolyo.aecdd010d6bceac73698.js
index 314a8fd6b..baec9cdbb 100644
--- a/3/ecolyo.b1a5d3f3abe225f5c329.js
+++ b/3/ecolyo.aecdd010d6bceac73698.js
@@ -36,6 +36,7 @@ var MatomoOptOut = function MatomoOptOut() {
}, /*#__PURE__*/_react.default.createElement("div", {
className: "styled-card-header text-16-normal-uppercase"
}, t('matomo.matomo_title')), /*#__PURE__*/_react.default.createElement("iframe", {
+ sandbox: "allow-popups allow-scripts",
title: "opt-out",
style: {
height: '250px'
@@ -415,16 +416,16 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
};
var buildDataRow = (0, _react2.useCallback)( /*#__PURE__*/function () {
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(dataload, fluidType) {
- var dataRow, fluidName, emas, maxPowerEntities, maxLoad;
+ var dataRow, FLUIDNAME, emas, maxPowerEntities, maxLoad;
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
dataRow = {};
- fluidName = (0, _utils.getFluidName)(fluidType);
+ FLUIDNAME = (0, _utils.getFluidName)(fluidType).toUpperCase();
dataRow[t('export.month')] = (0, _utils.formatTwoDigits)(dataload.date.month);
dataRow[t('export.year')] = dataload.date.year;
- dataRow["".concat(t('export.consumption'), " (").concat(t('FLUID.' + fluidName + '.UNIT'), ")")] = dataload.value;
+ dataRow["".concat(t('export.consumption'), " (").concat(t('FLUID.' + FLUIDNAME + '.UNIT'), ")")] = dataload.value;
if (!(fluidType === _enums.FluidType.ELECTRICITY)) {
_context.next = 11;
break;
@@ -553,6 +554,7 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
(0, _react2.useEffect)(function () {
var subscribed = true;
var date = new Date();
+ var timeout;
var exportData = /*#__PURE__*/function () {
var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
var exportDataSheets, _iterator3, _step3, fluidType, exportDataFluid;
@@ -593,28 +595,25 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
_iterator3.f();
return _context3.finish(18);
case 21:
- _context3.next = 23;
- return new Promise(function (r) {
- return setTimeout(r, 2000);
- });
- case 23:
- if (subscribed) {
- exportToXlsx(exportDataSheets, 'ecolyo_data_' + date.toLocaleDateString());
- handleDone();
- }
- _context3.next = 30;
+ timeout = setTimeout(function () {
+ if (subscribed) {
+ exportToXlsx(exportDataSheets, 'ecolyo_data_' + date.toLocaleDateString());
+ handleDone();
+ }
+ }, 2000);
+ _context3.next = 28;
break;
- case 26:
- _context3.prev = 26;
+ case 24:
+ _context3.prev = 24;
_context3.t1 = _context3["catch"](0);
Sentry.captureException(_context3.t1);
handleDone(_context3.t1);
- case 30:
+ case 28:
case "end":
return _context3.stop();
}
}
- }, _callee3, null, [[0, 26], [3, 15, 18, 21]]);
+ }, _callee3, null, [[0, 24], [3, 15, 18, 21]]);
}));
return function exportData() {
return _ref4.apply(this, arguments);
@@ -625,6 +624,7 @@ var ExportLoadingModal = function ExportLoadingModal(_ref) {
}
return function () {
subscribed = false;
+ clearTimeout(timeout);
};
}, [getExportDataSheet, handleDone, open, selectedFluids]);
return /*#__PURE__*/_react2.default.createElement(_Dialog.default, {
diff --git a/6/ecolyo.29f85a0dbdcb4c98427d.js b/6/ecolyo.7f1b6b6905ffdbd47ccd.js
similarity index 99%
rename from 6/ecolyo.29f85a0dbdcb4c98427d.js
rename to 6/ecolyo.7f1b6b6905ffdbd47ccd.js
index de7543744..cd2809764 100644
--- a/6/ecolyo.29f85a0dbdcb4c98427d.js
+++ b/6/ecolyo.7f1b6b6905ffdbd47ccd.js
@@ -420,7 +420,9 @@ var EcogestureTabsView = function EcogestureTabsView() {
profile = _useAppSelector.profile,
profileEcogesture = _useAppSelector.profileEcogesture,
profileType = _useAppSelector.profileType;
- var _useState = (0, _react.useState)(tab ? parseInt(tab) : _enums.EcogestureTab.OBJECTIVE),
+ var _useState = (0, _react.useState)(function () {
+ return tab ? parseInt(tab) : _enums.EcogestureTab.OBJECTIVE;
+ }),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
tabValue = _useState2[0],
setTabValue = _useState2[1];
diff --git a/app/ecolyo.29a80defcbcff4f0dc12.js b/app/ecolyo.12531e837defae7e9cb1.js
similarity index 99%
rename from app/ecolyo.29a80defcbcff4f0dc12.js
rename to app/ecolyo.12531e837defae7e9cb1.js
index e6d80b26f..dec0bd473 100644
--- a/app/ecolyo.29a80defcbcff4f0dc12.js
+++ b/app/ecolyo.12531e837defae7e9cb1.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"b1a5d3f3abe225f5c329","4":"67f3fe6d9d232a3381d9","5":"96b67016693ed2d7cd92","6":"29f85a0dbdcb4c98427d","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"aecdd010d6bceac73698","4":"67f3fe6d9d232a3381d9","5":"96b67016693ed2d7cd92","6":"7f1b6b6905ffdbd47ccd","7":"d1f87eb67105e4a00434","8":"7f86157816222c0086ca","9":"f45e19d3c34ba67e355b","10":"fe3625578fa387c11975","11":"346fcb0fa7b2e3565ad3"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -11063,6 +11063,7 @@ var ChallengeCard = function ChallengeCard(_ref) {
}
};
return /*#__PURE__*/_react.default.createElement("button", {
+ type: "button",
"aria-label": t('challenge.card.goto'),
onClick: function onClick() {
return moveToSlide(index);
@@ -17135,11 +17136,13 @@ var ProfileTypeFormDateSelection = function ProfileTypeFormDateSelection(_ref) {
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
selectedYear = _useState2[0],
setSelectedYear = _useState2[1];
- var _useState3 = (0, _react.useState)({
- label: _luxon.DateTime.now().toLocaleString({
- month: 'long'
- }),
- value: (0, _utils.formatTwoDigits)(_luxon.DateTime.now().month) // Date.getMonth starts at 0
+ var _useState3 = (0, _react.useState)(function () {
+ return {
+ label: _luxon.DateTime.now().toLocaleString({
+ month: 'long'
+ }),
+ value: (0, _utils.formatTwoDigits)(_luxon.DateTime.now().month) // Date.getMonth starts at 0
+ };
}),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
selectedMonth = _useState4[0],
@@ -17147,7 +17150,9 @@ var ProfileTypeFormDateSelection = function ProfileTypeFormDateSelection(_ref) {
var buildISODate = function buildISODate(year, month) {
return _luxon.DateTime.fromISO("".concat(year, "-").concat(month, "-01"));
};
- var _useState5 = (0, _react.useState)(buildISODate(selectedYear.toString(), selectedMonth.value)),
+ var _useState5 = (0, _react.useState)(function () {
+ return buildISODate(selectedYear.toString(), selectedMonth.value);
+ }),
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
answer = _useState6[0],
setAnswer = _useState6[1];
@@ -20233,6 +20238,7 @@ var SkipLink = function SkipLink() {
}
};
return /*#__PURE__*/_react.default.createElement("button", {
+ type: "button",
className: "skip-link",
onClick: handleSkip
}, t('common.accessibility.skip_link'));
diff --git a/index.html b/index.html
index 14a44d90b..4391fb5d7 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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.77ee755a00655d3845ec.js"></script><script src="app/ecolyo.29a80defcbcff4f0dc12.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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.77ee755a00655d3845ec.js"></script><script src="app/ecolyo.12531e837defae7e9cb1.js"></script></div></body></html>
\ No newline at end of file
--
GitLab