@sumaris-net/ngx-components 0.18.11 → 0.18.16

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

@@ -8689,6 +8689,7 @@
             return !obj || obj[checkedAttribute] === null || obj[checkedAttribute] === undefined;
         };
         EntityUtils.equals = function (o1, o2, checkAttribute) {
+            checkAttribute = checkAttribute || 'id';
             return (o1 === o2) || (isNil(o1) && isNil(o2)) || (o1 && o2 && o1[checkAttribute] === o2[checkAttribute]);
         };
         EntityUtils.getPropertyByPath = function (obj, path) {
@@ -16279,6 +16280,7 @@
             _this.filterType = filterType;
             _this.debug = false;
             _this.dirty = false;
+            _this._saving = false;
             _this._onChange = new rxjs.BehaviorSubject(true);
             options = Object.assign({ onSort: _this.sort, equals: _this.equals }, options);
             _this._sortFn = options.onSort;
@@ -16302,7 +16304,6 @@
             get: function () {
                 return this.data;
             },
-            // TODO add test  see sub-batches.modal.ts onLoadData & _hiddenData
             set: function (data) {
                 this.setValue(data);
             },
@@ -16334,53 +16335,54 @@
                 console.warn('[memory-data-service] Waiting value to be set...');
             }
             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) {
+                .pipe(operators.filter(isNotNil), operators.mergeMap(function (_) { return waitFor(function () { return !_this._saving; }); }), operators.mergeMap(function (_) { return __awaiter(_this, void 0, void 0, function () {
+                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 +16392,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:
@@ -16400,9 +16402,14 @@
                             // /!\ If already observed, then always create a copy of the original array
                             // Because datasource will only update if the array changed
                             if (data === this.data) {
-                                data = data.slice(0);
+                                data = data.slice();
                             }
                             return [2 /*return*/, { data: data, total: total }];
+                        case 6:
+                            // Remember hidden data
+                            this._hiddenData = !excludedDataByPagination ? excludedDataByFilter : excludedDataByFilter.concat.apply(excludedDataByFilter, __spread(excludedDataByPagination));
+                            return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             }); }));
@@ -16415,26 +16422,34 @@
                         case 0:
                             if (!this.data)
                                 throw new Error('[memory-service] Could not save, because value not set');
+                            this.markAsSaving();
+                            _b.label = 1;
+                        case 1:
+                            _b.trys.push([1, , 6, 7]);
                             // Restore hidden data
                             if (isNotEmptyArray(this._hiddenData))
-                                data = data.concat(this._hiddenData);
-                            if (!this._onSaveFn) return [3 /*break*/, 4];
+                                data = data.concat.apply(data, __spread(this._hiddenData));
+                            if (!this._onSaveFn) return [3 /*break*/, 5];
                             res = this._onSaveFn(data);
-                            if (!((res instanceof Promise))) return [3 /*break*/, 2];
+                            if (!((res instanceof Promise))) return [3 /*break*/, 3];
                             return [4 /*yield*/, res];
-                        case 1:
-                            _a = _b.sent();
-                            return [3 /*break*/, 3];
                         case 2:
-                            _a = res;
-                            _b.label = 3;
+                            _a = _b.sent();
+                            return [3 /*break*/, 4];
                         case 3:
-                            data = _a;
+                            _a = res;
                             _b.label = 4;
                         case 4:
+                            data = _a;
+                            _b.label = 5;
+                        case 5:
                             this.data = data;
                             this.dirty = true;
                             return [2 /*return*/, this.data];
+                        case 6:
+                            this.markAsSaved();
+                            return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             });
@@ -16447,8 +16462,8 @@
                     if (!this.data)
                         throw new Error('[memory-service] Could not delete, because value not set');
                     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.equals(entityToRemove, entity); }) !== -1;
+                        return !removed;
                     });
                     deleteCount = this.data.length - updatedData.length;
                     if (deleteCount > 0) {
@@ -16472,6 +16487,11 @@
         InMemoryEntitiesService.prototype.addSortByReplacement = function (source, target) {
             this._sortByReplacement[source] = target;
         };
+        InMemoryEntitiesService.prototype.equals = function (d1, d2) {
+            if (this._equalsFn)
+                return this._equalsFn(d1, d2);
+            return d1 && d1.equals ? d1.equals(d2) : EntityUtils.equals(d1, d2, 'id');
+        };
         /* -- protected methods -- */
         InMemoryEntitiesService.prototype.filter = function (data, _filter, hiddenData) {
             // if filter is DataFilter instance, use its test function
@@ -16497,8 +16517,11 @@
                 return { data: data, total: total };
             }));
         };
-        InMemoryEntitiesService.prototype.equals = function (d1, d2) {
-            return d1 && d1.equals ? d1.equals(d2) : EntityUtils.equals(d1, d2, 'id');
+        InMemoryEntitiesService.prototype.markAsSaving = function () {
+            this._saving = true;
+        };
+        InMemoryEntitiesService.prototype.markAsSaved = function () {
+            this._saving = false;
         };
         return InMemoryEntitiesService;
     }(EntitiesService));
@@ -23049,7 +23072,7 @@
             }
         };
         AppTable.prototype.markAsUntouched = function (opts) {
-            if (this.dirtySubject.value !== false || (this.editedRow && this.editedRow.id !== this.previouslySavedEditedRowId)) {
+            if (this.dirtySubject.value !== false || (this.editedRow && this.editedRow.id !== this.previouslyEditedRowId)) {
                 // Cancel the current editing row only if editing and if it was not previously saved
                 this.dirtySubject.next(false);
                 if (this.editedRow && this.editedRow.editing) {
@@ -23060,7 +23083,7 @@
                     this.markForCheck();
                 }
             }
-            this.previouslySavedEditedRowId = undefined;
+            this.previouslyEditedRowId = undefined;
         };
         /**
          * @deprecated prefer to use markAllAsTouched()
@@ -23526,7 +23549,7 @@
         AppTable.prototype.save = function (opts) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var isOK, err_1;
+                var previouslyEditedData, isOK, err_1;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -23536,7 +23559,8 @@
                             }
                             this.resetError();
                             // Keep edited row id (should be done BEFORE confirmEditCreate() )
-                            this.previouslySavedEditedRowId = opts.keepEditing && ((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) ? this.editedRow.id : undefined;
+                            this.previouslyEditedRowId = opts.keepEditing && ((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) ? this.editedRow.id : undefined;
+                            previouslyEditedData = isNotNil(this.previouslyEditedRowId) && this.editedRow.currentData || ((_b = this.singleSelectedRow) === null || _b === void 0 ? void 0 : _b.currentData);
                             if (!this.confirmEditCreate()) {
                                 throw { code: ErrorCodes$2.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                             }
@@ -23544,7 +23568,7 @@
                             this.markAsSaving();
                             _d.label = 1;
                         case 1:
-                            _d.trys.push([1, 3, 4, 5]);
+                            _d.trys.push([1, 3, 4, 7]);
                             // Calling service save()
                             if (this.debug)
                                 console.debug('[table] Calling dataSource.save()...');
@@ -23560,18 +23584,13 @@
                             throw err_1;
                         case 4:
                             this.markAsSaved();
-                            // Restoring previous row
-                            if (isNotNil(this.previouslySavedEditedRowId)) {
-                                if (this.previouslySavedEditedRowId !== -1) {
-                                    // Select by row id
-                                    this.selectRowById(this.previouslySavedEditedRowId);
-                                }
-                                else {
-                                    this.selectRowByData((_b = this.singleSelectedRow) === null || _b === void 0 ? void 0 : _b.currentData);
-                                }
-                            }
-                            return [7 /*endfinally*/];
-                        case 5: return [2 /*return*/];
+                            if (!isNotNil(this.previouslyEditedRowId)) return [3 /*break*/, 6];
+                            return [4 /*yield*/, this.selectRowByIdOrData(this.previouslyEditedRowId, previouslyEditedData)];
+                        case 5:
+                            _d.sent();
+                            _d.label = 6;
+                        case 6: return [7 /*endfinally*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             });
@@ -23755,39 +23774,26 @@
                 });
             });
         };
-        AppTable.prototype.editRow = function (event, row, opts) {
-            if (!this._enabled)
-                return false;
-            if (this.editedRow === row)
-                return true; // Already the edited row
-            if (event === null || event === void 0 ? void 0 : event.defaultPrevented)
-                return false;
-            if (!this.confirmEditCreate()) {
-                return false;
-            }
-            if (!row.editing && !this.loading) {
-                this._focusColumn = opts && opts.focusColumn || this._focusColumn;
-                this._dataSource.startEdit(row);
-            }
-            this.editedRow = row;
-            this.onStartEditingRow.emit(row);
-            return true;
-        };
         AppTable.prototype.selectRowById = function (id) {
             var _this = this;
             if (id === undefined)
-                return;
-            this.dataSource.waitIdle()
+                return Promise.resolve(false);
+            return this.dataSource.waitIdle()
                 .then(function () { return _this.dataSource.getRow(id); })
-                .then(function (row) { return _this.clickRow(null, row); });
+                .then(function (row) { return row && _this.clickRow(null, row); });
         };
+        /**
+         * Try to select row by data. Will use dataEquals() (that call EntityUtils.equals()) to find same row's data
+         * @param data
+         */
         AppTable.prototype.selectRowByData = function (data) {
             var _this = this;
             if (data === undefined)
-                return;
-            this.dataSource.waitIdle()
+                return Promise.resolve(false);
+            return this.dataSource.waitIdle()
                 .then(function () { return _this.dataSource.getRows(); })
-                .then(function (rows) { var _a; return _this.selectRowById((_a = rows.find(function (row) { return _this.dataEquals(row.currentData, data); })) === null || _a === void 0 ? void 0 : _a.id); });
+                .then(function (rows) { return rows.find(function (row) { return _this.equals(row.currentData, data); }); })
+                .then(function (row) { return row && _this.clickRow(null, row); });
         };
         AppTable.prototype.clickRow = function (event, row) {
             var _this = this;
@@ -23805,8 +23811,6 @@
                 return true; // Already in edition
             if (event === null || event === void 0 ? void 0 : event.defaultPrevented)
                 return false; // Cancelled by event
-            if (this.loading)
-                return false; // Already busy
             // Open the detail page (if not inline editing)
             if (!this.inlineEdition) {
                 if (this.dirty && this.debug) {
@@ -23819,10 +23823,10 @@
                 // No ID defined: unable to open details
                 if (isNil(row.currentData.id)) {
                     console.warn('[table] Opening row details, but missing currentData.id!');
-                    //return false;
+                    return false;
                 }
                 this.markAsLoading();
-                this.openRow(row.currentData.id, row)
+                this.openRowDetail(row.currentData.id, row)
                     .then(function () { return _this.markAsLoaded(); });
                 return true;
             }
@@ -23933,8 +23937,70 @@
                 }
             }
         };
+        /* -- protected method -- */
+        AppTable.prototype.editRow = function (event, row, opts) {
+            if (!this._enabled)
+                return false;
+            if (this.editedRow === row)
+                return true; // Already the edited row
+            if (event === null || event === void 0 ? void 0 : event.defaultPrevented)
+                return false;
+            if (!this.confirmEditCreate()) {
+                return false;
+            }
+            if (!row.editing && !this.loading) {
+                this._focusColumn = opts && opts.focusColumn || this._focusColumn;
+                this._dataSource.startEdit(row);
+            }
+            this.editedRow = row;
+            this.onStartEditingRow.emit(row);
+            return true;
+        };
+        /**
+         * Try to select row, by row.id, or by data. WIll use EntityUtils.equals()
+         * @param id
+         * @param data
+         * @protected
+         */
+        AppTable.prototype.selectRowByIdOrData = function (id, data) {
+            return __awaiter(this, void 0, void 0, function () {
+                var done, err_3;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            done = false;
+                            _d.label = 1;
+                        case 1:
+                            _d.trys.push([1, 6, , 7]);
+                            if (!(isNotNil(id) || id !== -1)) return [3 /*break*/, 3];
+                            return [4 /*yield*/, this.selectRowById(id)];
+                        case 2:
+                            done = _d.sent();
+                            if (done)
+                                return [2 /*return*/, true];
+                            console.warn('[app-table] Save: Cannot reselect row by row.id: ', id);
+                            _d.label = 3;
+                        case 3:
+                            if (!data) return [3 /*break*/, 5];
+                            return [4 /*yield*/, this.selectRowByData(data)];
+                        case 4:
+                            done = _d.sent();
+                            if (done)
+                                return [2 /*return*/, true];
+                            console.warn('[app-table] Save: Cannot reselect row by data: ', data);
+                            _d.label = 5;
+                        case 5: return [2 /*return*/, false];
+                        case 6:
+                            err_3 = _d.sent();
+                            // Log, but continue
+                            console.error(err_3 && err_3.message || err_3);
+                            return [2 /*return*/, false];
+                        case 7: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         Object.defineProperty(AppTable.prototype, "singleSelectedRow", {
-            /* -- protected method -- */
             /**
              * return the selected row if unique in selection
              */
@@ -23947,7 +24013,7 @@
         });
         AppTable.prototype.canDeleteRows = function (rows, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var canDelete, err_3;
+                var canDelete, err_4;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -23964,11 +24030,11 @@
                                 return [2 /*return*/, false];
                             return [3 /*break*/, 4];
                         case 3:
-                            err_3 = _d.sent();
-                            if (err_3 === 'CANCELLED')
+                            err_4 = _d.sent();
+                            if (err_4 === 'CANCELLED')
                                 return [2 /*return*/, false]; // User cancel
-                            console.error('Error while checking if can delete rows', err_3);
-                            throw err_3;
+                            console.error('Error while checking if can delete rows', err_4);
+                            throw err_4;
                         case 4:
                             // Ask user confirmation
                             if (this.confirmBeforeDelete && (!opts || opts.interactive !== false)) {
@@ -23981,7 +24047,7 @@
         };
         AppTable.prototype.canCancelRows = function (rows, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var _d, isCancel, err_4;
+                var _d, isCancel, err_5;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
@@ -24009,11 +24075,11 @@
                                 return [2 /*return*/, false];
                             return [3 /*break*/, 6];
                         case 5:
-                            err_4 = _e.sent();
-                            if (err_4 === 'CANCELLED')
+                            err_5 = _e.sent();
+                            if (err_5 === 'CANCELLED')
                                 return [2 /*return*/, false]; // User cancel
-                            console.error('Error while checking if can cancel rows', err_4);
-                            throw err_4;
+                            console.error('Error while checking if can cancel rows', err_5);
+                            throw err_5;
                         case 6:
                             // Ask user confirmation
                             if (this.confirmBeforeCancel && (!opts || opts.interactive !== false)) {
@@ -24026,7 +24092,7 @@
         };
         AppTable.prototype.saveBeforeAction = function (saveAction) {
             return __awaiter(this, void 0, void 0, function () {
-                var save, confirmed, res, err_5, saved;
+                var save, confirmed, res, err_6, saved;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -24062,11 +24128,11 @@
                             save = res.save;
                             return [3 /*break*/, 4];
                         case 3:
-                            err_5 = _d.sent();
-                            if (err_5 === 'CANCELLED')
+                            err_6 = _d.sent();
+                            if (err_6 === 'CANCELLED')
                                 return [2 /*return*/, false]; // User cancel
-                            console.error('Error while checking if can delete rows', err_5);
-                            throw err_5;
+                            console.error('Error while checking if can delete rows', err_6);
+                            throw err_6;
                         case 4:
                             if (!confirmed) return [3 /*break*/, 7];
                             if (!save) return [3 /*break*/, 6];
@@ -24081,7 +24147,7 @@
                 });
             });
         };
-        AppTable.prototype.openRow = function (id, row) {
+        AppTable.prototype.openRowDetail = function (id, row) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -24352,12 +24418,12 @@
          * Compare data equality (default by id)
          * Can be overridden to add additional properties to compare
          *
-         * @param t1
-         * @param t2
+         * @param d1
+         * @param d2
          * @protected
          */
-        AppTable.prototype.dataEquals = function (t1, t2) {
-            return EntityUtils.equals(t1, t2, 'id');
+        AppTable.prototype.equals = function (d1, d2) {
+            return EntityUtils.equals(d1, d2, 'id');
         };
         /* -- private method -- */
         AppTable.prototype.setLoading = function (value, opts) {
@@ -26046,6 +26112,9 @@
                 this.onRefresh.emit();
             }
         };
+        AppInMemoryTable.prototype.equals = function (t1, t2) {
+            return this.memoryDataService.equals(t1, t2);
+        };
         return AppInMemoryTable;
     }(AppTable));
     AppInMemoryTable.decorators = [