@sumaris-net/ngx-components 1.12.3 → 1.12.4

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

@@ -22097,19 +22097,29 @@ class AppTable {
             const canDelete = yield this.canDeleteRows(rows, opts);
             if (!canDelete)
                 return 0; // Cannot delete
+            // Reverse row order (on a copy)
+            // This is a workaround, need because row.delete() has async execution
+            // and index cache is updated with a delay
+            rows = rows.slice()
+                .sort((a, b) => a.id > b.id ? -1 : 1);
             // If data need to be saved first
             if (this.saveBeforeDelete) {
                 // Cancel invalid rows (because of save() will fail, if invalid rows exists)
                 rows = rows.reduce((res, row) => {
                     if (row.validator && !row.validator.valid) {
-                        const deleted = row.id === -1;
-                        row.cancelOrDelete();
                         // When deleted (= newly created row) : decrement counter
-                        if (deleted) {
+                        if (row.id === -1 || !row.editing) {
+                            row.delete();
                             this.visibleRowCount--;
                             this.totalRowCount--;
                             return res;
                         }
+                        // Mark row as pristine, to avoid row to be saved
+                        else {
+                            row.cancelOrDelete(); // Will cancel only (delete will always go into the previous 'if')
+                            row.validator.markAsPristine();
+                            // Continue: the row will be deleted after the save
+                        }
                     }
                     return res.concat(row);
                 }, []);
@@ -22131,11 +22141,6 @@ class AppTable {
                 if (deleteCount) {
                     if (this.debug)
                         console.debug('[table] Delete selected rows...');
-                    // Reverse row order (on a copy)
-                    // This is a workaround, need because row.delete() has async execution
-                    // and index cache is updated with a delay
-                    rows = rows.slice()
-                        .sort((a, b) => a.id > b.id ? -1 : 1);
                     yield this._dataSource.deleteAll(rows);
                 }
                 // DO not update manually, because watchALl().subscribe() will update this count