ng-miam 4.0.2 → 4.0.3

package/bundles/ng-miam.umd.js

@@ -1358,7 +1358,7 @@
             if (this.currentSubscription) {
                 this.currentSubscription.unsubscribe();
             }
-            this.currentSubscription = this.get(endpoint).pipe(operators.skipWhile(function (l) { return l.is_loading; }), operators.tap(function (l) { return _this.assignList(l); })).subscribe();
+            this.currentSubscription = this.get(endpoint + '&include=groceries-entries').pipe(operators.skipWhile(function (l) { return l.is_loading; }), operators.tap(function (l) { return _this.assignList(l); })).subscribe();
             return this._list$;
         };
         GroceriesListsService.prototype.resetList = function () {
@@ -13826,14 +13826,20 @@
             }
             this.loading = true;
             this.cdr.detectChanges();
-            this.listsService.addEntriesFromPicture(file, ['groceries-entries'], this.disableIngredientsMatching).subscribe(function (list) {
-                var addedEntries = list.entries.data.filter(function (entry) { return !entry.recipesIds || entry.recipesIds.length === 0; });
-                _this.loading = false;
-                _this.entriesAdded.emit(addedEntries);
+            // takeFirstList to make sure the list is initialised before checking its value
+            this.listsService.takeFirstList().subscribe(function (currentList) {
+                var precedentEntries = currentList.entries.data;
+                _this.listsService.addEntriesFromPicture(file, ['groceries-entries'], _this.disableIngredientsMatching).subscribe(function (list) {
+                    var addedEntries = list.entries.data
+                        // Remove entries that were already present in the same quantities before
+                        .filter(function (entry) { return -1 === precedentEntries.findIndex(function (e) { return e.id === entry.id; }); });
+                    _this.loading = false;
+                    _this.entriesAdded.emit(addedEntries);
+                    _this.cdr.detectChanges();
+                });
+                event.target.value = null;
                 _this.cdr.detectChanges();
             });
-            event.target.value = null;
-            this.cdr.detectChanges();
         };
         return ListScanFilesInputsComponent;
     }());
@@ -14182,6 +14188,7 @@
             this.basketsService = basketsService;
             this.entries = [];
             this.closed = new i0.EventEmitter();
+            this.cancelled = new i0.EventEmitter();
             this.icon = exports.Icon;
             this.lines = [];
             this.unavailable = [];
@@ -14208,6 +14215,9 @@
         ListScanBasketPreviewComponent.prototype.close = function () {
             this.closed.emit();
         };
+        ListScanBasketPreviewComponent.prototype.cancel = function () {
+            this.cancelled.emit();
+        };
         // Remove groceries entry from entries array, and line from lines array
         ListScanBasketPreviewComponent.prototype.deleteEntry = function (line) {
             var _this = this;
@@ -14227,12 +14237,12 @@
         return ListScanBasketPreviewComponent;
     }());
     ListScanBasketPreviewComponent.ɵfac = function ListScanBasketPreviewComponent_Factory(t) { return new (t || ListScanBasketPreviewComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef), i0.ɵɵdirectiveInject(BasketsService)); };
-    ListScanBasketPreviewComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ListScanBasketPreviewComponent, selectors: [["ng-miam-list-scan-basket-preview"]], inputs: { entries: "entries" }, outputs: { closed: "closed" }, decls: 13, vars: 8, consts: [[1, "miam-list-scan__basket-preview"], [1, "miam-list-scan__basket-preview__header"], ["width", "24", "height", "24", 3, "iconName", "click"], [1, "miam-list-scan__basket-preview__content", 3, "ngClass"], [4, "ngFor", "ngForOf"], [3, "entries", 4, "ngIf"], [1, "miam-list-scan__basket-preview__controls"], [1, "m-button-primary", 3, "click"], ["width", "24", "height", "24", 3, "iconName"], [3, "line", "removed", "replaceItem", 4, "ngIf"], [3, "line", "selected", 4, "ngIf"], [3, "line", "removed", "replaceItem"], [3, "line", "selected"], [3, "entries"]], template: function ListScanBasketPreviewComponent_Template(rf, ctx) {
+    ListScanBasketPreviewComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ListScanBasketPreviewComponent, selectors: [["ng-miam-list-scan-basket-preview"]], inputs: { entries: "entries" }, outputs: { closed: "closed", cancelled: "cancelled" }, decls: 13, vars: 8, consts: [[1, "miam-list-scan__basket-preview"], [1, "miam-list-scan__basket-preview__header"], ["width", "24", "height", "24", 3, "iconName", "click"], [1, "miam-list-scan__basket-preview__content", 3, "ngClass"], [4, "ngFor", "ngForOf"], [3, "entries", 4, "ngIf"], [1, "miam-list-scan__basket-preview__controls"], [1, "m-button-primary", 3, "click"], ["width", "24", "height", "24", 3, "iconName"], [3, "line", "removed", "replaceItem", 4, "ngIf"], [3, "line", "selected", 4, "ngIf"], [3, "line", "removed", "replaceItem"], [3, "line", "selected"], [3, "entries"]], template: function ListScanBasketPreviewComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0.ɵɵelementStart(0, "div", 0);
                 i0.ɵɵelementStart(1, "div", 1);
                 i0.ɵɵelementStart(2, "ng-miam-icon", 2);
-                i0.ɵɵlistener("click", function ListScanBasketPreviewComponent_Template_ng_miam_icon_click_2_listener() { return ctx.replaceItemCurrentLine ? ctx.toggleReplacing(ctx.replaceItemCurrentLine) : ctx.close(); });
+                i0.ɵɵlistener("click", function ListScanBasketPreviewComponent_Template_ng_miam_icon_click_2_listener() { return ctx.replaceItemCurrentLine ? ctx.toggleReplacing(ctx.replaceItemCurrentLine) : ctx.cancel(); });
                 i0.ɵɵelementEnd();
                 i0.ɵɵelementStart(3, "h3");
                 i0.ɵɵtext(4);
@@ -14282,6 +14292,8 @@
                     type: i0.Input
                 }], closed: [{
                     type: i0.Output
+                }], cancelled: [{
+                    type: i0.Output
                 }] });
     })();
 
@@ -14325,7 +14337,7 @@
         if (rf & 1) {
             var _r12_1 = i0.ɵɵgetCurrentView();
             i0.ɵɵelementStart(0, "ng-miam-list-scan-basket-preview", 9);
-            i0.ɵɵlistener("closed", function ListScanComponent_ng_miam_list_scan_basket_preview_5_Template_ng_miam_list_scan_basket_preview_closed_0_listener() { i0.ɵɵrestoreView(_r12_1); var ctx_r11 = i0.ɵɵnextContext(); return ctx_r11.hideBasketPreview(); });
+            i0.ɵɵlistener("closed", function ListScanComponent_ng_miam_list_scan_basket_preview_5_Template_ng_miam_list_scan_basket_preview_closed_0_listener() { i0.ɵɵrestoreView(_r12_1); var ctx_r11 = i0.ɵɵnextContext(); return ctx_r11.hideBasketPreview(); })("cancel", function ListScanComponent_ng_miam_list_scan_basket_preview_5_Template_ng_miam_list_scan_basket_preview_cancel_0_listener() { i0.ɵɵrestoreView(_r12_1); var ctx_r13 = i0.ɵɵnextContext(); return ctx_r13.returnToIngredients(); });
             i0.ɵɵelementEnd();
         }
         if (rf & 2) {
@@ -14353,6 +14365,11 @@
             this.ingredientsShown = false;
             this.cdr.detectChanges();
         };
+        ListScanComponent.prototype.returnToIngredients = function () {
+            this.basketPreviewShown = false;
+            this.ingredientsShown = true;
+            this.cdr.detectChanges();
+        };
         ListScanComponent.prototype.showBasketPreview = function () {
             this.basketPreviewShown = true;
             this.hideIngredients();
@@ -14365,7 +14382,7 @@
         return ListScanComponent;
     }());
     ListScanComponent.ɵfac = function ListScanComponent_Factory(t) { return new (t || ListScanComponent)(i0.ɵɵdirectiveInject(i0.ChangeDetectorRef)); };
-    ListScanComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ListScanComponent, selectors: [["ng-miam-list-scan"]], inputs: { floatingButton: "floatingButton", overlay: "overlay", disableIngredientsMatching: "disableIngredientsMatching" }, outputs: { close: "close" }, decls: 6, vars: 8, consts: [[1, "miam-list-scan"], [3, "disableIngredientsMatching", "entriesAdded", 4, "ngIf"], [3, "overlay", "entriesAdded", 4, "ngIf"], [3, "isAngularComponent", "noHeaderMode", "expanded", "expandedChange"], ["class", "miam-list-scan__content", 3, "entries", "closed", "confirmed", 4, "ngIf"], ["class", "miam-list-scan__content", 3, "entries", "closed", 4, "ngIf"], [3, "disableIngredientsMatching", "entriesAdded"], [3, "overlay", "entriesAdded"], [1, "miam-list-scan__content", 3, "entries", "closed", "confirmed"], [1, "miam-list-scan__content", 3, "entries", "closed"]], template: function ListScanComponent_Template(rf, ctx) {
+    ListScanComponent.ɵcmp = i0.ɵɵdefineComponent({ type: ListScanComponent, selectors: [["ng-miam-list-scan"]], inputs: { floatingButton: "floatingButton", overlay: "overlay", disableIngredientsMatching: "disableIngredientsMatching" }, outputs: { close: "close" }, decls: 6, vars: 8, consts: [[1, "miam-list-scan"], [3, "disableIngredientsMatching", "entriesAdded", 4, "ngIf"], [3, "overlay", "entriesAdded", 4, "ngIf"], [3, "isAngularComponent", "noHeaderMode", "expanded", "expandedChange"], ["class", "miam-list-scan__content", 3, "entries", "closed", "confirmed", 4, "ngIf"], ["class", "miam-list-scan__content", 3, "entries", "closed", "cancel", 4, "ngIf"], [3, "disableIngredientsMatching", "entriesAdded"], [3, "overlay", "entriesAdded"], [1, "miam-list-scan__content", 3, "entries", "closed", "confirmed"], [1, "miam-list-scan__content", 3, "entries", "closed", "cancel"]], template: function ListScanComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0.ɵɵelementStart(0, "div", 0);
                 i0.ɵɵtemplate(1, ListScanComponent_ng_miam_list_scan_files_inputs_1_Template, 1, 1, "ng-miam-list-scan-files-inputs", 1);