@sumaris-net/ngx-components 1.23.6 → 1.23.7

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

@@ -22601,7 +22601,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 // Workaround, to be sure all rows have been deleted
                 // Sometime, the service miss deletion, or GraphQl cache remove failed.
                 // In this case, apply missing deletion using the super.delete() function
-                const rowNotDeleted = this.getRows().filter(rows.includes);
+                const rowNotDeleted = this.getRows().filter(row => rows.includes(row));
                 if (isNotEmptyArray(rowNotDeleted)) {
                     console.warn(`[table-datasource] Force deletion of ${rowNotDeleted.length} rows! Please check that data service update the cache, after deletion`);
                     rowNotDeleted
@@ -23262,7 +23262,6 @@ class AppTable {
         // Stop event
         event === null || event === void 0 ? void 0 : event.stopPropagation();
         // Confirmation edition or creation
-        //const confirmed = this.dataSource.confirmEditCreate(row);
         const confirmed = row.confirmEditCreate();
         if (confirmed) {
             // If edit finished, forget edited row
@@ -23487,18 +23486,22 @@ class AppTable {
             // 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()
+            let tempRows = rows.slice()
                 .sort((a, b) => a.id > b.id ? -1 : 1);
+            let deletedRows = [];
             // If data need to be saved first
             if (this.saveBeforeDelete) {
                 // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
-                rows = rows.filter(row => {
+                tempRows = tempRows.filter(row => {
                     // Delete the row, if newly created row (id = -1), or if invalid and not editing (= not cancellable)
                     if (row.id === -1 || (!row.valid && !row.editing)) {
+                        if (this.debug)
+                            console.debug(`[table] Delete row #${row.id}`);
                         row.delete();
                         this.visibleRowCount--;
                         this.totalRowCount--;
-                        return false;
+                        deletedRows.push(row);
+                        return false; // Exclude from the list to delete using the service
                     }
                     // Cancel the row (and mark as pristine), when not valid but in edition
                     else if (!row.valid && row.editing) {
@@ -23511,7 +23514,7 @@ class AppTable {
                 });
                 // 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)) {
+                if (deletedRows.length || tempRows.length) {
                     // Save data (e.g. when using memory service)
                     const saved = yield this.saveBeforeAction('delete');
                     if (!saved) {
@@ -23521,13 +23524,12 @@ class AppTable {
                 }
             }
             try {
-                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 (tempRows.length) {
                     if (this.debug)
-                        console.debug('[table] Delete selected rows...');
-                    yield this._dataSource.deleteAll(rows);
+                        console.debug(`[table] Delete ${tempRows.length} rows...`);
+                    yield this._dataSource.deleteAll(tempRows);
                 }
                 // DO not update manually, because watchALl().subscribe() will update this count
                 //this.totalRowCount -= deleteCount;
@@ -23536,9 +23538,8 @@ class AppTable {
                 this.editedRow = undefined;
                 this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
                 this.markForCheck();
-                if (deleteCount)
-                    this.onAfterDeletedRows.next(rows);
-                return deleteCount;
+                this.onAfterDeletedRows.next(rows);
+                return rows.length;
             }
             catch (err) {
                 this.setError(err && err.message || err);