diff --git a/1/ecolyo.812715c2a24f19cbdaae.js b/1/ecolyo.cedfef00ced97e45ba04.js
similarity index 95%
rename from 1/ecolyo.812715c2a24f19cbdaae.js
rename to 1/ecolyo.cedfef00ced97e45ba04.js
index 2d4345be80561d25a2fe9851bd84282f875e6777..3ae0041d5e984fcf32e04e54e2f04edeb529f5cb 100644
--- a/1/ecolyo.812715c2a24f19cbdaae.js
+++ b/1/ecolyo.cedfef00ced97e45ba04.js
@@ -564,8 +564,7 @@ __webpack_require__("0OtY");
var _FormLogin = _interopRequireDefault(__webpack_require__("PlmD"));
var EpglForm = function EpglForm(_ref) {
- var fluidStatus = _ref.fluidStatus,
- hasCreatedAccount = _ref.hasCreatedAccount;
+ var hasCreatedAccount = _ref.hasCreatedAccount;
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
@@ -576,9 +575,7 @@ var EpglForm = function EpglForm(_ref) {
className: "connection-form-title eglgrandlyon text-20-bold"
}, t('auth.eglgrandlyon.with_account.title')), /*#__PURE__*/_react.default.createElement("div", {
className: "connection-form-subtitle text-18-bold"
- }, t('auth.eglgrandlyon.with_account.subtitle1')), /*#__PURE__*/_react.default.createElement(_FormLogin.default, {
- fluidStatus: fluidStatus
- }));
+ }, t('auth.eglgrandlyon.with_account.subtitle1')), /*#__PURE__*/_react.default.createElement(_FormLogin.default, null));
};
var _default = EpglForm;
@@ -927,6 +924,8 @@ var _useKonnectorAuth3 = _interopRequireDefault(__webpack_require__("Gk06"));
var _I18n = __webpack_require__("buk/");
+var _enums = __webpack_require__("gnxY");
+
var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
@@ -945,24 +944,29 @@ 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 SgeInit = function SgeInit(_ref) {
- var fluidStatus = _ref.fluidStatus;
-
+var SgeInit = function SgeInit() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var navigate = (0, _reactRouterDom.useNavigate)();
- var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
- var account = fluidStatus.connection.account;
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo.global;
}),
- sgeConnect = _useAppSelector.sgeConnect;
+ fluidStatus = _useAppSelector.fluidStatus;
+
+ var currentFluidStatus = fluidStatus[_enums.FluidType.ELECTRICITY];
+ var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
+ 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)(fluidStatus),
+ var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(currentFluidStatus.fluidType),
_useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 2),
connect = _useKonnectorAuth2[0],
update = _useKonnectorAuth2[1];
@@ -1039,7 +1043,7 @@ var SgeInit = function SgeInit(_ref) {
root: 'btn-highlight',
label: 'text-16-bold'
}
- }, t("auth.".concat(konnectorSlug, ".connect"))), fluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_core.Button, {
+ }, t("auth.".concat(konnectorSlug, ".connect"))), currentFluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_core.Button, {
classes: {
root: 'btn-secondary',
label: 'text-16-bold'
@@ -1567,9 +1571,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
})), !isMulti && /*#__PURE__*/_react.default.createElement("div", {
className: "konnector-section"
}, /*#__PURE__*/_react.default.createElement(_KonnectorViewerCard.default, {
- fluidStatus: fluidStatus[fluidType],
fluidType: fluidType,
- isParam: true,
isDisconnected: false,
showOfflineData: true,
setActive: setActive,
@@ -1578,9 +1580,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
}))), !showOfflineData && /*#__PURE__*/_react.default.createElement("div", {
className: "konnector-section"
}, isMulti ? /*#__PURE__*/_react.default.createElement(_KonnectorViewerList.default, null) : /*#__PURE__*/_react.default.createElement(_KonnectorViewerCard.default, {
- fluidStatus: fluidStatus[fluidType],
fluidType: fluidType,
- isParam: false,
isDisconnected: true,
showOfflineData: false,
setActive: setActive,
@@ -1592,7 +1592,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
}).map(function (issuedFluid) {
return /*#__PURE__*/_react.default.createElement(_PartnerIssueModal.default, {
key: issuedFluid.fluidType,
- issuedFluid: issuedFluid,
+ issuedFluid: issuedFluid.fluidType,
open: partnersIssueModal[getPartnerKey(issuedFluid.fluidType)],
handleCloseClick: handleClosePartnerIssueModal
});
@@ -1665,7 +1665,14 @@ 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 Connection = function Connection(_ref) {
- var fluidStatus = _ref.fluidStatus;
+ var fluidType = _ref.fluidType;
+
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector.fluidStatus;
+
+ var currentFluidStatus = fluidStatus[fluidType];
var dispatch = (0, _hooks.useAppDispatch)();
var handleSuccess = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
var updatedConnection;
@@ -1673,11 +1680,11 @@ var Connection = function Connection(_ref) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
shouldLaunchKonnector: true
});
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: fluidType,
fluidConnection: updatedConnection
}));
@@ -1687,15 +1694,10 @@ var Connection = function Connection(_ref) {
}
}
}, _callee);
- })), [dispatch, fluidStatus.fluidType, fluidStatus.connection]);
+ })), [dispatch, fluidType, currentFluidStatus.connection]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "konnector-form"
- }, fluidStatus.fluidType === _enums.FluidType.ELECTRICITY && /*#__PURE__*/_react.default.createElement(_SgeInit.default, {
- fluidStatus: fluidStatus
- }), fluidStatus.fluidType === _enums.FluidType.WATER && /*#__PURE__*/_react.default.createElement(_EpglInit.default, {
- fluidStatus: fluidStatus
- }), fluidStatus.fluidType === _enums.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_GrdfInit.default, {
- fluidStatus: fluidStatus,
+ }, fluidType === _enums.FluidType.ELECTRICITY && /*#__PURE__*/_react.default.createElement(_SgeInit.default, null), fluidType === _enums.FluidType.WATER && /*#__PURE__*/_react.default.createElement(_EpglInit.default, null), fluidType === _enums.FluidType.GAS && /*#__PURE__*/_react.default.createElement(_GrdfInit.default, {
onSuccess: handleSuccess
}));
};
@@ -1784,54 +1786,35 @@ 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 useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
+var useKonnectorAuth = function useKonnectorAuth(fluidType, login, password) {
var client = (0, _cozyClient.useClient)();
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var dispatch = (0, _hooks.useAppDispatch)();
- var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo.global;
}),
- sgeConnect = _useAppSelector.sgeConnect;
+ sgeConnect = _useAppSelector.sgeConnect,
+ fluidStatus = _useAppSelector.fluidStatus;
+
+ var currentFluidStatus = fluidStatus[fluidType];
+ var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
var _useState = (0, _react2.useState)(''),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
connectError = _useState2[0],
setError = _useState2[1];
- var onSuccess = (0, _react2.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
- var updatedConnection;
- return _regenerator.default.wrap(function _callee$(_context) {
- while (1) {
- switch (_context.prev = _context.next) {
- case 0:
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
- shouldLaunchKonnector: true
- });
- dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
- fluidConnection: updatedConnection
- }));
-
- case 2:
- case "end":
- return _context.stop();
- }
- }
- }, _callee);
- })), [dispatch, fluidStatus.fluidType, fluidStatus.connection]);
-
var sendUsageEventError = /*#__PURE__*/function () {
- var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(slug) {
- return _regenerator.default.wrap(function _callee2$(_context2) {
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(slug) {
+ return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
- switch (_context2.prev = _context2.next) {
+ switch (_context.prev = _context.next) {
case 0:
- return _context2.abrupt("return", _usageEvent.default.addEvent(client, {
+ return _context.abrupt("return", _usageEvent.default.addEvent(client, {
type: _enums.UsageEventType.KONNECTOR_CONNECT_EVENT,
target: slug,
result: 'error'
@@ -1839,28 +1822,28 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
case 1:
case "end":
- return _context2.stop();
+ return _context.stop();
}
}
- }, _callee2);
+ }, _callee);
}));
return function sendUsageEventError(_x) {
- return _ref2.apply(this, arguments);
+ return _ref.apply(this, arguments);
};
}();
var connect = /*#__PURE__*/function () {
- var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
- var connectionService, _ref4, _account, _trigger, updatedConnection;
+ var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+ var connectionService, _ref3, _account, _trigger, updatedConnection;
- return _regenerator.default.wrap(function _callee3$(_context3) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
- switch (_context3.prev = _context3.next) {
+ switch (_context2.prev = _context2.next) {
case 0:
connectionService = new _connection.default(client);
- _context3.prev = 1;
- _context3.next = 4;
+ _context2.prev = 1;
+ _context2.next = 4;
return _usageEvent.default.addEvent(client, {
type: _enums.UsageEventType.KONNECTOR_ATTEMPT_EVENT,
target: konnectorSlug,
@@ -1869,95 +1852,95 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
case 4:
if (!(konnectorSlug === _enums.FluidSlugType.WATER)) {
- _context3.next = 10;
+ _context2.next = 10;
break;
}
- _context3.next = 7;
+ _context2.next = 7;
return connectionService.connectNewUser(konnectorSlug, {
login: login ? login : '',
password: password
});
case 7:
- _context3.t0 = _context3.sent;
- _context3.next = 13;
+ _context2.t0 = _context2.sent;
+ _context2.next = 13;
break;
case 10:
- _context3.next = 12;
+ _context2.next = 12;
return connectionService.connectNewUser(konnectorSlug, undefined, sgeConnect);
case 12:
- _context3.t0 = _context3.sent;
+ _context2.t0 = _context2.sent;
case 13:
- _ref4 = _context3.t0;
- _account = _ref4.account;
- _trigger = _ref4.trigger;
+ _ref3 = _context2.t0;
+ _account = _ref3.account;
+ _trigger = _ref3.trigger;
if (!(!_trigger || !_account)) {
- _context3.next = 20;
+ _context2.next = 20;
break;
}
setError(t('konnector_form.error_account_creation'));
sendUsageEventError(konnectorSlug);
- return _context3.abrupt("return", null);
+ return _context2.abrupt("return", null);
case 20:
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
account: _account,
- trigger: _trigger
+ trigger: _trigger,
+ shouldLaunchKonnector: true
});
(0, _chart.setLoading)(false);
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
fluidConnection: updatedConnection
}));
- onSuccess();
- _context3.next = 32;
+ _context2.next = 31;
break;
- case 26:
- _context3.prev = 26;
- _context3.t1 = _context3["catch"](1);
+ case 25:
+ _context2.prev = 25;
+ _context2.t1 = _context2["catch"](1);
(0, _chart.setLoading)(false);
sendUsageEventError(konnectorSlug);
- _logger.default.error(_context3.t1);
+ _logger.default.error(_context2.t1);
Sentry.captureException(JSON.stringify({
- error: _context3.t1
+ error: _context2.t1
}));
- case 32:
+ case 31:
case "end":
- return _context3.stop();
+ return _context2.stop();
}
}
- }, _callee3, null, [[1, 26]]);
+ }, _callee2, null, [[1, 25]]);
}));
return function connect() {
- return _ref3.apply(this, arguments);
+ return _ref2.apply(this, arguments);
};
}();
var update = /*#__PURE__*/function () {
- var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+ var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
var _account, auth, accountService, updatedAccount, updatedConnection;
- return _regenerator.default.wrap(function _callee4$(_context4) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
- switch (_context4.prev = _context4.next) {
+ switch (_context3.prev = _context3.next) {
case 0:
- if (!fluidStatus.connection.account) {
- _context4.next = 11;
+ if (!currentFluidStatus.connection.account) {
+ _context3.next = 10;
break;
}
- _account = fluidStatus.connection.account;
+ _account = currentFluidStatus.connection.account;
if (konnectorSlug === _enums.FluidSlugType.WATER) {
auth = {
@@ -1977,30 +1960,30 @@ var useKonnectorAuth = function useKonnectorAuth(fluidStatus, login, password) {
_account.auth = auth;
accountService = new _account2.default(client);
- _context4.next = 7;
+ _context3.next = 7;
return accountService.updateAccount(_account);
case 7:
- updatedAccount = _context4.sent;
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
- account: updatedAccount
+ updatedAccount = _context3.sent;
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
+ account: updatedAccount,
+ shouldLaunchKonnector: true
});
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
fluidConnection: updatedConnection
}));
- onSuccess();
- case 11:
+ case 10:
case "end":
- return _context4.stop();
+ return _context3.stop();
}
}
- }, _callee4);
+ }, _callee3);
}));
return function update() {
- return _ref5.apply(this, arguments);
+ return _ref4.apply(this, arguments);
};
}();
@@ -2144,9 +2127,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
- var fluidStatus = _ref.fluidStatus,
- isParam = _ref.isParam,
- isDisconnected = _ref.isDisconnected,
+ var isDisconnected = _ref.isDisconnected,
showOfflineData = _ref.showOfflineData,
active = _ref.active,
fluidType = _ref.fluidType,
@@ -2158,21 +2139,23 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
var client = (0, _cozyClient.useClient)();
var dispatch = (0, _hooks.useAppDispatch)();
var navigate = (0, _reactRouterDom.useNavigate)();
- var fluidSlug = fluidStatus.connection.konnectorConfig.slug;
- var fluidState = fluidStatus.status;
- var konnector = fluidStatus.connection.konnector;
- var account = fluidStatus.connection.account;
- var trigger = fluidStatus.connection.trigger;
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo;
}),
currentChallenge = _useAppSelector.challenge.currentChallenge,
_useAppSelector$globa = _useAppSelector.global,
- statusArray = _useAppSelector$globa.fluidStatus,
+ fluidStatus = _useAppSelector$globa.fluidStatus,
shouldRefreshConsent = _useAppSelector$globa.shouldRefreshConsent,
partnersInfo = _useAppSelector$globa.partnersInfo;
+ var currentFluidStatus = fluidStatus[fluidType];
+ var fluidSlug = currentFluidStatus.connection.konnectorConfig.slug;
+ var fluidState = currentFluidStatus.status;
+ var konnector = currentFluidStatus.connection.konnector;
+ var account = currentFluidStatus.connection.account;
+ var trigger = currentFluidStatus.connection.trigger;
+
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
openModal = _useState2[0],
@@ -2183,7 +2166,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
isUpdating = _useState4[0],
setIsUpdating = _useState4[1];
- var _useState5 = (0, _react.useState)(fluidSlug !== _enums.FluidSlugType.GAS ? true : false),
+ var _useState5 = (0, _react.useState)(fluidSlug !== _enums.FluidSlugType.GAS),
_useState6 = (0, _slicedToArray2.default)(_useState5, 2),
isLogging = _useState6[0],
setIsLogging = _useState6[1];
@@ -2198,15 +2181,10 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
konnectorState = _useState10[0],
setKonnectorState = _useState10[1];
- var _useState11 = (0, _react.useState)([]),
+ var _useState11 = (0, _react.useState)(null),
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
- updatedFluidStatus = _useState12[0],
- setUpdatedFluidStatus = _useState12[1];
-
- var _useState13 = (0, _react.useState)(null),
- _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
- isOutdatedData = _useState14[0],
- setIsOutdatedData = _useState14[1];
+ isOutdatedData = _useState12[0],
+ setIsOutdatedData = _useState12[1];
var fluidService = (0, _react.useMemo)(function () {
return new _fluid.default(client);
@@ -2214,9 +2192,8 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
var partnersInfoService = (0, _react.useMemo)(function () {
return new _partnersInfo2.default(client);
}, [client]);
- var lastDataDate = fluidType !== _enums.FluidType.MULTIFLUID && statusArray[fluidType].lastDataDate ? statusArray[fluidType].lastDataDate.toLocaleString() + fluidType : fluidType;
- var iconType = (0, _picto.getParamPicto)(fluidStatus.fluidType);
- var iconAddType = isParam ? (0, _picto.getParamPicto)(fluidStatus.fluidType) : (0, _picto.getAddPicto)(fluidStatus.fluidType);
+ var lastDataDate = fluidType !== _enums.FluidType.MULTIFLUID && currentFluidStatus.lastDataDate ? currentFluidStatus.lastDataDate.toLocaleString() + fluidType : fluidType;
+ var iconType = (0, _picto.getParamPicto)(currentFluidStatus.fluidType);
var toggleAccordion = function toggleAccordion() {
setActive(function (prev) {
@@ -2236,7 +2213,6 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
case 2:
_updatedFluidStatus = _context.sent;
- setUpdatedFluidStatus(_updatedFluidStatus);
refDate = _luxon.DateTime.fromISO('0001-01-01');
_lastDataDate = _luxon.DateTime.fromISO('0001-01-01');
_iterator = _createForOfIteratorHelper(_updatedFluidStatus);
@@ -2261,7 +2237,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return _context.abrupt("return", _updatedFluidStatus);
- case 10:
+ case 9:
case "end":
return _context.stop();
}
@@ -2309,7 +2285,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
}, _callee2);
})), [client, dispatch, currentChallenge]);
var handleAccountDeletion = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
- var _updatedFluidStatus, _partnersInfo, _updatedFluidStatus2;
+ var _updatedFluidStatus, _partnersInfo, updatedFluidStatus;
return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
@@ -2339,8 +2315,8 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return fluidService.getFluidStatus(_partnersInfo);
case 11:
- _updatedFluidStatus2 = _context3.sent;
- dispatch((0, _global.setFluidStatus)(_updatedFluidStatus2));
+ updatedFluidStatus = _context3.sent;
+ dispatch((0, _global.setFluidStatus)(updatedFluidStatus));
case 13:
setActive(false);
@@ -2354,72 +2330,76 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
})), [refreshChallengeState, updateGlobalFluidStatus, setActive, partnersInfoService, fluidService, dispatch]);
var handleConnectionEnd = (0, _react.useCallback)( /*#__PURE__*/function () {
var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(isSuccess) {
- var isGlobalLoginFailed, isEnedisCodeInseeError, shouldDeleteAccount, _fluidStatus$connecti, auth, accountService, _updatedFluidStatus3;
+ var isGlobalLoginFailed, isEnedisCodeInseeError, shouldDeleteAccount, _currentFluidStatus$c, lastEpglLogin, auth, accountService, updatedFluidStatus;
return _regenerator.default.wrap(function _callee4$(_context4) {
while (1) {
switch (_context4.prev = _context4.next) {
case 0:
// CASE FOR GLOBAL LOGIN FAILED
- isGlobalLoginFailed = konnectorErrorDescription === _enums.KonnectorError.LOGIN_FAILED || konnectorErrorDescription === _enums.KonnectorError.UNKNOWN_ERROR || konnectorErrorDescription === _enums.KonnectorError.CHALLENGE_ASKED || konnectorErrorDescription === _enums.KonnectorError.CRITICAL; // CASE FOR ENEDIS CODE INSEE ERROR
+ isGlobalLoginFailed = konnectorErrorDescription === _enums.KonnectorError.LOGIN_FAILED || konnectorErrorDescription === _enums.KonnectorError.UNKNOWN_ERROR || konnectorErrorDescription === _enums.KonnectorError.CHALLENGE_ASKED || konnectorErrorDescription === _enums.KonnectorError.CRITICAL || konnectorErrorDescription === _enums.KonnectorError.MISSING_SECRET; // CASE FOR ENEDIS CODE INSEE ERROR
isEnedisCodeInseeError = !isUpdating && fluidType === _enums.FluidType.ELECTRICITY;
- shouldDeleteAccount = account && !isSuccess && fluidStatus && fluidStatus.connection.account && (isGlobalLoginFailed || isEnedisCodeInseeError);
+ shouldDeleteAccount = account && !isSuccess && currentFluidStatus && currentFluidStatus.connection.account && (isGlobalLoginFailed || isEnedisCodeInseeError);
if (!shouldDeleteAccount) {
- _context4.next = 12;
+ _context4.next = 14;
break;
}
- // KEEP CREDENTIALS FOR EGL
- if (fluidSlug === _enums.FluidSlugType.WATER && (_fluidStatus$connecti = fluidStatus.connection.account) !== null && _fluidStatus$connecti !== void 0 && _fluidStatus$connecti.auth) {
- auth = fluidStatus.connection.account.auth;
- fluidStatus.connection.konnectorConfig.lastKnownCredentials = auth.login;
+ // KEEP LAST LOGIN FOR EPGL
+ lastEpglLogin = '';
+
+ if (fluidSlug === _enums.FluidSlugType.WATER && (_currentFluidStatus$c = currentFluidStatus.connection.account) !== null && _currentFluidStatus$c !== void 0 && _currentFluidStatus$c.auth) {
+ auth = currentFluidStatus.connection.account.auth;
+ lastEpglLogin = auth.login;
} // DELETE ACCOUNT
accountService = new _account.default(client);
- _context4.next = 8;
+ _context4.next = 9;
return accountService.deleteAccount(account);
- case 8:
- _context4.next = 10;
+ case 9:
+ _context4.next = 11;
return handleAccountDeletion();
- case 10:
- _context4.next = 20;
- break;
-
- case 12:
- if (!(isSuccess && fluidStatus.lastDataDate === null)) {
- _context4.next = 15;
- break;
+ case 11:
+ // RESTORE LAST KNOWN CREDENTIALS
+ if (lastEpglLogin) {
+ dispatch((0, _global.setLastEpglLogin)({
+ lastEpglLogin: lastEpglLogin
+ }));
}
- _context4.next = 15;
- return _usageEvent.default.udpateConnectionAttemptEvent(client, fluidSlug);
+ _context4.next = 21;
+ break;
- case 15:
- if (!(updatedFluidStatus.length > 0)) {
- _context4.next = 20;
+ case 14:
+ if (!(isSuccess && currentFluidStatus.lastDataDate === null)) {
+ _context4.next = 17;
break;
}
- _context4.next = 18;
+ _context4.next = 17;
+ return _usageEvent.default.updateConnectionAttemptEvent(client, fluidSlug);
+
+ case 17:
+ _context4.next = 19;
return fluidService.getFluidStatus(partnersInfo);
- case 18:
- _updatedFluidStatus3 = _context4.sent;
- dispatch((0, _global.setFluidStatus)(_updatedFluidStatus3));
+ case 19:
+ updatedFluidStatus = _context4.sent;
+ dispatch((0, _global.setFluidStatus)(updatedFluidStatus));
- case 20:
+ case 21:
setActive(false);
setOpenModal(false); // TODO null state seems to be read before modal closing and display a success icon in modal
setKonnectorState(null);
setKonnectorErrorDescription(null);
- case 24:
+ case 25:
case "end":
return _context4.stop();
}
@@ -2430,7 +2410,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return function (_x) {
return _ref5.apply(this, arguments);
};
- }(), [account, konnectorErrorDescription, fluidStatus, isUpdating, fluidType, setActive, fluidSlug, client, handleAccountDeletion, updatedFluidStatus.length, fluidService, partnersInfo, dispatch]);
+ }(), [account, konnectorErrorDescription, currentFluidStatus, isUpdating, fluidType, setActive, fluidSlug, client, handleAccountDeletion, fluidService, partnersInfo, dispatch]);
var sendUsageEventSuccess = (0, _react.useCallback)( /*#__PURE__*/function () {
var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(konnectorSlug, isConnexion) {
return _regenerator.default.wrap(function _callee5$(_context5) {
@@ -2479,8 +2459,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return _ref7.apply(this, arguments);
};
}(), [client]);
-
- var toggleModalConnection = function toggleModalConnection() {
+ var toggleModalConnection = (0, _react.useCallback)(function () {
switch (fluidType) {
case _enums.FluidType.ELECTRICITY:
navigate('/sge-connect');
@@ -2492,8 +2471,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
dispatch((0, _modal.openConnectionModal)(true));
break;
}
- };
-
+ }, [dispatch, fluidType, navigate]);
var getConnectionCard = (0, _react.useCallback)(function () {
if (showOfflineData && !account) {
return /*#__PURE__*/_react.default.createElement(_core.Button, {
@@ -2510,19 +2488,18 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
konnectorSlug: fluidSlug
});
} // Handle login failed for EGL
- else if (fluidState === _enums.FluidState.ERROR_LOGIN_FAILED && fluidType === _enums.FluidType.WATER || account && fluidStatus.status !== _enums.FluidState.NOT_CONNECTED) {
+ else if (fluidState === _enums.FluidState.ERROR_LOGIN_FAILED && fluidType === _enums.FluidType.WATER || account && currentFluidStatus.status !== _enums.FluidState.NOT_CONNECTED) {
return /*#__PURE__*/_react.default.createElement(_ConnectionResult.default, {
- fluidStatus: fluidStatus,
handleAccountDeletion: handleAccountDeletion,
fluidType: fluidType,
key: lastDataDate
});
} else {
return /*#__PURE__*/_react.default.createElement(_Connection.default, {
- fluidStatus: fluidStatus
+ fluidType: currentFluidStatus.fluidType
});
}
- }, [fluidState, isUpdating, account, fluidStatus, fluidSlug, handleAccountDeletion, fluidType, lastDataDate]);
+ }, [account, currentFluidStatus.fluidType, currentFluidStatus.status, fluidSlug, fluidState, fluidType, handleAccountDeletion, isUpdating, lastDataDate, showOfflineData, t, toggleModalConnection]);
var callbackResponse = (0, _react.useCallback)( /*#__PURE__*/function () {
var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(_state) {
var updatedConnection;
@@ -2535,11 +2512,11 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
break;
}
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
shouldLaunchKonnector: false
});
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
fluidConnection: updatedConnection
}));
_context7.t0 = Promise;
@@ -2570,40 +2547,40 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
return function (_x6) {
return _ref8.apply(this, arguments);
};
- }(), [dispatch, fluidStatus.connection, fluidStatus.fluidType, refreshChallengeState, updateGlobalFluidStatus]);
+ }(), [dispatch, currentFluidStatus.connection, currentFluidStatus.fluidType, refreshChallengeState, updateGlobalFluidStatus]);
var displayKonnectorIcon = (0, _react.useCallback)(function () {
return /*#__PURE__*/_react.default.createElement("div", {
className: "konnector-icon"
}, /*#__PURE__*/_react.default.createElement(_Icon.default, {
- icon: fluidStatus.connection.account ? iconType : _offlineParam.default,
+ icon: currentFluidStatus.connection.account ? iconType : _offlineParam.default,
size: 49
- }), fluidStatus.maintenance ? /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ }), currentFluidStatus.maintenance ? /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
icon: _notif_maintenance.default,
size: 24,
className: "konnector-state-picto"
- }) : (fluidStatus.status === _enums.FluidState.ERROR || isOutdatedData || fluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) && fluidStatus.connection.account && /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ }) : (currentFluidStatus.status === _enums.FluidState.ERROR || isOutdatedData || currentFluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) && currentFluidStatus.connection.account && /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
icon: _notif_error.default,
size: 24,
className: "konnector-state-picto"
}));
- }, [fluidStatus.connection.account, fluidStatus.maintenance, fluidStatus.status, iconAddType, iconType, isOutdatedData]);
+ }, [currentFluidStatus.connection.account, currentFluidStatus.maintenance, currentFluidStatus.status, iconType, isOutdatedData]);
var displayKonnectorHeader = (0, _react.useCallback)(function () {
- if (fluidStatus.maintenance) {
+ if (currentFluidStatus.maintenance) {
return /*#__PURE__*/_react.default.createElement("span", {
className: "text-16-bold"
}, t("konnector_options.partner_issue"));
- } else if (isOutdatedData && fluidStatus.connection.account) {
+ } else if (isOutdatedData && currentFluidStatus.connection.account) {
return /*#__PURE__*/_react.default.createElement("span", {
className: "text-16-bold outdated"
}, t('konnector_options.outdated', {
isOutdatedData: isOutdatedData
}));
- } else if (fluidStatus.connection.account && !isOutdatedData) {
- return t("FLUID.".concat(_enums.FluidType[fluidStatus.fluidType], ".LABEL"));
+ } else if (currentFluidStatus.connection.account && !isOutdatedData) {
+ return t("FLUID.".concat(_enums.FluidType[currentFluidStatus.fluidType], ".LABEL"));
} else {
- return t("konnector_options.label_offline_".concat(_enums.FluidType[fluidStatus.fluidType].toLowerCase()));
+ return t("konnector_options.label_offline_".concat(_enums.FluidType[currentFluidStatus.fluidType].toLowerCase()));
}
- }, [fluidStatus.connection.account, fluidStatus.fluidType, fluidStatus.maintenance, isOutdatedData, t]); // If user has selected accept button on Expired consent modal, then delete its account
+ }, [currentFluidStatus.connection.account, currentFluidStatus.fluidType, currentFluidStatus.maintenance, isOutdatedData, t]); // If user has selected accept button on Expired consent modal, then delete its account
(0, _react.useEffect)(function () {
function deleteAccountForConsentRefresh() {
@@ -2651,20 +2628,26 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
function _getData() {
_getData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
- var connectionFlow;
+ var updatedConnection, connectionFlow;
return _regenerator.default.wrap(function _callee9$(_context9) {
while (1) {
switch (_context9.prev = _context9.next) {
case 0:
- if (!(fluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
+ if (!(currentFluidStatus.connection.shouldLaunchKonnector && !(0, _triggers.isKonnectorRunning)(trigger))) {
_context9.next = 8;
break;
}
if (subscribed) {
- if (fluidStatus.connection.isUpdating) setIsUpdating(true);
+ if (currentFluidStatus.connection.isUpdating) setIsUpdating(true);
setOpenModal(true);
- fluidStatus.connection.shouldLaunchKonnector = false;
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
+ shouldLaunchKonnector: false
+ });
+ dispatch((0, _global.updateFluidConnection)({
+ fluidType: currentFluidStatus.fluidType,
+ fluidConnection: updatedConnection
+ }));
}
connectionFlow = new _ConnectionFlow.default(client, trigger, konnector);
@@ -2673,16 +2656,16 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
case 5:
connectionFlow.jobWatcher.on(_flowEvents.ERROR_EVENT, function () {
- sendUsageEventError(fluidSlug, fluidStatus.lastDataDate === null);
+ sendUsageEventError(fluidSlug, currentFluidStatus.lastDataDate === null);
setKonnectorErrorDescription(connectionFlow.jobWatcher.on()._error);
callbackResponse(_flowEvents.ERROR_EVENT);
});
connectionFlow.jobWatcher.on(_flowEvents.LOGIN_SUCCESS_EVENT, function () {
setIsLogging(false);
- sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null);
+ sendUsageEventSuccess(fluidSlug, currentFluidStatus.lastDataDate === null);
});
connectionFlow.jobWatcher.on(_flowEvents.SUCCESS_EVENT, function () {
- sendUsageEventSuccess(fluidSlug, fluidStatus.lastDataDate === null);
+ sendUsageEventSuccess(fluidSlug, currentFluidStatus.lastDataDate === null);
callbackResponse(_flowEvents.SUCCESS_EVENT);
});
@@ -2698,19 +2681,19 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
!shouldRefreshConsent && getData();
var dateChartService = new _dateChart.default();
- setIsOutdatedData(dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidType));
+ setIsOutdatedData(dateChartService.isDataOutdated(currentFluidStatus.lastDataDate, fluidType));
return function () {
subscribed = false;
};
- }, [client, konnector, trigger, fluidStatus.connection, fluidStatus.connection.shouldLaunchKonnector, fluidStatus.connection.isUpdating, fluidStatus.fluidType, callbackResponse, setActive, fluidStatus.lastDataDate, fluidType, sendUsageEventError, fluidSlug, sendUsageEventSuccess, shouldRefreshConsent]);
+ }, [callbackResponse, client, currentFluidStatus.connection, currentFluidStatus.fluidType, currentFluidStatus.lastDataDate, dispatch, fluidSlug, fluidType, konnector, sendUsageEventError, sendUsageEventSuccess, shouldRefreshConsent, trigger]);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isDisconnected ? /*#__PURE__*/_react.default.createElement(_core.Accordion, {
expanded: active,
onChange: toggleAccordion,
classes: {
- root: "expansion-panel-root ".concat(!fluidStatus.maintenance && (fluidStatus.status === _enums.FluidState.ERROR || fluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) ? 'red-border' : '')
+ root: "expansion-panel-root ".concat(!currentFluidStatus.maintenance && (currentFluidStatus.status === _enums.FluidState.ERROR || currentFluidStatus.status === _enums.FluidState.ERROR_LOGIN_FAILED) ? 'red-border' : '')
}
}, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, {
- "aria-label": t("konnector_options.accessibility.button_toggle_detail_".concat(_enums.FluidType[fluidStatus.fluidType].toLowerCase())),
+ "aria-label": t("konnector_options.accessibility.button_toggle_detail_".concat(_enums.FluidType[currentFluidStatus.fluidType].toLowerCase())),
expandIcon: /*#__PURE__*/_react.default.createElement(_Icon.default, {
icon: _chevronDown.default,
size: 16,
@@ -2721,7 +2704,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
content: 'expansion-panel-content'
}
}, displayKonnectorIcon(), /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)('text-16-bold konnector-title', (0, _defineProperty2.default)({}, "".concat(_enums.FluidType[fluidStatus.fluidType].toLowerCase(), "-connected"), fluidStatus.status !== _enums.FluidState.NOT_CONNECTED && !fluidStatus.maintenance))
+ className: (0, _classnames.default)('text-16-bold konnector-title', (0, _defineProperty2.default)({}, "".concat(_enums.FluidType[currentFluidStatus.fluidType].toLowerCase(), "-connected"), currentFluidStatus.status !== _enums.FluidState.NOT_CONNECTED && !currentFluidStatus.maintenance))
}, displayKonnectorHeader())), /*#__PURE__*/_react.default.createElement(_core.AccordionDetails, {
classes: {
root: 'expansion-panel-details'
@@ -2732,7 +2715,7 @@ var KonnectorViewerCard = function KonnectorViewerCard(_ref) {
isLogging: isLogging,
state: konnectorState,
error: konnectorErrorDescription,
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
handleCloseClick: handleConnectionEnd,
handleAccountDeletion: handleAccountDeletion,
account: account
@@ -3303,24 +3286,25 @@ 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 GrdfInit = function GrdfInit(_ref) {
- var fluidStatus = _ref.fluidStatus,
- onSuccess = _ref.onSuccess;
+ var onSuccess = _ref.onSuccess;
var client = (0, _cozyClient.useClient)();
var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
- return state.ecolyo.modal;
+ return state.ecolyo;
}),
- isConnectionModalOpen = _useAppSelector.isConnectionModalOpen;
+ isConnectionModalOpen = _useAppSelector.modal.isConnectionModalOpen,
+ fluidStatus = _useAppSelector.global.fluidStatus;
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
showForm = _useState2[0],
setShowForm = _useState2[1];
- var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
- var siteLink = fluidStatus.connection.konnectorConfig.siteLink;
- var konnector = fluidStatus.connection.konnector;
+ var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
+ var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
+ var siteLink = currentFluidStatus.connection.konnectorConfig.siteLink;
+ var konnector = currentFluidStatus.connection.konnector;
var handleSuccess = (0, _react.useCallback)( /*#__PURE__*/function () {
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(accountId) {
var accountService, account, updatedConnection, triggersServices, trigger, _updatedConnection;
@@ -3346,12 +3330,12 @@ var GrdfInit = function GrdfInit(_ref) {
break;
}
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
account: null,
trigger: null
});
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
fluidConnection: updatedConnection
}));
_context.next = 10;
@@ -3372,12 +3356,12 @@ var GrdfInit = function GrdfInit(_ref) {
case 15:
trigger = _context.sent;
- _updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ _updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
account: account,
trigger: trigger
});
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
fluidConnection: _updatedConnection
}));
onSuccess();
@@ -3393,17 +3377,13 @@ var GrdfInit = function GrdfInit(_ref) {
return function (_x) {
return _ref2.apply(this, arguments);
};
- }(), [client, konnector, dispatch, fluidStatus.fluidType, fluidStatus.connection, onSuccess, konnectorSlug]);
+ }(), [client, konnector, dispatch, currentFluidStatus.fluidType, currentFluidStatus.connection, onSuccess, konnectorSlug]);
var goToPartnerSite = (0, _react.useCallback)(function () {
window.open(siteLink, '_blank');
}, [siteLink]);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !showForm ? /*#__PURE__*/_react.default.createElement(_GrdfBill.default, {
- fluidStatus: fluidStatus
- }) : /*#__PURE__*/_react.default.createElement(_GrdfForm.default, null), /*#__PURE__*/_react.default.createElement(_GrdfConnectModal.default, {
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !showForm ? /*#__PURE__*/_react.default.createElement(_GrdfBill.default, null) : /*#__PURE__*/_react.default.createElement(_GrdfForm.default, null), /*#__PURE__*/_react.default.createElement(_GrdfConnectModal.default, {
open: isConnectionModalOpen,
showForm: showForm,
- konnector: konnector,
- fluidStatus: fluidStatus,
handleCloseClick: function handleCloseClick() {
return dispatch((0, _modal.openConnectionModal)(false));
},
@@ -3473,7 +3453,7 @@ var PartnerIssueModal = function PartnerIssueModal(_ref) {
t = _useI18n.t;
var getFluidTypeLabel = function getFluidTypeLabel() {
- switch (issuedFluid.fluidType) {
+ switch (issuedFluid) {
case _enums.FluidType.ELECTRICITY:
return 'elec';
@@ -3489,7 +3469,7 @@ var PartnerIssueModal = function PartnerIssueModal(_ref) {
open: open,
disableEscapeKeyDown: true,
onClose: function onClose(event, reason) {
- event && reason !== 'backdropClick' && handleCloseClick(issuedFluid.fluidType);
+ event && reason !== 'backdropClick' && handleCloseClick(issuedFluid);
},
"aria-labelledby": 'accessibility-title',
classes: {
@@ -3505,7 +3485,7 @@ var PartnerIssueModal = function PartnerIssueModal(_ref) {
"aria-label": t('feedback.accessibility.button_close'),
className: "modal-paper-close-button",
onClick: function onClick() {
- return handleCloseClick(issuedFluid.fluidType);
+ return handleCloseClick(issuedFluid);
}
}, /*#__PURE__*/_react.default.createElement(_Icon.default, {
icon: _close.default,
@@ -3529,7 +3509,7 @@ var PartnerIssueModal = function PartnerIssueModal(_ref) {
}
}), /*#__PURE__*/_react.default.createElement(_Button.default, {
onClick: function onClick() {
- return handleCloseClick(issuedFluid.fluidType);
+ return handleCloseClick(issuedFluid);
},
classes: {
root: 'btn-highlight',
@@ -3791,6 +3771,8 @@ var _enums = __webpack_require__("gnxY");
var _react2 = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _hooks = __webpack_require__("Zlw4");
+
var _picto = __webpack_require__("6DBe");
__webpack_require__("GGWR");
@@ -3799,16 +3781,20 @@ 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; }
-var FormLogin = function FormLogin(_ref) {
- var fluidStatus = _ref.fluidStatus;
-
+var FormLogin = function FormLogin() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
- var konnectorSlug = fluidStatus.connection.konnectorConfig.slug;
- var lastKnownCredentials = fluidStatus.connection.konnectorConfig.lastKnownCredentials;
- var fluidName = _enums.FluidType[fluidStatus.fluidType];
- var account = fluidStatus.connection.account;
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector.fluidStatus,
+ lastEpglLogin = _useAppSelector.lastEpglLogin;
+
+ var currentFluidStatus = fluidStatus[_enums.FluidType.WATER];
+ var konnectorSlug = currentFluidStatus.connection.konnectorConfig.slug;
+ var fluidName = _enums.FluidType[currentFluidStatus.fluidType];
+ var account = currentFluidStatus.connection.account;
var _useState = (0, _react2.useState)(''),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -3832,7 +3818,7 @@ var FormLogin = function FormLogin(_ref) {
var icon = (0, _picto.getPartnerPicto)(konnectorSlug);
- var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(fluidStatus, login, password),
+ var _useKonnectorAuth = (0, _useKonnectorAuth3.default)(currentFluidStatus.fluidType, login, password),
_useKonnectorAuth2 = (0, _slicedToArray2.default)(_useKonnectorAuth, 3),
connect = _useKonnectorAuth2[0],
update = _useKonnectorAuth2[1],
@@ -3863,7 +3849,7 @@ var FormLogin = function FormLogin(_ref) {
};
var handleSubmit = /*#__PURE__*/function () {
- var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(e) {
+ var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(e) {
return _regenerator.default.wrap(function _callee$(_context) {
while (1) {
switch (_context.prev = _context.next) {
@@ -3921,7 +3907,7 @@ var FormLogin = function FormLogin(_ref) {
}));
return function handleSubmit(_x) {
- return _ref2.apply(this, arguments);
+ return _ref.apply(this, arguments);
};
}();
@@ -3936,11 +3922,11 @@ var FormLogin = function FormLogin(_ref) {
if (authData.login) {
setLogin(authData.login);
}
- } else if (lastKnownCredentials) {
- setLogin(lastKnownCredentials);
+ } else if (lastEpglLogin) {
+ setLogin(lastEpglLogin);
setError(t('konnector_form.error_login_failed'));
}
- }, [account, lastKnownCredentials, t]);
+ }, [account, lastEpglLogin, t]);
return /*#__PURE__*/_react2.default.createElement("form", {
className: "form",
onSubmit: function onSubmit(e) {
@@ -4679,8 +4665,6 @@ var GrdfConnectModal = function GrdfConnectModal(_ref) {
var open = _ref.open,
showForm = _ref.showForm,
- konnector = _ref.konnector,
- fluidStatus = _ref.fluidStatus,
handleCloseClick = _ref.handleCloseClick,
setShowForm = _ref.setShowForm,
goToPartnerSite = _ref.goToPartnerSite,
@@ -4758,9 +4742,7 @@ var GrdfConnectModal = function GrdfConnectModal(_ref) {
}
}, "< ".concat(t('auth.button_previous'))),
rightButton: /*#__PURE__*/_react.default.createElement(_GrdfFormOAuth.default, {
- konnector: konnector,
- onSuccess: handleSuccess,
- fluidStatus: fluidStatus
+ onSuccess: handleSuccess
})
}), _steps);
return /*#__PURE__*/_react.default.createElement(_core.Dialog, {
@@ -6264,6 +6246,8 @@ var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
var _I18n = __webpack_require__("buk/");
+var _enums = __webpack_require__("gnxY");
+
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _chart = __webpack_require__("idK9");
@@ -6274,13 +6258,18 @@ var _modal = __webpack_require__("oKH6");
__webpack_require__("0OtY");
-var GrdfBill = function GrdfBill(_ref) {
- var fluidStatus = _ref.fluidStatus;
-
+var GrdfBill = function GrdfBill() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var dispatch = (0, _hooks.useAppDispatch)();
+
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector.fluidStatus;
+
+ var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-form"
}, /*#__PURE__*/_react.default.createElement("p", {
@@ -6304,7 +6293,7 @@ var GrdfBill = function GrdfBill(_ref) {
root: 'btn-highlight',
label: 'text-16-bold'
}
- }, t('auth.grdfgrandlyon.connect')), fluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
+ }, t('auth.grdfgrandlyon.connect')), currentFluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
classes: {
root: 'btn-secondary',
label: 'text-16-bold'
@@ -6752,10 +6741,9 @@ 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$connecti2;
+ var _currentFluidStatus$c2;
- var fluidStatus = _ref.fluidStatus,
- handleAccountDeletion = _ref.handleAccountDeletion,
+ var handleAccountDeletion = _ref.handleAccountDeletion,
fluidType = _ref.fluidType;
var _useI18n = (0, _I18n.useI18n)(),
@@ -6763,7 +6751,14 @@ var ConnectionResult = function ConnectionResult(_ref) {
var client = (0, _cozyClient.useClient)();
var dispatch = (0, _hooks.useAppDispatch)();
- var account = fluidStatus.connection.account;
+
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector.fluidStatus;
+
+ var currentFluidStatus = fluidStatus[fluidType];
+ var account = currentFluidStatus.connection.account;
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -6817,12 +6812,12 @@ var ConnectionResult = function ConnectionResult(_ref) {
setStatus('');
setLastExecutionDate('-');
setKonnectorError('');
- updatedConnection = _objectSpread(_objectSpread({}, fluidStatus.connection), {}, {
+ updatedConnection = _objectSpread(_objectSpread({}, currentFluidStatus.connection), {}, {
shouldLaunchKonnector: true,
isUpdating: true
});
dispatch((0, _global.updateFluidConnection)({
- fluidType: fluidStatus.fluidType,
+ fluidType: currentFluidStatus.fluidType,
fluidConnection: updatedConnection
}));
setUpdating(false);
@@ -6935,8 +6930,8 @@ var ConnectionResult = function ConnectionResult(_ref) {
})), [account, client, handleAccountDeletion]);
var isOutdated = (0, _react.useCallback)(function () {
var dateChartService = new _dateChart.default();
- return dateChartService.isDataOutdated(fluidStatus.lastDataDate, fluidType);
- }, [fluidStatus, fluidType]);
+ return dateChartService.isDataOutdated(currentFluidStatus.lastDataDate, currentFluidStatus.fluidType);
+ }, [currentFluidStatus]);
var hasUpdatedToday = (0, _react.useCallback)(function () {
var todayDate = _luxon.DateTime.local().setZone('utc', {
keepLocalTime: true
@@ -6954,9 +6949,9 @@ var ConnectionResult = function ConnectionResult(_ref) {
}, [lastExecutionDate]);
var handleRefreshConsent = (0, _react.useCallback)(function (fluidType) {
if (fluidType == _enums.FluidType.ELECTRICITY) {
- var _fluidStatus$connecti;
+ var _currentFluidStatus$c;
- 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
+ var accountData = (_currentFluidStatus$c = currentFluidStatus.connection.account) === null || _currentFluidStatus$c === void 0 ? void 0 : _currentFluidStatus$c.auth; // store the previous account data since the onDelete will remove account from DB
dispatch((0, _global.updateSgeStore)({
currentStep: 0,
@@ -6974,27 +6969,27 @@ var ConnectionResult = function ConnectionResult(_ref) {
} else {
deleteAccountsAndTriggers();
}
- }, [deleteAccountsAndTriggers, dispatch, (_fluidStatus$connecti2 = fluidStatus.connection.account) === null || _fluidStatus$connecti2 === void 0 ? void 0 : _fluidStatus$connecti2.auth]);
+ }, [deleteAccountsAndTriggers, dispatch, (_currentFluidStatus$c2 = currentFluidStatus.connection.account) === null || _currentFluidStatus$c2 === void 0 ? void 0 : _currentFluidStatus$c2.auth]);
(0, _react.useEffect)(function () {
- var _fluidStatus$connecti3, _fluidStatus$connecti4, _fluidStatus$connecti5;
+ var _currentFluidStatus$c3, _currentFluidStatus$c4, _currentFluidStatus$c5;
- if ((_fluidStatus$connecti3 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti3 !== void 0 && _fluidStatus$connecti3.last_success) {
- var result = _luxon.DateTime.fromISO(fluidStatus.connection.triggerState.last_success);
+ if ((_currentFluidStatus$c3 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c3 !== void 0 && _currentFluidStatus$c3.last_success) {
+ var result = _luxon.DateTime.fromISO(currentFluidStatus.connection.triggerState.last_success);
setLastExecutionDate(result);
} else {
setLastExecutionDate('-');
}
- if (((_fluidStatus$connecti4 = fluidStatus.connection.triggerState) === null || _fluidStatus$connecti4 === void 0 ? void 0 : _fluidStatus$connecti4.status) === 'errored' && (_fluidStatus$connecti5 = fluidStatus.connection.triggerState) !== null && _fluidStatus$connecti5 !== void 0 && _fluidStatus$connecti5.last_error) {
+ if (((_currentFluidStatus$c4 = currentFluidStatus.connection.triggerState) === null || _currentFluidStatus$c4 === void 0 ? void 0 : _currentFluidStatus$c4.status) === 'errored' && (_currentFluidStatus$c5 = currentFluidStatus.connection.triggerState) !== null && _currentFluidStatus$c5 !== void 0 && _currentFluidStatus$c5.last_error) {
setStatus('errored');
- setKonnectorError((0, _utils.getKonnectorUpdateError)(fluidStatus.connection.triggerState.last_error));
+ setKonnectorError((0, _utils.getKonnectorUpdateError)(currentFluidStatus.connection.triggerState.last_error));
}
if (isOutdated()) {
setOutDatedDataDays(isOutdated());
}
- }, [fluidStatus.connection.triggerState, isOutdated]);
+ }, [currentFluidStatus.connection.triggerState, isOutdated]);
var getFluidTypeTranslation = function getFluidTypeTranslation(fluidType) {
switch (fluidType) {
@@ -7020,7 +7015,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
var getConnectionStatus = function getConnectionStatus() {
// First check if there is partner error from backoffice
- if (fluidStatus.maintenance) {
+ if (currentFluidStatus.maintenance) {
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-caption text-16-normal"
}, /*#__PURE__*/_react.default.createElement("div", {
@@ -7043,7 +7038,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
if (outDatedDataDays) {
return /*#__PURE__*/_react.default.createElement(DisplayDataOutdated, {
- fluidStatus: fluidStatus,
+ fluidStatus: currentFluidStatus,
fluidType: fluidType,
lastExecutionDate: lastExecutionDate,
hasUpdatedToday: hasUpdatedToday()
@@ -7060,7 +7055,7 @@ var ConnectionResult = function ConnectionResult(_ref) {
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-update-result"
}, /*#__PURE__*/_react.default.createElement("div", {
- className: status === 'errored' && !hasUpdatedToday() && !fluidStatus.maintenance ? 'connection-update-errored' : ''
+ className: status === 'errored' && !hasUpdatedToday() && !currentFluidStatus.maintenance ? 'connection-update-errored' : ''
}, getConnectionStatus()), /*#__PURE__*/_react.default.createElement("div", {
className: "inline-buttons"
}, !consentError && /*#__PURE__*/_react.default.createElement(_Button.default, {
@@ -7143,7 +7138,7 @@ var DisplayDataOutdated = function DisplayDataOutdated(_ref5) {
var DisplayAlreadyUpdatedToday = function DisplayAlreadyUpdatedToday(_ref6) {
- var _fluidStatus$connecti6;
+ var _fluidStatus$connecti;
var fluidStatus = _ref6.fluidStatus,
fluidType = _ref6.fluidType,
@@ -7169,7 +7164,7 @@ var DisplayAlreadyUpdatedToday = function DisplayAlreadyUpdatedToday(_ref6) {
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$connecti6 = fluidStatus.connection) === null || _fluidStatus$connecti6 === void 0 ? void 0 : _fluidStatus$connecti6.konnector) && t('konnector_form.issue') + ' ' + getFluidTypeKonnectorTranslation(fluidType) + '.'));
+ }, lastExecutionDate.toLocaleString()), /*#__PURE__*/_react.default.createElement("div", null, (fluidStatus === null || fluidStatus === void 0 ? void 0 : (_fluidStatus$connecti = fluidStatus.connection) === null || _fluidStatus$connecti === void 0 ? void 0 : _fluidStatus$connecti.konnector) && t('konnector_form.issue') + ' ' + getFluidTypeKonnectorTranslation(fluidType) + '.'));
};
/** Tells user to run a manual update */
@@ -7303,9 +7298,7 @@ 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; }
var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
- var konnector = _ref.konnector,
- onSuccess = _ref.onSuccess,
- fluidStatus = _ref.fluidStatus;
+ var onSuccess = _ref.onSuccess;
var IDLE = 'idle';
var WAITING = 'waiting';
@@ -7317,8 +7310,11 @@ var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo.global;
}),
- shouldRefreshConsent = _useAppSelector.shouldRefreshConsent;
+ shouldRefreshConsent = _useAppSelector.shouldRefreshConsent,
+ fluidStatus = _useAppSelector.fluidStatus;
+ var currentFluidStatus = fluidStatus[_enums.FluidType.GAS];
+ var konnector = currentFluidStatus.connection.konnector;
var dispatch = (0, _hooks.useAppDispatch)();
var _useState = (0, _react.useState)(IDLE),
@@ -7336,7 +7332,7 @@ var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
while (1) {
switch (_context.prev = _context.next) {
case 0:
- if (!(konnector !== null && konnector !== void 0 && konnector.slug && fluidStatus.lastDataDate === null)) {
+ if (!(konnector !== null && konnector !== void 0 && konnector.slug && currentFluidStatus.lastDataDate === null)) {
_context.next = 3;
break;
}
@@ -7357,7 +7353,7 @@ var GrdfFormOAuth = function GrdfFormOAuth(_ref) {
}
}
}, _callee);
- })), [client, fluidStatus.lastDataDate, konnector]);
+ })), [client, currentFluidStatus.lastDataDate, konnector]);
var handleAccountId = (0, _react.useCallback)(function (accountId) {
endOAuth();
onSuccess(accountId);
@@ -7535,6 +7531,8 @@ var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
var _I18n = __webpack_require__("buk/");
+var _enums = __webpack_require__("gnxY");
+
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _chart = __webpack_require__("idK9");
@@ -7545,13 +7543,18 @@ var _modal = __webpack_require__("oKH6");
__webpack_require__("0OtY");
-var EpglBill = function EpglBill(_ref) {
- var fluidStatus = _ref.fluidStatus;
-
+var EpglBill = function EpglBill() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var dispatch = (0, _hooks.useAppDispatch)();
+
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ fluidStatus = _useAppSelector.fluidStatus;
+
+ var currentFluidStatus = fluidStatus[_enums.FluidType.WATER];
return /*#__PURE__*/_react.default.createElement("div", {
className: "connection-form"
}, /*#__PURE__*/_react.default.createElement("p", {
@@ -7575,7 +7578,7 @@ var EpglBill = function EpglBill(_ref) {
root: 'btn-highlight',
label: 'text-16-bold'
}
- }, t('auth.eglgrandlyon.connect')), fluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
+ }, t('auth.eglgrandlyon.connect')), currentFluidStatus.firstDataDate && /*#__PURE__*/_react.default.createElement(_Button.default, {
classes: {
root: 'btn-secondary',
label: 'text-16-bold'
@@ -7768,6 +7771,8 @@ var _slicedToArray2 = _interopRequireDefault(__webpack_require__("J4zp"));
var _EpglConnectModal = _interopRequireDefault(__webpack_require__("b88j"));
+var _enums = __webpack_require__("gnxY");
+
var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _hooks = __webpack_require__("Zlw4");
@@ -7784,16 +7789,17 @@ 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; }
-var EpglInit = function EpglInit(_ref) {
- var fluidStatus = _ref.fluidStatus;
+var EpglInit = function EpglInit() {
var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
- return state.ecolyo.modal;
+ return state.ecolyo;
}),
- isConnectionModalOpen = _useAppSelector.isConnectionModalOpen;
+ isConnectionModalOpen = _useAppSelector.modal.isConnectionModalOpen,
+ fluidStatus = _useAppSelector.global.fluidStatus;
- var siteLink = fluidStatus.connection.konnectorConfig.siteLink;
+ var currentFluidStatus = fluidStatus[_enums.FluidType.WATER];
+ var siteLink = currentFluidStatus.connection.konnectorConfig.siteLink;
var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -7808,10 +7814,7 @@ var EpglInit = function EpglInit(_ref) {
var goToPartnerSite = (0, _react.useCallback)(function () {
window.open(siteLink, '_blank');
}, [siteLink]);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !showForm ? /*#__PURE__*/_react.default.createElement(_EpglBill.default, {
- fluidStatus: fluidStatus
- }) : /*#__PURE__*/_react.default.createElement(_EpglForm.default, {
- fluidStatus: fluidStatus,
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !showForm ? /*#__PURE__*/_react.default.createElement(_EpglBill.default, null) : /*#__PURE__*/_react.default.createElement(_EpglForm.default, {
hasCreatedAccount: hasCreatedAccount
}), /*#__PURE__*/_react.default.createElement(_EpglConnectModal.default, {
open: isConnectionModalOpen,
diff --git a/app/ecolyo.f5f869b26f47315244f4.js b/app/ecolyo.4f753cfc67f6cf9444a1.js
similarity index 99%
rename from app/ecolyo.f5f869b26f47315244f4.js
rename to app/ecolyo.4f753cfc67f6cf9444a1.js
index c1e6da1cd9342272129999a20e1c77e150e968d8..96ee7a90f7fd7a81d83089662f13539209e3ba9a 100644
--- a/app/ecolyo.f5f869b26f47315244f4.js
+++ b/app/ecolyo.4f753cfc67f6cf9444a1.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"812715c2a24f19cbdaae","2":"ee6e82fa75e665d74560","4":"d2bf69e982254c3ce239","5":"376cdd52c18eb6f092a0","6":"07e8fd2b54e9d8d82c0d","7":"03964c0031ba71f39f0a","8":"79baa4590f4f0a94be8c","9":"30da7dc1931663d9bbdf","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"cedfef00ced97e45ba04","2":"ee6e82fa75e665d74560","4":"d2bf69e982254c3ce239","5":"376cdd52c18eb6f092a0","6":"07e8fd2b54e9d8d82c0d","7":"03964c0031ba71f39f0a","8":"79baa4590f4f0a94be8c","9":"30da7dc1931663d9bbdf","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -6570,6 +6570,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
+ KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
})(KonnectorError || (exports.KonnectorError = KonnectorError = {}));
var KonnectorUpdate;
@@ -23125,14 +23126,10 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
"use strict";
-var _interopRequireDefault = __webpack_require__("TqRt");
-
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.updateTermsStatus = exports.updateSgeStore = exports.updateFluidConnection = exports.updateEcogestureFilter = exports.toggleChallengeExplorationNotification = exports.toggleChallengeDuelNotification = exports.toggleChallengeActionNotification = exports.toggleAnalysisNotification = exports.showReleaseNotes = exports.setShouldRefreshConsent = exports.setPartnersInfo = exports.setFluidStatus = exports.globalSlice = exports.changeScreenType = void 0;
-
-var _toConsumableArray2 = _interopRequireDefault(__webpack_require__("RIqP"));
+exports.updateTermsStatus = exports.updateSgeStore = exports.updateFluidConnection = exports.updateEcogestureFilter = exports.toggleChallengeExplorationNotification = exports.toggleChallengeDuelNotification = exports.toggleChallengeActionNotification = exports.toggleAnalysisNotification = exports.showReleaseNotes = exports.setShouldRefreshConsent = exports.setPartnersInfo = exports.setLastEpglLogin = exports.setFluidStatus = exports.globalSlice = exports.changeScreenType = void 0;
var _toolkit = __webpack_require__("i7Pf");
@@ -23239,7 +23236,8 @@ var initialState = {
pdlConfirm: false,
shouldLaunchAccount: false
},
- ecogestureFilter: _enums.Usage.ALL
+ ecogestureFilter: _enums.Usage.ALL,
+ lastEpglLogin: ''
};
var getFluidTypesFromStatus = function getFluidTypesFromStatus(fluidStatus) {
@@ -23288,14 +23286,15 @@ var globalSlice = (0, _toolkit.createSlice)({
setShouldRefreshConsent: function setShouldRefreshConsent(state, action) {
state.shouldRefreshConsent = action.payload;
},
- updateFluidConnection: function updateFluidConnection(state, action) {
- var updatedFluidStatus = (0, _toConsumableArray2.default)(state.fluidStatus);
- var fluidType = action.payload.fluidType;
- var findIndex = state.fluidStatus.findIndex(function (fluid) {
- return fluid.fluidType === fluidType;
- });
- updatedFluidStatus[findIndex].connection = action.payload.fluidConnection;
- state.fluidStatus = updatedFluidStatus;
+ updateFluidConnection: function updateFluidConnection(state, _ref) {
+ var _ref$payload = _ref.payload,
+ fluidType = _ref$payload.fluidType,
+ fluidConnection = _ref$payload.fluidConnection;
+ state.fluidStatus[fluidType].connection = fluidConnection;
+ },
+ setLastEpglLogin: function setLastEpglLogin(state, _ref2) {
+ var lastEpglLogin = _ref2.payload.lastEpglLogin;
+ state.lastEpglLogin = lastEpglLogin;
},
updateSgeStore: function updateSgeStore(state, action) {
state.sgeConnect = action.payload;
@@ -23309,6 +23308,7 @@ exports.globalSlice = globalSlice;
var _globalSlice$actions = globalSlice.actions,
changeScreenType = _globalSlice$actions.changeScreenType,
setFluidStatus = _globalSlice$actions.setFluidStatus,
+ setLastEpglLogin = _globalSlice$actions.setLastEpglLogin,
setPartnersInfo = _globalSlice$actions.setPartnersInfo,
setShouldRefreshConsent = _globalSlice$actions.setShouldRefreshConsent,
showReleaseNotes = _globalSlice$actions.showReleaseNotes,
@@ -23331,6 +23331,7 @@ exports.toggleAnalysisNotification = toggleAnalysisNotification;
exports.showReleaseNotes = showReleaseNotes;
exports.setShouldRefreshConsent = setShouldRefreshConsent;
exports.setPartnersInfo = setPartnersInfo;
+exports.setLastEpglLogin = setLastEpglLogin;
exports.setFluidStatus = setFluidStatus;
exports.changeScreenType = changeScreenType;
@@ -24394,9 +24395,9 @@ var UsageEventService = /*#__PURE__*/function () {
*/
}, {
- key: "udpateConnectionAttemptEvent",
+ key: "updateConnectionAttemptEvent",
value: function () {
- var _udpateConnectionAttemptEvent = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, konnectorSlug) {
+ var _updateConnectionAttemptEvent = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(client, konnectorSlug) {
var query, _yield$client$query, _yield$client$query$d, usageEventEntity, updatedEvent, _yield$client$save, savedEvent, errorMessage;
return _regenerator.default.wrap(function _callee3$(_context3) {
@@ -24444,7 +24445,7 @@ var UsageEventService = /*#__PURE__*/function () {
case 16:
_context3.prev = 16;
_context3.t0 = _context3["catch"](0);
- errorMessage = "UsageEvent service error on udpateConnectionAttemptEvent: ".concat(JSON.stringify(_context3.t0));
+ errorMessage = "UsageEvent service error on updateConnectionAttemptEvent: ".concat(JSON.stringify(_context3.t0));
logStack('error', errorMessage);
_logger.default.error(errorMessage);
@@ -24459,11 +24460,11 @@ var UsageEventService = /*#__PURE__*/function () {
}, _callee3, null, [[0, 16]]);
}));
- function udpateConnectionAttemptEvent(_x6, _x7) {
- return _udpateConnectionAttemptEvent.apply(this, arguments);
+ function updateConnectionAttemptEvent(_x6, _x7) {
+ return _updateConnectionAttemptEvent.apply(this, arguments);
}
- return udpateConnectionAttemptEvent;
+ return updateConnectionAttemptEvent;
}()
/**
* updateUsageEventsAggregated
diff --git a/index.html b/index.html
index 3b61e06ed3ef8f23a1a32d1fe35abd84deecb78b..c884d52bbe1ac8d20fd87a69e8c93c29e1be66eb 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.c7b5649111024e54a69b.js"></script><script src="app/ecolyo.f5f869b26f47315244f4.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.4f753cfc67f6cf9444a1.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index 7201d37b822630185c0145200371880539134644..31019c882b53e170528a67cf47ae632d8801a1d8 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -19253,6 +19253,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
+ KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
})(KonnectorError || (exports.KonnectorError = KonnectorError = {}));
let KonnectorUpdate;
@@ -119802,7 +119803,7 @@ class UsageEventService {
*/
- static async udpateConnectionAttemptEvent(client, konnectorSlug) {
+ static async updateConnectionAttemptEvent(client, konnectorSlug) {
try {
// Get last Connection attempt Event
const query = (0, _cozyClient.Q)(_doctypes.USAGEEVENT_DOCTYPE).where({
@@ -119828,7 +119829,7 @@ class UsageEventService {
return savedEvent;
}
} catch (error) {
- const errorMessage = `UsageEvent service error on udpateConnectionAttemptEvent: ${JSON.stringify(error)}`;
+ const errorMessage = `UsageEvent service error on updateConnectionAttemptEvent: ${JSON.stringify(error)}`;
logStack('error', errorMessage);
_logger.default.error(errorMessage);
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index e018bbaeef92934574fdd8cd8c640a222f24a3da..1a1942ad4f3e485133d431477b280fc46ba02d38 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -18076,6 +18076,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
+ KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
})(KonnectorError || (exports.KonnectorError = KonnectorError = {}));
let KonnectorUpdate;
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index a5af27dd855535b7ddda1c421a7c39f7204aa1b1..22f5169e8e731b2c4f14ddee1a74cfeb0a0a9ea1 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -18076,6 +18076,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
+ KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
})(KonnectorError || (exports.KonnectorError = KonnectorError = {}));
let KonnectorUpdate;
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index a0ca68f2a4e2cdbabc185b2c7506cd8c5699bd27..4afba735636f220c5000b0cbb341a79bced880da 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -18076,6 +18076,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
+ KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
})(KonnectorError || (exports.KonnectorError = KonnectorError = {}));
let KonnectorUpdate;
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index 79a0ac87c8f909b933c68ebaf9e19cf5fcdc5d5c..88a01b6b4a36d4a3684ad74f62bf45777d0b15cd 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -18076,6 +18076,7 @@ exports.KonnectorError = KonnectorError;
KonnectorError["CHALLENGE_ASKED"] = "CHALLENGE_ASKED";
KonnectorError["UNKNOWN_ERROR"] = "UNKNOWN_ERROR";
KonnectorError["CRITICAL"] = "exit status 1";
+ KonnectorError["MISSING_SECRET"] = "Cannot read property 'secret' of null";
})(KonnectorError || (exports.KonnectorError = KonnectorError = {}));
let KonnectorUpdate;
diff --git a/vendors/ecolyo.c7b5649111024e54a69b.js b/vendors/ecolyo.e8305b3519e4c7b4170b.js
similarity index 99%
rename from vendors/ecolyo.c7b5649111024e54a69b.js
rename to vendors/ecolyo.e8305b3519e4c7b4170b.js
index 908cf52f198d1361ed86e41e2ea3ea5bfa9117dc..e6e8c1bd0771e0dab092a9294d73d860925c869a 100644
--- a/vendors/ecolyo.c7b5649111024e54a69b.js
+++ b/vendors/ecolyo.e8305b3519e4c7b4170b.js
@@ -28023,70 +28023,6 @@ var scheme = new Array(3).concat(
/* harmony default export */ __webpack_exports__["default"] = (Object(_ramp_js__WEBPACK_IMPORTED_MODULE_1__["default"])(scheme));
-/***/ }),
-
-/***/ "2ZlZ":
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- Copyright (c) 2018 Jed Watson.
- Licensed under the MIT License (MIT), see
- http://jedwatson.github.io/classnames
-*/
-/* global define */
-
-(function () {
- 'use strict';
-
- var hasOwn = {}.hasOwnProperty;
-
- function classNames() {
- var classes = [];
-
- for (var i = 0; i < arguments.length; i++) {
- var arg = arguments[i];
- if (!arg) continue;
-
- var argType = typeof arg;
-
- if (argType === 'string' || argType === 'number') {
- classes.push(arg);
- } else if (Array.isArray(arg)) {
- if (arg.length) {
- var inner = classNames.apply(null, arg);
- if (inner) {
- classes.push(inner);
- }
- }
- } else if (argType === 'object') {
- if (arg.toString === Object.prototype.toString) {
- for (var key in arg) {
- if (hasOwn.call(arg, key) && arg[key]) {
- classes.push(key);
- }
- }
- } else {
- classes.push(arg.toString());
- }
- }
- }
-
- return classes.join(' ');
- }
-
- if ( true && module.exports) {
- classNames.default = classNames;
- module.exports = classNames;
- } else if (true) {
- // register as 'classnames', consistent with npm package name
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function () {
- return classNames;
- }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
- __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
- } else {}
-}());
-
-
/***/ }),
/***/ "2ajD":
@@ -31373,7 +31309,7 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__);
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("q1tI");
/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("2ZlZ");
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("TSYQ");
/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("mwIZ");
/* harmony import */ var lodash_get__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(lodash_get__WEBPACK_IMPORTED_MODULE_5__);
@@ -50072,7 +50008,7 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _dedupe = _interopRequireDefault(__webpack_require__("dogg"));
+var _dedupe = _interopRequireDefault(__webpack_require__("A/WM"));
var _useCozyDialog2 = _interopRequireDefault(__webpack_require__("mB6O"));
@@ -68743,6 +68679,126 @@ function getThemeProps(params) {
return props;
}
+/***/ }),
+
+/***/ "A/WM":
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
+ Copyright (c) 2018 Jed Watson.
+ Licensed under the MIT License (MIT), see
+ http://jedwatson.github.io/classnames
+*/
+/* global define */
+
+(function () {
+ 'use strict';
+
+ var classNames = (function () {
+ // don't inherit from Object so we can skip hasOwnProperty check later
+ // http://stackoverflow.com/questions/15518328/creating-js-object-with-object-createnull#answer-21079232
+ function StorageObject() {}
+ StorageObject.prototype = Object.create(null);
+
+ function _parseArray (resultSet, array) {
+ var length = array.length;
+
+ for (var i = 0; i < length; ++i) {
+ _parse(resultSet, array[i]);
+ }
+ }
+
+ var hasOwn = {}.hasOwnProperty;
+
+ function _parseNumber (resultSet, num) {
+ resultSet[num] = true;
+ }
+
+ function _parseObject (resultSet, object) {
+ if (object.toString === Object.prototype.toString) {
+ for (var k in object) {
+ if (hasOwn.call(object, k)) {
+ // set value to false instead of deleting it to avoid changing object structure
+ // https://www.smashingmagazine.com/2012/11/writing-fast-memory-efficient-javascript/#de-referencing-misconceptions
+ resultSet[k] = !!object[k];
+ }
+ }
+ } else {
+ resultSet[object.toString()] = true;
+ }
+ }
+
+ var SPACE = /\s+/;
+ function _parseString (resultSet, str) {
+ var array = str.split(SPACE);
+ var length = array.length;
+
+ for (var i = 0; i < length; ++i) {
+ resultSet[array[i]] = true;
+ }
+ }
+
+ function _parse (resultSet, arg) {
+ if (!arg) return;
+ var argType = typeof arg;
+
+ // 'foo bar'
+ if (argType === 'string') {
+ _parseString(resultSet, arg);
+
+ // ['foo', 'bar', ...]
+ } else if (Array.isArray(arg)) {
+ _parseArray(resultSet, arg);
+
+ // { 'foo': true, ... }
+ } else if (argType === 'object') {
+ _parseObject(resultSet, arg);
+
+ // '130'
+ } else if (argType === 'number') {
+ _parseNumber(resultSet, arg);
+ }
+ }
+
+ function _classNames () {
+ // don't leak arguments
+ // https://github.com/petkaantonov/bluebird/wiki/Optimization-killers#32-leaking-arguments
+ var len = arguments.length;
+ var args = Array(len);
+ for (var i = 0; i < len; i++) {
+ args[i] = arguments[i];
+ }
+
+ var classSet = new StorageObject();
+ _parseArray(classSet, args);
+
+ var list = [];
+
+ for (var k in classSet) {
+ if (classSet[k]) {
+ list.push(k)
+ }
+ }
+
+ return list.join(' ');
+ }
+
+ return _classNames;
+ })();
+
+ if ( true && module.exports) {
+ classNames.default = classNames;
+ module.exports = classNames;
+ } else if (true) {
+ // register as 'classnames', consistent with npm package name
+ !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function () {
+ return classNames;
+ }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
+ __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+ } else {}
+}());
+
+
/***/ }),
/***/ "A204":
@@ -76596,7 +76652,7 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _omit = _interopRequireDefault(__webpack_require__("Puqe"));
@@ -113124,7 +113180,7 @@ var _extends2 = _interopRequireDefault(__webpack_require__("pVnL"));
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _useCozyDialog2 = _interopRequireDefault(__webpack_require__("mB6O"));
@@ -132624,7 +132680,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(__webpack_require__("QILm
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
@@ -163304,7 +163360,7 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
@@ -224892,9 +224948,9 @@ module.exports = isUndefined;
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- Copyright (c) 2018 Jed Watson.
- Licensed under the MIT License (MIT), see
- http://jedwatson.github.io/classnames
+ Copyright (c) 2018 Jed Watson.
+ Licensed under the MIT License (MIT), see
+ http://jedwatson.github.io/classnames
*/
/* global define */
@@ -224902,7 +224958,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
'use strict';
var hasOwn = {}.hasOwnProperty;
- var nativeCodeString = '[native code]';
function classNames() {
var classes = [];
@@ -224923,15 +224978,14 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
}
}
} else if (argType === 'object') {
- if (arg.toString !== Object.prototype.toString && !arg.toString.toString().includes('[native code]')) {
- classes.push(arg.toString());
- continue;
- }
-
- for (var key in arg) {
- if (hasOwn.call(arg, key) && arg[key]) {
- classes.push(key);
+ if (arg.toString === Object.prototype.toString) {
+ for (var key in arg) {
+ if (hasOwn.call(arg, key) && arg[key]) {
+ classes.push(key);
+ }
}
+ } else {
+ classes.push(arg.toString());
}
}
}
@@ -238308,7 +238362,7 @@ var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
@@ -282241,70 +282295,6 @@ Apps.propTypes = {
};
/* harmony default export */ __webpack_exports__["default"] = (Apps);
-/***/ }),
-
-/***/ "d2Ux":
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- Copyright (c) 2018 Jed Watson.
- Licensed under the MIT License (MIT), see
- http://jedwatson.github.io/classnames
-*/
-/* global define */
-
-(function () {
- 'use strict';
-
- var hasOwn = {}.hasOwnProperty;
-
- function classNames() {
- var classes = [];
-
- for (var i = 0; i < arguments.length; i++) {
- var arg = arguments[i];
- if (!arg) continue;
-
- var argType = typeof arg;
-
- if (argType === 'string' || argType === 'number') {
- classes.push(arg);
- } else if (Array.isArray(arg)) {
- if (arg.length) {
- var inner = classNames.apply(null, arg);
- if (inner) {
- classes.push(inner);
- }
- }
- } else if (argType === 'object') {
- if (arg.toString === Object.prototype.toString) {
- for (var key in arg) {
- if (hasOwn.call(arg, key) && arg[key]) {
- classes.push(key);
- }
- }
- } else {
- classes.push(arg.toString());
- }
- }
- }
-
- return classes.join(' ');
- }
-
- if ( true && module.exports) {
- classNames.default = classNames;
- module.exports = classNames;
- } else if (true) {
- // register as 'classnames', consistent with npm package name
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function () {
- return classNames;
- }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
- __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
- } else {}
-}());
-
-
/***/ }),
/***/ "d4HN":
@@ -287748,126 +287738,6 @@ function ordinal (number) {
module.exports = buildFormatLocale
-/***/ }),
-
-/***/ "dogg":
-/***/ (function(module, exports, __webpack_require__) {
-
-var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- Copyright (c) 2018 Jed Watson.
- Licensed under the MIT License (MIT), see
- http://jedwatson.github.io/classnames
-*/
-/* global define */
-
-(function () {
- 'use strict';
-
- var classNames = (function () {
- // don't inherit from Object so we can skip hasOwnProperty check later
- // http://stackoverflow.com/questions/15518328/creating-js-object-with-object-createnull#answer-21079232
- function StorageObject() {}
- StorageObject.prototype = Object.create(null);
-
- function _parseArray (resultSet, array) {
- var length = array.length;
-
- for (var i = 0; i < length; ++i) {
- _parse(resultSet, array[i]);
- }
- }
-
- var hasOwn = {}.hasOwnProperty;
-
- function _parseNumber (resultSet, num) {
- resultSet[num] = true;
- }
-
- function _parseObject (resultSet, object) {
- if (object.toString === Object.prototype.toString) {
- for (var k in object) {
- if (hasOwn.call(object, k)) {
- // set value to false instead of deleting it to avoid changing object structure
- // https://www.smashingmagazine.com/2012/11/writing-fast-memory-efficient-javascript/#de-referencing-misconceptions
- resultSet[k] = !!object[k];
- }
- }
- } else {
- resultSet[object.toString()] = true;
- }
- }
-
- var SPACE = /\s+/;
- function _parseString (resultSet, str) {
- var array = str.split(SPACE);
- var length = array.length;
-
- for (var i = 0; i < length; ++i) {
- resultSet[array[i]] = true;
- }
- }
-
- function _parse (resultSet, arg) {
- if (!arg) return;
- var argType = typeof arg;
-
- // 'foo bar'
- if (argType === 'string') {
- _parseString(resultSet, arg);
-
- // ['foo', 'bar', ...]
- } else if (Array.isArray(arg)) {
- _parseArray(resultSet, arg);
-
- // { 'foo': true, ... }
- } else if (argType === 'object') {
- _parseObject(resultSet, arg);
-
- // '130'
- } else if (argType === 'number') {
- _parseNumber(resultSet, arg);
- }
- }
-
- function _classNames () {
- // don't leak arguments
- // https://github.com/petkaantonov/bluebird/wiki/Optimization-killers#32-leaking-arguments
- var len = arguments.length;
- var args = Array(len);
- for (var i = 0; i < len; i++) {
- args[i] = arguments[i];
- }
-
- var classSet = new StorageObject();
- _parseArray(classSet, args);
-
- var list = [];
-
- for (var k in classSet) {
- if (classSet[k]) {
- list.push(k)
- }
- }
-
- return list.join(' ');
- }
-
- return _classNames;
- })();
-
- if ( true && module.exports) {
- classNames.default = classNames;
- module.exports = classNames;
- } else if (true) {
- // register as 'classnames', consistent with npm package name
- !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = (function () {
- return classNames;
- }).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
- __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
- } else {}
-}());
-
-
/***/ }),
/***/ "dpMW":
@@ -289244,7 +289114,7 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _dedupe = _interopRequireDefault(__webpack_require__("dogg"));
+var _dedupe = _interopRequireDefault(__webpack_require__("A/WM"));
var _useCozyDialog2 = _interopRequireDefault(__webpack_require__("mB6O"));
@@ -320369,7 +320239,7 @@ var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
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); }
@@ -333462,7 +333332,7 @@ var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _IconButton = _interopRequireDefault(__webpack_require__("1glO"));
@@ -340292,7 +340162,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(__webpack_require__("QILm
var _react = __webpack_require__("q1tI");
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _useBreakpoints2 = _interopRequireDefault(__webpack_require__("1I/2"));
@@ -366219,7 +366089,7 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _dedupe = _interopRequireDefault(__webpack_require__("dogg"));
+var _dedupe = _interopRequireDefault(__webpack_require__("A/WM"));
var _useCozyDialog2 = _interopRequireDefault(__webpack_require__("mB6O"));
@@ -374260,7 +374130,7 @@ var _extends2 = _interopRequireDefault(__webpack_require__("pVnL"));
var _react = _interopRequireDefault(__webpack_require__("q1tI"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _useCozyDialog2 = _interopRequireDefault(__webpack_require__("mB6O"));
@@ -379587,7 +379457,7 @@ var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _cozyClient = __webpack_require__("SH7X");
@@ -416481,7 +416351,7 @@ var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _propTypes = _interopRequireDefault(__webpack_require__("17x9"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
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); }
@@ -416835,7 +416705,7 @@ exports.useCozyTheme = exports.default = exports.CozyThemeContext = void 0;
var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
-var _classnames = _interopRequireDefault(__webpack_require__("d2Ux"));
+var _classnames = _interopRequireDefault(__webpack_require__("TSYQ"));
var _MuiCozyTheme = _interopRequireDefault(__webpack_require__("xIbs"));