@sumaris-net/ngx-components 2.4.55 → 2.4.57

package/esm2020/src/app/core/table/table.utils.mjs

@@ -1,4 +1,6 @@
 import { AppFormUtils } from '../form/form.utils';
+import { EntityUtils } from '../services/model/entity.model';
+import { isNotNil, isNotNilOrNaN } from '../../shared/functions';
 export class AppTableUtils {
     static waitIdle(table) {
         if (!table || !table.dataSource) {
@@ -9,5 +11,20 @@ export class AppTableUtils {
     static logRowErrors(row, logPrefix) {
         AppFormUtils.logFormErrors(row.validator, logPrefix);
     }
+    static getEntityId(row) {
+        return EntityUtils.getId(row.currentData);
+    }
+    static getEntityIds(rows) {
+        return (rows || [])
+            .map((row) => row.currentData)
+            .filter(isNotNil)
+            .map(EntityUtils.getId)
+            .filter(isNotNilOrNaN);
+    }
+    static getEntities(rows) {
+        return (rows || [])
+            .map((row) => row.currentData)
+            .filter(isNotNil);
+    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUudXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvcmUvdGFibGUvdGFibGUudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFDLFlBQVksRUFBQyxNQUFNLG9CQUFvQixDQUFDO0FBR2hELE1BQU0sT0FBTyxhQUFhO0lBRXhCLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBOEI7UUFDNUMsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUU7WUFDL0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO1NBQ3JFO1FBQ0QsT0FBTyxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQTZDLEVBQUUsU0FBa0I7UUFDbkYsWUFBWSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7Q0FFRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7QXBwVGFibGV9IGZyb20gJy4vdGFibGUuY2xhc3MnO1xuaW1wb3J0IHtUYWJsZUVsZW1lbnR9IGZyb20gJ0BlLWlzL25neC1tYXRlcmlhbC10YWJsZSc7XG5pbXBvcnQge0FwcEZvcm1VdGlsc30gZnJvbSAnLi4vZm9ybS9mb3JtLnV0aWxzJztcbmltcG9ydCB7QXN5bmNUYWJsZUVsZW1lbnR9IGZyb20gJ0BlLWlzL25neC1tYXRlcmlhbC10YWJsZS9zcmMvYXBwL25neC1tYXRlcmlhbC10YWJsZS9hc3luYy9hc3luYy10YWJsZS1lbGVtZW50JztcblxuZXhwb3J0IGNsYXNzIEFwcFRhYmxlVXRpbHMge1xuXG4gIHN0YXRpYyB3YWl0SWRsZSh0YWJsZTogQXBwVGFibGU8YW55LCBhbnksIGFueT4pOiBQcm9taXNlPGFueT4ge1xuICAgIGlmICghdGFibGUgfHwgIXRhYmxlLmRhdGFTb3VyY2UpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcignSW52YWxpZCB0YWJsZS4gTWlzc2luZyB0YWJsZSBvciB0YWJsZS5kYXRhU291cmNlJyk7XG4gICAgfVxuICAgIHJldHVybiB0YWJsZS5kYXRhU291cmNlLndhaXRJZGxlKCk7XG4gIH1cblxuICBzdGF0aWMgbG9nUm93RXJyb3JzKHJvdzogVGFibGVFbGVtZW50PGFueT58QXN5bmNUYWJsZUVsZW1lbnQ8YW55PiwgbG9nUHJlZml4Pzogc3RyaW5nKTogdm9pZCB7XG4gICAgQXBwRm9ybVV0aWxzLmxvZ0Zvcm1FcnJvcnMocm93LnZhbGlkYXRvciwgbG9nUHJlZml4KTtcbiAgfVxuXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUudXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvcmUvdGFibGUvdGFibGUudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFDLFlBQVksRUFBQyxNQUFNLG9CQUFvQixDQUFDO0FBRWhELE9BQU8sRUFBQyxXQUFXLEVBQVUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRSxPQUFPLEVBQUMsUUFBUSxFQUFFLGFBQWEsRUFBQyxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE1BQU0sT0FBTyxhQUFhO0lBRXhCLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBOEI7UUFDNUMsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUU7WUFDL0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO1NBQ3JFO1FBQ0QsT0FBTyxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQTZDLEVBQUUsU0FBa0I7UUFDbkYsWUFBWSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUF5RCxHQUEyQztRQUNwSCxPQUFPLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUF5RCxJQUFnRDtRQUMxSCxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQzthQUNoQixHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7YUFDN0IsTUFBTSxDQUFDLFFBQVEsQ0FBQzthQUNoQixHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQzthQUN0QixNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVELE1BQU0sQ0FBQyxXQUFXLENBQXlELElBQWdEO1FBQ3pILE9BQU8sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO2FBQ2hCLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQzthQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEIsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtBcHBUYWJsZX0gZnJvbSAnLi90YWJsZS5jbGFzcyc7XG5pbXBvcnQge1RhYmxlRWxlbWVudH0gZnJvbSAnQGUtaXMvbmd4LW1hdGVyaWFsLXRhYmxlJztcbmltcG9ydCB7QXBwRm9ybVV0aWxzfSBmcm9tICcuLi9mb3JtL2Zvcm0udXRpbHMnO1xuaW1wb3J0IHtBc3luY1RhYmxlRWxlbWVudH0gZnJvbSAnQGUtaXMvbmd4LW1hdGVyaWFsLXRhYmxlL3NyYy9hcHAvbmd4LW1hdGVyaWFsLXRhYmxlL2FzeW5jL2FzeW5jLXRhYmxlLWVsZW1lbnQnO1xuaW1wb3J0IHtFbnRpdHlVdGlscywgSUVudGl0eX0gZnJvbSAnLi4vc2VydmljZXMvbW9kZWwvZW50aXR5Lm1vZGVsJztcbmltcG9ydCB7aXNOb3ROaWwsIGlzTm90TmlsT3JOYU59IGZyb20gJy4uLy4uL3NoYXJlZC9mdW5jdGlvbnMnO1xuXG5leHBvcnQgY2xhc3MgQXBwVGFibGVVdGlscyB7XG5cbiAgc3RhdGljIHdhaXRJZGxlKHRhYmxlOiBBcHBUYWJsZTxhbnksIGFueSwgYW55Pik6IFByb21pc2U8YW55PiB7XG4gICAgaWYgKCF0YWJsZSB8fCAhdGFibGUuZGF0YVNvdXJjZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdJbnZhbGlkIHRhYmxlLiBNaXNzaW5nIHRhYmxlIG9yIHRhYmxlLmRhdGFTb3VyY2UnKTtcbiAgICB9XG4gICAgcmV0dXJuIHRhYmxlLmRhdGFTb3VyY2Uud2FpdElkbGUoKTtcbiAgfVxuXG4gIHN0YXRpYyBsb2dSb3dFcnJvcnMocm93OiBUYWJsZUVsZW1lbnQ8YW55PnxBc3luY1RhYmxlRWxlbWVudDxhbnk+LCBsb2dQcmVmaXg/OiBzdHJpbmcpOiB2b2lkIHtcbiAgICBBcHBGb3JtVXRpbHMubG9nRm9ybUVycm9ycyhyb3cudmFsaWRhdG9yLCBsb2dQcmVmaXgpO1xuICB9XG5cbiAgc3RhdGljIGdldEVudGl0eUlkPFQgZXh0ZW5kcyBJRW50aXR5PFQsIElEPiA9IElFbnRpdHk8YW55LCBhbnk+LCBJRCA9IGFueT4ocm93OiBUYWJsZUVsZW1lbnQ8VD4gfCBBc3luY1RhYmxlRWxlbWVudDxUPik6IElEIHtcbiAgICByZXR1cm4gRW50aXR5VXRpbHMuZ2V0SWQocm93LmN1cnJlbnREYXRhKTtcbiAgfVxuXG4gIHN0YXRpYyBnZXRFbnRpdHlJZHM8VCBleHRlbmRzIElFbnRpdHk8VCwgSUQ+ID0gSUVudGl0eTxhbnksIGFueT4sIElEID0gYW55Pihyb3dzOiBUYWJsZUVsZW1lbnQ8VD5bXSB8IEFzeW5jVGFibGVFbGVtZW50PFQ+W10pOiBJRFtdIHtcbiAgICByZXR1cm4gKHJvd3MgfHwgW10pXG4gICAgICAubWFwKChyb3cpID0+IHJvdy5jdXJyZW50RGF0YSlcbiAgICAgIC5maWx0ZXIoaXNOb3ROaWwpXG4gICAgICAubWFwKEVudGl0eVV0aWxzLmdldElkKVxuICAgICAgLmZpbHRlcihpc05vdE5pbE9yTmFOKTtcbiAgfVxuXG4gIHN0YXRpYyBnZXRFbnRpdGllczxUIGV4dGVuZHMgSUVudGl0eTxULCBJRD4gPSBJRW50aXR5PGFueSwgYW55PiwgSUQgPSBhbnk+KHJvd3M6IFRhYmxlRWxlbWVudDxUPltdIHwgQXN5bmNUYWJsZUVsZW1lbnQ8VD5bXSk6IFRbXSB7XG4gICAgcmV0dXJuIChyb3dzIHx8IFtdKVxuICAgICAgLm1hcCgocm93KSA9PiByb3cuY3VycmVudERhdGEpXG4gICAgICAuZmlsdGVyKGlzTm90TmlsKTtcbiAgfVxufVxuIl19

package/fesm2015/sumaris-net.ngx-components.mjs

@@ -11515,6 +11515,15 @@ class EntityUtils {
     static isRemoteId(id) {
         return isNotNil(id) && +id >= 0;
     }
+    static getId(entity) {
+        return entity.id;
+    }
+    static collectById(entities) {
+        return (entities || []).map(e => e.id);
+    }
+    static arrayDistinctFilterFn(item, index, values) {
+        return values.findIndex(e => e.id === item.id) === index;
+    }
 }
 EntityUtils.getPropertyByPath = getPropertyByPath;
 
@@ -25995,6 +26004,21 @@ class AppTableUtils {
     static logRowErrors(row, logPrefix) {
         AppFormUtils.logFormErrors(row.validator, logPrefix);
     }
+    static getEntityId(row) {
+        return EntityUtils.getId(row.currentData);
+    }
+    static getEntityIds(rows) {
+        return (rows || [])
+            .map((row) => row.currentData)
+            .filter(isNotNil)
+            .map(EntityUtils.getId)
+            .filter(isNotNilOrNaN);
+    }
+    static getEntities(rows) {
+        return (rows || [])
+            .map((row) => row.currentData)
+            .filter(isNotNil);
+    }
 }
 
 // @dynamic
@@ -26421,6 +26445,7 @@ class AppTable {
         this.dirtySubject = new BehaviorSubject(false);
         this.errorSubject = new BehaviorSubject(undefined);
         this.selection = new SelectionModel(true, []);
+        this.permanentSelection = null;
         this.editedRow = undefined;
         this.i18nColumnPrefix = 'COMMON.';
         this.autoLoad = true;
@@ -26474,18 +26499,6 @@ class AppTable {
     set error(error) {
         this.setError(error);
     }
-    /**
-     * @deprecated
-     */
-    get loading$() {
-        return this.loadingSubject.asObservable();
-    }
-    /**
-     * @deprecated
-     */
-    get saving$() {
-        return this.savingSubject.asObservable();
-    }
     get firstUserColumn() {
         return this.displayedColumns[RESERVED_START_COLUMNS.length];
     }
@@ -26507,6 +26520,11 @@ class AppTable {
     get empty() {
         return this.loading || this.totalRowCount === 0;
     }
+    get selectedEntities() {
+        var _a;
+        return ((_a = this.permanentSelection) === null || _a === void 0 ? void 0 : _a.selected)
+            || AppTableUtils.getEntities(this.selection.selected);
+    }
     get dirty() {
         return this.dirtySubject.value;
     }
@@ -27076,8 +27094,7 @@ class AppTable {
     isAllSelected() {
         // DEBUG
         //console.debug('isAllSelected. lengths', this.selection.selected.length, this.totalRowCount);
-        return this.selection.selected.length === this.totalRowCount ||
-            this.selection.selected.length === this.visibleRowCount;
+        return this.selection.selected.length === this.visibleRowCount;
     }
     /** Selects all rows if they are not all selected; otherwise clear selection. */
     masterToggle() {
@@ -27206,7 +27223,8 @@ class AppTable {
                 // DO not update manually, because watchALl().subscribe() will update this count
                 //this.totalRowCount -= deleteCount;
                 //this.visibleRowCount -= deleteCount;
-                this.selection.clear();
+                // Deselect deleted rows
+                this.selection.deselect(...rows);
                 this.editedRow = undefined;
                 this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
                 this.markForCheck();
@@ -27275,7 +27293,6 @@ class AppTable {
                 event.preventDefault();
             }
             this.markAsLoading();
-            this.selection.clear();
             this.openRow(row.currentData.id, row)
                 .then(() => this.markAsLoaded())
                 .catch(() => this.markAsLoaded());
@@ -27590,9 +27607,7 @@ class AppTable {
                 this.onNewRow.emit(event);
                 return true;
             }
-            return yield this.router.navigate(['new'], {
-                relativeTo: this.route
-            });
+            return this.navController.navigateForward(`${this.router.url}/new`);
         });
     }
     // can be overridden to add more required columns
@@ -28019,6 +28034,53 @@ class AppTable {
             def.subject.unsubscribe();
         }
     }
+    /**
+     * Initialize the permanent selection model
+     * @protected
+     */
+    initPermanentSelection() {
+        if (this.permanentSelection)
+            throw new Error('initPermanentSelection() already called!');
+        this.permanentSelection = new SelectionModel(true, []);
+        let selectionChangedPrevented = false;
+        // Listen sort change
+        this.registerSubscription(this.onSort.subscribe(() => (selectionChangedPrevented = true)) // prevent selection change on sort
+        );
+        // Listen datasource update
+        this.registerSubscription(this.dataSource.rowsSubject
+            // restore the 'adding' selection (for example after a page or sort change)
+            .subscribe((rows) => {
+            selectionChangedPrevented = true;
+            try {
+                const permanentSelectionIds = (this.permanentSelection.selected || []).map(EntityUtils.getId);
+                this.selection.setSelection(...rows.filter((row) => permanentSelectionIds.includes(AppTableUtils.getEntityId(row))));
+                this.markForCheck();
+            }
+            finally {
+                selectionChangedPrevented = false;
+            }
+        }));
+        // Listen selection change
+        this.registerSubscription(this.selection.changed
+            .pipe(filter(() => !selectionChangedPrevented))
+            .subscribe((selectionChange) => {
+            // add to selection
+            if (selectionChange.added.length) {
+                this.permanentSelection.setSelection(...(this.permanentSelection.selected || [])
+                    // Add new elements
+                    .concat(...AppTableUtils.getEntities(selectionChange.added))
+                    // Avoid duplicated entities (Mantis #55351)
+                    .filter(EntityUtils.arrayDistinctFilterFn));
+            }
+            // remove from selection
+            if (selectionChange.removed.length) {
+                const removedIds = AppTableUtils.getEntityIds(selectionChange.removed);
+                this.permanentSelection.setSelection(...(this.permanentSelection.selected || [])
+                    .filter((entity) => !removedIds.includes(entity.id)));
+            }
+            this.markForCheck();
+        }));
+    }
 }
 AppTable.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AppTable, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
 AppTable.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.12", type: AppTable, inputs: { settingsId: "settingsId", debug: "debug", i18nColumnPrefix: "i18nColumnPrefix", i18nColumnSuffix: "i18nColumnSuffix", autoLoad: "autoLoad", readOnly: "readOnly", inlineEdition: "inlineEdition", focusFirstColumn: "focusFirstColumn", confirmBeforeDelete: "confirmBeforeDelete", confirmBeforeCancel: "confirmBeforeCancel", undoableDeletion: "undoableDeletion", saveBeforeDelete: "saveBeforeDelete", keepEditedRowOnSave: "keepEditedRowOnSave", saveBeforeSort: "saveBeforeSort", saveBeforeFilter: "saveBeforeFilter", propagateRowError: "propagateRowError", defaultSortBy: "defaultSortBy", defaultSortDirection: "defaultSortDirection", defaultPageSize: "defaultPageSize", defaultPageSizeOptions: "defaultPageSizeOptions", focusColumn: "focusColumn", dataSource: "dataSource", filter: "filter", disabled: "disabled", paginator: "paginator" }, outputs: { onRefresh: "onRefresh", onOpenRow: "onOpenRow", onNewRow: "onNewRow", onStartEditingRow: "onStartEditingRow", onConfirmEditCreateRow: "onConfirmEditCreateRow", onCancelOrDeleteRow: "onCancelOrDeleteRow", onBeforeDeleteRows: "onBeforeDeleteRows", onBeforeCancelRows: "onBeforeCancelRows", onBeforeSave: "onBeforeSave", onAfterDeletedRows: "onAfterDeletedRows", onSort: "onSort", onDirty: "onDirty", onError: "onError" }, viewQueries: [{ propertyName: "table", first: true, predicate: MatTable, descendants: true }, { propertyName: "childPaginator", first: true, predicate: MatPaginator, descendants: true }, { propertyName: "sort", first: true, predicate: MatSort, descendants: true }], ngImport: i0 });
@@ -29441,7 +29503,8 @@ class AppEntityEditor extends AppTabEditor {
                         console.debug('[entity-editor] Updating route using queryParams: ', queryParams);
                     return yield this.router.navigate(['.'], {
                         relativeTo: this.route,
-                        queryParams: this.queryParams
+                        queryParams: this.queryParams,
+                        state: { animated: false }
                     });
                 }
             }
@@ -29451,7 +29514,8 @@ class AppEntityEditor extends AppTabEditor {
                     const res = yield this.router.navigate(['.'], {
                         relativeTo: this.route,
                         replaceUrl: true,
-                        queryParams: Object.assign(Object.assign({}, this.queryParams), { [this.pathIdAttribute]: futureId })
+                        queryParams: Object.assign(Object.assign({}, this.queryParams), { [this.pathIdAttribute]: futureId }),
+                        state: { animated: false }
                     });
                     if (!res)
                         return false;
@@ -29463,7 +29527,8 @@ class AppEntityEditor extends AppTabEditor {
                         console.debug('[entity-editor] Updating route to: ' + path);
                     return yield this.router.navigate(commands, {
                         replaceUrl: true,
-                        queryParams: this.queryParams
+                        queryParams: this.queryParams,
+                        state: { animated: false }
                     });
                 }
                 return Promise.reject('Missing page URL');