@sumaris-net/ngx-components 2.8.2-beta5 → 2.8.3-beta7

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

@@ -29250,7 +29250,7 @@ class AppTable {
     isAllSelected() {
         // DEBUG
         //console.debug('isAllSelected. lengths', this.selection.selected.length, this.totalRowCount);
-        return this.selection.selected.length === this.visibleRowCount;
+        return this.selection.selected.length === this.totalRowCount || this.selection.selected.length === this.visibleRowCount;
     }
     /** Selects all rows if they are not all selected; otherwise clear selection. */
     async masterToggle() {
@@ -29266,9 +29266,8 @@ class AppTable {
     }
     async deleteSelection(event, opts) {
         const deleteCount = await this.deleteRows(event, this.selection.selected, opts);
-        if (deleteCount > 0) {
+        if (deleteCount > 0)
             this.selection.clear();
-        }
         return deleteCount;
     }
     /**
@@ -29279,11 +29278,7 @@ class AppTable {
      *  And to force deletion even if table is busy
      */
     async deleteRow(event, row, opts) {
-        const isSelected = this.selection.isSelected(row);
         const deleteCount = await this.deleteRows(event, [row], opts);
-        // Unselect the deleted row
-        if (deleteCount && isSelected)
-            this.selection.deselect(row);
         return deleteCount === 1;
     }
     /**
@@ -29461,7 +29456,8 @@ class AppTable {
             return Promise.resolve();
         return waitForFalse(this.loadingSubject, { stop: this.destroySubject, ...opts });
     }
-    async openSelectColumnsModal(_) {
+    async openSelectColumnsModal(event) {
+        event?.preventDefault();
         // Copy current columns (deep copy)
         const columns = this.getCurrentColumns();
         const hasTopModal = !!(await this.modalCtrl.getTop());
@@ -29523,12 +29519,12 @@ class AppTable {
         if (row.id === -1) {
             if (row.validator) {
                 // If pending: Wait end of validation, then loop
-                if (row.validator.pending) {
+                if (row.pending) {
                     AppFormUtils.waitWhilePending(row.validator).then(() => this.escapeEditingRow(event, row));
                     return;
                 }
                 // Row is invalid: delete the row
-                if (row.validator.invalid) {
+                if (row.invalid) {
                     this.deleteNewRow(event, row);
                     return;
                 }
@@ -29536,7 +29532,7 @@ class AppTable {
         }
         // If the row exists (has an id)
         else {
-            // need to call cancel function (if confirmation will be call before cancel)
+            // need to call cancel function (if confirmation will be called before)
             if (this.confirmBeforeCancel) {
                 this.cancelExistingRow(event, row, { keepEditing: false });
                 return;
@@ -29546,7 +29542,7 @@ class AppTable {
         this.confirmEditCreate(event, row);
     }
     translateControlPath(path) {
-        // Can be override by subclasses, to resolve all field name
+        // Can be overridden by subclasses, to resolve all field name
         // Use columns key, has default name
         const i18nColumnKey = this.getI18nColumnName(path);
         return this.translate?.instant(i18nColumnKey) || i18nColumnKey;
@@ -29710,7 +29706,7 @@ class AppTable {
     }
     /**
      * Open a row detail view. By default, will to open row detail page.
-     * Can be override by subclasses, BUT prefer to subscribe on onOpenRow
+     * Can be overridden by subclasses, BUT prefer to subscribe on onOpenRow
      *
      * @param id
      * @param row
@@ -29730,7 +29726,7 @@ class AppTable {
                 console.warn('[table] Opening row details, but data has no id!');
                 return false;
             }
-            return this.navController.navigateForward(`${this.router.url}/${id.toString()}`, {
+            return this.navController.navigateForward(`${this.router.url}/${id}`, {
                 queryParams: {},
             });
         }
@@ -29811,17 +29807,17 @@ class AppTable {
         return (this.i18nColumnPrefix || '') + changeCaseToUnderscore(columnName).toUpperCase();
     }
     generateTableId() {
+        // noinspection JSNonASCIINames
         const meta = this.constructor['ɵcmp'];
         // Get a component unique name - See https://stackoverflow.com/questions/60114682/how-to-access-components-unique-encapsulation-id-in-angular-9
         const componentId = (meta && (meta.selectors?.[0] || meta.id)) || this.constructor.name;
         const id = this.location
             .path(true)
             .replace(/[?].*$/g, '')
-            .replace(/\/[\d]+/g, '_id') +
+            .replace(/\/\d+/g, '_id') +
             '_' +
             componentId;
-        //if (this.debug)
-        console.debug('[table] id = ' + id);
+        //if (this.debug) console.debug('[table] id = ' + id);
         return id;
     }
     async addRowToTable(insertAt, opts) {
@@ -29896,7 +29892,7 @@ class AppTable {
         return input && input.toUpperCase().startsWith(search);
     }
     markForCheck() {
-        // Should be override by subclasses, depending on ChangeDetectionStrategy
+        // Should be overridden by subclasses, depending on ChangeDetectionStrategy
     }
     async askDeleteConfirmation(event, rows) {
         if (this.undoableDeletion) {
@@ -34567,6 +34563,7 @@ class AppAsyncTable {
     allowRowDetail = true;
     route;
     router;
+    navController;
     location;
     settings;
     translate;
@@ -34663,13 +34660,13 @@ class AppAsyncTable {
         return this.dirtySubject.value;
     }
     get valid() {
-        return this.dataSource.getRows().every((row) => (row.editing ? row.valid : true));
+        return this.dataSource.getEditingRows().every((row) => (row.editing ? row.valid : true));
     }
     get invalid() {
-        return this.dataSource.getRows().some((row) => (row.editing ? row.invalid : false));
+        return this.dataSource.getEditingRows().some((row) => (row.editing ? row.invalid : false));
     }
     get pending() {
-        return this.dataSource.getRows().some((row) => (row.editing ? row.pending : false));
+        return this.dataSource.getEditingRows().some((row) => (row.editing ? row.pending : false));
     }
     get touched() {
         return this.touchedSubject.value;
@@ -34707,7 +34704,7 @@ class AppAsyncTable {
         return !this._enabled;
     }
     markAsDirty(opts) {
-        if (this.dirtySubject.value !== true) {
+        if (!this.dirtySubject.closed && this.dirtySubject.value !== true) {
             this.dirtySubject.next(true);
             if (!opts || opts.emitEvent !== false) {
                 this.markForCheck();
@@ -34715,7 +34712,7 @@ class AppAsyncTable {
         }
     }
     markAsPristine(opts) {
-        if (this.dirtySubject.value !== false) {
+        if (!this.dirtySubject.closed && this.dirtySubject.value !== false) {
             this.dirtySubject.next(false);
             if (!opts || opts.emitEvent !== false) {
                 this.markForCheck();
@@ -34728,7 +34725,7 @@ class AppAsyncTable {
             this.touchedSubject.next(false);
             needEmitEvent = true;
         }
-        if (this.dirty || this.dataSource.hasSomeEditingRow()) {
+        if (this.dirty) {
             for (const row of this.dataSource.getEditingRows()) {
                 // Cancel the current editing row only if editing and if it was not previously saved
                 if (row.id === -1) {
@@ -34762,17 +34759,15 @@ class AppAsyncTable {
         }
     }
     markAllAsTouched(opts) {
-        if (this.touchedSubject.value !== true) {
+        if (!this.touchedSubject.closed && this.touchedSubject.value !== true) {
             this.touchedSubject.next(true);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
         }
-        if (this.dataSource.hasSomeEditingRow()) {
-            this.dataSource.getEditingRows().forEach((row) => row.validator?.markAllAsTouched());
-        }
+        this.dataSource.getEditingRows().forEach((row) => row.validator?.markAllAsTouched());
     }
     markAsSaving(opts) {
-        if (this.savingSubject.value !== true) {
+        if (!this.savingSubject.closed && this.savingSubject.value !== true) {
             this.focusColumn = undefined; // unselect focus column
             this.savingSubject.next(true);
             if (!opts || opts.emitEvent !== false)
@@ -34780,7 +34775,7 @@ class AppAsyncTable {
         }
     }
     markAsSaved(opts) {
-        if (this.savingSubject.value !== false) {
+        if (!this.savingSubject.closed && this.savingSubject.value !== false) {
             this.savingSubject.next(false);
             if (!opts || opts.emitEvent !== false)
                 this.markForCheck();
@@ -34793,7 +34788,7 @@ class AppAsyncTable {
         this.setLoading(false, opts);
     }
     markAsReady(opts) {
-        if (this.readySubject.value !== true) {
+        if (!this.readySubject.closed && this.readySubject.value !== true) {
             this.readySubject.next(true);
             // If subclasses implements OnReady
             if (typeof this['ngOnReady'] === 'function') {
@@ -34852,6 +34847,7 @@ class AppAsyncTable {
         this._filter = _filter;
         this.route = injector.get(ActivatedRoute);
         this.router = injector.get(Router);
+        this.navController = injector.get(NavController);
         this.location = injector.get(Location);
         this.settings = injector.get(LocalSettingsService);
         this.translate = injector.get(TranslateService);
@@ -35290,7 +35286,7 @@ class AppAsyncTable {
             if (!confirmed)
                 return 0; // Cannot delete (e.g. edited row is invalid)
         }
-        // Check if it can delete
+        // Check if can delete
         const canDelete = await this.canDeleteRows(rows, opts);
         if (!canDelete)
             return 0; // Cannot delete
@@ -35309,6 +35305,7 @@ class AppAsyncTable {
                 if (row.id === -1 || (!row.editing && row.invalid) /*do not use !valid because if row is disabled, it will be always !valid */) {
                     if (this.debug)
                         console.debug(`[table] Delete row #${row.id}`);
+                    this.selection.deselect(row);
                     row.delete();
                     this.visibleRowCount--;
                     this.totalRowCount--;
@@ -35317,6 +35314,7 @@ class AppAsyncTable {
                 }
                 // Cancel the row (and mark as pristine), when not valid but in edition
                 else if (row.editing && !row.valid) {
+                    this.selection.deselect(row);
                     row.cancel();
                     // Mark row as pristine (if possible)
                     this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
@@ -35346,7 +35344,8 @@ class AppAsyncTable {
             // 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.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
             this.markForCheck();
             this.onAfterDeletedRows.next(rows);
@@ -35367,7 +35366,7 @@ class AppAsyncTable {
         return this.clickRow(null, row);
     }
     /**
-     * Try to select row by data. Will use dataEquals() (that call EntityUtils.equals()) to find same row's data
+     * Try to select row by data. Will use equals() to find same row's data
      *
      * @param data
      */
@@ -35380,6 +35379,10 @@ class AppAsyncTable {
             return false;
         return this.clickRow(null, row);
     }
+    toggleSelectRow(event, row) {
+        event.stopPropagation();
+        this.selection.toggle(row);
+    }
     async clickRow(event, row) {
         if (this.loading) {
             // Wait while loading, and loop
@@ -35421,10 +35424,12 @@ class AppAsyncTable {
         await this.dataSource.move(id, direction);
     }
     ready(opts) {
-        return waitForTrue(this.readySubject, opts);
+        return waitForTrue(this.readySubject, { stop: this.destroySubject, ...opts });
     }
     waitIdle(opts) {
-        return waitForFalse(this.loadingSubject, opts);
+        if (!this.loadingSubject.value)
+            return Promise.resolve();
+        return waitForFalse(this.loadingSubject, { stop: this.destroySubject, ...opts });
     }
     async openSelectColumnsModal(event) {
         event?.preventDefault();
@@ -35694,8 +35699,7 @@ class AppAsyncTable {
                 console.warn('[table] Opening row details, but data has no id!');
                 return false;
             }
-            return this.router.navigate(['.', id.toString()], {
-                relativeTo: this.route,
+            return this.navController.navigateForward(`${this.router.url}/${id}`, {
                 queryParams: {},
             });
         }
@@ -35708,9 +35712,7 @@ class AppAsyncTable {
             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() {
@@ -35779,14 +35781,16 @@ class AppAsyncTable {
     }
     generateTableId() {
         // noinspection JSNonASCIINames
+        const meta = this.constructor['ɵcmp'];
+        // Get a component unique name - See https://stackoverflow.com/questions/60114682/how-to-access-components-unique-encapsulation-id-in-angular-9
+        const componentId = (meta && (meta.selectors?.[0] || meta.id)) || this.constructor.name;
         const id = this.location
             .path(true)
             .replace(/[?].*$/g, '')
             .replace(/\/\d+/g, '_id') +
             '_' +
-            // Get a component unique name - See https://stackoverflow.com/questions/60114682/how-to-access-components-unique-encapsulation-id-in-angular-9
-            (this.constructor['ɵcmp']?.id || this.constructor.name);
-        //if (this.debug) console.debug("[table] id = " + id);
+            componentId;
+        //if (this.debug) console.debug('[table] id = ' + id);
         return id;
     }
     async addRowToTable(insertAt, opts) {
@@ -35902,7 +35906,7 @@ class AppAsyncTable {
         }
     }
     /**
-     * Compare data equality (default by id)
+     * Compare data equality (default by id, using EntityUtils.equals())
      * Can be overridden to add additional properties to compare
      *
      * @param d1
@@ -35930,6 +35934,50 @@ class AppAsyncTable {
             this.onRefresh.emit(value);
         }
     }
+    /**
+     * Initialize the permanent selection model
+     *
+     * @protected
+     */
+    initPermanentSelection() {
+        if (this.permanentSelection)
+            throw new Error('initPermanentSelection() already called!');
+        this.permanentSelection = new SelectionModel(true, []);
+        // Listen sort change
+        this.registerSubscription(this.onSort.subscribe(() => (this.permanentSelectionChangedPrevented = 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) => {
+            this.permanentSelectionChangedPrevented = true;
+            try {
+                const permanentSelectionIds = (this.permanentSelection.selected || []).map(EntityUtils.getId);
+                this.selection.setSelection(...rows.filter((row) => permanentSelectionIds.includes(AppTableUtils.getEntityId(row))));
+                this.markForCheck();
+            }
+            finally {
+                this.permanentSelectionChangedPrevented = false;
+            }
+        }));
+        // Listen selection change
+        this.registerSubscription(this.selection.changed.pipe(filter(() => !this.permanentSelectionChangedPrevented)).subscribe((selectionChange) => {
+            // add to selection
+            if (selectionChange.added.length) {
+                this.permanentSelection.setSelection(...(this.permanentSelection.selected || [])
+                    // Add new elements
+                    .concat(...AppTableUtils.getEntities(selectionChange.added).filter(EntityUtils.hasId))
+                    // 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) => EntityUtils.hasId(entity) && !removedIds.includes(entity.id)));
+            }
+            this.markForCheck();
+        }));
+    }
     /* -- private method -- */
     async listenSortAndPaginationEvents() {
         if (!this.table) {
@@ -35993,8 +36041,8 @@ class AppAsyncTable {
         event?.stopPropagation();
         this.selection.clear();
         await this._dataSource.cancelOrDelete(row);
-        this.onCancelOrDeleteRow.next(row);
         this.resetError();
+        this.onCancelOrDeleteRow.next(row);
         this.totalRowCount--;
         this.visibleRowCount--;
     }
@@ -36126,50 +36174,6 @@ class AppAsyncTable {
             def.subject.unsubscribe();
         }
     }
-    /**
-     * Initialize the permanent selection model
-     *
-     * @protected
-     */
-    initPermanentSelection() {
-        if (this.permanentSelection)
-            throw new Error('initPermanentSelection() already called!');
-        this.permanentSelection = new SelectionModel(true, []);
-        // Listen sort change
-        this.registerSubscription(this.onSort.subscribe(() => (this.permanentSelectionChangedPrevented = 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) => {
-            this.permanentSelectionChangedPrevented = true;
-            try {
-                const permanentSelectionIds = (this.permanentSelection.selected || []).map(EntityUtils.getId);
-                this.selection.setSelection(...rows.filter((row) => permanentSelectionIds.includes(AppTableUtils.getEntityId(row))));
-                this.markForCheck();
-            }
-            finally {
-                this.permanentSelectionChangedPrevented = false;
-            }
-        }));
-        // Listen selection change
-        this.registerSubscription(this.selection.changed.pipe(filter(() => !this.permanentSelectionChangedPrevented)).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();
-        }));
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.2.4", ngImport: i0, type: AppAsyncTable, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.2.4", type: AppAsyncTable, 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", permanentSelectionAllowed: "permanentSelectionAllowed", 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 });
 }