ng-miam 10.5.5 → 10.5.8

package/bundles/ng-miam.umd.js

@@ -3452,7 +3452,7 @@
         EventJourney["EMPTY"] = "";
     })(EventJourney || (EventJourney = {}));
 
-    var VERSION = "10.5.5"; // TODO: replace by ##VERSION## and update it in the CI/CD
+    var VERSION = "10.5.8"; // TODO: replace by ##VERSION## and update it in the CI/CD
 
     var ContextRegistryService = /** @class */ (function () {
         function ContextRegistryService() {
@@ -6516,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);
         };
@@ -6809,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
@@ -8454,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) {
@@ -9770,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) {
@@ -9788,6 +9794,7 @@
                         });
                     }
                 });
+                _this.basketSynchroService.addToActionList([action]);
             });
         };
         /**
@@ -9801,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);
         };
@@ -9854,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)
@@ -9865,7 +9874,6 @@
                 .subscribe(function () {
                 _this.rollbackReplace();
             });
-            this.basketSynchroService.addToActionList([addIngredientWithoutRecipe]);
             return rxjs.of(addIngredientWithoutRecipe);
         };
         /**
@@ -9922,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;
                 });
@@ -9998,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);
         };
@@ -10969,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; });
@@ -10978,6 +10983,7 @@
                             .subscribe({
                             complete: function () { return _this.allIngredientsToBasketLoading$.next(false); }
                         });
+                        _this.basketSynchroService.addToActionList(addRecipes);
                     }
                     else {
                         _this.allIngredientsToBasketLoading$.next(false);
@@ -11808,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);
                 }
             });
         };
@@ -15106,19 +15112,21 @@
         };
         RecipePricingComponent.prototype.initPricingFromGuestsAndViewPort = function () {
             var _this = this;
-            // If the recipe is in basket, we ignore the change => pricing will be updated when the new basket preview is ready
-            // After the shallow copy with events of the recipe, ngOnChanges is called again because the recipe object is different
-            // So if changes contains only a recipe and no serves, we also avoid re-fetching
             var wasInBasketBefore;
+            var previousServes;
             return rxjs.combineLatest([
                 this.posService.waitForPos,
                 this.isInView$,
                 this.guests$,
                 this.basketsService.recipeIsInBasket(this.recipeId)
-            ]).pipe(operators.skipWhile(function (results) { return !results[1] || !results[3]; })).subscribe(function (results) {
+            ]).pipe(operators.skipWhile(function (results) { return !results[1]; })).subscribe(function (results) {
                 _this.pos = results[0];
-                // fetch the price if the recipe isn't in the basket and if it was last time we check or on startup
-                if (!results[3] && wasInBasketBefore !== false && _this.inViewport) {
+                var inViewport = results[1];
+                var serves = results[2];
+                var recipeIsInBasket = results[3];
+                var servesChanged = previousServes !== serves;
+                // If the recipe is in basket, we ignore the change => pricing will be updated when the new basket preview is ready.
+                if (!recipeIsInBasket && serves && (wasInBasketBefore !== false || servesChanged) && inViewport) {
                     _this.loading = true;
                     _this.cdr.detectChanges();
                     if (_this.onChangesSubscription) {
@@ -15126,7 +15134,8 @@
                     }
                     _this.onChangesSubscription = _this.fetchPricing().subscribe();
                 }
-                wasInBasketBefore = results[3];
+                wasInBasketBefore = recipeIsInBasket;
+                previousServes = serves;
             });
         };
         RecipePricingComponent.prototype.initPricingFromBasketChanges = function () {
@@ -15137,9 +15146,7 @@
                 _this.pos = results[0];
                 var recipeLine = results[1].find(function (l) { var _a, _b; return l.isRecipe && ((_a = l.id) === null || _a === void 0 ? void 0 : _a.toString()) === ((_b = _this.recipeId) === null || _b === void 0 ? void 0 : _b.toString()); });
                 if (!!recipeLine) {
-                    return _this.recipesService.getPricing(_this.recipeId, _this.pos.id, _this.serves).pipe(operators.switchMap(function (pricing) {
-                        return _this.extractPricing(recipeLine, pricing);
-                    }));
+                    return _this.recipesService.getPricing(_this.recipeId, _this.pos.id, _this.serves).pipe(operators.switchMap(function (pricing) { return _this.extractPricing(recipeLine, pricing); }));
                 }
                 return rxjs.of(null);
             }));
@@ -16734,11 +16741,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,
@@ -22140,16 +22147,26 @@
     })();
 
     var NoSupplierAddToCartCtaComponent = /** @class */ (function () {
-        function NoSupplierAddToCartCtaComponent(noSupplierAddToCartCtaService, sanitizer, cdr) {
+        function NoSupplierAddToCartCtaComponent(noSupplierAddToCartCtaService, sanitizer, cdr, element) {
             this.noSupplierAddToCartCtaService = noSupplierAddToCartCtaService;
             this.sanitizer = sanitizer;
             this.cdr = cdr;
+            this.element = element;
             this.clicked = new i0.EventEmitter();
             this.ctaHTML = null;
         }
         NoSupplierAddToCartCtaComponent.prototype.ngOnChanges = function (changes) {
+            if (!this.recipeId) {
+                return;
+            }
             var recipeId = String(this.recipeId);
-            if (!changes.recipeId || !this.recipeId || recipeId === this.loadedRecipeId) {
+            var recipeIdChanged = !!changes.recipeId && recipeId !== this.loadedRecipeId;
+            var guestsChanged = !!changes.guests &&
+                changes.guests.previousValue !== changes.guests.currentValue;
+            if (guestsChanged) {
+                this.syncRenderedGuests();
+            }
+            if (!recipeIdChanged && !guestsChanged) {
                 return;
             }
             this.loadComponent(recipeId);
@@ -22162,15 +22179,28 @@
                     _this.ctaHTML = _this.sanitizer.bypassSecurityTrustHtml(html);
                     _this.clicked.emit();
                     _this.cdr.detectChanges();
+                    _this.syncRenderedGuests();
                 },
                 error: function (error) {
                     console.error('Error loading no-supplier-add-to-cart-cta component:', error);
                 }
             });
         };
+        NoSupplierAddToCartCtaComponent.prototype.syncRenderedGuests = function () {
+            var cta = this.element.nativeElement.querySelector('mealz-no-supplier-add-to-cart-cta');
+            if (!cta) {
+                return;
+            }
+            if (this.guests && this.guests > 0) {
+                cta.setAttribute('guests', String(this.guests));
+            }
+            else {
+                cta.removeAttribute('guests');
+            }
+        };
         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.ɵ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), i0__namespace.ɵɵdirectiveInject(i0__namespace.ElementRef)); };
     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);
@@ -22188,7 +22218,7 @@
                         encapsulation: i0.ViewEncapsulation.None,
                         changeDetection: i0.ChangeDetectionStrategy.OnPush
                     }]
-            }], function () { return [{ type: NoSupplierAddToCartCtaService }, { type: i2__namespace.DomSanitizer }, { type: i0__namespace.ChangeDetectorRef }]; }, { recipeId: [{
+            }], function () { return [{ type: NoSupplierAddToCartCtaService }, { type: i2__namespace.DomSanitizer }, { type: i0__namespace.ChangeDetectorRef }, { type: i0__namespace.ElementRef }]; }, { recipeId: [{
                     type: i0.Input
                 }], guests: [{
                     type: i0.Input