ng-miam 10.3.0 → 10.3.2

package/bundles/ng-miam.umd.js

@@ -735,9 +735,14 @@
     var detectJourney = function (mappings, document, location) {
         var e_1, _b;
         var doc = document !== null && document !== void 0 ? document : (typeof window !== 'undefined' ? window.document : null);
-        if (!doc) {
+        var loc = location !== null && location !== void 0 ? location : (typeof window !== 'undefined' ? window.location : null);
+        if (!doc || !loc) {
             return null;
         }
+        var urlParams = new URLSearchParams(loc.search);
+        if (urlParams.has('from') && urlParams.get('from') === 'header') {
+            return 'meals-space-header';
+        }
         var journeyMappings = mappings !== null && mappings !== void 0 ? mappings : defaultJourneyMappings;
         try {
             // Check each journey mapping
@@ -1635,7 +1640,7 @@
         env: 'prod',
         miamAPI: 'https://api.miam.tech',
         miamWeb: 'https://miam.tech',
-        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.5/dist',
+        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.6/dist',
         mealzSsrApi: 'https://ssr-api.mealz.ai',
         lang: 'fr',
         analyticsEnabled: true // Only used in DEV mode
@@ -3435,7 +3440,7 @@
         EventJourney["EMPTY"] = "";
     })(EventJourney || (EventJourney = {}));
 
-    var VERSION = "10.3.0"; // TODO: replace by ##VERSION## and update it in the CI/CD
+    var VERSION = "10.3.2"; // TODO: replace by ##VERSION## and update it in the CI/CD
 
     var ContextRegistryService = /** @class */ (function () {
         function ContextRegistryService() {
@@ -5902,12 +5907,40 @@
             }], function () { return [{ type: CurrencyService }]; }, null);
     })();
 
+    var MenusService = /** @class */ (function () {
+        function MenusService(http, statesService) {
+            this.http = http;
+            this.statesService = statesService;
+        }
+        /**
+         * Transfers the authless user's current menu to the authenticated user.
+         * Replaces the user's menu with the authless one (no merge).
+         * Call at end of authless journey when user logs in. Authless user must have a current menu.
+         */
+        MenusService.prototype.transferAuthlessMenu = function (authlessId) {
+            this.statesService.callAuthlessTransfer.next();
+            var url = environment$1.miamAPI + "/api/v1/menus/transfer-authless?authless_user_id=" + authlessId;
+            return this.http.patch(url, {}).pipe(operators.map(function () { return undefined; }), operators.catchError(function () { return rxjs.of(undefined); }));
+        };
+        return MenusService;
+    }());
+    MenusService.ɵfac = function MenusService_Factory(t) { return new (t || MenusService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(StatesService)); };
+    MenusService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: MenusService, factory: MenusService.ɵfac, providedIn: 'root' });
+    (function () {
+        (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(MenusService, [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], function () { return [{ type: i1__namespace.HttpClient }, { type: StatesService }]; }, null);
+    })();
+
     var BASKET_SPARSE_FIELDS = {
         baskets: ['total-price', 'recipes-infos', 'completion', 'status']
     };
     var BasketsService = /** @class */ (function (_super) {
         __extends(BasketsService, _super);
-        function BasketsService(http, basketEntriesService, posService, recipesService, analyticsService, usersService, toasterService, ignoredBasketsService, statesService, priceService) {
+        function BasketsService(http, basketEntriesService, posService, recipesService, analyticsService, usersService, toasterService, ignoredBasketsService, statesService, priceService, menusService) {
             var _this = _super.call(this) || this;
             _this.http = http;
             _this.basketEntriesService = basketEntriesService;
@@ -5919,6 +5952,7 @@
             _this.ignoredBasketsService = ignoredBasketsService;
             _this.statesService = statesService;
             _this.priceService = priceService;
+            _this.menusService = menusService;
             _this.resource = Basket;
             _this.type = 'baskets';
             _this._basket$ = new rxjs.BehaviorSubject(null);
@@ -5932,6 +5966,7 @@
             _this.confirming = new rxjs.BehaviorSubject(false);
             _this.currentlyAddingRecipes = [];
             _this.basketActionsQueue = new rxjs.BehaviorSubject([]);
+            _this.authlessTransferInProgress$ = new rxjs.BehaviorSubject(false);
             _this._entries$ = new rxjs.BehaviorSubject([]);
             _this.actionsBeingProcessed = new rxjs.BehaviorSubject([]);
             _this.actionsBeingOverridden = [];
@@ -6146,12 +6181,27 @@
                 mealzDebug('[Mealz] refreshing basket');
                 var authlessId = localStorage.getItem('_miam/authlessId');
                 var userId = localStorage.getItem('_miam/userId');
-                if (_this.currentSubscription) {
+                var hasAuthlessAndUser = !!authlessId && !!userId;
+                if (_this.authlessTransferInProgress$.value) {
+                    return _this._basket$;
+                }
+                // We can safely cancel any previous in-flight request as long as it's not an authless transfer.
+                if (_this.currentSubscription && !_this.authlessTransferInProgress$.value) {
                     _this.currentSubscription.unsubscribe();
                 }
-                var basketObservable = (authlessId && userId)
-                    ? _this.transferAuthlessBasket(pos.id, authlessId)
-                    : _this.fetchCurrentBasket(pos.id);
+                var basketObservable;
+                if (hasAuthlessAndUser) {
+                    _this.authlessTransferInProgress$.next(true);
+                    basketObservable = rxjs.forkJoin([
+                        _this.transferAuthlessBasket(pos.id, authlessId),
+                        _this.menusService.transferAuthlessMenu(authlessId)
+                    ]).pipe(operators.map(function () { return undefined; }), operators.finalize(function () {
+                        _this.authlessTransferInProgress$.next(false);
+                    }));
+                }
+                else {
+                    basketObservable = _this.fetchCurrentBasket(pos.id);
+                }
                 if (authlessId && userId) {
                     localStorage.removeItem('_miam/authlessId');
                     localStorage.removeItem('_miam/authless-forbid-profiling');
@@ -6920,7 +6970,7 @@
         return BasketsService;
     }(i2$2.Service));
     BasketsService.entriesPerPages = 30;
-    BasketsService.ɵfac = function BasketsService_Factory(t) { return new (t || BasketsService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(BasketEntriesService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(RecipesService), i0__namespace.ɵɵinject(AnalyticsService), i0__namespace.ɵɵinject(UserService), i0__namespace.ɵɵinject(ToasterService), i0__namespace.ɵɵinject(IgnoredIngredientsService), i0__namespace.ɵɵinject(StatesService), i0__namespace.ɵɵinject(PriceService)); };
+    BasketsService.ɵfac = function BasketsService_Factory(t) { return new (t || BasketsService)(i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(BasketEntriesService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(RecipesService), i0__namespace.ɵɵinject(AnalyticsService), i0__namespace.ɵɵinject(UserService), i0__namespace.ɵɵinject(ToasterService), i0__namespace.ɵɵinject(IgnoredIngredientsService), i0__namespace.ɵɵinject(StatesService), i0__namespace.ɵɵinject(PriceService), i0__namespace.ɵɵinject(MenusService)); };
     BasketsService.ɵprov = i0__namespace.ɵɵdefineInjectable({ token: BasketsService, factory: BasketsService.ɵfac, providedIn: 'root' });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(BasketsService, [{
@@ -6928,7 +6978,7 @@
                 args: [{
                         providedIn: 'root'
                     }]
-            }], function () { return [{ type: i1__namespace.HttpClient }, { type: BasketEntriesService }, { type: PointOfSalesService }, { type: RecipesService }, { type: AnalyticsService }, { type: UserService }, { type: ToasterService }, { type: IgnoredIngredientsService }, { type: StatesService }, { type: PriceService }]; }, null);
+            }], function () { return [{ type: i1__namespace.HttpClient }, { type: BasketEntriesService }, { type: PointOfSalesService }, { type: RecipesService }, { type: AnalyticsService }, { type: UserService }, { type: ToasterService }, { type: IgnoredIngredientsService }, { type: StatesService }, { type: PriceService }, { type: MenusService }]; }, null);
     })();
 
     var BasketRecipeCleanupService = /** @class */ (function () {
@@ -9707,6 +9757,9 @@
             this.addProductMode = state;
             this.additionModalOpen$.next(state);
         };
+        ReplaceItemService.prototype.setRecipe = function (recipe) {
+            this.recipe = recipe;
+        };
         /**
          * Replaces the selected item in the given basket entry with the given item.
          * If the basket entry currently has a selected item, it will be removed.
@@ -10671,8 +10724,14 @@
                 _this.invalidPosDisplay$.next(!_this.noPosDisplay$.value && !isValid);
             });
         };
-        NewRecipeDetailsService.prototype.updateGuests = function (eventTrace) {
+        NewRecipeDetailsService.prototype.updateGuests = function (eventTrace, guests) {
             var _this = this;
+            if (!this.recipe) {
+                return;
+            }
+            if (typeof guests === 'number' && this.recipe) {
+                this.recipe.modifiedGuests = guests;
+            }
             this.basketsService.recipeIsInBasket(this.recipe.id).pipe(operators.take(1)).subscribe(function (inBasket) {
                 _this.basketsService.updateRecipesInBasket([_this.recipe.id], _this.recipe.modifiedGuests, eventTrace, true);
                 _this.recipeDetailsProductsService.getIngredientsBasketEntries(_this.recipe.ingredients, _this.recipe.modifiedGuests, false).pipe(operators.take(1)).subscribe(function (products) {
@@ -11272,8 +11331,9 @@
                         if (categoryId === void 0) { categoryId = null; }
                         return _this.recipesService.openRecipeDetails(recipeId, guests, initialTabIndex, path, categoryId);
                     },
+                    loadAndSetupRecipe: function (recipeId, guests) { return _this.loadAndSetupRecipe(recipeId, guests); },
                     replaceBasketEntry: function (basketEntry, ignoreSelected) { return _this.recipeDetailsProductsService.replaceBasketEntry(basketEntry, ignoreSelected); },
-                    updateGuests: function (eventTrace) { return _this.newRecipeDetailsService.updateGuests(eventTrace); },
+                    updateGuests: function (eventTrace, guests) { return _this.newRecipeDetailsService.updateGuests(eventTrace, guests); },
                     addAllIngredientsToBasket: function (eventTrace) { return _this.newRecipeDetailsService.addAllIngredientsToBasket(eventTrace); },
                     addToBasket: function (product, eventTrace) { return _this.newRecipeDetailsService.addToBasket(product, eventTrace); },
                     ingredientRemoved: function (ingredient, eventTrace) { return _this.newRecipeDetailsService.ingredientRemoved(ingredient, eventTrace); },
@@ -11342,6 +11402,7 @@
                 },
                 pos: {
                     currentPos: function () { return _this.posService.pos$; },
+                    posWasInitialized: function () { return _this.posService.posWasInitialized(); },
                     loadPos: function (posId) { return _this.posService.loadPos(posId); },
                     basketLoadedForNewPos: function () { return _this.posService.basketLoadedForNewPos(); }
                 },
@@ -11408,9 +11469,23 @@
                     autocomplete: function (query) { return _this.tagsService.autocomplete(query); }
                 },
                 hook: {
-                    hookCallback: function () { return rxjs.combineLatest([
-                        _this.userService.isLogged$,
-                        _this.posService.posWasInitialized()
+                    hookCallback: function (needLogin, needPos) { return rxjs.combineLatest([
+                        // needLogin === true => ask for login (false)
+                        // needLogin === false => don't ask (true)
+                        // needLogin === undefined => check userService.isLogged$
+                        needLogin === true
+                            ? rxjs.of(false)
+                            : needLogin === false
+                                ? rxjs.of(true)
+                                : _this.userService.isLogged$,
+                        // needPos === true => ask for pos (false)
+                        // needPos === false => don't ask (true)
+                        // needPos === undefined => check posService.posWasInitialized()
+                        needPos === true
+                            ? rxjs.of(false)
+                            : needPos === false
+                                ? rxjs.of(true)
+                                : _this.posService.posWasInitialized()
                     ]).pipe(operators.take(1), operators.switchMap(function (_a) {
                         var _b = __read(_a, 2), isLogged = _b[0], posId = _b[1];
                         return rxjs.of(_this.contextRegistryService.hookCallback(isLogged, posId));
@@ -11546,13 +11621,7 @@
         ContextService.prototype.addAllIngredientsFromRecipeId = function (recipeId, guests) {
             var _this = this;
             var eventTrace = { originPath: '/locator', props: { recipe_id: recipeId } };
-            return this.recipesService.get(recipeId, { include: ['ingredients', 'recipe-steps', 'recipe-type', 'sponsors', 'tags', 'recipe-provider'] })
-                .pipe(operators.map(function (recipe) {
-                if (guests && guests > 0) {
-                    recipe.modifiedGuests = guests;
-                }
-                return recipe;
-            }), operators.switchMap(function (recipe) { return _this.newRecipeDetailsService.setupRecipe(recipe); }), operators.tap(function () {
+            return this.loadAndSetupRecipe(recipeId, guests).pipe(operators.tap(function () {
                 // Wait for the loading to complete and open basket
                 _this.waitForIngredientsToFinish().pipe(operators.tap(function () {
                     _this.basketUtilsService.openBasket('/locator', 1);
@@ -11561,7 +11630,6 @@
                 _this.newRecipeDetailsService.addAllIngredientsToBasket(eventTrace);
             }), operators.take(1), operators.map(function () { return void 0; }));
         };
-        ;
         ContextService.prototype.waitForIngredientsToFinish = function () {
             var _this = this;
             var waitFor = function (loadingState) { return _this.newRecipeDetailsService.allIngredientsToBasketLoading$.pipe(operators.skipWhile(function (loading) { return loading === loadingState; }), operators.take(1)); };
@@ -11572,6 +11640,20 @@
             // Finally wait for false again (loading completed)
             operators.switchMap(function () { return waitFor(true); }));
         };
+        ContextService.prototype.loadAndSetupRecipe = function (recipeId, guests) {
+            var _this = this;
+            if (!recipeId) {
+                return rxjs.of(void 0);
+            }
+            return this.recipesService.get(recipeId, { include: ['ingredients', 'recipe-steps', 'recipe-type', 'sponsors', 'tags', 'recipe-provider'] })
+                .pipe(operators.take(1), operators.switchMap(function (recipe) {
+                if (guests != null) {
+                    recipe.modifiedGuests = guests;
+                }
+                _this.replaceItemService.setRecipe(recipe);
+                return _this.newRecipeDetailsService.setupRecipe(recipe);
+            }));
+        };
         return ContextService;
     }());
     ContextService.ɵfac = function ContextService_Factory(t) { return new (t || ContextService)(i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(BasketsService), i0__namespace.ɵɵinject(UserService), i0__namespace.ɵɵinject(PreferencesService), i0__namespace.ɵɵinject(AnalyticsService), i0__namespace.ɵɵinject(RecipesService), i0__namespace.ɵɵinject(BasketRecipeCleanupService), i0__namespace.ɵɵinject(i8__namespace.MediaMatcher), i0__namespace.ɵɵinject(SuppliersService), i0__namespace.ɵɵinject(i8__namespace.BreakpointObserver), i0__namespace.ɵɵinject(BasketsSynchronizerService), i0__namespace.ɵɵinject(StoreLocatorService), i0__namespace.ɵɵinject(RecipeLikesService), i0__namespace.ɵɵinject(FakeRetailerCartService), i0__namespace.ɵɵinject(ContextRegistryService), i0__namespace.ɵɵinject(BasketUtilsService), i0__namespace.ɵɵinject(BasketTransferService), i0__namespace.ɵɵinject(RecipeDetailsService), i0__namespace.ɵɵinject(RecipeDetailsProductsService), i0__namespace.ɵɵinject(RecipeDetailsProductsPlannerService), i0__namespace.ɵɵinject(NewRecipeDetailsService), i0__namespace.ɵɵinject(ReplaceItemService), i0__namespace.ɵɵinject(MealsPlannerService), i0__namespace.ɵɵinject(TagsService)); };
@@ -12923,7 +13005,7 @@
         env: 'prod',
         miamAPI: 'https://api.miam.tech',
         miamWeb: 'https://miam.tech',
-        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.5/dist',
+        mealzComponents: 'https://cdn.jsdelivr.net/npm/mealz-components@2.6/dist',
         mealzSsrApi: 'https://ssr-api.mealz.ai',
         lang: 'fr',
         analyticsEnabled: true // Only used in DEV mode
@@ -22234,6 +22316,7 @@
     exports.Menu = Menu;
     exports.MenuItem = MenuItem;
     exports.MenuRecipe = MenuRecipe;
+    exports.MenusService = MenusService;
     exports.MiamInterceptor = MiamInterceptor;
     exports.ModalComponent = ModalComponent;
     exports.NgMiamModule = NgMiamModule;