@sumaris-net/ngx-components 1.10.0 → 1.10.1

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

@@ -22208,6 +22208,7 @@ class AppTable {
             const canDelete = yield this.canDeleteRows(rows, opts);
             if (!canDelete)
                 return 0; // Cannot delete
+            // 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) => {
@@ -22218,30 +22219,40 @@ class AppTable {
                         if (deleted) {
                             this.visibleRowCount--;
                             this.totalRowCount--;
+                            // Forget is was the edited row
+                            if (row === this.editedRow) {
+                                this.editedRow = undefined;
+                            }
                             return res;
                         }
                     }
                     return res.concat(row);
                 }, []);
-                if (isEmptyArray(rows))
-                    return 0;
-                // If data need to be saved first: do it
-                const saved = yield this.saveBeforeAction('delete');
-                if (!saved) {
-                    // Stop if save cancelled or save failed
-                    return;
+                // Apply save, only if there is still some rows to delete
+                // WARN: If no more rows (e.g. because all has been cancelled) then continue anyway to clear editedRow and selection (issue IMAGINE-669)
+                if (isNotEmptyArray(rows)) {
+                    // Save data (e.g. when using memory service)
+                    const saved = yield this.saveBeforeAction('delete');
+                    if (!saved) {
+                        // Stop if save cancelled or save failed
+                        return;
+                    }
                 }
             }
-            if (this.debug)
-                console.debug('[table] Delete selection...');
-            const rowsToDelete = rows.slice()
-                // Reverse row order
-                // This is a workaround, need because row.delete() has async execution
-                // and index cache is updated with a delay)
-                .sort((a, b) => a.id > b.id ? -1 : 1);
             try {
-                const deleteCount = rowsToDelete.length;
-                yield this._dataSource.deleteAll(rowsToDelete);
+                const deleteCount = rows.length;
+                // Apply deletion on datasource
+                // If no more rows to delete, continue anyway to clear editedRow and selection (issue IMAGINE-669)
+                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
                 //this.totalRowCount -= deleteCount;
                 //this.visibleRowCount -= deleteCount;
@@ -22249,7 +22260,8 @@ class AppTable {
                 this.editedRow = undefined;
                 this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
                 this.markForCheck();
-                this.onAfterDeletedRows.next(rowsToDelete);
+                if (deleteCount)
+                    this.onAfterDeletedRows.next(rows);
                 return deleteCount;
             }
             catch (err) {