@sumaris-net/ngx-components 1.23.1 → 1.23.4

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

@@ -25813,7 +25813,6 @@
             _this._creating = false;
             _this._saving = false;
             _this._stopWatching$ = new rxjs.Subject();
-            _this._editingRowCount = 0;
             _this._fetchMoreFn = null;
             _this.loadingSubject = new rxjs.BehaviorSubject(undefined);
             _this._entityName = removeEnd((new dataType()).__typename || 'UnknownVO', 'VO');
@@ -25882,7 +25881,6 @@
         EntitiesTableDataSource.prototype.watchAll = function (offset, size, sortBy, sortDirection, filter) {
             var _this = this;
             this._stopWatching$.next();
-            this._editingRowCount = 0;
             this._fetchMoreFn = null;
             this.markAsLoading();
             return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
@@ -25890,8 +25888,8 @@
                 if (_this._saving) {
                     console.info("[table-datasource] Received " + _this._entityName + " data (from service), but still saving: skip");
                 }
-                else if (_this._editingRowCount > 0) {
-                    console.warn("[table-datasource] Received " + _this._entityName + " data, while " + _this._editingRowCount + " rows still editing: skip; Please check save() implementation in the table!");
+                else if (_this.hasSomeEditingRow()) {
+                    console.warn("[table-datasource] Received " + _this._entityName + " data, while some row still editing: skip; Please check save() implementation in the table!");
                 }
                 else {
                     _this.updateDatasource((res.data || []));
@@ -25950,7 +25948,6 @@
                                 // Stop with an error
                                 throw { code: ErrorCodes.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                             }
-                            this._editingRowCount = 0;
                             data = void 0;
                             if (this.validatorService) {
                                 dataToSave_1 = [];
@@ -26030,7 +26027,6 @@
                 console.warn('[table-datasource] Row still has {editing: true} after confirmCreate()! Force editing to false');
                 row.validator.disable({ onlySelf: true, emitEvent: false });
             }
-            this._editingRowCount--;
             return true;
         };
         EntitiesTableDataSource.prototype.confirmEdit = function (row) {
@@ -26040,7 +26036,6 @@
                 console.warn('[table-datasource] Row still has {editing: true} after confirmEdit()! Force editing to false');
                 row.validator.disable({ onlySelf: true, emitEvent: false });
             }
-            this._editingRowCount--;
             return true;
         };
         EntitiesTableDataSource.prototype.startEdit = function (row) {
@@ -26050,7 +26045,6 @@
                 console.warn('[table-datasource] Row still has {editing: false} after startEdit()! Force editing');
                 row.validator.enable({ onlySelf: true, emitEvent: false });
             }
-            this._editingRowCount++;
         };
         EntitiesTableDataSource.prototype.handleError = function (error, message) {
             var errorMsg = error && error.message || error;
@@ -26075,9 +26069,7 @@
                 console.error("[table-datasource] Row to delete with id=" + id + " not found");
                 return;
             }
-            if (row.editing)
-                this._editingRowCount--;
-            this.loadingSubject.next(true);
+            this.markAsLoading();
             this.dataService.deleteAll([row.currentData], this.serviceOptions)
                 .catch(function (err) { return _this.handleServiceError(err); })
                 .then(function () {
@@ -26086,7 +26078,7 @@
                     var present = _this.getRow(id) === row;
                     if (present)
                         _super_1.prototype.delete.call(_this, id);
-                    _this.loadingSubject.next(false);
+                    _this.markAsLoaded();
                 }, 300);
             });
         };
@@ -26095,14 +26087,13 @@
                 delete: { get: function () { return _super_1.prototype.delete; } }
             });
             return __awaiter(this, void 0, void 0, function () {
-                var data, rowsById, rowNotDeleted, err_1;
+                var data, rowNotDeleted, err_1;
                 var _this = this;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             this.markAsLoading();
                             data = this.getDataFromRows(rows);
-                            rowsById = Beans.collectById(rows);
                             _b.label = 1;
                         case 1:
                             _b.trys.push([1, 3, 4, 5]);
@@ -26111,14 +26102,7 @@
                         case 2:
                             // Call service deletion
                             _b.sent();
-                            rowNotDeleted = Object.getOwnPropertyNames(rowsById)
-                                .reduce(function (res, id) {
-                                var row = rowsById[id];
-                                var present = _this.getRow(+id) === row;
-                                return present ? res.concat(row) : res;
-                            }, []);
-                            //this.getRows().filter(row => rows.includes(row));
-                            // Apply missing deletion
+                            rowNotDeleted = this.getRows().filter(rows.includes);
                             if (isNotEmptyArray(rowNotDeleted)) {
                                 console.warn("[table-datasource] Force deletion of " + rowNotDeleted.length + " rows (Is service update the cache ?)");
                                 rowNotDeleted
@@ -26129,7 +26113,7 @@
                             return [3 /*break*/, 5];
                         case 3:
                             err_1 = _b.sent();
-                            // Handle sservice error
+                            // Handle service error
                             this.handleServiceError(err_1);
                             return [3 /*break*/, 5];
                         case 4:
@@ -26146,6 +26130,9 @@
         EntitiesTableDataSource.prototype.getRows = function () {
             return this.rowsSubject.getValue();
         };
+        EntitiesTableDataSource.prototype.hasSomeEditingRow = function () {
+            return (this.rowsSubject.value || []).some(function (row) { return row.editing; });
+        };
         EntitiesTableDataSource.prototype.createNew = function (insertAt, options) {
             if (options === void 0) { options = { editing: true }; }
             var _super = Object.create(null, {
@@ -26181,10 +26168,7 @@
                             // Log, then continue
                             console.error(err_2 && err_2.message || err_2, err_2);
                             return [3 /*break*/, 6];
-                        case 6:
-                            if (row.editing)
-                                this._editingRowCount++;
-                            return [2 /*return*/, row];
+                        case 6: return [2 /*return*/, row];
                         case 7:
                             this._creating = false;
                             return [7 /*endfinally*/];
@@ -26209,8 +26193,8 @@
                         case 0:
                             if (!this._fetchMoreFn)
                                 return [2 /*return*/, false]; // Avoid multiple call
-                            if (this._editingRowCount > 0) {
-                                console.warn("Cannot fetch more " + this._entityName + " because " + this._editingRowCount + " row(s) still editing");
+                            if (this.hasSomeEditingRow()) {
+                                console.warn("Cannot fetch more " + this._entityName + " because some row) still editing");
                                 return [2 /*return*/];
                             }
                             console.debug("Will fetching more row(s) still...");
@@ -26289,7 +26273,6 @@
             this.savingSubject = new rxjs.BehaviorSubject(false);
             this.dirtySubject = new rxjs.BehaviorSubject(false);
             this.errorSubject = new rxjs.BehaviorSubject(undefined);
-            this.isRateLimitReached = false;
             this.selection = new collections.SelectionModel(true, []);
             this.editedRow = undefined;
             this.i18nColumnPrefix = 'COMMON.';
@@ -26697,7 +26680,7 @@
                 return rxjs.of(undefined); // Continue
             }))
                 .subscribe(function (res) { return _this.updateView(res); }));
-            // Listen dataSource events
+            // Listen dataSource loading events
             if (this._dataSource)
                 this.listenDatasourceLoading(this._dataSource);
         };
@@ -26779,7 +26762,6 @@
                     if (!res)
                         return [2 /*return*/]; // Skip (e.g error)
                     if (res && res.data) {
-                        this.isRateLimitReached = !this.paginator || (res.data.length < this.paginator.pageSize);
                         this.visibleRowCount = res.data.length;
                         this.totalRowCount = isNotNil(res.total) ? res.total : ((this.paginator && this.paginator.pageIndex * (this.paginator.pageSize || DEFAULT_PAGE_SIZE) || 0) + this.visibleRowCount);
                         if (this.debug)
@@ -26787,7 +26769,6 @@
                     }
                     else {
                         //if (this.debug) console.debug('[table] NO rows loaded');
-                        this.isRateLimitReached = true;
                         this.totalRowCount = 0;
                         this.visibleRowCount = 0;
                     }
@@ -27196,22 +27177,19 @@
                             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) {
-                                if (row.validator && !row.validator.valid) {
-                                    // When deleted (= newly created row) : decrement counter
-                                    if (row.id === -1 || !row.editing) {
-                                        row.delete();
-                                        _this.visibleRowCount--;
-                                        _this.totalRowCount--;
-                                        return false; // Remove this row to the list, because already deleted
-                                    }
-                                    // Mark row as pristine, to avoid row to be saved even if still invalid
-                                    else {
-                                        // Will cancel only (delete will always go into the previous 'if')
-                                        row.cancelOrDelete();
-                                        // Mark row as pristine (if possible)
-                                        _this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
-                                        // Continue: the row will be deleted after the save
-                                    }
+                                // 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)) {
+                                    row.delete();
+                                    _this.visibleRowCount--;
+                                    _this.totalRowCount--;
+                                    return false;
+                                }
+                                // Cancel the row (and mark as pristine), when not valid but in edition
+                                else if (!row.valid && row.editing) {
+                                    row.cancel();
+                                    // Mark row as pristine (if possible)
+                                    _this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
+                                    return true; // Keep the row. the row will be deleted after the save
                                 }
                                 return true;
                             });
@@ -28056,8 +28034,9 @@
                 if (this.debug)
                     console.debug('[table] Many call to listenDatasource(): Cleaning previous subscriptions...');
                 this._dataSourceLoadingSubscription.unsubscribe();
-                this._subscription.remove(this._dataSourceLoadingSubscription);
+                this.unregisterSubscription(this._dataSourceLoadingSubscription);
             }
+            // Propage loading to table
             this._dataSourceLoadingSubscription = this._dataSource.loadingSubject
                 .pipe(operators.distinctUntilChanged(), 
             // If changed to True: propagate as soon as possible
@@ -28065,7 +28044,7 @@
             // If changed to False: wait 250ms before propagate (to make sure the spinner has been displayed)
             operators.debounceTime(250), operators.tap(function (loading) { return !loading && _this.setLoading(false); }))
                 .subscribe();
-            this._subscription.add(this._dataSourceLoadingSubscription);
+            this.registerSubscription(this._dataSourceLoadingSubscription);
         };
         AppTable.prototype.startCellValueChanges = function (name, row) {
             var def = this._cellValueChangesDefs[name];