ng-miam 6.3.10 → 6.3.12

package/bundles/ng-miam.umd.js

@@ -779,13 +779,14 @@
             // Unused in sdk at the moment but any client app can subscribe on it to know when a recipe has been added
             _this.recipeWasDeleted$ = new rxjs.BehaviorSubject([]);
             _this.recipesToRemove = new rxjs.BehaviorSubject([]);
+            _this.isRemovingRecipes = false;
             // Singleton instance of GroceriesList
             _this._list$ = new rxjs.BehaviorSubject(null);
             _this.saveOperationType = '';
             // Observe the fetching of the recipe so calls to list$ are delayed instead of calling refreshCurrentList dozens of times
             _this.listIsFetching = false;
             _this.register();
-            _this.recipesToRemove.pipe(operators.skipWhile(function (toRemove) { return toRemove.length === 0; }), operators.debounceTime(1000), operators.switchMap(function () { return _this.emptyRecipesToRemove(); })).subscribe();
+            _this.recipesToRemove.pipe(operators.skipWhile(function (toRemove) { return toRemove.length === 0 || _this.isRemovingRecipes; }), operators.debounceTime(200), operators.tap(function () { return _this.emptyRecipesToRemove(); })).subscribe();
             return _this;
         }
         Object.defineProperty(GroceriesListsService.prototype, "list$", {
@@ -939,22 +940,24 @@
         };
         GroceriesListsService.prototype.emptyRecipesToRemove = function () {
             var _this = this;
+            this.isRemovingRecipes = true;
             var idsToRemove = this.recipesToRemove.value.map(function (i) { return i.id; });
             if (idsToRemove.length > 0) {
                 var eventTrace_1 = this.recipesToRemove.value[0].eventTrace;
-                return this.takeFirstList().pipe(operators.switchMap(function (list) {
+                this.takeFirstList().pipe(operators.switchMap(function (list) {
                     if (list.attributes['recipes-infos']) {
                         list.attributes['recipes-infos'] = list.attributes['recipes-infos'].filter(function (info) {
                             return !idsToRemove.includes(info.id);
                         });
                         _this.analyticsService.sendEventWhenReady(_this.analyticsService.EVENT_RECIPE_REMOVE, eventTrace_1.originPath, eventTrace_1.props);
                         _this.saveOperationType = 'REMOVE';
-                        return _this.saveList(list).pipe(operators.take(1), operators.tap(function () { return _this.recipesToRemove.next(_this.recipesToRemove.value.filter(function (i) { return !idsToRemove.includes(i.id); })); }));
+                        return _this.saveList(list).pipe(operators.take(1));
                     }
-                    return rxjs.of(null);
-                }));
+                })).subscribe(function () {
+                    _this.isRemovingRecipes = false;
+                    _this.recipesToRemove.next(_this.recipesToRemove.value.filter(function (i) { return !idsToRemove.includes(i.id); }));
+                });
             }
-            return rxjs.of(null);
         };
         /**
          * save() returns an object that isn't a resource so methods aren't attached, so we have to do a little trick
@@ -972,16 +975,19 @@
             delete (list.attributes['recipes-ids']);
             delete (list.relationships['groceries-entries']);
             return list.save({ include: ['groceries-entries'] }).pipe(operators.skipWhile(function (l) { return l.is_loading; }), operators.tap(function (l) {
-                _this._list$.next(_this.afterSave(l));
-                if (_this.saveOperationType === 'ADD') {
-                    _this.recipeWasAdded$.next(list.recipeInfos);
-                }
-                if (_this.saveOperationType === 'REMOVE') {
-                    _this.recipeWasDeleted$.next(list.recipeInfos);
-                }
-                _this.saveOperationType = '';
-                if (openBasket) {
-                    window.open(_this.miamBasketURL + "/" + list.id, '_blank');
+                var _a;
+                if ((_a = l === null || l === void 0 ? void 0 : l.data) === null || _a === void 0 ? void 0 : _a.id) {
+                    _this._list$.next(_this.afterSave(l));
+                    if (_this.saveOperationType === 'ADD') {
+                        _this.recipeWasAdded$.next(list.recipeInfos);
+                    }
+                    if (_this.saveOperationType === 'REMOVE') {
+                        _this.recipeWasDeleted$.next(list.recipeInfos);
+                    }
+                    _this.saveOperationType = '';
+                    if (openBasket) {
+                        window.open(_this.miamBasketURL + "/" + list.id, '_blank');
+                    }
                 }
             }), operators.map(function (l) { return l.data; }));
         };
@@ -3588,19 +3594,22 @@
             this.suggestionsPrimaryButtonActions = { display: display, addToBasket: addToBasket };
             this.reloadAllRecipes();
         };
-        RecipesService.prototype.plan = function (budget, guests, recipesCount, includes, fields) {
+        RecipesService.prototype.plan = function (budget, guests, recipesCount, includes, fields, in_basket) {
             var _this = this;
             if (includes === void 0) { includes = []; }
             if (fields === void 0) { fields = {}; }
+            if (in_basket === void 0) { in_basket = undefined; }
             var plannerFields = '';
             Object.keys(fields).forEach(function (key) {
                 var _a;
                 plannerFields += "&fields[" + key + "]=" + ((_a = fields[key]) === null || _a === void 0 ? void 0 : _a.join(','));
             });
             var url = MIAM_API_HOST$3 + 'recipes/plan';
+            url += "?budget=" + budget + "&filter[guests]=" + guests + "&recipes_count=" + recipesCount + "&filter[recipe_type_id]=main-dish";
+            url += "&include=" + includes.join(',') + plannerFields + "&filter[recipe_type_id]=main-dish&filter[primary_completion_perc]=100,100";
+            url += in_basket === undefined ? '' : "&filter[in_basket]=" + in_basket;
             return this.posService.pos$.pipe(operators.skipWhile(function (pos) { return !(pos === null || pos === void 0 ? void 0 : pos.id); }), operators.take(1), operators.switchMap(function (pos) {
-                url += "?point_of_sale_id=" + pos.id + "&guests=" + guests + "&budget=" + budget + "&recipes_count=" + recipesCount;
-                url += "&include=" + includes.join(',') + plannerFields + "&filter[recipe_type_id]=main-dish";
+                url += "&filter[point_of_sale_id]=" + pos.id;
                 return _this.http.get(url, {}).pipe(operators.map(function (returnedRecipes) {
                     var recipes = _this.newCollection();
                     recipes.fill(returnedRecipes);
@@ -3608,10 +3617,14 @@
                 }));
             }));
         };
-        RecipesService.prototype.maxPlannableRecipes = function (budget, guests) {
+        RecipesService.prototype.maxPlannableRecipes = function (budget, guests, in_basket) {
             var _this = this;
+            if (in_basket === void 0) { in_basket = undefined; }
+            var url = MIAM_API_HOST$3 + 'recipes/plan_max_recipes';
+            url += "?budget=" + budget + "&filter[guests]=" + guests + "&filter[recipe_type_id]=main-dish&filter[primary_completion_perc]=100,100";
+            url += in_basket === undefined ? '' : "&filter[in_basket]=" + in_basket;
             return this.posService.pos$.pipe(operators.skipWhile(function (pos) { return !(pos === null || pos === void 0 ? void 0 : pos.id); }), operators.take(1), operators.switchMap(function (pos) {
-                return _this.http.get(MIAM_API_HOST$3 + ("recipes/plan_max_recipes?point_of_sale_id=" + pos.id + "&guests=" + guests + "&budget=" + budget + "&filter[recipe_type_id]=main-dish"), {}).pipe(operators.map(function (result) { return result.max_recipes; }));
+                return _this.http.get(url += "&filter[point_of_sale_id]=" + pos.id, {}).pipe(operators.map(function (result) { return result.max_recipes; }));
             }));
         };
         // DEPRECATED / use TTL instead
@@ -13117,9 +13130,16 @@
             }
         };
         BasketPreviewDisabledComponent.prototype.ngOnChanges = function () {
+            var _this = this;
             if (this.alwaysExpanded) {
                 this.reduced = false;
             }
+            Object.keys(this.loading).forEach(function (id) {
+                var _a;
+                if (((_a = _this.entries) === null || _a === void 0 ? void 0 : _a.filter(function (entry) { return entry.id === id; }).length) === 0) {
+                    delete _this.loading[id];
+                }
+            });
         };
         BasketPreviewDisabledComponent.prototype.onResize = function (event) {
             this.mobile = window.innerWidth <= MOBILE_BREAKPOINT;
@@ -25716,16 +25736,18 @@
             if (!this.form.value.guestsCount || !this.form.value.budget) {
                 return rxjs.of(null);
             }
-            return this.recipesService.maxPlannableRecipes(this.form.value.budget, this.form.value.guestsCount).pipe(operators.tap(function (maxRecipes) {
-                var numbers = [];
-                for (var i = 1; i <= maxRecipes; i++) {
-                    numbers.push(i);
-                }
-                _this.recipesNumbers = numbers;
-                if (_this.form.value.recipesCount > maxRecipes) {
-                    _this.updateRecipesCount(0);
-                }
-                _this.noRecipesAvailable = maxRecipes < 1;
+            return this.userService.isLogged$.asObservable().pipe(operators.take(2)).pipe(operators.switchMap(function (logged) {
+                return _this.recipesService.maxPlannableRecipes(_this.form.value.budget, _this.form.value.guestsCount, logged ? false : undefined).pipe(operators.tap(function (maxRecipes) {
+                    var numbers = [];
+                    for (var i = 1; i <= maxRecipes; i++) {
+                        numbers.push(i);
+                    }
+                    _this.recipesNumbers = numbers;
+                    if (_this.form.value.recipesCount > maxRecipes) {
+                        _this.updateRecipesCount(maxRecipes);
+                    }
+                    _this.noRecipesAvailable = maxRecipes < 1;
+                }));
             }));
         };
         MealsPlannerFormComponent.prototype.submit = function () {
@@ -26499,7 +26521,8 @@
                 filters: {
                     recipe_type_id: 'main-dish',
                     price: "0," + this.remainingBudget,
-                    in_basket: false
+                    in_basket: false,
+                    primary_completion_perc: '100,100'
                 },
                 title: ''
             };
@@ -26919,7 +26942,7 @@
                 recipeSparseFields$5.recipes.push('ingredients');
                 recipeSparseFields$5['ingredients'] = ['name', 'quantity', 'unit', 'active', 'forced-eans', 'picture-url', 'position'];
             }
-            this.recipesService.plan(inputs.budget, inputs.guestsCount, inputs.recipesCount, recipeIncludes$5, recipeSparseFields$5).pipe(operators.switchMap(function (recipes) {
+            this.recipesService.plan(inputs.budget, inputs.guestsCount, inputs.recipesCount, recipeIncludes$5, recipeSparseFields$5, false).pipe(operators.switchMap(function (recipes) {
                 _this.budgettedRecipes = []; // Refresh the result view
                 _this.cdr.detectChanges();
                 _this.budgettedRecipes = recipes.map(function (r) {
@@ -27462,7 +27485,7 @@
                 request = request.clone({
                     setHeaders: {
                         'miam-origin': context.origin,
-                        'miam-front-version': '6.3.10',
+                        'miam-front-version': '6.3.12',
                         'miam-front-type': 'web',
                         'miam-api-version': '4.7.0'
                     }