From 96d22de3cc3d584cd9b53d1f6e11496d3de03d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Pailharey?= <rpailharey@grandlyon.com>
Date: Tue, 29 Aug 2023 12:49:42 +0200
Subject: [PATCH] publish: wip: use updateFluidConnection
generated from commit e9097a6857256a03cb7e9ac6cabf74c9096dff2d
---
...f0e4.js => ecolyo.d77dd954ef0ede32e594.js} | 120 +++++++++---------
...3fd0.js => ecolyo.57f92fbd13d6f9e6a0db.js} | 2 +-
index.html | 2 +-
3 files changed, 62 insertions(+), 62 deletions(-)
rename 1/{ecolyo.f17998bc671fb694f0e4.js => ecolyo.d77dd954ef0ede32e594.js} (99%)
rename app/{ecolyo.a80bda66a8cab13e3fd0.js => ecolyo.57f92fbd13d6f9e6a0db.js} (99%)
diff --git a/1/ecolyo.f17998bc671fb694f0e4.js b/1/ecolyo.d77dd954ef0ede32e594.js
similarity index 99%
rename from 1/ecolyo.f17998bc671fb694f0e4.js
rename to 1/ecolyo.d77dd954ef0ede32e594.js
index 96e7f4549..82c4889fb 100644
--- a/1/ecolyo.f17998bc671fb694f0e4.js
+++ b/1/ecolyo.d77dd954ef0ede32e594.js
@@ -1806,21 +1806,18 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- console.log('Lancement du konnector : ');
dispatch((0, _global.updateShouldLaunchKonnector)({
fluidType: fluidStatus.fluidType,
shouldLaunchKonnector: true
}));
- console.log('FluidStatus.connection après lancement du konnector : ');
- console.log(fluidStatus.connection);
- case 4:
+ case 1:
case "end":
return _context.stop();
}
}
}, _callee);
- })), [dispatch, fluidStatus.fluidType, fluidStatus.connection]);
+ })), [dispatch, fluidStatus.fluidType]);
var sendUsageEventError = /*#__PURE__*/function () {
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(slug) {
@@ -1908,20 +1905,16 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
trigger: _trigger
});
(0, _chart.setLoading)(false);
- console.log('Ajout des trigger : ');
- console.log(updatedConnection);
dispatch((0, _global.updateFluidConnection)({
fluidType: fluidStatus.fluidType,
fluidConnection: updatedConnection
}));
- console.log('FluidStatus.connection après ajout des trigger : ');
- console.log(fluidStatus.connection);
onSuccess();
- _context3.next = 36;
+ _context3.next = 32;
break;
- case 30:
- _context3.prev = 30;
+ case 26:
+ _context3.prev = 26;
_context3.t1 = _context3["catch"](1);
(0, _chart.setLoading)(false);
sendUsageEventError(konnectorSlug);
@@ -1932,12 +1925,12 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
error: _context3.t1
}));
- case 36:
+ case 32:
case "end":
return _context3.stop();
}
}
- }, _callee3, null, [[1, 30]]);
+ }, _callee3, null, [[1, 26]]);
}));
return function connect() {
@@ -1945,59 +1938,66 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
};
}();
- var update = (0, _react2.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
- var _account, auth, accountService, updatedAccount, updatedConnection;
+ var update = /*#__PURE__*/function () {
+ var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+ var _account, auth, accountService, updatedAccount, updatedConnection;
- return _regenerator.default.wrap(function _callee4$(_context4) {
- while (1) {
- switch (_context4.prev = _context4.next) {
- case 0:
- if (!fluidStatus.connection.account) {
- _context4.next = 11;
- break;
- }
+ return _regenerator.default.wrap(function _callee4$(_context4) {
+ while (1) {
+ switch (_context4.prev = _context4.next) {
+ case 0:
+ if (!fluidStatus.connection.account) {
+ _context4.next = 11;
+ break;
+ }
- _account = fluidStatus.connection.account;
+ _account = fluidStatus.connection.account;
- if (konnectorSlug === _enums.FluidSlugType.WATER) {
- auth = {
- login: login,
- password: password
- };
- } else {
- auth = {
- pointId: sgeConnect.pdl ? sgeConnect.pdl.toString() : '',
- firstname: sgeConnect.firstName,
- lastname: sgeConnect.lastName,
- address: sgeConnect.address,
- postalCode: sgeConnect.zipCode ? sgeConnect.zipCode.toString() : '',
- city: sgeConnect.city
- };
- }
+ if (konnectorSlug === _enums.FluidSlugType.WATER) {
+ auth = {
+ login: login,
+ password: password
+ };
+ } else {
+ auth = {
+ pointId: sgeConnect.pdl ? sgeConnect.pdl.toString() : '',
+ firstname: sgeConnect.firstName,
+ lastname: sgeConnect.lastName,
+ address: sgeConnect.address,
+ postalCode: sgeConnect.zipCode ? sgeConnect.zipCode.toString() : '',
+ city: sgeConnect.city
+ };
+ }
- _account.auth = auth;
- accountService = new _account2.default(client);
- _context4.next = 7;
- return accountService.updateAccount(_account);
+ _account.auth = auth;
+ accountService = new _account2.default(client);
+ _context4.next = 7;
+ return accountService.updateAccount(_account);
- case 7:
- updatedAccount = _context4.sent;
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
- account: updatedAccount
- });
- dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
- fluidConnection: updatedConnection
- }));
- onSuccess();
+ case 7:
+ updatedAccount = _context4.sent;
+ updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ account: updatedAccount
+ });
+ dispatch((0, _global.updateFluidConnection)({
+ fluidType: fluidStatus.fluidType,
+ fluidConnection: updatedConnection
+ }));
+ onSuccess();
- case 11:
- case "end":
- return _context4.stop();
+ case 11:
+ case "end":
+ return _context4.stop();
+ }
}
- }
- }, _callee4);
- })), [client, dispatch, fluidStatus.connection, fluidStatus.fluidType, konnectorSlug, login, onSuccess, password, sgeConnect.address, sgeConnect.city, sgeConnect.firstName, sgeConnect.lastName, sgeConnect.pdl, sgeConnect.zipCode]);
+ }, _callee4);
+ }));
+
+ return function update() {
+ return _ref5.apply(this, arguments);
+ };
+ }();
+
return [connect, update, connectError];
};
diff --git a/app/ecolyo.a80bda66a8cab13e3fd0.js b/app/ecolyo.57f92fbd13d6f9e6a0db.js
similarity index 99%
rename from app/ecolyo.a80bda66a8cab13e3fd0.js
rename to app/ecolyo.57f92fbd13d6f9e6a0db.js
index f4e6db5cb..e97689971 100644
--- a/app/ecolyo.a80bda66a8cab13e3fd0.js
+++ b/app/ecolyo.57f92fbd13d6f9e6a0db.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"f17998bc671fb694f0e4","2":"ee6e82fa75e665d74560","4":"d2bf69e982254c3ce239","5":"376cdd52c18eb6f092a0","6":"06009b1da7881a5924bd","7":"03964c0031ba71f39f0a","8":"79baa4590f4f0a94be8c","9":"30da7dc1931663d9bbdf","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"d77dd954ef0ede32e594","2":"ee6e82fa75e665d74560","4":"d2bf69e982254c3ce239","5":"376cdd52c18eb6f092a0","6":"06009b1da7881a5924bd","7":"03964c0031ba71f39f0a","8":"79baa4590f4f0a94be8c","9":"30da7dc1931663d9bbdf","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
diff --git a/index.html b/index.html
index 9063ff82d..066118c5f 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.e8305b3519e4c7b4170b.js"></script><script src="app/ecolyo.a80bda66a8cab13e3fd0.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.e8305b3519e4c7b4170b.js"></script><script src="app/ecolyo.57f92fbd13d6f9e6a0db.js"></script></div></body></html>
\ No newline at end of file
--
GitLab