@sumaris-net/ngx-components 0.18.11 → 0.18.16

package/fesm2015/ngx-sumaris-components.js

@@ -7706,6 +7706,7 @@ class EntityUtils {
         return !obj || obj[checkedAttribute] === null || obj[checkedAttribute] === undefined;
     }
     static equals(o1, o2, checkAttribute) {
+        checkAttribute = checkAttribute || 'id';
         return (o1 === o2) || (isNil(o1) && isNil(o2)) || (o1 && o2 && o1[checkAttribute] === o2[checkAttribute]);
     }
     static getPropertyByPath(obj, path) {
@@ -14224,6 +14225,7 @@ class InMemoryEntitiesService extends EntitiesService {
         this.filterType = filterType;
         this.debug = false;
         this.dirty = false;
+        this._saving = false;
         this._onChange = new BehaviorSubject(true);
         options = Object.assign({ onSort: this.sort, equals: this.equals }, options);
         this._sortFn = options.onSort;
@@ -14241,7 +14243,6 @@ class InMemoryEntitiesService extends EntitiesService {
             // Detect rankOrder on the entity class
             id: (Object.getOwnPropertyNames(new dataType()).findIndex(key => key === 'rankOrder') !== -1) ? 'rankOrder' : undefined }, options.sortByReplacement);
     }
-    // TODO add test  see sub-batches.modal.ts onLoadData & _hiddenData
     set value(data) {
         this.setValue(data);
     }
@@ -14272,78 +14273,90 @@ class InMemoryEntitiesService extends EntitiesService {
             console.warn('[memory-data-service] Waiting value to be set...');
         }
         return this._onChange
-            .pipe(filter(isNotNil), mergeMap((_) => __awaiter(this, void 0, void 0, function* () {
-            this._hiddenData = [];
-            if (isEmptyArray(this.data)) {
-                return { data: [], total: 0 };
-            }
-            // Apply sort
-            let data = this._sortFn(this.data || [], sortBy, sortDirection);
-            if (this._onLoad) {
-                const promiseOrData = this._onLoad(data);
-                data = ((promiseOrData instanceof Promise)) ? yield promiseOrData : promiseOrData;
-            }
-            // Apply filter (will update hiddenData)
-            data = this.filter(data, filterData, this._hiddenData);
-            // Compute the total length
-            const total = data.length;
-            // If page size=0 (e.g. only need total)
-            if (size === 0) {
-                this._hiddenData.push(...data);
-                return { data: [], total };
-            }
-            // Slice in a page (using offset and size)
-            if (offset > 0) {
-                // Offset after the end: no result
-                if (offset >= data.length) {
-                    this._hiddenData.push(...data);
-                    data = [];
+            .pipe(filter(isNotNil), mergeMap(_ => waitFor(() => !this._saving)), mergeMap((_) => __awaiter(this, void 0, void 0, function* () {
+            const excludedDataByFilter = [];
+            let excludedDataByPagination;
+            try {
+                if (isEmptyArray(this.data)) {
+                    return { data: [], total: 0 };
                 }
-                else {
-                    const hiddenData = (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);
-                    this._hiddenData.push(...hiddenData);
-                    data = (size > 0 && ((offset + size) < data.length)) ?
-                        // Slice using limit to size
-                        data.slice(offset, offset + size) :
-                        // Slice without limit
-                        data.slice(offset);
+                // Apply sort
+                let data = this._sortFn(this.data || [], sortBy, sortDirection);
+                if (this._onLoad) {
+                    const promiseOrData = this._onLoad(data);
+                    data = ((promiseOrData instanceof Promise)) ? yield promiseOrData : promiseOrData;
                 }
+                // Apply filter (will update hiddenData)
+                data = this.filter(data, filterData, excludedDataByFilter);
+                // Compute the total length
+                const total = data.length;
+                // If page size=0 (e.g. only need total)
+                if (size === 0) {
+                    excludedDataByPagination = data;
+                    return { data: [], total };
+                }
+                // Slice in a page (using offset and size)
+                if (offset > 0) {
+                    // Offset after the end: no result
+                    if (offset >= data.length) {
+                        excludedDataByPagination = data;
+                        data = [];
+                    }
+                    else {
+                        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);
+                        data = (size > 0 && ((offset + size) < data.length)) ?
+                            // Slice using limit to size
+                            data.slice(offset, offset + size) :
+                            // Slice without limit
+                            data.slice(offset);
+                    }
+                }
+                // Apply a limit
+                else if (size > 0) {
+                    excludedDataByPagination = data.slice(size);
+                    data = data.slice(0, size);
+                }
+                // No limit:
+                else if (size === -1) {
+                    // Keep all data
+                }
+                // /!\ 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();
+                }
+                return { data, total };
             }
-            // Apply a limit
-            else if (size > 0) {
-                this._hiddenData.push(...data.slice(size));
-                data = data.slice(0, size);
-            }
-            // No limit:
-            else if (size === -1) {
-                // Keep all data
-            }
-            // /!\ 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);
+            finally {
+                // Remember hidden data
+                this._hiddenData = !excludedDataByPagination ? excludedDataByFilter : excludedDataByFilter.concat(...excludedDataByPagination);
             }
-            return { data, total };
         })));
     }
     saveAll(data, options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.data)
                 throw new Error('[memory-service] Could not save, because value not set');
-            // Restore hidden data
-            if (isNotEmptyArray(this._hiddenData))
-                data = data.concat(this._hiddenData);
-            if (this._onSaveFn) {
-                const res = this._onSaveFn(data);
-                data = ((res instanceof Promise)) ? yield res : res;
+            this.markAsSaving();
+            try {
+                // Restore hidden data
+                if (isNotEmptyArray(this._hiddenData))
+                    data = data.concat(...this._hiddenData);
+                if (this._onSaveFn) {
+                    const res = this._onSaveFn(data);
+                    data = ((res instanceof Promise)) ? yield res : res;
+                }
+                this.data = data;
+                this.dirty = true;
+                return this.data;
+            }
+            finally {
+                this.markAsSaved();
             }
-            this.data = data;
-            this.dirty = true;
-            return this.data;
         });
     }
     deleteAll(dataToRemove, options) {
@@ -14352,8 +14365,8 @@ class InMemoryEntitiesService extends EntitiesService {
                 throw new Error('[memory-service] Could not delete, because value not set');
             // Remove deleted item, from data
             const updatedData = this.data.filter(entity => {
-                const shouldRemoved = dataToRemove.findIndex(entityToRemove => this._equalsFn(entityToRemove, entity)) !== -1;
-                return !shouldRemoved;
+                const removed = dataToRemove.findIndex(entityToRemove => this.equals(entityToRemove, entity)) !== -1;
+                return !removed;
             });
             const deleteCount = this.data.length - updatedData.length;
             if (deleteCount > 0) {
@@ -14375,6 +14388,11 @@ class InMemoryEntitiesService extends EntitiesService {
     addSortByReplacement(source, target) {
         this._sortByReplacement[source] = target;
     }
+    equals(d1, d2) {
+        if (this._equalsFn)
+            return this._equalsFn(d1, d2);
+        return d1 && d1.equals ? d1.equals(d2) : EntityUtils.equals(d1, d2, 'id');
+    }
     /* -- protected methods -- */
     filter(data, _filter, hiddenData) {
         // if filter is DataFilter instance, use its test function
@@ -14399,8 +14417,11 @@ class InMemoryEntitiesService extends EntitiesService {
             return { data, total };
         }));
     }
-    equals(d1, d2) {
-        return d1 && d1.equals ? d1.equals(d2) : EntityUtils.equals(d1, d2, 'id');
+    markAsSaving() {
+        this._saving = true;
+    }
+    markAsSaved() {
+        this._saving = false;
     }
 }
 InMemoryEntitiesService.decorators = [
@@ -19982,7 +20003,7 @@ class AppTable {
         }
     }
     markAsUntouched(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) {
@@ -19993,7 +20014,7 @@ class AppTable {
                 this.markForCheck();
             }
         }
-        this.previouslySavedEditedRowId = undefined;
+        this.previouslyEditedRowId = undefined;
     }
     /**
      * @deprecated prefer to use markAllAsTouched()
@@ -20416,7 +20437,8 @@ class AppTable {
             }
             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;
+            const 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' };
             }
@@ -20437,15 +20459,9 @@ class AppTable {
             }
             finally {
                 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);
-                    }
+                // Restore previous row
+                if (isNotNil(this.previouslyEditedRowId)) {
+                    yield this.selectRowByIdOrData(this.previouslyEditedRowId, previouslyEditedData);
                 }
             }
         });
@@ -20590,37 +20606,24 @@ class AppTable {
             }
         });
     }
-    editRow(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;
-    }
     selectRowById(id) {
         if (id === undefined)
-            return;
-        this.dataSource.waitIdle()
+            return Promise.resolve(false);
+        return this.dataSource.waitIdle()
             .then(() => this.dataSource.getRow(id))
-            .then(row => this.clickRow(null, row));
+            .then(row => 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
+     */
     selectRowByData(data) {
         if (data === undefined)
-            return;
-        this.dataSource.waitIdle()
+            return Promise.resolve(false);
+        return this.dataSource.waitIdle()
             .then(() => this.dataSource.getRows())
-            .then(rows => { var _a; return this.selectRowById((_a = rows.find(row => this.dataEquals(row.currentData, data))) === null || _a === void 0 ? void 0 : _a.id); });
+            .then(rows => rows.find(row => this.equals(row.currentData, data)))
+            .then(row => row && this.clickRow(null, row));
     }
     clickRow(event, row) {
         var _a;
@@ -20637,8 +20640,6 @@ class AppTable {
             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) {
@@ -20651,10 +20652,10 @@ class AppTable {
             // 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(() => this.markAsLoaded());
             return true;
         }
@@ -20741,6 +20742,57 @@ class AppTable {
         }
     }
     /* -- protected method -- */
+    editRow(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
+     */
+    selectRowByIdOrData(id, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let done = false;
+            try {
+                // Select by row id (if NOT a new row)
+                if (isNotNil(id) || id !== -1) {
+                    done = yield this.selectRowById(id);
+                    if (done)
+                        return true;
+                    console.warn('[app-table] Save: Cannot reselect row by row.id: ', id);
+                }
+                // Try by data
+                if (data) {
+                    done = yield this.selectRowByData(data);
+                    if (done)
+                        return true;
+                    console.warn('[app-table] Save: Cannot reselect row by data: ', data);
+                }
+                return false;
+            }
+            catch (err) {
+                // Log, but continue
+                console.error(err && err.message || err);
+                return false;
+            }
+        });
+    }
     /**
      * return the selected row if unique in selection
      */
@@ -20854,7 +20906,7 @@ class AppTable {
             return false; // User cancel the action
         });
     }
-    openRow(id, row) {
+    openRowDetail(id, row) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.allowRowDetail)
                 return false;
@@ -21094,12 +21146,12 @@ class AppTable {
      * Compare data equality (default by id)
      * Can be overridden to add additional properties to compare
      *
-     * @param t1
-     * @param t2
+     * @param d1
+     * @param d2
      * @protected
      */
-    dataEquals(t1, t2) {
-        return EntityUtils.equals(t1, t2, 'id');
+    equals(d1, d2) {
+        return EntityUtils.equals(d1, d2, 'id');
     }
     /* -- private method -- */
     setLoading(value, opts) {
@@ -22468,6 +22520,9 @@ class AppInMemoryTable extends AppTable {
             this.onRefresh.emit();
         }
     }
+    equals(t1, t2) {
+        return this.memoryDataService.equals(t1, t2);
+    }
 }
 AppInMemoryTable.decorators = [
     { type: Directive }