@sumaris-net/ngx-components 0.18.11 → 0.18.12

package/bundles/ngx-sumaris-components.umd.js

@@ -16302,7 +16302,6 @@
             get: function () {
                 return this.data;
             },
-            // TODO add test  see sub-batches.modal.ts onLoadData & _hiddenData
             set: function (data) {
                 this.setValue(data);
             },
@@ -16335,52 +16334,53 @@
             }
             return this._onChange
                 .pipe(operators.filter(isNotNil), operators.mergeMap(function (_) { return __awaiter(_this, void 0, void 0, function () {
-                var data, promiseOrData, _a, total, hiddenData;
-                var _b, _c, _d, _e;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                var excludedDataByFilter, excludedDataByPagination, data, promiseOrData, _a, total;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
-                            this._hiddenData = [];
+                            excludedDataByFilter = [];
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, , 6, 7]);
                             if (isEmptyArray(this.data)) {
                                 return [2 /*return*/, { data: [], total: 0 }];
                             }
                             data = this._sortFn(this.data || [], sortBy, sortDirection);
-                            if (!this._onLoad) return [3 /*break*/, 4];
+                            if (!this._onLoad) return [3 /*break*/, 5];
                             promiseOrData = this._onLoad(data);
-                            if (!((promiseOrData instanceof Promise))) return [3 /*break*/, 2];
+                            if (!((promiseOrData instanceof Promise))) return [3 /*break*/, 3];
                             return [4 /*yield*/, promiseOrData];
-                        case 1:
-                            _a = _f.sent();
-                            return [3 /*break*/, 3];
                         case 2:
-                            _a = promiseOrData;
-                            _f.label = 3;
+                            _a = _b.sent();
+                            return [3 /*break*/, 4];
                         case 3:
-                            data = _a;
-                            _f.label = 4;
+                            _a = promiseOrData;
+                            _b.label = 4;
                         case 4:
+                            data = _a;
+                            _b.label = 5;
+                        case 5:
                             // Apply filter (will update hiddenData)
-                            data = this.filter(data, filterData, this._hiddenData);
+                            data = this.filter(data, filterData, excludedDataByFilter);
                             total = data.length;
                             // If page size=0 (e.g. only need total)
                             if (size === 0) {
-                                (_b = this._hiddenData).push.apply(_b, __spread(data));
+                                excludedDataByPagination = data;
                                 return [2 /*return*/, { data: [], total: total }];
                             }
                             // Slice in a page (using offset and size)
                             if (offset > 0) {
                                 // Offset after the end: no result
                                 if (offset >= data.length) {
-                                    (_c = this._hiddenData).push.apply(_c, __spread(data));
+                                    excludedDataByPagination = data;
                                     data = [];
                                 }
                                 else {
-                                    hiddenData = (size > 0 && ((offset + size) < data.length)) ?
+                                    excludedDataByPagination = (size > 0 && ((offset + size) < data.length)) ?
                                         // Slice using limit to size
                                         data.slice(0, offset - 1).concat(data.slice(offset + size)) :
                                         // Slice without limit
                                         data.slice(0, offset - 1);
-                                    (_d = this._hiddenData).push.apply(_d, __spread(hiddenData));
                                     data = (size > 0 && ((offset + size) < data.length)) ?
                                         // Slice using limit to size
                                         data.slice(offset, offset + size) :
@@ -16390,7 +16390,7 @@
                             }
                             // Apply a limit
                             else if (size > 0) {
-                                (_e = this._hiddenData).push.apply(_e, __spread(data.slice(size)));
+                                excludedDataByPagination = data.slice(size);
                                 data = data.slice(0, size);
                             }
                             // No limit:
@@ -16403,6 +16403,11 @@
                                 data = data.slice(0);
                             }
                             return [2 /*return*/, { data: data, total: total }];
+                        case 6:
+                            // Remember hidden data
+                            this._hiddenData = __spread(excludedDataByFilter, excludedDataByPagination);
+                            return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             }); }));
@@ -16446,9 +16451,11 @@
                 return __generator(this, function (_a) {
                     if (!this.data)
                         throw new Error('[memory-service] Could not delete, because value not set');
+                    if (!this._equalsFn)
+                        throw new Error("[memory-service] Could not delete, because no 'options.equals' has been set in the memory service");
                     updatedData = this.data.filter(function (entity) {
-                        var shouldRemoved = dataToRemove.findIndex(function (entityToRemove) { return _this._equalsFn(entityToRemove, entity); }) !== -1;
-                        return !shouldRemoved;
+                        var removed = dataToRemove.findIndex(function (entityToRemove) { return _this._equalsFn(entityToRemove, entity); }) !== -1;
+                        return !removed;
                     });
                     deleteCount = this.data.length - updatedData.length;
                     if (deleteCount > 0) {