@sumaris-net/ngx-components 1.23.2 → 1.23.5

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

@@ -22592,24 +22592,17 @@ 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
+                // Sometime, the service miss deletion, or GraphQl 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 ?)`);
+                    console.warn(`[table-datasource] Force deletion of ${rowNotDeleted.length} rows! Please check that data service update the cache, after deletion`);
                     rowNotDeleted
-                        // Start from the end
+                        // Start at the end
                         .sort((a, b) => a.id > b.id ? -1 : 1)
                         .forEach(r => _super.delete.call(this, r.id));
                 }
@@ -23063,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);
     }
@@ -24224,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
@@ -24233,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];