From 43d6ec4a4b90a5b5a69e924b00cc37a36702072c Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Tue, 9 Apr 2024 12:56:43 +0000
Subject: [PATCH] publish: Merge branch 'fix/sge-loader' into 'dev'
generated from commit 5cc470d5cc55943f005c5cced9d2af3e4dfd81c6
---
...532e.js => ecolyo.515b7748ea9f8758d1d8.js} | 64 +-----------------
...0455.js => ecolyo.d41eb72637e21f9a0094.js} | 67 +++++++++++++++++--
index.html | 2 +-
3 files changed, 64 insertions(+), 69 deletions(-)
rename 5/{ecolyo.780d32a201c74caa532e.js => ecolyo.515b7748ea9f8758d1d8.js} (98%)
rename app/{ecolyo.6b28a6651018f0fc0455.js => ecolyo.d41eb72637e21f9a0094.js} (99%)
diff --git a/5/ecolyo.780d32a201c74caa532e.js b/5/ecolyo.515b7748ea9f8758d1d8.js
similarity index 98%
rename from 5/ecolyo.780d32a201c74caa532e.js
rename to 5/ecolyo.515b7748ea9f8758d1d8.js
index d9c356991..d44678e8e 100644
--- a/5/ecolyo.780d32a201c74caa532e.js
+++ b/5/ecolyo.515b7748ea9f8758d1d8.js
@@ -1442,25 +1442,15 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
-var _regenerator = _interopRequireDefault(__webpack_require__("hJxD"));
-var _defineProperty2 = _interopRequireDefault(__webpack_require__("J58c"));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
-var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _core = __webpack_require__("rMFn");
var _electricity_bill = _interopRequireDefault(__webpack_require__("e16M"));
var _StyledIcon = _interopRequireDefault(__webpack_require__("VP3k"));
-var _useKonnectorAuth3 = _interopRequireDefault(__webpack_require__("VDG6"));
var _I18n = __webpack_require__("nUfk");
var _enums = __webpack_require__("j0hM");
-var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
+var _react = _interopRequireDefault(__webpack_require__("ivGQ"));
var _reactRouterDom = __webpack_require__("Iyno");
var _chart = __webpack_require__("dklY");
-var _global = __webpack_require__("33gc");
var _hooks = __webpack_require__("6FOS");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
var SgeInit = function SgeInit() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
@@ -1470,59 +1460,7 @@ var SgeInit = function SgeInit() {
}),
fluidStatus = _useAppSelector.fluidStatus;
var currentFluidStatus = fluidStatus[_enums.FluidType.ELECTRICITY];
- var account = currentFluidStatus.connection.account;
- var _useAppSelector2 = (0, _hooks.useAppSelector)(function (state) {
- return state.ecolyo.global;
- }),
- sgeConnect = _useAppSelector2.sgeConnect;
var dispatch = (0, _hooks.useAppDispatch)();
- var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(_enums.FluidType.ELECTRICITY, {
- sgeAuthData: sgeConnect
- }),
- _useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 2),
- connect = _useKonnectorAuth2[0],
- update = _useKonnectorAuth2[1];
- (0, _react.useEffect)(function () {
- function launchConnect() {
- return _launchConnect.apply(this, arguments);
- }
- function _launchConnect() {
- _launchConnect = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
- return _regenerator.default.wrap(function _callee$(_context) {
- while (1) {
- switch (_context.prev = _context.next) {
- case 0:
- if (!sgeConnect.shouldLaunchAccount) {
- _context.next = 10;
- break;
- }
- dispatch((0, _global.updateSgeStore)(_objectSpread(_objectSpread({}, sgeConnect), {}, {
- shouldLaunchAccount: false
- })));
- dispatch((0, _global.setShouldRefreshConsent)(false));
- if (account) {
- _context.next = 8;
- break;
- }
- _context.next = 6;
- return connect();
- case 6:
- _context.next = 10;
- break;
- case 8:
- _context.next = 10;
- return update();
- case 10:
- case "end":
- return _context.stop();
- }
- }
- }, _callee);
- }));
- return _launchConnect.apply(this, arguments);
- }
- launchConnect();
- }, [account, connect, dispatch, sgeConnect, update]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-form"
}, /*#__PURE__*/_react.default.createElement("h2", {
diff --git a/app/ecolyo.6b28a6651018f0fc0455.js b/app/ecolyo.d41eb72637e21f9a0094.js
similarity index 99%
rename from app/ecolyo.6b28a6651018f0fc0455.js
rename to app/ecolyo.d41eb72637e21f9a0094.js
index 40f7d840a..df3d9630c 100644
--- a/app/ecolyo.6b28a6651018f0fc0455.js
+++ b/app/ecolyo.d41eb72637e21f9a0094.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"b7c36a8f27e4baa4ae37","5":"780d32a201c74caa532e","6":"a172c09454aa06516604","7":"0aa5f5c57c463f74cbec","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"b7c36a8f27e4baa4ae37","5":"515b7748ea9f8758d1d8","6":"a172c09454aa06516604","7":"0aa5f5c57c463f74cbec","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -31264,16 +31264,19 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__("hJxD"));
var _defineProperty2 = _interopRequireDefault(__webpack_require__("J58c"));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _FormNavigation = _interopRequireDefault(__webpack_require__("BNdi"));
var _FormProgress = _interopRequireDefault(__webpack_require__("xJfO"));
var _Content = _interopRequireDefault(__webpack_require__("Yd9R"));
var _CozyBar = _interopRequireDefault(__webpack_require__("6pCu"));
var _Header = _interopRequireDefault(__webpack_require__("0soq"));
+var _useKonnectorAuth3 = _interopRequireDefault(__webpack_require__("VDG6"));
var _enums = __webpack_require__("j0hM");
var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
-var _reactRouter = __webpack_require__("P0ff");
+var _reactRouterDom = __webpack_require__("Iyno");
var _global = __webpack_require__("33gc");
var _hooks = __webpack_require__("6FOS");
__webpack_require__("b8sX");
@@ -31285,7 +31288,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
var SgeConnectView = function SgeConnectView() {
- var navigate = (0, _reactRouter.useNavigate)();
+ var navigate = (0, _reactRouterDom.useNavigate)();
var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo.global;
@@ -31303,6 +31306,61 @@ var SgeConnectView = function SgeConnectView() {
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
currentStep = _useState6[0],
setCurrentStep = _useState6[1];
+ var _useAppSelector2 = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector2.fluidStatus;
+ var currentFluidStatus = fluidStatus[_enums.FluidType.ELECTRICITY];
+ var account = currentFluidStatus.connection.account;
+ var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(_enums.FluidType.ELECTRICITY, {
+ sgeAuthData: sgeConnect
+ }),
+ _useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 2),
+ connect = _useKonnectorAuth2[0],
+ update = _useKonnectorAuth2[1];
+ (0, _react.useEffect)(function () {
+ function launchConnect() {
+ return _launchConnect.apply(this, arguments);
+ }
+ function _launchConnect() {
+ _launchConnect = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+ return _regenerator.default.wrap(function _callee$(_context) {
+ while (1) {
+ switch (_context.prev = _context.next) {
+ case 0:
+ if (!sgeConnect.shouldLaunchAccount) {
+ _context.next = 11;
+ break;
+ }
+ dispatch((0, _global.updateSgeStore)(_objectSpread(_objectSpread({}, sgeConnect), {}, {
+ shouldLaunchAccount: false
+ })));
+ dispatch((0, _global.setShouldRefreshConsent)(false));
+ if (account) {
+ _context.next = 8;
+ break;
+ }
+ _context.next = 6;
+ return connect();
+ case 6:
+ _context.next = 10;
+ break;
+ case 8:
+ _context.next = 10;
+ return update();
+ case 10:
+ navigate('/consumption/electricity');
+ case 11:
+ case "end":
+ return _context.stop();
+ }
+ }
+ }, _callee);
+ }));
+ return _launchConnect.apply(this, arguments);
+ }
+ launchConnect();
+ }, [account, connect, dispatch, navigate, sgeConnect, update]);
var isNextValid = (0, _react.useCallback)(function () {
switch (currentStep) {
case _enums.SgeStep.IdentityAndPDL:
@@ -31330,9 +31388,8 @@ var SgeConnectView = function SgeConnectView() {
});
setCurrentSgeState(updatedState);
dispatch((0, _global.updateSgeStore)(updatedState));
- navigate('/consumption/electricity');
}
- }, [currentStep, isLoading, dispatch, currentSgeState, navigate]);
+ }, [currentStep, isLoading, dispatch, currentSgeState]);
var handlePrev = (0, _react.useCallback)(function () {
if (currentStep !== _enums.SgeStep.IdentityAndPDL) {
setCurrentStep(function (prev) {
diff --git a/index.html b/index.html
index 7f75284d2..fd1400814 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.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.6b28a6651018f0fc0455.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.b479e82bf0a2e56e4c58.js"></script><script src="app/ecolyo.d41eb72637e21f9a0094.js"></script></div></body></html>
\ No newline at end of file
--
GitLab