@sumaris-net/ngx-components 1.23.6 → 1.23.7

package/bundles/sumaris-net.ngx-components.umd.js

@@ -26105,7 +26105,7 @@
                         case 2:
                             // Call service deletion
                             _b.sent();
-                            rowNotDeleted = this.getRows().filter(rows.includes);
+                            rowNotDeleted = this.getRows().filter(function (row) { return 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
@@ -26907,7 +26907,6 @@
             // Stop event
             event === null || event === void 0 ? void 0 : event.stopPropagation();
             // Confirmation edition or creation
-            //const confirmed = this.dataSource.confirmEditCreate(row);
             var confirmed = row.confirmEditCreate();
             if (confirmed) {
                 // If edit finished, forget edited row
@@ -27144,7 +27143,7 @@
         AppTable.prototype.deleteRows = function (event, rows, opts) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var confirmed, canDelete, saved, deleteCount, err_2;
+                var confirmed, canDelete, tempRows, deletedRows, saved, err_2;
                 var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
@@ -27172,20 +27171,21 @@
                             canDelete = _e.sent();
                             if (!canDelete)
                                 return [2 /*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()
+                            tempRows = rows.slice()
                                 .sort(function (a, b) { return a.id > b.id ? -1 : 1; });
+                            deletedRows = [];
                             if (!this.saveBeforeDelete) return [3 /*break*/, 3];
                             // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
-                            rows = rows.filter(function (row) {
+                            tempRows = tempRows.filter(function (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) {
@@ -27196,7 +27196,7 @@
                                 }
                                 return true;
                             });
-                            if (!isNotEmptyArray(rows)) return [3 /*break*/, 3];
+                            if (!(deletedRows.length || tempRows.length)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.saveBeforeAction('delete')];
                         case 2:
                             saved = _e.sent();
@@ -27207,11 +27207,10 @@
                             _e.label = 3;
                         case 3:
                             _e.trys.push([3, 6, , 7]);
-                            deleteCount = rows.length;
-                            if (!deleteCount) return [3 /*break*/, 5];
+                            if (!tempRows.length) return [3 /*break*/, 5];
                             if (this.debug)
-                                console.debug('[table] Delete selected rows...');
-                            return [4 /*yield*/, this._dataSource.deleteAll(rows)];
+                                console.debug("[table] Delete " + tempRows.length + " rows...");
+                            return [4 /*yield*/, this._dataSource.deleteAll(tempRows)];
                         case 4:
                             _e.sent();
                             _e.label = 5;
@@ -27223,9 +27222,8 @@
                             this.editedRow = undefined;
                             this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
                             this.markForCheck();
-                            if (deleteCount)
-                                this.onAfterDeletedRows.next(rows);
-                            return [2 /*return*/, deleteCount];
+                            this.onAfterDeletedRows.next(rows);
+                            return [2 /*return*/, rows.length];
                         case 6:
                             err_2 = _e.sent();
                             this.setError(err_2 && err_2.message || err_2);