From 60f717eada6c5ec98f5a37394ff18702bfdbff76 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Thu, 6 Oct 2022 13:48:54 +0000
Subject: [PATCH] publish: Merge branch 'fix/prevent-backoffice-to-crash-app'
into 'dev'
generated from commit b6f7179acce8fb42a6af034b0903257a996ddfc8
---
...6f23.js => ecolyo.4aabf9a43f1e4b98c959.js} | 26 ++++++++++++-------
index.html | 2 +-
2 files changed, 18 insertions(+), 10 deletions(-)
rename app/{ecolyo.8d75682a276bcf066f23.js => ecolyo.4aabf9a43f1e4b98c959.js} (99%)
diff --git a/app/ecolyo.8d75682a276bcf066f23.js b/app/ecolyo.4aabf9a43f1e4b98c959.js
similarity index 99%
rename from app/ecolyo.8d75682a276bcf066f23.js
rename to app/ecolyo.4aabf9a43f1e4b98c959.js
index bab929b26..95784efe6 100644
--- a/app/ecolyo.8d75682a276bcf066f23.js
+++ b/app/ecolyo.4aabf9a43f1e4b98c959.js
@@ -2950,7 +2950,6 @@ exports.InitStepsErrors = InitStepsErrors;
InitStepsErrors["ECOGESTURE_ERROR"] = "ecogesture_error";
InitStepsErrors["CHALLENGES_ERROR"] = "challenges_error";
InitStepsErrors["ANALYSIS_ERROR"] = "analysis_error";
- InitStepsErrors["PRICES_ERROR"] = "prices_error";
InitStepsErrors["CONSOS_ERROR"] = "consos_error";
InitStepsErrors["PARTNERS_ERROR"] = "partners_error";
InitStepsErrors["NETWORK_ERROR"] = "network_error";
@@ -4126,6 +4125,10 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _environment = _interopRequireDefault(__webpack_require__("X6DI"));
+var _cozyLogger = _interopRequireDefault(__webpack_require__("Vggm"));
+
+var log = _cozyLogger.default.namespace('partnersInfoService');
+
var PartnersInfoService = /*#__PURE__*/function () {
function PartnersInfoService(_client) {
(0, _classCallCheck2.default)(this, PartnersInfoService);
@@ -4161,10 +4164,9 @@ var PartnersInfoService = /*#__PURE__*/function () {
case 9:
_context.prev = 9;
_context.t0 = _context["catch"](2);
- console.error("getPartnersInfo: Failed to get partners info:".concat(_context.t0));
- throw new Error('Error while getting partnersInfo');
+ log('error', "getPartnersInfo: Failed to get partners info: ".concat(JSON.stringify(_context.t0)));
- case 13:
+ case 12:
case "end":
return _context.stop();
}
@@ -20993,6 +20995,10 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
var _environment = _interopRequireDefault(__webpack_require__("X6DI"));
+var _cozyLogger = _interopRequireDefault(__webpack_require__("Vggm"));
+
+var log = _cozyLogger.default.namespace('customPupopService');
+
var CustomPupopService = /*#__PURE__*/function () {
function CustomPupopService(_client) {
(0, _classCallCheck2.default)(this, CustomPupopService);
@@ -21028,10 +21034,9 @@ var CustomPupopService = /*#__PURE__*/function () {
case 9:
_context.prev = 9;
_context.t0 = _context["catch"](2);
- console.error("getCustomPopup: Failed to get custom popup:".concat(_context.t0));
- throw new Error('Error while getting customPopup');
+ log('error', "getCustomPopup: Failed to get custom popup:".concat(JSON.stringify(_context.t0)));
- case 13:
+ case 12:
case "end":
return _context.stop();
}
@@ -37126,6 +37131,8 @@ var _profileTypeEntity = _interopRequireDefault(__webpack_require__("aypK"));
var _terms = _interopRequireDefault(__webpack_require__("wPjT"));
+var _cozyLogger = _interopRequireDefault(__webpack_require__("Vggm"));
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
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; }
@@ -37136,6 +37143,8 @@ 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 cozyLog = _cozyLogger.default.namespace('initializationService');
+
var InitializationService = /*#__PURE__*/function () {
function InitializationService(_client, _setinitStep, _setinitStepError) {
(0, _classCallCheck2.default)(this, InitializationService);
@@ -37625,10 +37634,9 @@ var InitializationService = /*#__PURE__*/function () {
_context5.prev = 36;
_context5.t0 = _context5["catch"](9);
- this._setinitStepError(_initialisationSteps.InitStepsErrors.PRICES_ERROR);
-
_logger.default.error('Initialization error - initFluidPrices: ', _context5.t0);
+ cozyLog('error', "Initialization error - initFluidPrices: ".concat(_context5.t0));
return _context5.abrupt("return", false);
case 41:
diff --git a/index.html b/index.html
index 510a48f24..67b26e1a3 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.0d9221201ffbd1127b31.js"></script><script src="app/ecolyo.8d75682a276bcf066f23.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.0d9221201ffbd1127b31.js"></script><script src="app/ecolyo.4aabf9a43f1e4b98c959.js"></script></div></body></html>
\ No newline at end of file
--
GitLab