@sumaris-net/ngx-components 2.4.106 → 2.4.107

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

@@ -1,6 +1,6 @@
 import { AppFormUtils } from '../form/form.utils';
 import { EntityUtils } from '../services/model/entity.model';
-import { isNotNil, isNotNilOrNaN } from '../../shared/functions';
+import { isNotNil } from '../../shared/functions';
 export class AppTableUtils {
     static waitIdle(table) {
         if (!table || !table.dataSource) {
@@ -12,6 +12,9 @@ export class AppTableUtils {
         AppFormUtils.logFormErrors(row.validator, logPrefix);
     }
     static getEntityId(row) {
+        // When using validator: use the control (avoid to load the full form's value)
+        if (row.validator)
+            return row.validator.get('id').value;
         return EntityUtils.getId(row.currentData);
     }
     static getEntityIds(rows) {
@@ -19,7 +22,7 @@ export class AppTableUtils {
             .map((row) => row.currentData)
             .filter(isNotNil)
             .map(EntityUtils.getId)
-            .filter(isNotNilOrNaN);
+            .filter(isNotNil);
     }
     static getEntities(rows) {
         return (rows || [])
@@ -27,4 +30,4 @@ export class AppTableUtils {
             .filter(isNotNil);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUudXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvcmUvdGFibGUvdGFibGUudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFDLFlBQVksRUFBQyxNQUFNLG9CQUFvQixDQUFDO0FBRWhELE9BQU8sRUFBQyxXQUFXLEVBQVUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRSxPQUFPLEVBQUMsUUFBUSxFQUFFLGFBQWEsRUFBQyxNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE1BQU0sT0FBTyxhQUFhO0lBRXhCLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBOEI7UUFDNUMsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUU7WUFDL0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO1NBQ3JFO1FBQ0QsT0FBTyxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQTZDLEVBQUUsU0FBa0I7UUFDbkYsWUFBWSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUF5RCxHQUEyQztRQUNwSCxPQUFPLFdBQVcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUF5RCxJQUFnRDtRQUMxSCxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQzthQUNoQixHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7YUFDN0IsTUFBTSxDQUFDLFFBQVEsQ0FBQzthQUNoQixHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQzthQUN0QixNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDM0IsQ0FBQztJQUVELE1BQU0sQ0FBQyxXQUFXLENBQXlELElBQWdEO1FBQ3pILE9BQU8sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO2FBQ2hCLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQzthQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDdEIsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtBcHBUYWJsZX0gZnJvbSAnLi90YWJsZS5jbGFzcyc7XG5pbXBvcnQge1RhYmxlRWxlbWVudH0gZnJvbSAnQGUtaXMvbmd4LW1hdGVyaWFsLXRhYmxlJztcbmltcG9ydCB7QXBwRm9ybVV0aWxzfSBmcm9tICcuLi9mb3JtL2Zvcm0udXRpbHMnO1xuaW1wb3J0IHtBc3luY1RhYmxlRWxlbWVudH0gZnJvbSAnQGUtaXMvbmd4LW1hdGVyaWFsLXRhYmxlL3NyYy9hcHAvbmd4LW1hdGVyaWFsLXRhYmxlL2FzeW5jL2FzeW5jLXRhYmxlLWVsZW1lbnQnO1xuaW1wb3J0IHtFbnRpdHlVdGlscywgSUVudGl0eX0gZnJvbSAnLi4vc2VydmljZXMvbW9kZWwvZW50aXR5Lm1vZGVsJztcbmltcG9ydCB7aXNOb3ROaWwsIGlzTm90TmlsT3JOYU59IGZyb20gJy4uLy4uL3NoYXJlZC9mdW5jdGlvbnMnO1xuXG5leHBvcnQgY2xhc3MgQXBwVGFibGVVdGlscyB7XG5cbiAgc3RhdGljIHdhaXRJZGxlKHRhYmxlOiBBcHBUYWJsZTxhbnksIGFueSwgYW55Pik6IFByb21pc2U8YW55PiB7XG4gICAgaWYgKCF0YWJsZSB8fCAhdGFibGUuZGF0YVNvdXJjZSkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKCdJbnZhbGlkIHRhYmxlLiBNaXNzaW5nIHRhYmxlIG9yIHRhYmxlLmRhdGFTb3VyY2UnKTtcbiAgICB9XG4gICAgcmV0dXJuIHRhYmxlLmRhdGFTb3VyY2Uud2FpdElkbGUoKTtcbiAgfVxuXG4gIHN0YXRpYyBsb2dSb3dFcnJvcnMocm93OiBUYWJsZUVsZW1lbnQ8YW55PnxBc3luY1RhYmxlRWxlbWVudDxhbnk+LCBsb2dQcmVmaXg/OiBzdHJpbmcpOiB2b2lkIHtcbiAgICBBcHBGb3JtVXRpbHMubG9nRm9ybUVycm9ycyhyb3cudmFsaWRhdG9yLCBsb2dQcmVmaXgpO1xuICB9XG5cbiAgc3RhdGljIGdldEVudGl0eUlkPFQgZXh0ZW5kcyBJRW50aXR5PFQsIElEPiA9IElFbnRpdHk8YW55LCBhbnk+LCBJRCA9IGFueT4ocm93OiBUYWJsZUVsZW1lbnQ8VD4gfCBBc3luY1RhYmxlRWxlbWVudDxUPik6IElEIHtcbiAgICByZXR1cm4gRW50aXR5VXRpbHMuZ2V0SWQocm93LmN1cnJlbnREYXRhKTtcbiAgfVxuXG4gIHN0YXRpYyBnZXRFbnRpdHlJZHM8VCBleHRlbmRzIElFbnRpdHk8VCwgSUQ+ID0gSUVudGl0eTxhbnksIGFueT4sIElEID0gYW55Pihyb3dzOiBUYWJsZUVsZW1lbnQ8VD5bXSB8IEFzeW5jVGFibGVFbGVtZW50PFQ+W10pOiBJRFtdIHtcbiAgICByZXR1cm4gKHJvd3MgfHwgW10pXG4gICAgICAubWFwKChyb3cpID0+IHJvdy5jdXJyZW50RGF0YSlcbiAgICAgIC5maWx0ZXIoaXNOb3ROaWwpXG4gICAgICAubWFwKEVudGl0eVV0aWxzLmdldElkKVxuICAgICAgLmZpbHRlcihpc05vdE5pbE9yTmFOKTtcbiAgfVxuXG4gIHN0YXRpYyBnZXRFbnRpdGllczxUIGV4dGVuZHMgSUVudGl0eTxULCBJRD4gPSBJRW50aXR5PGFueSwgYW55PiwgSUQgPSBhbnk+KHJvd3M6IFRhYmxlRWxlbWVudDxUPltdIHwgQXN5bmNUYWJsZUVsZW1lbnQ8VD5bXSk6IFRbXSB7XG4gICAgcmV0dXJuIChyb3dzIHx8IFtdKVxuICAgICAgLm1hcCgocm93KSA9PiByb3cuY3VycmVudERhdGEpXG4gICAgICAuZmlsdGVyKGlzTm90TmlsKTtcbiAgfVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFibGUudXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBwL2NvcmUvdGFibGUvdGFibGUudXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFDLFlBQVksRUFBQyxNQUFNLG9CQUFvQixDQUFDO0FBRWhELE9BQU8sRUFBQyxXQUFXLEVBQVUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRSxPQUFPLEVBQUMsUUFBUSxFQUFnQixNQUFNLHdCQUF3QixDQUFDO0FBRS9ELE1BQU0sT0FBTyxhQUFhO0lBRXhCLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBOEI7UUFDNUMsSUFBSSxDQUFDLEtBQUssSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUU7WUFDL0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxrREFBa0QsQ0FBQyxDQUFDO1NBQ3JFO1FBQ0QsT0FBTyxLQUFLLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQTZDLEVBQUUsU0FBa0I7UUFDbkYsWUFBWSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUF5RCxHQUEyQztRQUNwSCw4RUFBOEU7UUFDOUUsSUFBSSxHQUFHLENBQUMsU0FBUztZQUFFLE9BQU8sR0FBRyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBVyxDQUFDO1FBQzlELE9BQU8sV0FBVyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDNUMsQ0FBQztJQUVELE1BQU0sQ0FBQyxZQUFZLENBQXlELElBQWdEO1FBQzFILE9BQU8sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO2FBQ2hCLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQzthQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDO2FBQ2hCLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDO2FBQ3RCLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN0QixDQUFDO0lBRUQsTUFBTSxDQUFDLFdBQVcsQ0FBeUQsSUFBZ0Q7UUFDekgsT0FBTyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7YUFDaEIsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDO2FBQzdCLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUN0QixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0FwcFRhYmxlfSBmcm9tICcuL3RhYmxlLmNsYXNzJztcbmltcG9ydCB7VGFibGVFbGVtZW50fSBmcm9tICdAZS1pcy9uZ3gtbWF0ZXJpYWwtdGFibGUnO1xuaW1wb3J0IHtBcHBGb3JtVXRpbHN9IGZyb20gJy4uL2Zvcm0vZm9ybS51dGlscyc7XG5pbXBvcnQge0FzeW5jVGFibGVFbGVtZW50fSBmcm9tICdAZS1pcy9uZ3gtbWF0ZXJpYWwtdGFibGUvc3JjL2FwcC9uZ3gtbWF0ZXJpYWwtdGFibGUvYXN5bmMvYXN5bmMtdGFibGUtZWxlbWVudCc7XG5pbXBvcnQge0VudGl0eVV0aWxzLCBJRW50aXR5fSBmcm9tICcuLi9zZXJ2aWNlcy9tb2RlbC9lbnRpdHkubW9kZWwnO1xuaW1wb3J0IHtpc05vdE5pbCwgaXNOb3ROaWxPck5hTn0gZnJvbSAnLi4vLi4vc2hhcmVkL2Z1bmN0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBBcHBUYWJsZVV0aWxzIHtcblxuICBzdGF0aWMgd2FpdElkbGUodGFibGU6IEFwcFRhYmxlPGFueSwgYW55LCBhbnk+KTogUHJvbWlzZTxhbnk+IHtcbiAgICBpZiAoIXRhYmxlIHx8ICF0YWJsZS5kYXRhU291cmNlKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoJ0ludmFsaWQgdGFibGUuIE1pc3NpbmcgdGFibGUgb3IgdGFibGUuZGF0YVNvdXJjZScpO1xuICAgIH1cbiAgICByZXR1cm4gdGFibGUuZGF0YVNvdXJjZS53YWl0SWRsZSgpO1xuICB9XG5cbiAgc3RhdGljIGxvZ1Jvd0Vycm9ycyhyb3c6IFRhYmxlRWxlbWVudDxhbnk+fEFzeW5jVGFibGVFbGVtZW50PGFueT4sIGxvZ1ByZWZpeD86IHN0cmluZyk6IHZvaWQge1xuICAgIEFwcEZvcm1VdGlscy5sb2dGb3JtRXJyb3JzKHJvdy52YWxpZGF0b3IsIGxvZ1ByZWZpeCk7XG4gIH1cblxuICBzdGF0aWMgZ2V0RW50aXR5SWQ8VCBleHRlbmRzIElFbnRpdHk8VCwgSUQ+ID0gSUVudGl0eTxhbnksIGFueT4sIElEID0gYW55Pihyb3c6IFRhYmxlRWxlbWVudDxUPiB8IEFzeW5jVGFibGVFbGVtZW50PFQ+KTogSUQge1xuICAgIC8vIFdoZW4gdXNpbmcgdmFsaWRhdG9yOiB1c2UgdGhlIGNvbnRyb2wgKGF2b2lkIHRvIGxvYWQgdGhlIGZ1bGwgZm9ybSdzIHZhbHVlKVxuICAgIGlmIChyb3cudmFsaWRhdG9yKSByZXR1cm4gcm93LnZhbGlkYXRvci5nZXQoJ2lkJykudmFsdWUgYXMgSUQ7XG4gICAgcmV0dXJuIEVudGl0eVV0aWxzLmdldElkKHJvdy5jdXJyZW50RGF0YSk7XG4gIH1cblxuICBzdGF0aWMgZ2V0RW50aXR5SWRzPFQgZXh0ZW5kcyBJRW50aXR5PFQsIElEPiA9IElFbnRpdHk8YW55LCBhbnk+LCBJRCA9IGFueT4ocm93czogVGFibGVFbGVtZW50PFQ+W10gfCBBc3luY1RhYmxlRWxlbWVudDxUPltdKTogSURbXSB7XG4gICAgcmV0dXJuIChyb3dzIHx8IFtdKVxuICAgICAgLm1hcCgocm93KSA9PiByb3cuY3VycmVudERhdGEpXG4gICAgICAuZmlsdGVyKGlzTm90TmlsKVxuICAgICAgLm1hcChFbnRpdHlVdGlscy5nZXRJZClcbiAgICAgIC5maWx0ZXIoaXNOb3ROaWwpO1xuICB9XG5cbiAgc3RhdGljIGdldEVudGl0aWVzPFQgZXh0ZW5kcyBJRW50aXR5PFQsIElEPiA9IElFbnRpdHk8YW55LCBhbnk+LCBJRCA9IGFueT4ocm93czogVGFibGVFbGVtZW50PFQ+W10gfCBBc3luY1RhYmxlRWxlbWVudDxUPltdKTogVFtdIHtcbiAgICByZXR1cm4gKHJvd3MgfHwgW10pXG4gICAgICAubWFwKChyb3cpID0+IHJvdy5jdXJyZW50RGF0YSlcbiAgICAgIC5maWx0ZXIoaXNOb3ROaWwpO1xuICB9XG59XG4iXX0=

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

@@ -11659,6 +11659,9 @@ class EntityUtils {
     static getId(entity) {
         return entity.id;
     }
+    static hasId(entity) {
+        return isNotNil(entity.id);
+    }
     static collectById(entities) {
         return (entities || []).map(e => e.id);
     }
@@ -26976,6 +26979,9 @@ class AppTableUtils {
         AppFormUtils.logFormErrors(row.validator, logPrefix);
     }
     static getEntityId(row) {
+        // When using validator: use the control (avoid to load the full form's value)
+        if (row.validator)
+            return row.validator.get('id').value;
         return EntityUtils.getId(row.currentData);
     }
     static getEntityIds(rows) {
@@ -26983,7 +26989,7 @@ class AppTableUtils {
             .map((row) => row.currentData)
             .filter(isNotNil)
             .map(EntityUtils.getId)
-            .filter(isNotNilOrNaN);
+            .filter(isNotNil);
     }
     static getEntities(rows) {
         return (rows || [])
@@ -27747,6 +27753,11 @@ class AppTable {
         // Listen dataSource loading events
         if (this._dataSource)
             this.listenDatasourceLoading(this._dataSource);
+        // Enable permanent selection (to keep selected rows after reloading)
+        // (only on desktop, if not already done)
+        if (!this.mobile && !this.permanentSelection) {
+            this.initPermanentSelection();
+        }
     }
     ngAfterViewInit() {
         // Detect when parent ngOnInit() not call
@@ -28156,6 +28167,7 @@ class AppTable {
                     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--;
@@ -28166,6 +28178,7 @@ class AppTable {
                     }
                     // 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*/ });
@@ -29040,7 +29053,7 @@ class AppTable {
             if (selectionChange.added.length) {
                 this.permanentSelection.setSelection(...(this.permanentSelection.selected || [])
                     // Add new elements
-                    .concat(...AppTableUtils.getEntities(selectionChange.added))
+                    .concat(...AppTableUtils.getEntities(selectionChange.added).filter(EntityUtils.hasId))
                     // Avoid duplicated entities (Mantis #55351)
                     .filter(EntityUtils.arrayDistinctFilterFn));
             }
@@ -29048,7 +29061,7 @@ class AppTable {
             if (selectionChange.removed.length) {
                 const removedIds = AppTableUtils.getEntityIds(selectionChange.removed);
                 this.permanentSelection.setSelection(...(this.permanentSelection.selected || [])
-                    .filter((entity) => !removedIds.includes(entity.id)));
+                    .filter((entity) => EntityUtils.hasId(entity) && !removedIds.includes(entity.id)));
             }
             this.markForCheck();
         }));