ng-miam 10.5.4 → 10.5.7

package/bundles/ng-miam.umd.js

@@ -1640,7 +1640,7 @@
         env: 'prod',
         miamAPI: 'https://api.miam.tech',
         miamWeb: 'https://miam.tech',
-        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.8/dist',
+        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.9/dist',
         mealzSsrApi: 'https://ssr-api.mealz.ai',
         lang: 'fr',
         analyticsEnabled: true // Only used in DEV mode
@@ -3115,10 +3115,22 @@
             _this.type = 'suppliers';
             _this.supplier$ = new rxjs.BehaviorSubject(null);
             _this.lastSupplierCart = []; // Stock the last retailer's cart for external purposes
+            _this.token$ = new rxjs.BehaviorSubject(null);
             _this.url = environment$1.miamAPI + "/api/v1";
             _this.register();
             return _this;
         }
+        Object.defineProperty(SuppliersService.prototype, "token", {
+            get: function () {
+                return this._token;
+            },
+            set: function (value) {
+                this._token = value;
+                this.token$.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
         SuppliersService.prototype.loadSupplier = function (supplierId) {
             var _this = this;
             this.supplier$.next(null);
@@ -3440,7 +3452,7 @@
         EventJourney["EMPTY"] = "";
     })(EventJourney || (EventJourney = {}));
 
-    var VERSION = "10.5.4"; // TODO: replace by ##VERSION## and update it in the CI/CD
+    var VERSION = "10.5.7"; // TODO: replace by ##VERSION## and update it in the CI/CD
 
     var ContextRegistryService = /** @class */ (function () {
         function ContextRegistryService() {
@@ -3917,6 +3929,7 @@
             this.suppliersService = suppliersService;
             this.toasterService = toasterService;
             this.ignoredBasketsService = ignoredBasketsService;
+            this.language$ = new rxjs.BehaviorSubject(null);
             this.isLogged$ = new rxjs.BehaviorSubject(false);
             this.preferencesActivated$ = new rxjs.BehaviorSubject(false);
             this.generatingAuthlessId$ = new rxjs.BehaviorSubject(false);
@@ -3926,6 +3939,17 @@
             this.userProvider$ = new rxjs.BehaviorSubject(undefined);
             this.userSupplier$ = new rxjs.BehaviorSubject(undefined);
         }
+        Object.defineProperty(UserService.prototype, "language", {
+            get: function () {
+                return this._language;
+            },
+            set: function (value) {
+                this._language = value;
+                this.language$.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(UserService.prototype, "userProvider", {
             get: function () {
                 return this.userProvider$.pipe(operators.skipWhile(function (provider) { return provider === undefined; }));
@@ -4448,6 +4472,16 @@
             }
             return headers;
         };
+        HttpUtilsService.prototype.waitForSsrHeaders = function () {
+            var _this = this;
+            return rxjs.combineLatest([
+                this.suppliersService.token$,
+                this.userService.language$
+            ]).pipe(operators.filter(function (_a) {
+                var _b = __read(_a, 2), supplierToken = _b[0], languageId = _b[1];
+                return !!supplierToken && !!languageId;
+            }), operators.take(1), operators.map(function () { return _this.buildHeaders(); }));
+        };
         return HttpUtilsService;
     }());
     HttpUtilsService.ɵfac = function HttpUtilsService_Factory(t) { return new (t || HttpUtilsService)(i0__namespace.ɵɵinject(SuppliersService), i0__namespace.ɵɵinject(UserService)); };
@@ -6482,11 +6516,12 @@
             }); });
             this.basketActionsQueue.next(toAdd);
         };
-        BasketsService.prototype.addItemToBasket = function (item, eventTrace, previousItem) {
+        BasketsService.prototype.addItemToBasket = function (item, eventTrace, previousItem, forcedQuantity) {
+            if (forcedQuantity === void 0) { forcedQuantity = 1; }
             var toAdd = this.basketActionsQueue.value;
             toAdd.push({
                 type: BasketActionType.ADD_ITEM,
-                params: { item: item, eventTrace: eventTrace, previousItem: previousItem }
+                params: { item: item, eventTrace: eventTrace, previousItem: previousItem, forcedQuantity: forcedQuantity }
             });
             this.basketActionsQueue.next(toAdd);
         };
@@ -6775,9 +6810,11 @@
             var _this = this;
             return this.waitForBasket.pipe(operators.switchMap(function (basket) {
                 var requests = itemsToAdd.map(function (action) {
+                    var forcedQuantity = action.params.forcedQuantity || 1;
                     var postUrl = environment$1.miamAPI + "/api/v1/baskets/" + basket.id + "/basket-entries/from-item" +
                         ("?include=selected-item&selected_item_id=" + action.params.item.id) +
-                        ("&name=" + action.params.item.attributes.name);
+                        ("&name=" + action.params.item.attributes.name) +
+                        ("&forced_quantity=" + forcedQuantity);
                     return _this.http.post(encodeURI(postUrl.trim()), {});
                 });
                 // NOT WORKING AS ITEM AND NOT BASKET ENTRY
@@ -8420,13 +8457,16 @@
                 var recipe = _a.recipe, basketEntries = _a.basketEntries;
                 var filteredProducts = _this.buildRemoveProducts(recipe, basketEntries);
                 var recipeRemoveActions = _this.buildRemoveActions(filteredProducts);
-                if (recipeRemoveActions.length !== 0) {
-                    _this.basketSynchroService.addToActionList(recipeRemoveActions);
-                    return recipeRemoveActions[recipeRemoveActions.length - 1].onSuccess.pipe(operators.take(1), operators.switchMap(function () { return _this.removeRecipeFromBasket(filteredProducts, recipeId, analyticsPath); }));
-                }
-                else {
+                if (recipeRemoveActions.length === 0) {
                     return _this.basketsService.removeRecipeById(recipeId, analyticsPath);
                 }
+                return new rxjs.Observable(function (observer) {
+                    var onSuccesses = rxjs.forkJoin(recipeRemoveActions.map(function (action) { return action.onSuccess.pipe(operators.take(1)); })).pipe(operators.switchMap(function () { return _this.removeRecipeFromBasket(filteredProducts, recipeId, analyticsPath); }));
+                    var onFailures = rxjs.merge.apply(void 0, __spread(recipeRemoveActions.map(function (action) { return action.onTimeout; }), recipeRemoveActions.map(function (action) { return action.onError; }))).pipe(operators.take(1), operators.switchMap(function () { return rxjs.throwError('Basket sync remove recipe failed'); }));
+                    var subscription = rxjs.merge(onSuccesses, onFailures).pipe(operators.take(1)).subscribe(observer);
+                    _this.basketSynchroService.addToActionList(recipeRemoveActions);
+                    return function () { return subscription.unsubscribe(); };
+                });
             }));
         };
         BasketUtilsService.prototype.removeProduct = function (basketEntry, eventTrace) {
@@ -9736,7 +9776,7 @@
                 .subscribe(function (action) {
                 action.onSuccess.pipe(operators.take(1)).subscribe(function () {
                     _this.recipeDetailsService.hasReplaced = true;
-                    if (eventTrace && fromRecipeDetails) {
+                    if (eventTrace && fromRecipeDetails && !_this.addProductMode) {
                         _this.sendReplaceEvent(searchString, eventTrace);
                     }
                     if (_this.addProductMode || !fromRecipeDetails) {
@@ -9754,6 +9794,7 @@
                         });
                     }
                 });
+                _this.basketSynchroService.addToActionList([action]);
             });
         };
         /**
@@ -9767,7 +9808,7 @@
          */
         ReplaceItemService.prototype.onSelectItem = function (item, searchString, eventTrace) {
             if (this.addProductMode) {
-                return this.handleAddProductMode(item, this.basketEntry, eventTrace);
+                return this.handleAddProductMode(item, eventTrace);
             }
             return this.handleReplaceProductMode(item, this.basketEntry, this.ingredient, searchString, eventTrace, this.ignoreSelected);
         };
@@ -9820,10 +9861,12 @@
          * Handles any errors by rolling back the operation.
          * Adds the action to the synchronization service's action list for processing.
          */
-        ReplaceItemService.prototype.handleAddProductMode = function (item, basketEntry, eventTrace) {
+        ReplaceItemService.prototype.handleAddProductMode = function (item, eventTrace) {
             var _this = this;
             this.replaceItemLoading$.next(item);
-            var newBasketEntry = deepCloneWithClass(basketEntry);
+            var newBasketEntry = new BasketEntry();
+            newBasketEntry.quantity = 1;
+            newBasketEntry.quantityToAdd = 0;
             this.replaceRelationship(newBasketEntry, item);
             var addIngredientWithoutRecipe = new AddIngredientAction(newBasketEntry, { eventTrace: eventTrace, item: item }, this.basketsService, this.basketEntriesService);
             rxjs.merge(addIngredientWithoutRecipe.onTimeout, addIngredientWithoutRecipe.onError)
@@ -9831,7 +9874,6 @@
                 .subscribe(function () {
                 _this.rollbackReplace();
             });
-            this.basketSynchroService.addToActionList([addIngredientWithoutRecipe]);
             return rxjs.of(addIngredientWithoutRecipe);
         };
         /**
@@ -9888,7 +9930,6 @@
                 rxjs.merge(addIngredientFromReplace.onTimeout, addIngredientFromReplace.onError).pipe(operators.take(1)).subscribe(function () {
                     _this.rollbackReplace();
                 });
-                _this.basketSynchroService.addToActionList([addIngredientFromReplace]);
                 addIngredientFromReplace.onSuccess.pipe(operators.take(1)).subscribe(function () {
                     _this.recipeDetailsService.updateIngredientFromBasketLoading = false;
                 });
@@ -9964,7 +10005,6 @@
                 searchString: searchString
             }, this.basketsService);
             this.handleAddIngredientActionErrors(addIngredient);
-            this.basketSynchroService.addToActionList([addIngredient]);
             // No need to send entry.added event, because it is done in the action
             return rxjs.of(addIngredient);
         };
@@ -10935,7 +10975,6 @@
                         ingredientId: re.ingredientId,
                         eventTrace: eventTrace
                     }, _this.basketsService); });
-                    _this.basketSynchroService.addToActionList(addRecipes);
                     var onTimeouts = addRecipes.map(function (action) { return action.onTimeout; });
                     var onErrors = addRecipes.map(function (action) { return action.onError; });
                     var onSuccesses = addRecipes.map(function (action) { return action.onSuccess; });
@@ -10944,6 +10983,7 @@
                             .subscribe({
                             complete: function () { return _this.allIngredientsToBasketLoading$.next(false); }
                         });
+                        _this.basketSynchroService.addToActionList(addRecipes);
                     }
                     else {
                         _this.allIngredientsToBasketLoading$.next(false);
@@ -11774,11 +11814,11 @@
                     _this.basketsService.resetBasket().subscribe();
                 }
                 var resetBasket = clonedEntriesToRemove.map(function (entry) { return new ResetBasketAction(entry, {}, _this.basketsService); });
-                _this.basketHandler.addToActionList(resetBasket);
                 if (resetBasket.length > 0) {
                     resetBasket[resetBasket.length - 1].onSuccess.pipe(operators.take(1)).subscribe(function () {
                         _this.basketsService.resetBasket().subscribe();
                     });
+                    _this.basketHandler.addToActionList(resetBasket);
                 }
             });
         };
@@ -13110,7 +13150,7 @@
         env: 'prod',
         miamAPI: 'https://api.miam.tech',
         miamWeb: 'https://miam.tech',
-        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.8/dist',
+        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.9/dist',
         mealzSsrApi: 'https://ssr-api.mealz.ai',
         lang: 'fr',
         analyticsEnabled: true // Only used in DEV mode
@@ -16700,11 +16740,11 @@
                     _this.basketEntry.quantity = previousValue;
                     _this.cdr.detectChanges();
                 });
-                this.basketSynchroService.addToActionList([updateQuantity]);
                 updateQuantity.onSuccess.pipe(operators.take(1)).subscribe(function () {
                     _this.basketEntry.quantity = newBasketEntry_1.quantity;
                     _this.subscriptions.push(_this.basketsService.reloadBasket().subscribe(function () { return _this.cdr.detectChanges(); }));
                 });
+                this.basketSynchroService.addToActionList([updateQuantity]);
                 this.analyticsService.sendEvent('entry.change-quantity', this.path, {
                     entry_name: this.basketEntry.name,
                     item_id: this.basketEntry.selectedItem.id,
@@ -22077,11 +22117,11 @@
         }
         NoSupplierAddToCartCtaService.prototype.displayNoSupplierAddToCartCta = function (recipeId, guests) {
             var _this = this;
-            var headers = this.httpUtils.buildHeaders();
-            this.loadStyles();
-            this.loadComponentScripts();
-            this.fetchingHTMLLoader$.next(true);
-            return this.posService.posWasInitialized().pipe(operators.take(1), operators.map(function (wasInitialized) { return wasInitialized ? _this.posService.pos$.value : null; }), operators.switchMap(function (pos) {
+            return this.httpUtils.waitForSsrHeaders().pipe(operators.tap(function () {
+                _this.loadStyles();
+                _this.loadComponentScripts();
+                _this.fetchingHTMLLoader$.next(true);
+            }), operators.switchMap(function (headers) { return _this.posService.posWasInitialized().pipe(operators.take(1), operators.map(function (wasInitialized) { return wasInitialized ? _this.posService.pos$.value : null; }), operators.switchMap(function (pos) {
                 var url = _this.MEALZ_SSR_API + "/no-supplier-add-to-cart-cta?recipe_id=" + recipeId;
                 if (pos === null || pos === void 0 ? void 0 : pos.id) {
                     url += "&store_id=" + pos.id;
@@ -22090,7 +22130,7 @@
                     url += "&guests=" + guests;
                 }
                 return _this.http.get(url, { headers: headers, responseType: 'text' });
-            }), operators.tap(function () { return _this.fetchingHTMLLoader$.next(false); }));
+            })); }), operators.finalize(function () { return _this.fetchingHTMLLoader$.next(false); }));
         };
         return NoSupplierAddToCartCtaService;
     }(LoadSsrScriptsAndLinksService));
@@ -22113,12 +22153,17 @@
             this.clicked = new i0.EventEmitter();
             this.ctaHTML = null;
         }
-        NoSupplierAddToCartCtaComponent.prototype.ngOnInit = function () {
-            this.loadComponent();
+        NoSupplierAddToCartCtaComponent.prototype.ngOnChanges = function (changes) {
+            var recipeId = String(this.recipeId);
+            if (!changes.recipeId || !this.recipeId || recipeId === this.loadedRecipeId) {
+                return;
+            }
+            this.loadComponent(recipeId);
         };
-        NoSupplierAddToCartCtaComponent.prototype.loadComponent = function () {
+        NoSupplierAddToCartCtaComponent.prototype.loadComponent = function (recipeId) {
             var _this = this;
-            this.noSupplierAddToCartCtaService.displayNoSupplierAddToCartCta(this.recipeId, this.guests).pipe(operators.take(1)).subscribe({
+            this.loadedRecipeId = recipeId;
+            this.noSupplierAddToCartCtaService.displayNoSupplierAddToCartCta(recipeId, this.guests).pipe(operators.take(1)).subscribe({
                 next: function (html) {
                     _this.ctaHTML = _this.sanitizer.bypassSecurityTrustHtml(html);
                     _this.clicked.emit();
@@ -22132,7 +22177,7 @@
         return NoSupplierAddToCartCtaComponent;
     }());
     NoSupplierAddToCartCtaComponent.ɵfac = function NoSupplierAddToCartCtaComponent_Factory(t) { return new (t || NoSupplierAddToCartCtaComponent)(i0__namespace.ɵɵdirectiveInject(NoSupplierAddToCartCtaService), i0__namespace.ɵɵdirectiveInject(i2__namespace.DomSanitizer), i0__namespace.ɵɵdirectiveInject(i0__namespace.ChangeDetectorRef)); };
-    NoSupplierAddToCartCtaComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: NoSupplierAddToCartCtaComponent, selectors: [["ng-miam-no-supplier-add-to-cart-cta"]], inputs: { recipeId: "recipeId", guests: "guests" }, outputs: { clicked: "clicked" }, decls: 1, vars: 1, consts: [[3, "innerHTML"]], template: function NoSupplierAddToCartCtaComponent_Template(rf, ctx) {
+    NoSupplierAddToCartCtaComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: NoSupplierAddToCartCtaComponent, selectors: [["ng-miam-no-supplier-add-to-cart-cta"]], inputs: { recipeId: "recipeId", guests: "guests" }, outputs: { clicked: "clicked" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [[3, "innerHTML"]], template: function NoSupplierAddToCartCtaComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelement(0, "div", 0);
             }