@sumaris-net/ngx-components 1.5.7 → 1.5.11

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

@@ -551,7 +551,7 @@
         // Pagination (truncate if need)
         var pageData = filteredItems;
         if (opts) {
-            if (isNil(opts.offset) && opts.offset > 0) {
+            if ((opts.offset || 0) > 0) {
                 pageData = pageData.slice(opts.offset);
             }
             if (isNotNil(opts.size) && pageData.length > opts.size) {
@@ -24892,8 +24892,10 @@
          * @param opts Use interactive=false to avoid user interaction (e.g. user confirmation)
          */
         AppTable.prototype.deleteRows = function (event, rows, opts) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var canDelete, saved, rowsToDelete, deleteCount, err_2;
+                var confirmed, canDelete, saved, rowsToDelete, deleteCount, err_2;
+                var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -24907,15 +24909,34 @@
                                 return [2 /*return*/, 0];
                             if (this.loading || isEmptyArray(rows))
                                 return [2 /*return*/, 0];
+                            // Make sure to keep newly created row
+                            if (((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.id) === -1 && this.editedRow.editing && !rows.includes(this.editedRow)) {
+                                confirmed = this.confirmEditCreate();
+                                if (!confirmed)
+                                    return [2 /*return*/, 0]; // Cannot delete (e.g. edited row is invalid)
+                            }
                             return [4 /*yield*/, this.canDeleteRows(rows, opts)];
                         case 1:
                             canDelete = _d.sent();
                             if (!canDelete)
                                 return [2 /*return*/, 0]; // Cannot delete
                             if (!this.saveBeforeDelete) return [3 /*break*/, 3];
-                            // Cancel invalid rows (because of save() will failed if there is invalid rows)
-                            rows.filter(function (row) { var _a; return !((_a = row.validator) === null || _a === void 0 ? void 0 : _a.valid); })
-                                .forEach(function (row) { return row.cancelOrDelete(); });
+                            // Cancel invalid rows (because of save() will fail, if invalid rows exists)
+                            rows = rows.reduce(function (res, row) {
+                                if (row.validator && !row.validator.valid) {
+                                    var deleted = row.id === -1;
+                                    row.cancelOrDelete();
+                                    // When deleted (= newly created row) : decrement counter
+                                    if (deleted) {
+                                        _this.visibleRowCount--;
+                                        _this.totalRowCount--;
+                                        return res;
+                                    }
+                                }
+                                return res.concat(row);
+                            }, []);
+                            if (isEmptyArray(rows))
+                                return [2 /*return*/, 0];
                             return [4 /*yield*/, this.saveBeforeAction('delete')];
                         case 2:
                             saved = _d.sent();
@@ -24939,7 +24960,7 @@
                             return [4 /*yield*/, this._dataSource.deleteAll(rowsToDelete)];
                         case 5:
                             _d.sent();
-                            // Not need to update manually, because watchALl().subscribe() will update this count
+                            // DO not update manually, because watchALl().subscribe() will update this count
                             //this.totalRowCount -= deleteCount;
                             //this.visibleRowCount -= deleteCount;
                             this.selection.clear();