ng-miam 10.6.0 → 10.7.0

package/bundles/ng-miam.umd.js

@@ -1577,7 +1577,8 @@
                     if (found) {
                         // Clone to avoid changing the original object reference
                         var updatedBasketEntry = deepCloneWithClass(_this.basketEntry);
-                        updatedBasketEntry.quantity = found.quantity + _this.basketEntry.quantityToAdd;
+                        var baseQuantity = found.status === 'active' ? found.quantity : 0;
+                        updatedBasketEntry.quantity = baseQuantity + _this.basketEntry.quantityToAdd;
                         _this.quantity = updatedBasketEntry.quantity;
                         return updatedBasketEntry;
                     }
@@ -1640,7 +1641,7 @@
         env: 'prod',
         miamAPI: 'https://api.miam.tech',
         miamWeb: 'https://miam.tech',
-        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.10/dist',
+        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.11/dist',
         mealzSsrApi: 'https://ssr-api.mealz.ai',
         lang: 'fr',
         analyticsEnabled: true // Only used in DEV mode
@@ -3395,12 +3396,9 @@
         };
         PointOfSalesService.prototype.loadPos = function (posId) {
             var _this = this;
-            this.posIsLoading$.next(true);
             if (!this.pos$.value || this.pos$.value.id !== posId) {
-                this.get(posId, { include: ['supplier'] }).pipe(operators.skipWhile(function (pos) { return pos.is_loading; }), operators.tap(function (pos) {
-                    _this.pos$.next(pos);
-                    _this.posIsLoading$.next(false);
-                })).subscribe();
+                this.posIsLoading$.next(true);
+                this.get(posId, { include: ['supplier'] }).pipe(operators.skipWhile(function (pos) { return pos.is_loading; }), operators.tap(function (pos) { return _this.pos$.next(pos); }), operators.finalize(function () { return _this.posIsLoading$.next(false); })).subscribe();
             }
             return this.pos$;
         };
@@ -3648,7 +3646,7 @@
         EventJourney["EMPTY"] = "";
     })(EventJourney || (EventJourney = {}));
 
-    var VERSION = "10.6.0"; // TODO: replace by ##VERSION## and update it in the CI/CD
+    var VERSION = "10.7.0"; // TODO: replace by ##VERSION## and update it in the CI/CD
 
     var ContextRegistryService = /** @class */ (function () {
         function ContextRegistryService() {
@@ -5773,7 +5771,10 @@
         RecipesService.prototype.getSuggestedRecipes = function () {
             var _this = this;
             var pref = this.buildfilterUrlFromPreferences();
-            var url = pref ? MIAM_API_HOST$2 + "recipes/suggest?" + pref.slice(1) : MIAM_API_HOST$2 + "recipes/suggest";
+            var params = new URLSearchParams(pref ? pref.slice(1) : '');
+            params.append('include', 'sponsors');
+            params.append('fields[sponsors]', 'logo-url');
+            var url = MIAM_API_HOST$2 + "recipes/suggest?" + params.toString();
             return this.http.get(url, {
                 headers: {
                     'Cache-Control': 'no-cache, no-store, must-revalidate',
@@ -6208,6 +6209,7 @@
             _this.basketPreviewIsCalculating$ = new rxjs.BehaviorSubject(true);
             _this.basketInitCalled = false;
             _this.recipesAdded = new i0.EventEmitter();
+            _this.recipesAddFailed = new i0.EventEmitter();
             _this.confirming = new rxjs.BehaviorSubject(false);
             _this.currentlyAddingRecipes = [];
             _this.basketActionsQueue = new rxjs.BehaviorSubject([]);
@@ -6392,8 +6394,30 @@
             return this.basket$.pipe(operators.skipWhile(function (b) { return !b; }), operators.map(function (basket) { return basket.hasRecipe(recipeId); }));
         };
         BasketsService.prototype.guestsForRecipe = function (recipeId) {
+            return this.resolveGuestsForRecipe(recipeId);
+        };
+        BasketsService.prototype.resolveGuestsForRecipe = function (recipeId) {
             var _a;
-            return (_a = this.basket$.value) === null || _a === void 0 ? void 0 : _a.guestsForRecipe(recipeId);
+            var guestsFromBasket = (_a = this.basket$.value) === null || _a === void 0 ? void 0 : _a.guestsForRecipe(recipeId);
+            if (Number.isFinite(guestsFromBasket)) {
+                return guestsFromBasket;
+            }
+            var pendingRecipeAction = __spread(this.actionsBeingProcessed.value, this.basketActionsQueue.value).find(function (action) { return (action.type === BasketActionType.ADD_RECIPE || action.type === BasketActionType.ADD_RECIPE_LIGHT) &&
+                action.params.recipeId === recipeId &&
+                Number.isFinite(action.params.guests); });
+            return pendingRecipeAction === null || pendingRecipeAction === void 0 ? void 0 : pendingRecipeAction.params.guests;
+        };
+        /**
+         * Waits until the given recipe is in the basket before resolving.
+         * Emits `true` when the recipe is confirmed in the basket, `false` when its addition failed,
+         * so callers can avoid firing dependent requests (e.g. add-ingredient) against a recipe that was never created.
+         */
+        BasketsService.prototype.waitUntilRecipeInBasket = function (recipeId) {
+            var _a;
+            if (!recipeId || ((_a = this.basket$.value) === null || _a === void 0 ? void 0 : _a.hasRecipe(recipeId))) {
+                return rxjs.of(true);
+            }
+            return rxjs.merge(this.basket$.pipe(operators.skipWhile(function (basket) { return !(basket === null || basket === void 0 ? void 0 : basket.hasRecipe(recipeId)); }), operators.take(1), operators.map(function () { return true; })), this.recipesAdded.pipe(operators.skipWhile(function (recipeIds) { return !recipeIds.includes(recipeId); }), operators.take(1), operators.map(function () { return true; })), this.recipesAddFailed.pipe(operators.skipWhile(function (recipeIds) { return !recipeIds.includes(recipeId); }), operators.take(1), operators.map(function () { return false; }))).pipe(operators.take(1));
         };
         BasketsService.prototype.showRecipeAddedToaster = function () {
             var _this = this;
@@ -6774,8 +6798,11 @@
         /** *************************************************** PROCESS THE ACTIONS QUEUE *************************************************** **/
         BasketsService.prototype.emptyActionsQueue = function () {
             var _this = this;
-            if (this.basketActionsQueue.value.length > 0) {
+            if (this.basketActionsQueue.value.length > 0 && this.actionsBeingProcessed.value.length === 0) {
                 var actionsToProcess_1 = this.nextActionsBatch();
+                if (actionsToProcess_1.length === 0) {
+                    return;
+                }
                 this.actionsBeingProcessed.next(__spread(actionsToProcess_1));
                 if (actionsToProcess_1.length > 0) {
                     this.processActionsBatch(actionsToProcess_1).subscribe(function () {
@@ -6791,14 +6818,16 @@
          * @returns the next batch of actions to process
          */
         BasketsService.prototype.nextActionsBatch = function () {
+            var _this = this;
+            var pendingActions = this.basketActionsQueue.value.filter(function (action) { return !_this.actionsBeingProcessed.value.includes(action); });
             var batch = [];
-            var i = 0;
-            var currentAction = this.basketActionsQueue.value[i];
+            var index = 0;
+            var currentAction = pendingActions[index];
             var shouldForceStop = false;
-            while (this.basketActionsQueue.value[i] && this.basketActionsQueue.value[i].type === currentAction.type && !shouldForceStop) {
-                currentAction = this.basketActionsQueue.value[i];
+            while (pendingActions[index] && pendingActions[index].type === currentAction.type && !shouldForceStop) {
+                currentAction = pendingActions[index];
                 shouldForceStop = this.addActionToBatchOrStopProcessingBatch(batch, currentAction);
-                i++;
+                index++;
             }
             return batch;
         };
@@ -6923,6 +6952,10 @@
                 return _this.http.post(postUrl, body).pipe(operators.switchMap(function (b) { var _a; return ((_a = b.data) === null || _a === void 0 ? void 0 : _a.id) ? _this.fillBasket(b) : rxjs.of(null); }), operators.tap(function () {
                     _this.recipesAdded.emit(recipeIds.map(function (r) { return r.recipe_id; }));
                     _this.currentlyAddingRecipes = _this.currentlyAddingRecipes.filter(function (id) { return !(_this.basket$.value.recipeInfos.find(function (i) { return i.id === id; })); });
+                }), operators.catchError(function () {
+                    _this.currentlyAddingRecipes = _this.currentlyAddingRecipes.filter(function (recipeId) { return !recipeIds.some(function (candidate) { return candidate.recipe_id === recipeId; }); });
+                    _this.recipesAddFailed.emit(recipeIds.map(function (r) { return r.recipe_id; }));
+                    return rxjs.of(null);
                 }));
             }), operators.catchError(function () { return rxjs.of(null); }));
         };
@@ -6982,23 +7015,32 @@
          */
         BasketsService.prototype.addItemsForIngredients = function (ingredientsToAdd) {
             var _this = this;
-            return this.waitForBasket.pipe(operators.switchMap(function (basket) {
-                var requests = ingredientsToAdd.map(function (action) {
-                    var modifiedGuests = _this.guestsForRecipe(action.params.recipeId);
-                    var patchUrl = environment$1.miamAPI + "/api/v1/baskets/" + basket.id + "/basket-entries/" + action.params.basketEntry.id + "/add-ingredient" +
-                        ("?ingredient_id=" + action.params.ingredientId + "&selected_item_id=" + action.params.basketEntry.selectedItem.id) +
-                        ("&guests=" + modifiedGuests + "&forced_quantity=" + action.params.basketEntry.quantity);
-                    return _this.http.patch(patchUrl, {});
-                });
-                return rxjs.forkJoin(requests);
-            }), operators.tap(function () {
-                // Determine journey: item-replacement if previousItem exists (indicates replacement), otherwise meals-space-recipe-details
-                var journey = ingredientsToAdd.some(function (action) { return action.params.previousItem; })
-                    ? 'item-replacement'
-                    : 'meals-space-recipe-details';
-                _this.analyticsService.sendAddProductsEvents(ingredientsToAdd, journey);
-            }), operators.switchMap(function () { return _this.reloadBasket(); }), operators.switchMap(function () { return rxjs.of(null); }), // Just to keep the return type as Observable<void> to match with the other methods
-            operators.catchError(function () { return rxjs.of(null); }));
+            var _a;
+            var recipeId = (_a = ingredientsToAdd[0]) === null || _a === void 0 ? void 0 : _a.params.recipeId;
+            return this.waitUntilRecipeInBasket(recipeId).pipe(operators.switchMap(function (recipeIsInBasket) {
+                // The parent recipe add failed: skip add-ingredient to avoid a request against a recipe that was never created
+                // (which would leave the retailer basket updated while Mealz stays out of sync).
+                if (!recipeIsInBasket) {
+                    return rxjs.of(null);
+                }
+                return _this.waitForBasket.pipe(operators.switchMap(function (basket) {
+                    var requests = ingredientsToAdd.map(function (action) {
+                        var modifiedGuests = _this.resolveGuestsForRecipe(action.params.recipeId);
+                        var patchUrl = environment$1.miamAPI + "/api/v1/baskets/" + basket.id + "/basket-entries/" + action.params.basketEntry.id + "/add-ingredient" +
+                            ("?ingredient_id=" + action.params.ingredientId + "&selected_item_id=" + action.params.basketEntry.selectedItem.id) +
+                            ("&guests=" + modifiedGuests + "&forced_quantity=" + action.params.basketEntry.quantity);
+                        return _this.http.patch(patchUrl, {});
+                    });
+                    return rxjs.forkJoin(requests);
+                }), operators.tap(function () {
+                    // Determine journey: item-replacement if previousItem exists (indicates replacement), otherwise meals-space-recipe-details
+                    var journey = ingredientsToAdd.some(function (action) { return action.params.previousItem; })
+                        ? 'item-replacement'
+                        : 'meals-space-recipe-details';
+                    _this.analyticsService.sendAddProductsEvents(ingredientsToAdd, journey);
+                }), operators.switchMap(function () { return _this.reloadBasket(); }), operators.switchMap(function () { return rxjs.of(null); }) // Just to keep the return type as Observable<void> to match with the other methods
+                );
+            }), operators.catchError(function () { return rxjs.of(null); }));
         };
         /**
          * Add items to the basket HTTP request.
@@ -7126,7 +7168,7 @@
                     var lines = _this.recipesAndLineEntriesToBasketPreviewLine(recipes, lineEntries);
                     _this._basketPreview$.next(lines);
                     _this.basketPreviewIsCalculating$.next(false);
-                    _this.basketStats$.next(_this.buildStats(lines));
+                    _this.basketStats$.next(_this.buildStats(lines, entries));
                 }));
             }));
         };
@@ -7144,7 +7186,8 @@
                 return _this._entries$.value;
             }));
         };
-        BasketsService.prototype.buildStats = function (lines) {
+        BasketsService.prototype.buildStats = function (lines, entries) {
+            if (entries === void 0) { entries = []; }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
             var entriesFound = lodashEs.unionBy.apply(void 0, __spread(lines.map(function (line) { return line.entries.found; }), ['id']));
             var totalPrice = entriesFound.reduce(function (total, entry) {
@@ -7152,8 +7195,11 @@
                 total += (entry.attributes.quantity || 0) * parseFloat(basketEntriesItem['unit-price']);
                 return total;
             }, 0);
+            // productsCount cannot be derived from `lines` alone: preview lines are recipe-only,
+            // while standalone products (empty recipe-ids) live only in the full entries list.
             return {
                 recipesCount: lines.length,
+                productsCount: entries.filter(function (entry) { return entry.status === 'active' && entry.attributes['selected-item-id'] != null; }).length,
                 entriesCount: entriesFound.length,
                 totalPrice: totalPrice
             };
@@ -8616,17 +8662,27 @@
 
     var BasketUtilsService = /** @class */ (function () {
         function BasketUtilsService(basketsService, recipesService, priceService, basketSynchroService, analyticsService, loadLitDrawerService) {
+            var _this = this;
             this.basketsService = basketsService;
             this.recipesService = recipesService;
             this.priceService = priceService;
             this.basketSynchroService = basketSynchroService;
             this.analyticsService = analyticsService;
             this.loadLitDrawerService = loadLitDrawerService;
+            this.removeRecipeJobs$ = new rxjs.Subject();
             this.recipesWithEntries = [];
             this.basketPreviewState$ = new rxjs.BehaviorSubject({
                 isOpen: false,
                 activeTabIndex: 0 // Default to the first tab (recipes)
             });
+            this.removeRecipeJobs$.pipe(operators.concatMap(function (_a) {
+                var recipeId = _a.recipeId, analyticsPath = _a.analyticsPath, result$ = _a.result$;
+                return _this.removeRecipeInternal(recipeId, analyticsPath).pipe(operators.tap({
+                    next: function (value) { return result$.next(value); },
+                    error: function (error) { return result$.error(error); },
+                    complete: function () { return result$.complete(); }
+                }), operators.catchError(function () { return rxjs.EMPTY; }));
+            })).subscribe();
         }
         /**
          * Builds a preview of recipes in the basket, including their total price and total number of products per recipe.
@@ -8652,6 +8708,15 @@
             });
         };
         BasketUtilsService.prototype.removeRecipe = function (recipeId, analyticsPath) {
+            var _this = this;
+            return new rxjs.Observable(function (subscriber) {
+                var result$ = new rxjs.Subject();
+                var resultSubscription = result$.subscribe(subscriber);
+                _this.removeRecipeJobs$.next({ recipeId: recipeId, analyticsPath: analyticsPath, result$: result$ });
+                return function () { return resultSubscription.unsubscribe(); };
+            });
+        };
+        BasketUtilsService.prototype.removeRecipeInternal = function (recipeId, analyticsPath) {
             var _this = this;
             return this.fetchDataToRemoveRecipe(recipeId).pipe(operators.switchMap(function (_a) {
                 var recipe = _a.recipe, basketEntries = _a.basketEntries;
@@ -11397,6 +11462,7 @@
                         _this.resetBasket();
                     },
                     recipeCount: function () { return _this.basketsService.waitForBasket.pipe(operators.switchMap(function () { return _this.basketsService.basketStats$; }), operators.skipWhile(function (bs) { return !bs; }), operators.map(function (bs) { return bs.recipesCount; }), operators.distinctUntilChanged()); },
+                    productCount: function () { return _this.basketsService.waitForBasket.pipe(operators.switchMap(function () { return _this.basketsService.basketStats$; }), operators.skipWhile(function (bs) { return !bs; }), operators.map(function (bs) { return bs.productsCount; }), operators.distinctUntilChanged()); },
                     openPreview: function (analyticsPath, selectedTab) {
                         if (analyticsPath === void 0) { analyticsPath = ''; }
                         if (selectedTab === void 0) { selectedTab = 0; }
@@ -13391,7 +13457,7 @@
         env: 'prod',
         miamAPI: 'https://api.miam.tech',
         miamWeb: 'https://miam.tech',
-        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.10/dist',
+        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.11/dist',
         mealzSsrApi: 'https://ssr-api.mealz.ai',
         lang: 'fr',
         analyticsEnabled: true // Only used in DEV mode