@sumaris-net/ngx-components 1.23.6 → 1.23.9

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
@@ -26688,47 +26688,11 @@
                 this.listenDatasourceLoading(this._dataSource);
         };
         AppTable.prototype.ngAfterViewInit = function () {
-            var _this = this;
-            if (this.debug) {
-                // Warn if table not exists
-                if (!this.table) {
-                    setTimeout(function () {
-                        if (!_this.table) {
-                            console.warn("[table] Missing <mat-table> in the HTML template (after waiting 500ms)! Component: " + _this.constructor.name);
-                        }
-                    }, 500);
-                }
-                if (!this.displayedColumns)
-                    console.warn("[table] Missing 'displayedColumns'. Did you call super.ngOnInit() in component " + this.constructor.name + " ?");
-            }
-            rxjs.merge(
-            // Listen sort events
-            this.sort && this.sort.sortChange
-                .pipe(operators.filter(function () { return !_this.sort.disabled; }), operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_e) {
-                return [2 /*return*/, this.saveBeforeAction('sort')];
-            }); }); }), operators.filter(function (res) { return res === true; }), 
-            // Save sort in settings
-            operators.tap(function () {
-                var value = [_this.sort.active, _this.sort.direction || 'asc'].join(':');
-                _this.settings.savePageSetting(_this.settingsId, value, SETTINGS_SORTED_COLUMN);
-            }))
-                || rxjs.EMPTY, 
-            // Listen paginator events
-            this.paginator && this.paginator.page
-                .pipe(operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_e) {
-                return [2 /*return*/, this.saveBeforeAction('sort')];
-            }); }); }), operators.filter(function (res) { return res === true; }), 
-            // Save page size
-            operators.tap(function () { return _this.settings.savePageSetting(_this.settingsId, _this.paginator.pageSize, SETTINGS_PAGE_SIZE); })) || rxjs.EMPTY).subscribe(function (value) {
-                _this.onSort.emit();
-                _this.onRefresh.emit(value);
-            });
-            // If the user changes the sort order, reset back to the first page.
-            if (this.sort && this.paginator) {
-                this.registerSubscription(this.sort.sortChange
-                    .pipe(operators.filter(function () { return !_this.sort.disabled; }))
-                    .subscribe(function () { return _this.paginator.pageIndex = 0; }));
-            }
+            // Detect when super.ngOnInit() not call
+            if (this.debug && !this.displayedColumns)
+                console.warn("[table] Missing 'displayedColumns'. Did you call super.ngOnInit() in component " + this.constructor.name + " ?");
+            // Start listening sort and paginator events
+            this.listenSortAndPaginationEvents();
         };
         AppTable.prototype.ngOnDestroy = function () {
             var _this = this;
@@ -26871,27 +26835,6 @@
             this.editRowById(event, row.id + 1, { focusColumn: this.firstUserColumn });
             return true;
         };
-        AppTable.prototype.editRowById = function (event, id, opts) {
-            return __awaiter(this, void 0, void 0, function () {
-                var row;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
-                        case 0:
-                            if (id < 0)
-                                return [2 /*return*/];
-                            if (!(id >= this.visibleRowCount)) return [3 /*break*/, 1];
-                            this.addRow(event, undefined, Object.assign(Object.assign({}, opts), { editing: true }));
-                            return [3 /*break*/, 3];
-                        case 1: return [4 /*yield*/, this.dataSource.getRow(id)];
-                        case 2:
-                            row = _e.sent();
-                            this.editRow(event, row, opts);
-                            _e.label = 3;
-                        case 3: return [2 /*return*/];
-                    }
-                });
-            });
-        };
         /**
          * Confirm the creation of the given row, or if not specified the currently edited row
          *
@@ -26907,7 +26850,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 +27086,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 +27114,23 @@
                             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);
+                                    if (_this.editedRow === row)
+                                        _this.editedRow = undefined;
+                                    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 +27141,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 +27152,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 +27167,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);
@@ -27925,6 +27868,80 @@
             this.markAsDirty(opts);
         };
         /* -- private method -- */
+        AppTable.prototype.listenSortAndPaginationEvents = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            if (!!this.table) return [3 /*break*/, 2];
+                            // DEBUG only -- alert user that table not found in template
+                            if (this.debug) {
+                                setTimeout(function () { return !_this.table && console.warn("[table] Missing <mat-table> in the HTML template (after waiting 500ms)! Component: " + _this.constructor.name); }, 500);
+                            }
+                            // Make sure to wait the table
+                            return [4 /*yield*/, waitFor(function () { return !!_this.table; }, { stop: this.destroySubject })];
+                        case 1:
+                            // Make sure to wait the table
+                            _e.sent();
+                            _e.label = 2;
+                        case 2:
+                            this.registerSubscription(rxjs.merge(
+                            // Listen sort events
+                            this.sort && this.sort.sortChange
+                                .pipe(operators.filter(function () { return !_this.sort.disabled; }), operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_e) {
+                                return [2 /*return*/, this.saveBeforeAction('sort')];
+                            }); }); }), operators.filter(function (res) { return res === true; }), 
+                            // Save sort in settings
+                            operators.tap(function () {
+                                var value = [_this.sort.active, _this.sort.direction || 'asc'].join(':');
+                                _this.settings.savePageSetting(_this.settingsId, value, SETTINGS_SORTED_COLUMN);
+                            }))
+                                || rxjs.EMPTY, 
+                            // Listen paginator events
+                            this.paginator && this.paginator.page
+                                .pipe(operators.mergeMap(function (event) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_e) {
+                                return [2 /*return*/, this.saveBeforeAction('sort')];
+                            }); }); }), operators.filter(function (res) { return res === true; }), 
+                            // Save page size in settings
+                            operators.tap(function () { return _this.settings.savePageSetting(_this.settingsId, _this.paginator.pageSize, SETTINGS_PAGE_SIZE); })) || rxjs.EMPTY)
+                                // Refresh on any sort or paginator events
+                                .subscribe(function (value) {
+                                _this.onSort.emit(value);
+                                _this.onRefresh.emit(value);
+                            }));
+                            // If the user changes the sort order, reset back to the first page.
+                            if (this.sort && this.paginator) {
+                                this.registerSubscription(this.sort.sortChange
+                                    .pipe(operators.filter(function () { return !_this.sort.disabled; }))
+                                    .subscribe(function () { return _this.paginator.pageIndex = 0; }));
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        AppTable.prototype.editRowById = function (event, id, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var row;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            if (id < 0)
+                                return [2 /*return*/];
+                            if (!(id >= this.visibleRowCount)) return [3 /*break*/, 1];
+                            this.addRow(event, undefined, Object.assign(Object.assign({}, opts), { editing: true }));
+                            return [3 /*break*/, 3];
+                        case 1: return [4 /*yield*/, this.dataSource.getRow(id)];
+                        case 2:
+                            row = _e.sent();
+                            this.editRow(event, row, opts);
+                            _e.label = 3;
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         AppTable.prototype.setLoading = function (value, opts) {
             if (this.loadingSubject.value !== value) {
                 this.loadingSubject.next(value);
@@ -33914,6 +33931,7 @@
                 this.data = this.generateData(0, TableTestPage.maxRowCount);
             }
             this.dataService.value = this.data;
+            this.onRefresh.emit();
         };
         TableTestPage.prototype.fetchMore = function (event) {
             return __awaiter(this, void 0, void 0, function () {