diff --git a/5/ecolyo.30084ca8fd34a003d374.js b/5/ecolyo.42c613701eb2e4cb1401.js
similarity index 99%
rename from 5/ecolyo.30084ca8fd34a003d374.js
rename to 5/ecolyo.42c613701eb2e4cb1401.js
index c35b86185058ced2d8f5eb0af43485d483092a88..ed9777dde316bca847162389eb1f4e7058671de1 100644
--- a/5/ecolyo.30084ca8fd34a003d374.js
+++ b/5/ecolyo.42c613701eb2e4cb1401.js
@@ -186,7 +186,7 @@ exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE
exports = module.exports = __webpack_require__("DjJv")(false);
// Module
-exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.kmodal-content {\n margin: 0.5rem 1.5rem;\n min-height: 12rem;\n}\n@media only screen and (max-width : 768px) {\n .kmodal-content {\n margin: 0.5rem 0;\n }\n}\n.kmodal-content .kmodal-content-text {\n color: #e0e0e0;\n margin: 1rem;\n text-align: center;\n}\n.kmodal-content .kmodal-waiting-text {\n align-items: center;\n display: flex;\n justify-content: center;\n margin: 1rem;\n min-height: 11.25rem;\n text-align: center;\n}\n.kmodal-content .kmodal-waiting-text .kc-wait {\n margin-bottom: 2rem;\n}\n.kmodal-content .kmodal-waiting-text .waiting-text {\n display: none;\n}\n.kmodal-content .kmodal-waiting-text .waiting-text.show {\n animation-duration: 8s;\n animation-name: fadeIn;\n display: block;\n opacity: 0;\n}\n.kmodal-content .kmodal-info {\n padding: 1rem;\n display: flex;\n flex-direction: column;\n gap: 24px;\n}\n.kmodal-content .kmodal-info .buttons {\n display: flex;\n gap: 1rem;\n}\n.kmodal-content .kmodal-info .konnector-config {\n align-items: center;\n display: flex;\n flex-direction: column;\n justify-content: center;\n text-align: center;\n gap: 1rem;\n}\n.kmodal-content .kmodal-info .konnector-config .elec-fail {\n color: #e0e0e0;\n}\n.kmodal-content .kmodal-info .konnector-config.mismatch .title {\n color: #ec9d41;\n}\n.kmodal-content .kmodal-info .konnector-config.mismatch .info {\n color: #e0e0e0;\n}\n.kmodal-content .kmodal-info .konnector-config .headerSuccess {\n color: #e3b82a;\n}\n.kmodal-content .kmodal-info .konnector-config .headerError {\n color: #d25959;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList {\n text-align: left;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList span {\n font-weight: 700;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList span.gold {\n color: #e3b82a;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList .center {\n text-align: center;\n font-weight: 700;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList p {\n text-align: center;\n font-style: italic;\n font-weight: 400;\n font-size: 0.9rem;\n}\n.kmodal-content .light {\n color: #e0e0e0;\n}\n\n#accessibility-title {\n display: none;\n}\n\n@keyframes fadeIn {\n 10%, 90% {\n opacity: 1;\n }\n 100% {\n opacity: 0;\n }\n}", ""]);
+exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.kmodal-content {\n margin: 0.5rem 1.5rem;\n min-height: 12rem;\n}\n@media only screen and (max-width : 768px) {\n .kmodal-content {\n margin: 0.5rem 0;\n }\n}\n.kmodal-content .kmodal-content-text {\n color: #e0e0e0;\n margin: 1rem;\n text-align: center;\n}\n.kmodal-content .kmodal-waiting-text {\n align-items: center;\n display: flex;\n justify-content: center;\n margin: 1rem;\n min-height: 11.25rem;\n text-align: center;\n}\n.kmodal-content .kmodal-waiting-text .waiting-text {\n display: none;\n}\n.kmodal-content .kmodal-waiting-text .waiting-text.show {\n animation-duration: 8s;\n animation-name: fadeIn;\n display: block;\n opacity: 0;\n}\n.kmodal-content .kmodal-info {\n padding: 1rem;\n display: flex;\n flex-direction: column;\n gap: 24px;\n}\n.kmodal-content .kmodal-info .buttons {\n display: flex;\n gap: 1rem;\n}\n.kmodal-content .kmodal-info .konnector-config {\n align-items: center;\n display: flex;\n flex-direction: column;\n justify-content: center;\n text-align: center;\n gap: 1rem;\n}\n.kmodal-content .kmodal-info .konnector-config .elec-fail {\n color: #e0e0e0;\n}\n.kmodal-content .kmodal-info .konnector-config.mismatch .title {\n color: #ec9d41;\n}\n.kmodal-content .kmodal-info .konnector-config.mismatch .info {\n color: #e0e0e0;\n}\n.kmodal-content .kmodal-info .konnector-config .headerSuccess {\n color: #e3b82a;\n}\n.kmodal-content .kmodal-info .konnector-config .headerError {\n color: #d25959;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList {\n text-align: left;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList span {\n font-weight: 700;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList span.gold {\n color: #e3b82a;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList .center {\n text-align: center;\n font-weight: 700;\n}\n.kmodal-content .kmodal-info .konnector-config .commonErrorsList p {\n text-align: center;\n font-style: italic;\n font-weight: 400;\n font-size: 0.9rem;\n}\n.kmodal-content .light {\n color: #e0e0e0;\n}\n\n#accessibility-title {\n display: none;\n}\n\n@keyframes fadeIn {\n 10%, 90% {\n opacity: 1;\n }\n 100% {\n opacity: 0;\n }\n}", ""]);
@@ -1147,11 +1147,12 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
updatedFluidStatus = _context4.sent;
dispatch((0, _global.setFluidStatus)(updatedFluidStatus));
case 18:
+ console.log('closing all stuff');
dispatch((0, _chart.setShowConnectionDetails)(false));
setOpenModal(false);
setKonnectorState(null);
setKonnectorErrorDescription(null);
- case 22:
+ case 23:
case "end":
return _context4.stop();
}
@@ -1330,6 +1331,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}, [account, client, handleAccountDeletion, shouldRefreshConsent]);
(0, _react.useEffect)(function () {
var subscribed = true;
+ console.log('🚀 ~ getData ~ subscribed:', subscribed);
function getData() {
return _getData.apply(this, arguments);
}
@@ -1666,9 +1668,13 @@ var ExpiredConsentModal = function ExpiredConsentModal(_ref) {
shouldLaunchAccount: true
}));
dispatch((0, _global.setShouldRefreshConsent)(true));
+ toggleModal();
+ navigate("/consumption/".concat(_enums.FluidType[fluidType].toLocaleLowerCase()));
+ }
+ if (fluidType === _enums.FluidType.GAS) {
+ toggleModal();
+ navigate("/connect/".concat(_enums.FluidType[fluidType].toLocaleLowerCase()));
}
- toggleModal();
- navigate("/consumption/".concat(_enums.FluidType[fluidType].toLocaleLowerCase()));
}, [dispatch, fluidStatus, fluidType, navigate, toggleModal]);
return /*#__PURE__*/_react.default.createElement(_Dialog.default, {
open: open,
@@ -2892,6 +2898,8 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
fluidStatus = _useAppSelector.fluidStatus;
var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
var account = currentFluidStatus.connection.account;
+ var authData = account === null || account === void 0 ? void 0 : account.auth;
+ console.log('🚀 ~ GrdfWaitConsent ~ account:', account);
var _useState = (0, _react.useState)(''),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
consentEmail = _useState2[0],
@@ -2924,9 +2932,9 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
(0, _react.useEffect)(function () {
if (account !== null && account !== void 0 && account.auth) {
var auth = account.auth;
- var authData = auth;
- if (authData.email) {
- setConsentEmail(authData.email);
+ var _authData = auth;
+ if (_authData.email) {
+ setConsentEmail(_authData.email);
}
}
}, [account]);
@@ -2938,7 +2946,7 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
className: "text-16-normal"
}, t('auth.grdfgrandlyon.waiting.mailDelay')), /*#__PURE__*/_react.default.createElement("span", {
className: "emailContainer"
- }, consentEmail), /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ }, authData.email || ''), /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
size: 80,
icon: _grdfMail.default
}), /*#__PURE__*/_react.default.createElement("div", {
@@ -4053,6 +4061,7 @@ var KonnectorModal = function KonnectorModal(_ref) {
clearInterval(interval);
};
}, [open, state]);
+ console.log('modal', open, state, error);
if (fluidType === _enums.FluidType.GAS && error === _enums.KonnectorError.CHALLENGE_ASKED) {
return null;
}
@@ -4076,7 +4085,7 @@ var KonnectorModal = function KonnectorModal(_ref) {
}), !isVerifyingIdentity && /*#__PURE__*/_react.default.createElement("div", {
className: "kmodal-content-text text-16-normal"
}, /*#__PURE__*/_react.default.createElement("div", {
- className: "kc-wait text-16-bold"
+ className: "text-16-bold"
}, t("konnector_modal.loading_data".concat(isUpdating ? '_update' : '')))), isUpdating && getUpdatingText(), !isUpdating && getConnectionText()) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
className: "kmodal-info"
}, state === _flowEvents.ERROR_EVENT && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, error === _enums.KonnectorError.LOGIN_FAILED &&
diff --git a/app/ecolyo.bfe06297e2a67248d822.js b/app/ecolyo.238fd3ce247c9863be7b.js
similarity index 99%
rename from app/ecolyo.bfe06297e2a67248d822.js
rename to app/ecolyo.238fd3ce247c9863be7b.js
index 0206bab806ae6cbf4987e1beebb2093dfb046f4e..ce70e8811e262a1d90f884a97e158cd08127d2d6 100644
--- a/app/ecolyo.bfe06297e2a67248d822.js
+++ b/app/ecolyo.238fd3ce247c9863be7b.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"3b4996d5b14bfb7665c0","5":"30084ca8fd34a003d374","6":"55a8c1b77f056fa82248","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"3b4996d5b14bfb7665c0","5":"42c613701eb2e4cb1401","6":"55a8c1b77f056fa82248","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -16903,14 +16903,13 @@ var FluidService = /*#__PURE__*/function () {
elecStatus = _yield$Promise$all8[0];
waterStatus = _yield$Promise$all8[1];
gasStatus = _yield$Promise$all8[2];
- console.log('🚀 ~ FluidService ~ gasStatus:', gasStatus);
- _context.next = 36;
+ _context.next = 35;
return consumptionService.fetchAllFirstDateData(_utils.allFluids);
- case 36:
+ case 35:
firstDataDates = _context.sent;
- _context.next = 39;
+ _context.next = 38;
return consumptionService.fetchAllLastDateData(_utils.allFluids);
- case 39:
+ case 38:
lastDataDates = _context.sent;
result = [{
fluidType: _enums.FluidType.ELECTRICITY,
@@ -16959,7 +16958,7 @@ var FluidService = /*#__PURE__*/function () {
}
}];
return _context.abrupt("return", result);
- case 42:
+ case 41:
case "end":
return _context.stop();
}
diff --git a/index.html b/index.html
index 6c9844633ec0e5998b9180523f838c457aad2827..aa3e90ee533ec6f7192f5983c101b41773cfd099 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.0d643adf7b74041441a1.js"></script><script src="app/ecolyo.bfe06297e2a67248d822.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.0d643adf7b74041441a1.js"></script><script src="app/ecolyo.238fd3ce247c9863be7b.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index f27c393b404a9e52914dfccd57c7452c8a1c0ca9..640c6bde7e7e44235d9e75a180250741355d9830 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -100512,7 +100512,6 @@ class FluidService {
const [elecTrigger, waterTrigger, gasTrigger] = await Promise.all([elecAccount && elecKonnector ? triggerService.getTrigger(elecAccount, elecKonnector) : null, waterAccount && waterKonnector ? triggerService.getTrigger(waterAccount, waterKonnector) : null, gasAccount && gasKonnector ? triggerService.getTrigger(gasAccount, gasKonnector) : null]);
const consumptionService = new _consumption.default(this._client);
const [elecStatus, waterStatus, gasStatus] = await Promise.all([elecTrigger ? triggerService.fetchTriggerState(elecTrigger) : null, waterTrigger ? triggerService.fetchTriggerState(waterTrigger) : null, gasTrigger ? triggerService.fetchTriggerState(gasTrigger) : null]);
- console.log('🚀 ~ FluidService ~ gasStatus:', gasStatus);
const firstDataDates = await consumptionService.fetchAllFirstDateData(_utils.allFluids);
const lastDataDates = await consumptionService.fetchAllLastDateData(_utils.allFluids);
const result = [{