From f040596ffd0a324fdb89c91a4006daad3fa3e28d Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 23 Apr 2024 14:51:19 +0200
Subject: [PATCH] publish: remove prop showRelaunch
generated from commit cf6e4f430c186ea1a5c13185feff7e8e03f19bed
---
...7da9.js => ecolyo.ea624a4fee68a8f41849.js} | 25 +++++++------------
...2545.js => ecolyo.26b0ef58a3143b7cc79b.js} | 2 +-
index.html | 2 +-
3 files changed, 11 insertions(+), 18 deletions(-)
rename 5/{ecolyo.50efef50b522dc967da9.js => ecolyo.ea624a4fee68a8f41849.js} (99%)
rename app/{ecolyo.c5e6df4685cabe842545.js => ecolyo.26b0ef58a3143b7cc79b.js} (99%)
diff --git a/5/ecolyo.50efef50b522dc967da9.js b/5/ecolyo.ea624a4fee68a8f41849.js
similarity index 99%
rename from 5/ecolyo.50efef50b522dc967da9.js
rename to 5/ecolyo.ea624a4fee68a8f41849.js
index e3cfe2099..591e0751a 100644
--- a/5/ecolyo.50efef50b522dc967da9.js
+++ b/5/ecolyo.ea624a4fee68a8f41849.js
@@ -988,10 +988,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
_useState10 = (0, _slicedToArray2.default)(_useState9, 2),
isOutdatedData = _useState10[0],
setIsOutdatedData = _useState10[1];
- var _useState11 = (0, _react.useState)(true),
- _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
- showConnection = _useState12[0],
- setShowConnection = _useState12[1];
var isWaitingForConsent = fluidType === _enums.FluidType.GAS && currentFluidStatus.status === _enums.FluidState.CHALLENGE_ASKED;
var fluidService = (0, _react.useMemo)(function () {
return new _fluid.default(client);
@@ -1239,9 +1235,7 @@ 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$ = updatedFluidStatus[2].connection.triggerState) === null || _updatedFluidStatus$ === void 0 ? void 0 : _updatedFluidStatus$.last_error) === _enums.KonnectorError.CHALLENGE_ASKED) {
- setShowConnection(false);
- // dispatch early ?
- // dispatch(setFluidStatus(updatedFluidStatus))
+ // timeout this 5 sec ?
handleConnectionEnd(false);
}
case 18:
@@ -1344,7 +1338,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
switch (_context8.prev = _context8.next) {
case 0:
if (!(currentFluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
- _context8.next = 9;
+ _context8.next = 8;
break;
}
if (subscribed) {
@@ -1358,11 +1352,10 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
fluidConnection: updatedConnection
}));
}
- setShowConnection(false);
connectionFlow = new _ConnectionFlow.default(client, trigger, konnector);
- _context8.next = 6;
+ _context8.next = 5;
return connectionFlow.launch();
- case 6:
+ case 5:
connectionFlow.jobWatcher.on(_flowEvents.ERROR_EVENT, /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
@@ -1384,7 +1377,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
connectionFlow.jobWatcher.on(_flowEvents.SUCCESS_EVENT, function () {
callbackResponse(_flowEvents.SUCCESS_EVENT);
});
- case 9:
+ case 8:
case "end":
return _context8.stop();
}
@@ -1402,7 +1395,7 @@ 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 && showConnection && /*#__PURE__*/_react.default.createElement(_Connection.default, {
+ }, !showOfflineData && /*#__PURE__*/_react.default.createElement(_Connection.default, {
fluidType: fluidType
}), showOfflineData && !isWaitingForConsent && /*#__PURE__*/_react.default.createElement(_core.Accordion, {
expanded: showConnectionDetails,
@@ -3446,6 +3439,7 @@ var _reactRouterDom = __webpack_require__("Iyno");
var _chart = __webpack_require__("dklY");
var _hooks = __webpack_require__("6FOS");
__webpack_require__("b8sX");
+var _GrdfWaitConsent = __webpack_require__("c3xf");
var GrdfInit = function GrdfInit() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
@@ -3460,7 +3454,7 @@ var GrdfInit = function GrdfInit() {
/** 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);
+ return /*#__PURE__*/_react.default.createElement(_GrdfWaitConsent.GrdfWaitConsent, null);
}
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-form"
@@ -4561,7 +4555,6 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("J58c"));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _ExpiredConsentModal = _interopRequireDefault(__webpack_require__("Hmac"));
-var _GrdfWaitConsent = __webpack_require__("c3xf");
var _Content = _interopRequireDefault(__webpack_require__("Yd9R"));
var _CustomPopupModal = _interopRequireDefault(__webpack_require__("oJdK"));
var _DateNavigator = _interopRequireDefault(__webpack_require__("r5RG"));
@@ -4790,7 +4783,7 @@ 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(_react.default.Fragment, null) : /*#__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.c5e6df4685cabe842545.js b/app/ecolyo.26b0ef58a3143b7cc79b.js
similarity index 99%
rename from app/ecolyo.c5e6df4685cabe842545.js
rename to app/ecolyo.26b0ef58a3143b7cc79b.js
index f796f2ae3..02d653a95 100644
--- a/app/ecolyo.c5e6df4685cabe842545.js
+++ b/app/ecolyo.26b0ef58a3143b7cc79b.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"f407a5f06d8f4c483bb7","4":"3b4996d5b14bfb7665c0","5":"50efef50b522dc967da9","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":"ea624a4fee68a8f41849","6":"55a8c1b77f056fa82248","7":"d61472e75eb196504d3e","8":"a73a83af326b8e1dfa4a","9":"73a97eac0086801c9dc9","10":"26edbface76655274ad8","11":"3baf0b358c1c353001a4"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 2c010dd38..667910fc6 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.c5e6df4685cabe842545.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.26b0ef58a3143b7cc79b.js"></script></div></body></html>
\ No newline at end of file
--
GitLab