From f56235ac4ccb933a35fa31fd89c7f4489f91f619 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Tue, 10 Jan 2023 16:12:38 +0000
Subject: [PATCH] publish: better handle loading
generated from commit 3fbe98daac166adc129b43b30c0da47efd61c276
---
...4dc1.js => ecolyo.5e4189d03772bd7ab09f.js} | 35 +++++++++++--------
...54a3.js => ecolyo.5b190abbb10931ea36d6.js} | 12 +++----
index.html | 2 +-
3 files changed, 28 insertions(+), 21 deletions(-)
rename 2/{ecolyo.e5f704b8a8de0e474dc1.js => ecolyo.5e4189d03772bd7ab09f.js} (99%)
rename app/{ecolyo.7e0640babffe990e54a3.js => ecolyo.5b190abbb10931ea36d6.js} (99%)
diff --git a/2/ecolyo.e5f704b8a8de0e474dc1.js b/2/ecolyo.5e4189d03772bd7ab09f.js
similarity index 99%
rename from 2/ecolyo.e5f704b8a8de0e474dc1.js
rename to 2/ecolyo.5e4189d03772bd7ab09f.js
index c689e7b1b..4f3428621 100644
--- a/2/ecolyo.e5f704b8a8de0e474dc1.js
+++ b/2/ecolyo.5e4189d03772bd7ab09f.js
@@ -788,16 +788,7 @@ var SgeConnectView = function SgeConnectView() {
});
setCurrentSgeState(updatedState);
- dispatch((0, _global.updateSgeStore)(updatedState)); // Timeout to let konnectorAuth load before we dismiss SGE form
-
- setTimeout(function () {
- dispatch((0, _global.updateSgeStore)(_objectSpread(_objectSpread({}, currentSgeState), {}, {
- openSGEForm: false,
- // switch to false in case the form fails and the user have to give its consent again
- dataConsent: false,
- pdlConfirm: false
- })));
- }, 500);
+ dispatch((0, _global.updateSgeStore)(updatedState));
}
}, [currentSgeState, currentStep, dispatch, isNextValid]);
var handlePrev = (0, _react.useCallback)(function () {
@@ -2671,7 +2662,8 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return state.ecolyo.global;
}),
statusArray = _useSelector.fluidStatus,
- shouldRefreshConsent = _useSelector.shouldRefreshConsent;
+ shouldRefreshConsent = _useSelector.shouldRefreshConsent,
+ sgeConnect = _useSelector.sgeConnect;
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -3117,6 +3109,19 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
deleteAccountForConsentRefresh();
}, [account, client, handleAccountDeletion, shouldRefreshConsent]);
+ /** Closes SGE form if opened */
+
+ var closeSGEForm = function closeSGEForm() {
+ if (sgeConnect.openSGEForm) {
+ dispatch((0, _global.updateSgeStore)(_objectSpread(_objectSpread({}, sgeConnect), {}, {
+ openSGEForm: false,
+ // switch to false in case the form fails and the user have to give its consent again
+ dataConsent: false,
+ pdlConfirm: false
+ })));
+ }
+ };
+
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -3132,7 +3137,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
switch (_context9.prev = _context9.next) {
case 0:
if (!(fluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
- _context9.next = 8;
+ _context9.next = 9;
break;
}
@@ -3147,6 +3152,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return connectionFlow.launch();
case 5:
+ closeSGEForm();
connectionFlow.jobWatcher.on(_flowEvents.ERROR_EVENT, function () {
sendUsageEventError(fluidSlug, fluidStatus.lastDataDate === null);
setKonnectorErrorDescription(connectionFlow.jobWatcher.on()._error);
@@ -3161,7 +3167,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
callbackResponse(_flowEvents.SUCCESS_EVENT);
});
- case 8:
+ case 9:
case "end":
return _context9.stop();
}
@@ -8045,7 +8051,8 @@ var ConnectionResult = function ConnectionResult(_ref) {
city: accountData.city,
dataConsent: true,
pdlConfirm: true,
- shouldLaunchAccount: true
+ shouldLaunchAccount: true,
+ openSGEForm: false
}));
dispatch((0, _global.setShouldRefreshConsent)(true));
} else {
diff --git a/app/ecolyo.7e0640babffe990e54a3.js b/app/ecolyo.5b190abbb10931ea36d6.js
similarity index 99%
rename from app/ecolyo.7e0640babffe990e54a3.js
rename to app/ecolyo.5b190abbb10931ea36d6.js
index 556711deb..f89cf5c6f 100644
--- a/app/ecolyo.7e0640babffe990e54a3.js
+++ b/app/ecolyo.5b190abbb10931ea36d6.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"e5f704b8a8de0e474dc1","3":"9944d58d716d0502d706","4":"3dce9fe3dee4e77244fa","5":"3a48b3c8783b8b429d7f","6":"a113251de3c27963062b","7":"8e0088481e1baf094fa4","8":"260ed9b202a1b7c1d846","9":"c032f05af862fb957661"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"5e4189d03772bd7ab09f","3":"9944d58d716d0502d706","4":"3dce9fe3dee4e77244fa","5":"3a48b3c8783b8b429d7f","6":"a113251de3c27963062b","7":"8e0088481e1baf094fa4","8":"260ed9b202a1b7c1d846","9":"c032f05af862fb957661"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -15345,19 +15345,19 @@ exports.default = void 0;
var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
-var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-
-__webpack_require__("ptXp");
+var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
+__webpack_require__("ptXp");
+
var _I18n = __webpack_require__("buk/");
-var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
+var _ecogestureForm = __webpack_require__("kcOp");
var _profileType = __webpack_require__("D9qV");
-var _ecogestureForm = __webpack_require__("kcOp");
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("55Ip");
diff --git a/index.html b/index.html
index d5ec5bfd9..b126da867 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"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.71f31ccb2e4e3905e912.js"></script><script src="app/ecolyo.7e0640babffe990e54a3.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"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.71f31ccb2e4e3905e912.js"></script><script src="app/ecolyo.5b190abbb10931ea36d6.js"></script></div></body></html>
\ No newline at end of file
--
GitLab