ng-miam 4.6.2 → 4.6.4

package/bundles/ng-miam.umd.js

@@ -3054,9 +3054,19 @@
             _this.resource = RecipeLike;
             _this.type = 'recipe-likes';
             _this.activeRecipeLikes = new Map();
+            _this.MAX_RECIPE_LIKES_BEFORE_CLEAN = 200;
+            _this.cleanUnobservedLikesIfNecessary = new i0.EventEmitter();
+            _this.isCleaning = new rxjs.BehaviorSubject(false);
+            _this.subscriptions = [];
             _this.register();
+            _this.subscriptions.push(_this.cleanUnobservedLikesIfNecessary.pipe(operators.tap(function (_) { return _this.isCleaning.next(true); }), operators.debounceTime(100)).subscribe(function (_) {
+                _this.doCleanUnobservedLikesIfNecessary();
+            }));
             return _this;
         }
+        RecipeLikesService.prototype.ngOnDestroy = function () {
+            this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
+        };
         RecipeLikesService.prototype.getLike = function (recipeId) {
             this.addLikeToActivesIfNecessary(recipeId);
             return this.activeRecipeLikes.get(recipeId);
@@ -3094,15 +3104,53 @@
                 this.activeRecipeLikes.delete(recipeId);
             }
         };
+        RecipeLikesService.prototype.doCleanUnobservedLikesIfNecessary = function () {
+            var e_1, _a;
+            var _this = this;
+            console.debug('[Miam] will check cleaning', this.activeRecipeLikes.size);
+            if (this.activeRecipeLikes.size < this.MAX_RECIPE_LIKES_BEFORE_CLEAN) {
+                this.isCleaning.next(false);
+                return;
+            }
+            console.debug('[Miam] will clean unobserved recipes like');
+            var keysToDelete = [];
+            try {
+                for (var _b = __values(this.activeRecipeLikes), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var _d = __read(_c.value, 2), recipeId = _d[0], activeLikes = _d[1];
+                    if (activeLikes && activeLikes.observers.length === 0) {
+                        keysToDelete.push(recipeId);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            keysToDelete.forEach(function (recipeId) { return _this.activeRecipeLikes.delete(recipeId); });
+            this.isCleaning.next(false);
+        };
         RecipeLikesService.prototype.addLikesToRecipes = function (recipes) {
             var _this = this;
             if (!this.userService.isLogged$.value) {
                 return rxjs.of(null);
             }
+            ;
+            return this.isCleaning.asObservable().pipe(operators.skipWhile(function (isCleaning) { return isCleaning; }), operators.take(1), operators.switchMap(function (_) { return _this.afterCLeanAddLikesToRecipes(recipes); }));
+        };
+        RecipeLikesService.prototype.afterCLeanAddLikesToRecipes = function (recipes) {
+            var _this = this;
+            var recipeIds = recipes.map(function (r) { return r.id; }).filter(function (rid) { return !_this.activeRecipeLikes.has(rid); });
+            if (recipeIds.length == 0) {
+                return rxjs.of(null);
+            }
+            ;
             return this.all({
                 page: { size: 20, number: 1 },
                 remotefilter: {
-                    recipe_id: recipes.map(function (r) { return r.id; }).join(),
+                    recipe_id: recipeIds.join(),
                     is_past: 'true,false'
                 }
             }).pipe(operators.skipWhile(function (resp) { return resp.is_loading; }), operators.tap(function (result) {
@@ -4341,7 +4389,7 @@
                     _this.onBasketAndPosSendEvent(_this.analyticsService.EVENT_PAYMENT_STARTED, totalPrice);
                 },
                 basket: {
-                    stats$: this.basketsService.basketStats$,
+                    stats$: this.basketsService.basketStats$.pipe(operators.skipWhile(function (stats) { return !stats; })),
                     basketIsReady$: this.basketsService.basketStats$.pipe(operators.skipWhile(function (stats) { return !stats; }), operators.take(1), operators.map(function () { return true; })),
                     entries$: this.basketsService.activeBasketEntries(),
                     confirm: function (totalPrice) { return _this.basketsService.confirmBasket(totalPrice); },
@@ -7843,7 +7891,7 @@
         };
         LikeButtonComponent.prototype.ngOnDestroy = function () {
             this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
-            this.recipeLikesService.removeLikeFromActivesIfNecessary(this.recipe.id);
+            this.recipeLikesService.cleanUnobservedLikesIfNecessary.emit();
         };
         LikeButtonComponent.prototype.currentPath = function () { return ''; };
         LikeButtonComponent.prototype.initRecipeLike = function () {
@@ -8603,16 +8651,19 @@
             return 'preferences';
         };
         RecipeFiltersComponent.prototype.ngOnChanges = function (changes) {
-            if (this.filterToRemove) {
-                this.removeFilter(this.filterToRemove);
-            }
-            if (changes.isFilterCollapsed !== undefined && this.isMobile) {
-                this.context.globalScrollableElement.style.overflow = this.isFilterCollapsed ? 'initial' : 'hidden';
-            }
-            this.recalculateRecipesCount();
-            this.cdr.detectChanges();
-            if (!this.isFilterCollapsed) {
-                this.pageview();
+            // Sometimes confirm() can send the component in a loop of onChanges triggers with no changes, so this would stop it
+            if (changes.filters || changes.filterToRemove || changes.isFilterCollapsed || changes.position) {
+                if (this.filterToRemove) {
+                    this.removeFilter(this.filterToRemove);
+                }
+                if (changes.isFilterCollapsed !== undefined && this.isMobile) {
+                    this.context.globalScrollableElement.style.overflow = this.isFilterCollapsed ? 'initial' : 'hidden';
+                }
+                this.recalculateRecipesCount();
+                this.cdr.detectChanges();
+                if (!this.isFilterCollapsed) {
+                    this.pageview();
+                }
             }
         };
         RecipeFiltersComponent.prototype.ngOnDestroy = function () {
@@ -10513,7 +10564,7 @@
                     _this.loading.next(false);
                     _this.cdr.detectChanges();
                 }),
-                this.basketsService.basketStats$.pipe(operators.tap(function (stats) { return _this.statsUpdated.emit(stats); })).subscribe()
+                this.basketsService.basketStats$.pipe(operators.skipWhile(function (stats) { return !stats; }), operators.tap(function (stats) { return _this.statsUpdated.emit(stats); })).subscribe()
             ];
         };
         BasketPreviewBlockComponent.prototype.ngOnChanges = function (changes) {
@@ -12958,11 +13009,8 @@
                     }
                 });
                 this.noMoreRecipes = results.length === 0;
-                // Get all recipe-likes before displaying
-                return this.recipeLikesService.addLikesToRecipes(results).pipe(operators.map(function () {
-                    _this.retrievedRecipes.emit(_this.currentRecipes);
-                    return _this.currentRecipes;
-                }));
+                this.retrievedRecipes.emit(this.currentRecipes);
+                return rxjs.of(this.currentRecipes);
             }
             else {
                 // tslint:disable-next-line: no-console
@@ -13919,7 +13967,7 @@
                 _this.pos = pos;
                 _this.assessValid();
             })).subscribe());
-            this.subscriptions.push(this.basketsService.basketStats$.pipe(operators.tap(function (stats) {
+            this.subscriptions.push(this.basketsService.basketStats$.pipe(operators.skipWhile(function (stats) { return !stats; }), operators.tap(function (stats) {
                 _this.basketStats = stats;
                 _this.cdr.detectChanges();
             })).subscribe());
@@ -15810,7 +15858,7 @@
                     _this.supplierId = supplier.id;
                     return _this.loadPackages();
                 })).subscribe(),
-                this.basketsService.basketStats$.subscribe(function (bs) {
+                this.basketsService.basketStats$.pipe(operators.skipWhile(function (bs) { return !bs; })).subscribe(function (bs) {
                     _this.recipeCount = bs.recipesCount;
                     _this.totalPrice = bs.totalPrice;
                     _this.cdr.detectChanges();
@@ -15858,6 +15906,7 @@
             this.filters.additionalFilters = null;
         };
         RecipeCatalogComponent.prototype.updateFilters = function (filters) {
+            console.log('updateFilters');
             this.filters = filters.copy(); // necessary to trigger child component change
             this.filterToRemove = undefined;
             this.returnToTop();