ng-miam 9.1.5 → 9.1.7

package/bundles/ng-miam.umd.js

@@ -1674,19 +1674,11 @@
       return ResetBasketAction;
   }(BasketAction));
 
-  var EventJourney;
-  (function (EventJourney) {
-      EventJourney["MEALZ"] = "mealz-space";
-      EventJourney["SHELVES"] = "shelves";
-      EventJourney["SEARCH"] = "search";
-      EventJourney["EMPTY"] = "";
-  })(EventJourney || (EventJourney = {}));
-
   var environment$1 = {
       env: 'prod',
       miamAPI: 'https://api.miam.tech',
       miamWeb: 'https://miam.tech',
-      mealzComponents: 'https://unpkg.com/mealz-components@0.7/dist',
+      mealzComponents: 'https://unpkg.com/mealz-components@1.2/dist',
       mealzSsrApi: 'https://ssr-api.mealz.ai',
       lang: 'fr',
       tagsWhitelist: [
@@ -3515,7 +3507,15 @@
       return RecipeFilters;
   }());
 
-  var VERSION = '9.1.5'; // TODO: replace by ##VERSION## and update it in the CI/CD
+  var EventJourney;
+  (function (EventJourney) {
+      EventJourney["MEALZ"] = "mealz-space";
+      EventJourney["SHELVES"] = "shelves";
+      EventJourney["SEARCH"] = "search";
+      EventJourney["EMPTY"] = "";
+  })(EventJourney || (EventJourney = {}));
+
+  var VERSION = '9.1.6'; // TODO: replace by ##VERSION## and update it in the CI/CD
 
   var ContextRegistryService = /** @class */ (function () {
       function ContextRegistryService() {
@@ -3560,6 +3560,8 @@
       function AnalyticsService(contextRegistryService) {
           var _this = this;
           this.contextRegistryService = contextRegistryService;
+          /** Set to true if we currently are in a mealz dedicated page */
+          this.isMealzPage = false;
           this.eventEmitter = _eventEmitter;
           this.subscriptions = [];
           this.alreadyInitialized$ = new rxjs.BehaviorSubject(false);
@@ -3595,11 +3597,12 @@
           }
           this.alreadyInitialized$.next(true);
       };
-      AnalyticsService.prototype.sendEvent = function (name, path, props, journey) {
-          if (journey === void 0) { journey = EventJourney.MEALZ; }
+      AnalyticsService.prototype.sendEvent = function (name, path, props) {
           if (this.contextRegistryService.disabledAnalytics && this.contextRegistryService.forbidProfiling) {
               return;
           }
+          // Currently no way to know if it is search or shelves
+          var journey = this.isMealzPage ? EventJourney.MEALZ : EventJourney.EMPTY;
           this.callMethodOrAddToQueue(function () { return mealzSharedAnalytics.sendEvent(name, url(path), journey, props); });
       };
       /** ************************************************* SEND EVENT FOR BASKET ACTIONS ************************************************* **/
@@ -5601,7 +5604,7 @@
           _this.basketStats$ = new rxjs.BehaviorSubject(null);
           _this.currentAndPreviewFetching = new rxjs.BehaviorSubject(false);
           _this.basketIsFetching$ = new rxjs.BehaviorSubject(false);
-          _this.basketPreviewIsCalculating$ = new rxjs.BehaviorSubject(false);
+          _this.basketPreviewIsCalculating$ = new rxjs.BehaviorSubject(true);
           _this.basketInitCalled = false;
           _this.recipesAdded = new i0.EventEmitter();
           _this.confirming = new rxjs.BehaviorSubject(false);
@@ -7665,10 +7668,9 @@
           this.userService = userService;
           this.catalogHistoryUrl = MEALZ_SSR_API + "/styles/catalog/catalog-history";
           this.scriptsPaths = [
-              environment$1.mealzSsrApi + "/catalog/catalog-history/catalog-history.min.js",
-              environment$1.mealzSsrApi + "/history-order/history-order.min.js",
-              environment$1.mealzSsrApi + "/drawer/drawer.min.js",
-              environment$1.mealzSsrApi + "/recipe-card/recipe-card.min.js",
+              environment$1.mealzComponents + "/catalog/catalog-history/catalog-history.min.js",
+              environment$1.mealzComponents + "/history-order/history-order.min.js",
+              environment$1.mealzComponents + "/recipe-card/recipe-card.min.js",
           ];
           this.allScriptLoaded$ = new rxjs.BehaviorSubject(false);
           this.scriptLoaded = 0;
@@ -8116,9 +8118,9 @@
           };
           this.mealzInternal = {
               analytics: {
-                  sendEvent: function (name, path, props, journey) {
-                      if (journey === void 0) { journey = EventJourney.MEALZ; }
-                      return _this.analyticsService.sendEvent(name, path, props, journey);
+                  sendEvent: function (name, path, props) { return _this.analyticsService.sendEvent(name, path, props); },
+                  setIsMealzPage: function (isMealzPage) {
+                      _this.analyticsService.isMealzPage = isMealzPage;
                   }
               },
               basket: {
@@ -9396,7 +9398,6 @@
       function EventTracerComponent(analyticsService) {
           this.analyticsService = analyticsService;
           this.originTrace = { originPath: '', props: {} };
-          this.eventJourney = EventJourney.MEALZ;
       }
       Object.defineProperty(EventTracerComponent.prototype, "eventTrace", {
           get: function () {
@@ -9430,7 +9431,7 @@
           }
       };
       EventTracerComponent.prototype.pageview = function () {
-          this.analyticsService.sendEvent('pageview', this.path, {}, this.eventJourney);
+          this.analyticsService.sendEvent('pageview', this.path, {});
       };
       return EventTracerComponent;
   }());
@@ -9842,7 +9843,7 @@
       env: 'prod',
       miamAPI: 'https://api.miam.tech',
       miamWeb: 'https://miam.tech',
-      mealzComponents: 'https://unpkg.com/mealz-components@0.7/dist',
+      mealzComponents: 'https://unpkg.com/mealz-components@1.2/dist',
       mealzSsrApi: 'https://ssr-api.mealz.ai',
       lang: 'fr',
       tagsWhitelist: [
@@ -9862,7 +9863,7 @@
       }
       MiamInterceptor.prototype.intercept = function (request, next) {
           var _this = this;
-          if (request.url.includes('plausible')) {
+          if (request.url.includes('plausible') || request.url.includes('ssr-api')) {
               return next.handle(request);
           }
           request = this.setAuthHeaders(request);
@@ -16771,7 +16772,7 @@
           }
           return this.recipesService.get(this.line.id, {
               include: ['ingredients'],
-              fields: { recipes: ['number-of-guests'], ingredients: ['name', 'quantity', 'unit'] }
+              fields: { recipes: ['number-of-guests', 'ingredients'], ingredients: ['name', 'quantity', 'unit'] }
           }).pipe(operators.switchMap(function (recipe) {
               _this.legacyRecipe = recipe;
               var requests = recipe.relationships.ingredients.data.map(function (ing) { return _this.basketsService.basketEntryFromIngredient(ing.id, _this.line.count).pipe(operators.map(function (entry) {
@@ -17855,8 +17856,8 @@
               _this.isLoading = true;
               _this.cdr.detectChanges();
           }), operators.switchMap(function (search) {
-              var _a;
-              return _this.itemsService.searchForIngredient(search, (_a = _this.ingredient) === null || _a === void 0 ? void 0 : _a.id, +_this.recipe.modifiedGuests).pipe(operators.map(function (response) {
+              var _a, _b;
+              return _this.itemsService.searchForIngredient(search, (_a = _this.ingredient) === null || _a === void 0 ? void 0 : _a.id, +((_b = _this.recipe) === null || _b === void 0 ? void 0 : _b.modifiedGuests)).pipe(operators.map(function (response) {
                   var items = _this.itemsService.newCollection();
                   items.fill(response);
                   return items.data.filter(function (item) { var _a; return item.id !== ((_a = _this.basketEntry.selectedItem) === null || _a === void 0 ? void 0 : _a.id); });
@@ -17903,7 +17904,7 @@
               _this.rollbackReplace();
           });
           this.basketSynchroService.addToActionList([removeIngredient]);
-          this.subscriptions.push(this.basketsService.basketEntryFromIngredient(this.ingredient.id, +this.recipe.modifiedGuests, true, item.id).pipe(operators.switchMap(function (newEntry) {
+          this.subscriptions.push((this.ingredient && this.recipe ? this.basketsService.basketEntryFromIngredient(this.ingredient.id, +this.recipe.modifiedGuests, true, item.id) : rxjs.of(this.basketEntry)).pipe(operators.switchMap(function (newEntry) {
               var newBasketEntry = deepCloneWithClass(_this.basketEntry);
               newBasketEntry.quantityToAdd = newEntry.quantityToAdd;
               _this.replaceRelationship(newBasketEntry, item);
@@ -18001,24 +18002,28 @@
       };
       ReplaceItemComponent.prototype.sendReplaceEvent = function () {
           // TODO analytics: entry.deleted and entry.add events should not be sent after entry.replaced
-          this.analyticsService.sendEvent('entry.replaced', this.path, {
+          var eventData = {
               entry_name: this.basketEntry.name,
               new_item_id: this.basketEntry.selectedItem.id,
               new_item_ext_id: this.basketEntry.selectedItem.attributes['ext-id'],
               new_item_ean: this.basketEntry.selectedItem.ean,
               product_quantity: this.basketEntry.quantity.toString(),
-              recipe_id: this.recipe.id,
               search_term: this.searchString,
               old_item_id: this.previousItem.id,
               old_item_ext_id: this.previousItem.attributes['ext-id'],
               old_item_ean: this.previousItem.ean
-          });
+          };
+          // Only add recipe_id if it exists
+          if (this.recipe && this.recipe.id) {
+              eventData['recipe_id'] = this.recipe.id;
+          }
+          this.analyticsService.sendEvent('entry.replaced', this.path, eventData);
       };
       ReplaceItemComponent.prototype.fetchItems = function () {
           var _this = this;
-          var _a, _b;
+          var _a, _b, _c;
           this.isLoading = true;
-          this.subscriptions.push(this.itemsService.searchForIngredient(((_a = this.ingredient) === null || _a === void 0 ? void 0 : _a.id) ? null : this.basketEntry.name, (_b = this.ingredient) === null || _b === void 0 ? void 0 : _b.id, +this.recipe.modifiedGuests).pipe(operators.map(function (response) {
+          this.subscriptions.push(this.itemsService.searchForIngredient(((_a = this.ingredient) === null || _a === void 0 ? void 0 : _a.id) ? null : this.basketEntry.name, (_b = this.ingredient) === null || _b === void 0 ? void 0 : _b.id, +((_c = this.recipe) === null || _c === void 0 ? void 0 : _c.modifiedGuests)).pipe(operators.map(function (response) {
               var items = _this.itemsService.newCollection();
               items.fill(response);
               return items.data;
@@ -22810,6 +22815,7 @@
       });
       MealsPlannerComponent.prototype.ngOnInit = function () {
           var _this = this;
+          this.analyticsService.isMealzPage = true;
           this.subscriptions.push(this.contextService.enableMealsPlanner$.pipe(operators.skipWhile(function (enabled) { return !enabled; }), operators.take(1)).subscribe(function () {
               _this.cdr.markForCheck();
               _this.featureIsAuthorized = true;
@@ -22855,6 +22861,7 @@
           }));
       };
       MealsPlannerComponent.prototype.ngOnDestroy = function () {
+          this.analyticsService.isMealzPage = false;
           this.subscriptions.forEach(function (s) { return s.unsubscribe(); });
           this.recipeDetailsService.onlyShowPreparation = false;
       };
@@ -24831,14 +24838,14 @@
           var _r33_1 = i0__namespace.ɵɵgetCurrentView();
           i0__namespace.ɵɵelementStart(0, "div", 52);
           i0__namespace.ɵɵelementStart(1, "div", 53);
-          i0__namespace.ɵɵlistener("click", function RecipeCatalogComponent_div_2_div_7_div_10_Template_div_click_1_listener() { i0__namespace.ɵɵrestoreView(_r33_1); var ctx_r32 = i0__namespace.ɵɵnextContext(3); return ctx_r32.historyDisplayed = false; });
+          i0__namespace.ɵɵlistener("click", function RecipeCatalogComponent_div_2_div_7_div_10_Template_div_click_1_listener() { i0__namespace.ɵɵrestoreView(_r33_1); var ctx_r32 = i0__namespace.ɵɵnextContext(3); return ctx_r32.toggleHistory(false); });
           i0__namespace.ɵɵelement(2, "img", 54);
           i0__namespace.ɵɵelementStart(3, "span");
           i0__namespace.ɵɵi18n(4, 55);
           i0__namespace.ɵɵelementEnd();
           i0__namespace.ɵɵelementEnd();
           i0__namespace.ɵɵelementStart(5, "div", 56);
-          i0__namespace.ɵɵlistener("click", function RecipeCatalogComponent_div_2_div_7_div_10_Template_div_click_5_listener() { i0__namespace.ɵɵrestoreView(_r33_1); var ctx_r34 = i0__namespace.ɵɵnextContext(3); return ctx_r34.displayHistory(); });
+          i0__namespace.ɵɵlistener("click", function RecipeCatalogComponent_div_2_div_7_div_10_Template_div_click_5_listener() { i0__namespace.ɵɵrestoreView(_r33_1); var ctx_r34 = i0__namespace.ɵɵnextContext(3); return ctx_r34.toggleHistory(true); });
           i0__namespace.ɵɵelement(6, "img", 57);
           i0__namespace.ɵɵelementStart(7, "span");
           i0__namespace.ɵɵi18n(8, 58);
@@ -25119,6 +25126,7 @@
       });
       RecipeCatalogComponent.prototype.ngOnInit = function () {
           var _this = this;
+          this.analyticsService.isMealzPage = true;
           this.pageview();
           this.initFilters();
           this.subscriptions.push(this.supplierService.supplier$.asObservable().pipe(operators.skipWhile(function (supp) { return supp === undefined || supp == null; }), operators.take(1), operators.switchMap(function (supplier) {
@@ -25141,6 +25149,7 @@
       };
       RecipeCatalogComponent.prototype.ngOnDestroy = function () {
           var _a, _b;
+          this.analyticsService.isMealzPage = false;
           this.subscriptions.forEach(function (s) { return s.unsubscribe(); });
           (_a = this.headerHeightSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
           (_b = this.stickyToolbarObserver) === null || _b === void 0 ? void 0 : _b.disconnect();
@@ -25162,9 +25171,12 @@
       RecipeCatalogComponent.prototype.displayHomePage = function () {
           return this.filters.isEmpty() && !this.forceListView;
       };
-      RecipeCatalogComponent.prototype.displayHistory = function () {
-          this.loadHistoryContent();
-          this.historyDisplayed = true;
+      RecipeCatalogComponent.prototype.toggleHistory = function (display) {
+          if (display) {
+              this.loadHistoryContent();
+          }
+          this.historyDisplayed = display;
+          this.cdr.detectChanges();
       };
       // init the value of the image and the text for the catalog header, using the catalog setting of the supplier
       RecipeCatalogComponent.prototype.initCatalogHeader = function (supplier) {