@sumaris-net/ngx-components 2.4.106 → 2.4.107

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

@@ -11609,6 +11609,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);
     }
@@ -26484,6 +26487,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) {
@@ -26491,7 +26497,7 @@ class AppTableUtils {
             .map((row) => row.currentData)
             .filter(isNotNil)
             .map(EntityUtils.getId)
-            .filter(isNotNilOrNaN);
+            .filter(isNotNil);
     }
     static getEntities(rows) {
         return (rows || [])
@@ -27233,6 +27239,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
@@ -27625,6 +27636,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--;
@@ -27635,6 +27647,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*/ });
@@ -28470,7 +28483,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));
             }
@@ -28478,7 +28491,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();
         }));