From 130ca6b3d121f8818cfb3c2fecda99645bb1661a Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 23 Apr 2024 16:02:58 +0200
Subject: [PATCH] publish: wip
generated from commit 04c8663f23c8cf7edc193abcc6786a8e41e47229
---
...aeaf.js => ecolyo.3befb3a0503a441a5c0a.js} | 44 +++++++++----------
...9859.js => ecolyo.689c76d97f16f465c6d9.js} | 14 +++---
index.html | 2 +-
3 files changed, 30 insertions(+), 30 deletions(-)
rename 5/{ecolyo.34739af3c1d64706aeaf.js => ecolyo.3befb3a0503a441a5c0a.js} (99%)
rename app/{ecolyo.863f33e3b00395709859.js => ecolyo.689c76d97f16f465c6d9.js} (99%)
diff --git a/5/ecolyo.34739af3c1d64706aeaf.js b/5/ecolyo.3befb3a0503a441a5c0a.js
similarity index 99%
rename from 5/ecolyo.34739af3c1d64706aeaf.js
rename to 5/ecolyo.3befb3a0503a441a5c0a.js
index f956b3252..c36a19bf4 100644
--- a/5/ecolyo.34739af3c1d64706aeaf.js
+++ b/5/ecolyo.3befb3a0503a441a5c0a.js
@@ -990,7 +990,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
isOutdatedData = _useState10[0],
setIsOutdatedData = _useState10[1];
var isWaitingForConsent = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
- console.log('🚀 ~ isWaitingForConsent:', isWaitingForConsent);
var fluidService = (0, _react.useMemo)(function () {
return new _fluid.default(client);
}, [client]);
@@ -1137,22 +1136,20 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
_context4.next = 12;
return handleAccountDeletion();
case 12:
- _context4.next = 19;
+ _context4.next = 18;
break;
case 14:
_context4.next = 16;
return fluidService.getFluidStatus(partnersInfo);
case 16:
updatedFluidStatus = _context4.sent;
- console.log('Set fluid status');
dispatch((0, _global.setFluidStatus)(updatedFluidStatus));
- case 19:
+ case 18:
dispatch((0, _chart.setShowConnectionDetails)(false));
- console.log('handleConnectionEnd - Close modal');
setOpenModal(false);
setKonnectorState(null);
setKonnectorErrorDescription(null);
- case 24:
+ case 22:
case "end":
return _context4.stop();
}
@@ -1205,7 +1202,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
switch (_context5.prev = _context5.next) {
case 0:
if (!(_state !== _flowEvents.LOGIN_SUCCESS_EVENT)) {
- _context5.next = 19;
+ _context5.next = 18;
break;
}
updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
@@ -1231,7 +1228,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
_yield$Promise$all = _context5.sent;
_yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 2);
updatedFluidStatus = _yield$Promise$all2[1];
- console.log('🚀 ~ updatedFluidStatus:', updatedFluidStatus[2]);
setKonnectorState(_state);
/**
@@ -1239,12 +1235,11 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
* Calling handleConnectionEnd because it won't be called in the KonnectorModal since we don't show it
*/
if (fluidType === _enums.FluidType.GAS && updatedFluidStatus[2].status == _enums.FluidState.CHALLENGE_ASKED) {
- // timeout this 5 sec ?
- // dispatch(setShowOfflineData(false))
+ // TODO to remove ?
dispatch((0, _global.setFluidStatus)(updatedFluidStatus));
handleConnectionEnd(false);
}
- case 19:
+ case 18:
case "end":
return _context5.stop();
}
@@ -1402,9 +1397,9 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}, [callbackResponse, client, currentFluidStatus.connection, currentFluidStatus.fluidType, currentFluidStatus.lastDataDate, dispatch, fluidSlug, fluidType, konnector, shouldRefreshConsent, trigger]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "konnector-section-root"
- }, !showOfflineData && !isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_Connection.default, {
+ }, isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), !isWaitingForConsent && !showOfflineData && /*#__PURE__*/_react.default.createElement(_Connection.default, {
fluidType: fluidType
- }), isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), showOfflineData && !isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_core.Accordion, {
+ }), !isWaitingForConsent && showOfflineData && /*#__PURE__*/_react.default.createElement(_core.Accordion, {
expanded: showConnectionDetails,
onChange: toggleAccordion,
classes: {
@@ -3457,11 +3452,14 @@ var GrdfInit = function GrdfInit() {
fluidStatus = _useAppSelector.fluidStatus;
var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
- /** Show wait consent screen when consent is "A valider" */
- var isWaitingForConsent = currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
- if (isWaitingForConsent) {
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
- }
+ // /** Show wait consent screen when consent is "A valider" */
+ // const isWaitingForConsent =
+ // currentFluidStatus.status === FluidState.CHALLENGE_ASKED
+
+ // if (isWaitingForConsent) {
+ // return null
+ // }
+
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-form"
}, /*#__PURE__*/_react.default.createElement("h2", {
@@ -4065,9 +4063,11 @@ var KonnectorModal = function KonnectorModal(_ref) {
clearInterval(interval);
};
}, [open, state]);
- if (fluidType === _enums.FluidType.GAS && error === _enums.KonnectorError.CHALLENGE_ASKED) {
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
- }
+
+ // if (fluidType === FluidType.GAS && error === KonnectorError.CHALLENGE_ASKED) {
+ // return null
+ // }
+
return /*#__PURE__*/_react.default.createElement(_Dialog.default, {
open: open,
disableEscapeKeyDown: true,
@@ -4788,7 +4788,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
})), /*#__PURE__*/_react.default.createElement(_Content.default, null, /*#__PURE__*/_react.default.createElement(_FluidButtons.default, {
activeFluid: fluidType,
key: updateKey
- }), showOfflineData && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
+ }), showOfflineData && !isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
fluidType: fluidType,
key: lastDataDateKey
}), /*#__PURE__*/_react.default.createElement(_ConsumptionDetails.default, {
diff --git a/app/ecolyo.863f33e3b00395709859.js b/app/ecolyo.689c76d97f16f465c6d9.js
similarity index 99%
rename from app/ecolyo.863f33e3b00395709859.js
rename to app/ecolyo.689c76d97f16f465c6d9.js
index 226908ce3..fd77e20bb 100644
--- a/app/ecolyo.863f33e3b00395709859.js
+++ b/app/ecolyo.689c76d97f16f465c6d9.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"3b4996d5b14bfb7665c0","5":"34739af3c1d64706aeaf","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":"3befb3a0503a441a5c0a","6":"55a8c1b77f056fa82248","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -3168,18 +3168,18 @@ var GrdfConnectView = function GrdfConnectView() {
currentStep = _useState4[0],
setCurrentStep = _useState4[1];
var _useState5 = (0, _react.useState)({
- lastname: 'Dumont',
- firstname: 'Bastien',
+ lastname: '',
+ firstname: '',
email: '',
- postalCode: '69007',
- pce: '19170766925335'
+ postalCode: '',
+ pce: ''
}),
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
formData = _useState6[0],
setFormData = _useState6[1];
var _useState7 = (0, _react.useState)({
- dataConsent: true,
- pceConfirm: true
+ dataConsent: false,
+ pceConfirm: false
}),
_useState8 = (0, _slicedToArray2.default)(_useState7, 2),
formConsent = _useState8[0],
diff --git a/index.html b/index.html
index c77531508..906710a34 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.863f33e3b00395709859.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.689c76d97f16f465c6d9.js"></script></div></body></html>
\ No newline at end of file
--
GitLab