diff --git a/3/ecolyo.af3c2f1704e8e286edcf.js b/3/ecolyo.94d07dbda06e55951946.js similarity index 99% rename from 3/ecolyo.af3c2f1704e8e286edcf.js rename to 3/ecolyo.94d07dbda06e55951946.js index 196a3cba9e6f3532c233065881eb8f625df7ea9d..58c67ff8b024f02b25c04e0a78f1b54aed6a1f88 100644 --- a/3/ecolyo.af3c2f1704e8e286edcf.js +++ b/3/ecolyo.94d07dbda06e55951946.js @@ -6965,7 +6965,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } var ConnectionResult = function ConnectionResult(_ref) { - var _fluidStatus$connecti4; + var _fluidStatus$connecti5; var fluidStatus = _ref.fluidStatus, handleAccountDeletion = _ref.handleAccountDeletion, @@ -7162,14 +7162,34 @@ var ConnectionResult = function ConnectionResult(_ref) { return true; } }, [lastExecutionDate]); - var handleRefreshConsent = (0, _react.useCallback)(function () { - deleteAccountsAndTriggers(); + var handleRefreshConsent = (0, _react.useCallback)(function (fluidType) { + if (fluidType == _fluid.FluidType.ELECTRICITY) { + var _fluidStatus$connecti; + + var accountData = (_fluidStatus$connecti = fluidStatus.connection.account) === null || _fluidStatus$connecti === void 0 ? void 0 : _fluidStatus$connecti.auth; //store the previous account data since the onDelete will remove account from DB + + dispatch((0, _global.updateSgeStore)({ + currentStep: 0, + firstName: accountData.firstname, + lastName: accountData.lastname, + pdl: parseInt(accountData.pointId), + address: accountData.address, + zipCode: parseInt(accountData.postalCode), + city: accountData.city, + dataConsent: true, + pdlConfirm: true, + shouldLaunchAccount: true + })); + } else { + deleteAccountsAndTriggers(); + } + dispatch((0, _global.setShouldRefreshConsent)(true)); }, [deleteAccountsAndTriggers, dispatch]); (0, _react.useEffect)(function () { - var _fluidStatus$connecti, _fluidStatus$connecti2, _fluidStatus$connecti3; + var _fluidStatus$connecti2, _fluidStatus$connecti3, _fluidStatus$connecti4; - if ((_fluidStatus$connecti = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti !== void 0 && _fluidStatus$connecti.last_success) { + if ((_fluidStatus$connecti2 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti2 !== void 0 && _fluidStatus$connecti2.last_success) { var result = _luxon.DateTime.fromISO(fluidStatus.connection.triggerState.last_success); setLastExecutionDate(result); @@ -7177,7 +7197,7 @@ var ConnectionResult = function ConnectionResult(_ref) { setLastExecutionDate('-'); } - if (((_fluidStatus$connecti2 = fluidStatus.connection.triggerState) === null || _fluidStatus$connecti2 === void 0 ? void 0 : _fluidStatus$connecti2.status) === 'errored' && (_fluidStatus$connecti3 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti3 !== void 0 && _fluidStatus$connecti3.last_error) { + if (((_fluidStatus$connecti3 = fluidStatus.connection.triggerState) === null || _fluidStatus$connecti3 === void 0 ? void 0 : _fluidStatus$connecti3.status) === 'errored' && (_fluidStatus$connecti4 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti4 !== void 0 && _fluidStatus$connecti4.last_error) { setStatus('errored'); setKonnectorError((0, _utils.getKonnectorUpdateError)(fluidStatus.connection.triggerState.last_error)); } @@ -7235,7 +7255,7 @@ var ConnectionResult = function ConnectionResult(_ref) { className: "connection-caption" }, t('konnector_form.label_updated_at')), /*#__PURE__*/_react.default.createElement("div", { className: "text-16-bold" - }, lastExecutionDate.toLocaleString()), /*#__PURE__*/_react.default.createElement("div", null, (fluidStatus === null || fluidStatus === void 0 ? void 0 : (_fluidStatus$connecti4 = fluidStatus.connection) === null || _fluidStatus$connecti4 === void 0 ? void 0 : _fluidStatus$connecti4.konnector) && t('konnector_form.issue') + ' ' + fluidStatus.connection.konnector.name + '.')) : + }, lastExecutionDate.toLocaleString()), /*#__PURE__*/_react.default.createElement("div", null, (fluidStatus === null || fluidStatus === void 0 ? void 0 : (_fluidStatus$connecti5 = fluidStatus.connection) === null || _fluidStatus$connecti5 === void 0 ? void 0 : _fluidStatus$connecti5.konnector) && t('konnector_form.issue') + ' ' + fluidStatus.connection.konnector.name + '.')) : /*#__PURE__*/ // Otherwise tells user to run a manual update _react.default.createElement("div", { @@ -7271,7 +7291,9 @@ var ConnectionResult = function ConnectionResult(_ref) { fluidType: fluidType }) : t('konnector_form.button_delete')), /*#__PURE__*/_react.default.createElement(_Button.default, { "aria-label": t('konnector_form.accessibility.button_update'), - onClick: konnectorError === 'error_update_oauth' ? handleRefreshConsent : updateKonnector, + onClick: konnectorError === 'error_update_oauth' ? function () { + return handleRefreshConsent(fluidType); + } : updateKonnector, disabled: updating || deleting, classes: { root: 'btn-highlight', diff --git a/app/ecolyo.9ff65e5115f4737b64e4.js b/app/ecolyo.dbc6d309bd26f25d9ced.js similarity index 99% rename from app/ecolyo.9ff65e5115f4737b64e4.js rename to app/ecolyo.dbc6d309bd26f25d9ced.js index 7af660d05556c0d7e4744420f065e6c87254e331..e33f075e62d7c962a7e04124613cf571e77d374c 100644 --- a/app/ecolyo.9ff65e5115f4737b64e4.js +++ b/app/ecolyo.dbc6d309bd26f25d9ced.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"4e0ea28c29b22ff83353","3":"af3c2f1704e8e286edcf","4":"5e481431cf0b2359d58d","5":"8f0e8caf7949bcc0f768","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"2de7ef350ec3c23cc49b","9":"86cadd702f6ebcc5f72c","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"4e0ea28c29b22ff83353","3":"94d07dbda06e55951946","4":"5e481431cf0b2359d58d","5":"8f0e8caf7949bcc0f768","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"2de7ef350ec3c23cc49b","9":"86cadd702f6ebcc5f72c","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function @@ -3020,10 +3020,10 @@ var StepAddress = function StepAddress(_ref) { className: "sge-step-container stepAddress" }, /*#__PURE__*/_react.default.createElement("div", { className: "title text-22-bold" - }, t('auth.enedis-sge-grandlyon.addressTitle')), /*#__PURE__*/_react.default.createElement("label", { + }, t('auth.enedissgegrandlyon.addressTitle')), /*#__PURE__*/_react.default.createElement("label", { htmlFor: "address", className: "text-16-normal" - }, t('auth.enedis-sge-grandlyon.address')), /*#__PURE__*/_react.default.createElement("input", { + }, t('auth.enedissgegrandlyon.address')), /*#__PURE__*/_react.default.createElement("input", { type: "text", id: "address", name: "address", @@ -3034,7 +3034,7 @@ var StepAddress = function StepAddress(_ref) { }), /*#__PURE__*/_react.default.createElement("label", { htmlFor: "zipCode", className: "text-16-normal" - }, t('auth.enedis-sge-grandlyon.zipCode')), /*#__PURE__*/_react.default.createElement("input", { + }, t('auth.enedissgegrandlyon.zipCode')), /*#__PURE__*/_react.default.createElement("input", { type: "number", min: 0, id: "zipCode", @@ -3046,7 +3046,7 @@ var StepAddress = function StepAddress(_ref) { }), /*#__PURE__*/_react.default.createElement("label", { htmlFor: "city", className: "text-16-normal" - }, t('auth.enedis-sge-grandlyon.city')), /*#__PURE__*/_react.default.createElement("input", { + }, t('auth.enedissgegrandlyon.city')), /*#__PURE__*/_react.default.createElement("input", { type: "text", id: "city", name: "city", @@ -8114,10 +8114,10 @@ var StepIdentityAndPdl = function StepIdentityAndPdl(_ref) { className: "sge-step-container stepIdentity" }, /*#__PURE__*/_react.default.createElement("div", { className: "title text-22-bold" - }, t('auth.enedis-sge-grandlyon.identityTitle')), /*#__PURE__*/_react.default.createElement("label", { + }, t('auth.enedissgegrandlyon.identityTitle')), /*#__PURE__*/_react.default.createElement("label", { htmlFor: "firstName", className: "text-16-normal" - }, t('auth.enedis-sge-grandlyon.firstName')), /*#__PURE__*/_react.default.createElement("input", { + }, t('auth.enedissgegrandlyon.firstName')), /*#__PURE__*/_react.default.createElement("input", { type: "text", id: "firstName", name: "firstName", @@ -8129,7 +8129,7 @@ var StepIdentityAndPdl = function StepIdentityAndPdl(_ref) { }), /*#__PURE__*/_react.default.createElement("label", { htmlFor: "lastName", className: "text-16-normal" - }, t('auth.enedis-sge-grandlyon.lastName')), /*#__PURE__*/_react.default.createElement("input", { + }, t('auth.enedissgegrandlyon.lastName')), /*#__PURE__*/_react.default.createElement("input", { type: "text", id: "lastName", name: "lastName", @@ -8140,10 +8140,10 @@ var StepIdentityAndPdl = function StepIdentityAndPdl(_ref) { required: true }), /*#__PURE__*/_react.default.createElement("div", { className: "title text-22-bold" - }, t('auth.enedis-sge-grandlyon.pdlTitle')), /*#__PURE__*/_react.default.createElement("label", { + }, t('auth.enedissgegrandlyon.pdlTitle')), /*#__PURE__*/_react.default.createElement("label", { htmlFor: "pdl", className: "text-16-normal" - }, t('auth.enedis-sge-grandlyon.pdlLabel')), /*#__PURE__*/_react.default.createElement("input", { + }, t('auth.enedissgegrandlyon.pdlLabel')), /*#__PURE__*/_react.default.createElement("input", { id: "pdl", name: "pdl", type: "number", @@ -8157,7 +8157,7 @@ var StepIdentityAndPdl = function StepIdentityAndPdl(_ref) { }), /*#__PURE__*/_react.default.createElement("div", { onClick: toggleModal, className: "pdl-hint text-16-normal" - }, t('auth.enedis-sge-grandlyon.pdlHint')), /*#__PURE__*/_react.default.createElement(_SgeModalHint.default, { + }, t('auth.enedissgegrandlyon.pdlHint')), /*#__PURE__*/_react.default.createElement(_SgeModalHint.default, { open: openHintModal, handleCloseClick: toggleModal })); @@ -9570,12 +9570,12 @@ var SgeModalHint = function SgeModalHint(_ref) { className: "sgeHintModal" }, /*#__PURE__*/_react.default.createElement("div", { className: "title text-20-bold" - }, t('auth.enedis-sge-grandlyon.modalHint.title')), /*#__PURE__*/_react.default.createElement(_Icon.default, { + }, t('auth.enedissgegrandlyon.modalHint.title')), /*#__PURE__*/_react.default.createElement(_Icon.default, { icon: _pdlImage.default, width: 240, height: 385 }), /*#__PURE__*/_react.default.createElement(_Button.default, { - "aria-label": t('auth.enedis-sge-grandlyon.modalHint.button-accessibility'), + "aria-label": t('auth.enedissgegrandlyon.modalHint.button-accessibility'), onClick: handleCloseClick, classes: { root: 'btn-highlight', @@ -9584,7 +9584,7 @@ var SgeModalHint = function SgeModalHint(_ref) { style: { height: '40px' } - }, t('auth.enedis-sge-grandlyon.modalHint.button')))); + }, t('auth.enedissgegrandlyon.modalHint.button')))); }; var _default = SgeModalHint; @@ -27021,11 +27021,11 @@ var StepConsent = function StepConsent(_ref) { className: "sge-step-container stepConsent" }, /*#__PURE__*/_react.default.createElement("div", { className: "head text-16-normal" - }, t('auth.enedis-sge-grandlyon.headConsent')), /*#__PURE__*/_react.default.createElement("div", { + }, t('auth.enedissgegrandlyon.headConsent')), /*#__PURE__*/_react.default.createElement("div", { className: "title text-22-bold" - }, t('auth.enedis-sge-grandlyon.textConsent')), /*#__PURE__*/_react.default.createElement("ul", { + }, t('auth.enedissgegrandlyon.textConsent')), /*#__PURE__*/_react.default.createElement("ul", { className: "text-16-normal" - }, /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedis-sge-grandlyon.consentLi1')), /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedis-sge-grandlyon.consentLi2')), /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedis-sge-grandlyon.consentLi3')), /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedis-sge-grandlyon.consentLi4'))), /*#__PURE__*/_react.default.createElement("hr", null), /*#__PURE__*/_react.default.createElement("label", { + }, /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedissgegrandlyon.consentLi1')), /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedissgegrandlyon.consentLi2')), /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedissgegrandlyon.consentLi3')), /*#__PURE__*/_react.default.createElement("li", null, t('auth.enedissgegrandlyon.consentLi4'))), /*#__PURE__*/_react.default.createElement("hr", null), /*#__PURE__*/_react.default.createElement("label", { className: (0, _classnames.default)('checkbox', (0, _defineProperty2.default)({}, 'answer-checked', sgeState.dataConsent)) }, /*#__PURE__*/_react.default.createElement("input", { id: "dataConsent", @@ -27035,7 +27035,7 @@ var StepConsent = function StepConsent(_ref) { return _onChange('dataConsent', e.target.checked); }, checked: sgeState.dataConsent - }), /*#__PURE__*/_react.default.createElement("span", null, (0, _decoreText.decoreText)(t('auth.enedis-sge-grandlyon.consentCheck1')))), /*#__PURE__*/_react.default.createElement("label", { + }), /*#__PURE__*/_react.default.createElement("span", null, (0, _decoreText.decoreText)(t('auth.enedissgegrandlyon.consentCheck1')))), /*#__PURE__*/_react.default.createElement("label", { className: (0, _classnames.default)('checkbox', (0, _defineProperty2.default)({}, 'answer-checked', sgeState.pdlConfirm)) }, /*#__PURE__*/_react.default.createElement("input", { id: "pdlConfirm", @@ -27045,7 +27045,7 @@ var StepConsent = function StepConsent(_ref) { return _onChange('pdlConfirm', e.target.checked); }, checked: sgeState.pdlConfirm - }), (0, _decoreText.decoreText)(t('auth.enedis-sge-grandlyon.consentCheck2')))); + }), (0, _decoreText.decoreText)(t('auth.enedissgegrandlyon.consentCheck2')))); }; var _default = StepConsent; diff --git a/index.html b/index.html index d706cc1b84c46b702b8888d82d736110d8dc34ff..04f84b0dd4dab87435d6f465dc8a5a7d02a34836 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,user-scalable=0,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.7dbee832d5682acf5797.js"></script><script src="app/ecolyo.9ff65e5115f4737b64e4.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,user-scalable=0,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.7dbee832d5682acf5797.js"></script><script src="app/ecolyo.dbc6d309bd26f25d9ced.js"></script></div></body></html> \ No newline at end of file