From 7249b31b46b8404be9baa1f0f71a5248d8124562 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Fri, 12 Apr 2024 14:14:20 +0200
Subject: [PATCH] publish: Merge branch 'feat/grdf-error-messages' into 'dev'
generated from commit 719ef087f88bbd1d60e3161cbb242e94ad165608
---
...c339d5.js => ecolyo.415983b8bf160af3bdc9.js} | 17 +++++++++++------
...c5d5c0.js => ecolyo.72b12ed570b09586aa9f.js} | 2 +-
index.html | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
rename 5/{ecolyo.e43490adbc5e4ec339d5.js => ecolyo.415983b8bf160af3bdc9.js} (99%)
rename app/{ecolyo.cfd02a91d88bd4c5d5c0.js => ecolyo.72b12ed570b09586aa9f.js} (99%)
diff --git a/5/ecolyo.e43490adbc5e4ec339d5.js b/5/ecolyo.415983b8bf160af3bdc9.js
similarity index 99%
rename from 5/ecolyo.e43490adbc5e4ec339d5.js
rename to 5/ecolyo.415983b8bf160af3bdc9.js
index 20b5aee1f..fdadc2768 100644
--- a/5/ecolyo.e43490adbc5e4ec339d5.js
+++ b/5/ecolyo.415983b8bf160af3bdc9.js
@@ -2861,7 +2861,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
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 GrdfWaitConsent = function GrdfWaitConsent() {
+var GrdfWaitConsent = function GrdfWaitConsent(_ref) {
+ var showRelaunch = _ref.showRelaunch;
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var dispatch = (0, _hooks.useAppDispatch)();
@@ -2880,7 +2881,7 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
setEmailSentOn(instanceSettings.email || '');
}, [instanceSettings]);
var updateKonnector = /*#__PURE__*/function () {
- var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
var updatedConnection;
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
@@ -2903,7 +2904,7 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
}, _callee);
}));
return function updateKonnector() {
- return _ref.apply(this, arguments);
+ return _ref2.apply(this, arguments);
};
}();
return /*#__PURE__*/_react.default.createElement("div", {
@@ -2921,7 +2922,7 @@ var GrdfWaitConsent = function GrdfWaitConsent() {
className: "text-18-normal"
}, /*#__PURE__*/_react.default.createElement("span", {
className: "text-18-bold green"
- }, t('auth.grdfgrandlyon.waiting.validate')), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", null, t('auth.grdfgrandlyon.waiting.comeback'))), /*#__PURE__*/_react.default.createElement(_core.Button, {
+ }, t('auth.grdfgrandlyon.waiting.validate')), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", null, t('auth.grdfgrandlyon.waiting.comeback'))), showRelaunch && /*#__PURE__*/_react.default.createElement(_core.Button, {
className: "btnPrimary",
onClick: updateKonnector
}, t('auth.grdfgrandlyon.waiting.button_done')));
@@ -4098,7 +4099,9 @@ var KonnectorModal = function KonnectorModal(_ref) {
className: "title text-16-bold"
}, t('konnector_modal.error_consent_form_gas_title')), /*#__PURE__*/_react.default.createElement("div", {
className: "light text-14-regular"
- }, t('konnector_modal.error_consent_form_gas_report'))), error === _enums.KonnectorError.CHALLENGE_ASKED && fluidType === _enums.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null), error !== _enums.KonnectorError.LOGIN_FAILED && error !== _enums.KonnectorError.TERMS_VERSION_MISMATCH && error !== _enums.KonnectorError.CHALLENGE_ASKED && error !== _enums.KonnectorError.USER_ACTION_NEEDED_ACCOUNT_REMOVED &&
+ }, t('konnector_modal.error_consent_form_gas_report'))), error === _enums.KonnectorError.CHALLENGE_ASKED && fluidType === _enums.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, {
+ showRelaunch: false
+ }), error !== _enums.KonnectorError.LOGIN_FAILED && error !== _enums.KonnectorError.TERMS_VERSION_MISMATCH && error !== _enums.KonnectorError.CHALLENGE_ASKED && error !== _enums.KonnectorError.USER_ACTION_NEEDED_ACCOUNT_REMOVED &&
/*#__PURE__*/
// DEFAULT CASE
_react.default.createElement("div", {
@@ -4746,7 +4749,9 @@ var ConsumptionView = function ConsumptionView(_ref) {
})), /*#__PURE__*/_react.default.createElement(_Content.default, null, /*#__PURE__*/_react.default.createElement(_FluidButtons.default, {
activeFluid: fluidType,
key: updateKey
- }), isWaitingForConsent ? /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showOfflineData && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FluidChart.default, {
+ }), isWaitingForConsent ? /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, {
+ showRelaunch: true
+ }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showOfflineData && /*#__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.cfd02a91d88bd4c5d5c0.js b/app/ecolyo.72b12ed570b09586aa9f.js
similarity index 99%
rename from app/ecolyo.cfd02a91d88bd4c5d5c0.js
rename to app/ecolyo.72b12ed570b09586aa9f.js
index f8a466aaf..801d5f065 100644
--- a/app/ecolyo.cfd02a91d88bd4c5d5c0.js
+++ b/app/ecolyo.72b12ed570b09586aa9f.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"8a84577641f87c081060","5":"e43490adbc5e4ec339d5","6":"d6c898dafabc82b6f0e4","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"8a84577641f87c081060","5":"415983b8bf160af3bdc9","6":"d6c898dafabc82b6f0e4","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index c71507155..70d262c20 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.cfd02a91d88bd4c5d5c0.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.72b12ed570b09586aa9f.js"></script></div></body></html>
\ No newline at end of file
--
GitLab