@sumaris-net/ngx-components 2.4.55 → 2.4.57

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

@@ -11463,6 +11463,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;
 
@@ -25534,6 +25543,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
@@ -25947,6 +25971,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;
@@ -26000,18 +26025,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];
     }
@@ -26033,6 +26046,10 @@ class AppTable {
     get empty() {
         return this.loading || this.totalRowCount === 0;
     }
+    get selectedEntities() {
+        return this.permanentSelection?.selected
+            || AppTableUtils.getEntities(this.selection.selected);
+    }
     get dirty() {
         return this.dirtySubject.value;
     }
@@ -26585,8 +26602,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. */
     async masterToggle() {
@@ -26707,7 +26723,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();
@@ -26771,7 +26788,6 @@ class AppTable {
                 event.preventDefault();
             }
             this.markAsLoading();
-            this.selection.clear();
             this.openRow(row.currentData.id, row)
                 .then(() => this.markAsLoaded())
                 .catch(() => this.markAsLoaded());
@@ -27071,9 +27087,7 @@ class AppTable {
             this.onNewRow.emit(event);
             return true;
         }
-        return await this.router.navigate(['new'], {
-            relativeTo: this.route
-        });
+        return this.navController.navigateForward(`${this.router.url}/new`);
     }
     // can be overridden to add more required columns
     getRequiredColumns() {
@@ -27481,6 +27495,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 });
@@ -28846,7 +28907,8 @@ class AppEntityEditor extends AppTabEditor {
                     console.debug('[entity-editor] Updating route using queryParams: ', queryParams);
                 return await this.router.navigate(['.'], {
                     relativeTo: this.route,
-                    queryParams: this.queryParams
+                    queryParams: this.queryParams,
+                    state: { animated: false }
                 });
             }
         }
@@ -28859,7 +28921,8 @@ class AppEntityEditor extends AppTabEditor {
                     queryParams: {
                         ...this.queryParams,
                         [this.pathIdAttribute]: futureId
-                    }
+                    },
+                    state: { animated: false }
                 });
                 if (!res)
                     return false;
@@ -28871,7 +28934,8 @@ class AppEntityEditor extends AppTabEditor {
                     console.debug('[entity-editor] Updating route to: ' + path);
                 return await this.router.navigate(commands, {
                     replaceUrl: true,
-                    queryParams: this.queryParams
+                    queryParams: this.queryParams,
+                    state: { animated: false }
                 });
             }
             return Promise.reject('Missing page URL');