@sumaris-net/ngx-components 1.23.1 → 1.23.4

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

@@ -22347,7 +22347,6 @@ class EntitiesTableDataSource extends TableDataSource {
         this._creating = false;
         this._saving = false;
         this._stopWatching$ = new Subject();
-        this._editingRowCount = 0;
         this._fetchMoreFn = null;
         this.loadingSubject = new BehaviorSubject(undefined);
         this._entityName = removeEnd((new dataType()).__typename || 'UnknownVO', 'VO');
@@ -22394,7 +22393,6 @@ class EntitiesTableDataSource extends TableDataSource {
     }
     watchAll(offset, size, sortBy, sortDirection, filter) {
         this._stopWatching$.next();
-        this._editingRowCount = 0;
         this._fetchMoreFn = null;
         this.markAsLoading();
         return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
@@ -22402,8 +22400,8 @@ class EntitiesTableDataSource extends TableDataSource {
             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 || []));
@@ -22457,7 +22455,6 @@ class EntitiesTableDataSource extends TableDataSource {
                     // Stop with an error
                     throw { code: ErrorCodes.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                 }
-                this._editingRowCount = 0;
                 let data;
                 let dataToSave;
                 if (this.validatorService) {
@@ -22534,7 +22531,6 @@ class EntitiesTableDataSource extends TableDataSource {
             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;
     }
     confirmEdit(row) {
@@ -22544,7 +22540,6 @@ class EntitiesTableDataSource extends TableDataSource {
             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;
     }
     startEdit(row) {
@@ -22554,7 +22549,6 @@ class EntitiesTableDataSource extends TableDataSource {
             console.warn('[table-datasource] Row still has {editing: false} after startEdit()! Force editing');
             row.validator.enable({ onlySelf: true, emitEvent: false });
         }
-        this._editingRowCount++;
     }
     handleError(error, message) {
         const errorMsg = error && error.message || error;
@@ -22578,9 +22572,7 @@ class EntitiesTableDataSource extends TableDataSource {
             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(err => this.handleServiceError(err))
             .then(() => {
@@ -22589,7 +22581,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 const present = this.getRow(id) === row;
                 if (present)
                     super.delete(id);
-                this.loadingSubject.next(false);
+                this.markAsLoaded();
             }, 300);
         });
     }
@@ -22600,20 +22592,13 @@ class EntitiesTableDataSource extends TableDataSource {
         return __awaiter(this, void 0, void 0, function* () {
             this.markAsLoading();
             const data = this.getDataFromRows(rows);
-            const rowsById = Beans.collectById(rows);
             try {
                 // Call service deletion
                 yield this.dataService.deleteAll(data, this.serviceOptions);
                 // Workaround, to be sure all rows have been deleted
-                // Sometimes, the service miss deletion, or GrapQHl cache remove failed
-                const rowNotDeleted = Object.getOwnPropertyNames(rowsById)
-                    .reduce((res, id) => {
-                    const row = rowsById[id];
-                    const present = this.getRow(+id) === row;
-                    return present ? res.concat(row) : res;
-                }, []);
-                //this.getRows().filter(row => rows.includes(row));
-                // Apply missing deletion
+                // Sometimes, the service miss deletion, or GrapQHl cache remove failed.
+                // In this case, apply missing deletion using the super.delete() function
+                const 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
@@ -22623,7 +22608,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 }
             }
             catch (err) {
-                // Handle sservice error
+                // Handle service error
                 this.handleServiceError(err);
             }
             finally {
@@ -22637,6 +22622,9 @@ class EntitiesTableDataSource extends TableDataSource {
     getRows() {
         return this.rowsSubject.getValue();
     }
+    hasSomeEditingRow() {
+        return (this.rowsSubject.value || []).some(row => row.editing);
+    }
     createNew(insertAt, options = { editing: true }) {
         const _super = Object.create(null, {
             createNew: { get: () => super.createNew }
@@ -22659,8 +22647,6 @@ class EntitiesTableDataSource extends TableDataSource {
                         console.error(err && err.message || err, err);
                     }
                 }
-                if (row.editing)
-                    this._editingRowCount++;
                 return row;
             }
             finally {
@@ -22679,8 +22665,8 @@ class EntitiesTableDataSource extends TableDataSource {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._fetchMoreFn)
                 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;
             }
             console.debug(`Will fetching more row(s) still...`);
@@ -22752,7 +22738,6 @@ class AppTable {
         this.savingSubject = new BehaviorSubject(false);
         this.dirtySubject = new BehaviorSubject(false);
         this.errorSubject = new BehaviorSubject(undefined);
-        this.isRateLimitReached = false;
         this.selection = new SelectionModel(true, []);
         this.editedRow = undefined;
         this.i18nColumnPrefix = 'COMMON.';
@@ -23071,7 +23056,7 @@ class AppTable {
             return of(undefined); // Continue
         }))
             .subscribe(res => this.updateView(res)));
-        // Listen dataSource events
+        // Listen dataSource loading events
         if (this._dataSource)
             this.listenDatasourceLoading(this._dataSource);
     }
@@ -23146,7 +23131,6 @@ class AppTable {
             if (!res)
                 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)
@@ -23154,7 +23138,6 @@ class AppTable {
             }
             else {
                 //if (this.debug) console.debug('[table] NO rows loaded');
-                this.isRateLimitReached = true;
                 this.totalRowCount = 0;
                 this.visibleRowCount = 0;
             }
@@ -23507,22 +23490,19 @@ class AppTable {
             if (this.saveBeforeDelete) {
                 // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
                 rows = rows.filter(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;
                 });
@@ -24237,8 +24217,9 @@ class AppTable {
             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(distinctUntilChanged(), 
         // If changed to True: propagate as soon as possible
@@ -24246,7 +24227,7 @@ class AppTable {
         // If changed to False: wait 250ms before propagate (to make sure the spinner has been displayed)
         debounceTime(250), tap(loading => !loading && this.setLoading(false)))
             .subscribe();
-        this._subscription.add(this._dataSourceLoadingSubscription);
+        this.registerSubscription(this._dataSourceLoadingSubscription);
     }
     startCellValueChanges(name, row) {
         const def = this._cellValueChangesDefs[name];