@sumaris-net/ngx-components 18.12.10 → 18.12.11

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -33757,11 +33757,11 @@ class EntitiesTableDataSource extends TableDataSource {
     _entityName;
     _debug = false;
     _creating = false;
-    _saving = false;
     _fetchMoreFn = null;
     _waitingNetworkResult;
     _stopWatchSubject = new Subject();
     loadingSubject = new BehaviorSubject(undefined);
+    savingSubject = new BehaviorSubject(false);
     get watchAllOptions() {
         return this.config.watchAllOptions;
     }
@@ -33775,10 +33775,13 @@ class EntitiesTableDataSource extends TableDataSource {
         this.config.saveAllOptions = value;
     }
     get loaded() {
-        return this.loadingSubject.value === false; // Should be false when undefined (initial state)
+        return this.loadingSubject.getValue() === false; // Should be false when undefined (initial state)
     }
     get loading() {
-        return this.loadingSubject.value !== false; // Should be true when undefined (initial state)
+        return this.loadingSubject.getValue() !== false; // Should be true when undefined (initial state)
+    }
+    get saving() {
+        return this.savingSubject.getValue();
     }
     /**
      * Creates a new TableDataSource instance, that can be used as datasource of `@angular/cdk` data-table.
@@ -33803,19 +33806,13 @@ class EntitiesTableDataSource extends TableDataSource {
     ngOnDestroy() {
         this.disconnect();
     }
-    /**
-     * @deprecated use disconnect
-     */
-    close() {
-        this.disconnect();
-    }
     watchAll(offset, size, sortBy, sortDirection, filter) {
         this._stopWatchSubject.next();
         this._fetchMoreFn = null;
         this.markAsLoading();
         this._waitingNetworkResult = (this.watchAllOptions?.fetchPolicy || this.dataService?.defaultFetchPolicy) === 'cache-and-network';
         return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.watchAllOptions).pipe(catchError((err) => this.handleError(err, 'ERROR.LOAD_DATA_ERROR')), map((res) => {
-            if (this._saving) {
+            if (this.saving) {
                 console.info(`[entities-table-datasource] Received ${this._entityName} data (from service), but still saving: skip`);
             }
             else {
@@ -33851,12 +33848,11 @@ class EntitiesTableDataSource extends TableDataSource {
             return false;
         }
         // Saving twice (should never occur)
-        if (this._saving) {
+        if (this.saving) {
             console.warn(`[entities-table-datasource] Trying to save ${this._entityName} rows twice. Skip`);
             return false;
         }
-        this._saving = true;
-        this.markAsLoading();
+        this.markAsSaving();
         const onlyDirtyRows = this.config.saveOnlyDirtyRows;
         try {
             if (this._debug)
@@ -33906,7 +33902,7 @@ class EntitiesTableDataSource extends TableDataSource {
             if (this._debug)
                 console.debug(`[entities-table-datasource] Saving ${this._entityName} data [OK]`);
             // LP 23/03/2021: update datasource is necessary but can be changed to a refetch() on QueryRef (must be created and registered in GraphqlService.watchQuery)
-            this.updateDatasource(data, { emitEvent: false });
+            this.updateDatasource(data);
             return true;
         }
         catch (error) {
@@ -33915,8 +33911,7 @@ class EntitiesTableDataSource extends TableDataSource {
             throw error;
         }
         finally {
-            this._saving = false;
-            this.markAsLoaded();
+            this.markAsSaved();
         }
     }
     updateDatasource(data, opts) {
@@ -33981,7 +33976,7 @@ class EntitiesTableDataSource extends TableDataSource {
         const confirmed = super.confirmEdit(row);
         if (!confirmed)
             return false;
-        if (row.editing && row.validator) {
+        if (row.validator?.enabled) {
             console.warn('[entities-table-datasource] Row still has {editing: true} after confirmEdit()! Force editing to false');
             row.validator.disable({ onlySelf: true, emitEvent: false });
         }
@@ -33991,7 +33986,7 @@ class EntitiesTableDataSource extends TableDataSource {
         const editing = super.startEdit(row);
         if (!editing)
             return false;
-        if (!row.editing && row.validator) {
+        if (row.validator?.disabled) {
             console.warn('[entities-table-datasource] Row still has {editing: false} after startEdit()! Force editing');
             row.validator.enable({ onlySelf: true, emitEvent: false });
         }
@@ -34020,8 +34015,6 @@ class EntitiesTableDataSource extends TableDataSource {
             return;
         }
         this.markAsLoading();
-        const superDelete = super.delete;
-        const self = this;
         this.dataService
             .deleteAll([row.currentData], this.saveAllOptions)
             .catch((err) => this.handleServiceError(err))
@@ -34030,7 +34023,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 // make sure row has been deleted (because GrapQHl cache remove can failed)
                 const present = this.getRow(id) === row;
                 if (present)
-                    superDelete.call(self, id);
+                    super.delete(id);
                 this.markAsLoaded();
             }, 300);
         });
@@ -34041,19 +34034,18 @@ class EntitiesTableDataSource extends TableDataSource {
         try {
             // Call service deletion
             await this.dataService.deleteAll(data, this.saveAllOptions);
-            await sleep(300); // Wait propagation (e.g. update cache, then received update from dataService.watchAll())
+            // Wait propagation (e.g. update cache, then received update from dataService.watchAll())
+            await sleep(500);
             // Workaround, to be sure all rows have been deleted
             // Sometime, the service miss deletion, or GraphQl cache remove failed.
-            // In this case, apply missing deletion using the super.delete() function
+            // In this case, apply missing deletion using the parent delete() function
             const rowNotDeleted = this.getRows().filter((row) => rows.includes(row));
             if (isNotEmptyArray(rowNotDeleted)) {
-                const superDelete = super.delete;
-                const self = this;
                 console.warn(`[entities-table-datasource] Force deletion of ${rowNotDeleted.length} rows! Please check that data service update the cache, after deletion`);
-                rowNotDeleted
-                    // Start at the end
-                    .sort((a, b) => (a.id > b.id ? -1 : 1))
-                    .forEach((r) => superDelete.call(self, r.id));
+                // Start at the end
+                for (const r of rowNotDeleted.sort((a, b) => (a.id > b.id ? -1 : 1))) {
+                    super.delete(r.id);
+                }
             }
         }
         catch (err) {
@@ -34068,13 +34060,13 @@ class EntitiesTableDataSource extends TableDataSource {
         return super.getRow(id);
     }
     getRows() {
-        return this.rowsSubject.getValue();
+        return this.rowsSubject.getValue() || [];
     }
     hasSomeEditingRow() {
-        return (this.rowsSubject.value || []).some((row) => row.editing);
+        return this.getRows().some((row) => row.editing);
     }
     hasSomeDirtyRow() {
-        return (this.rowsSubject.value || []).some((row) => row.dirty);
+        return this.getRows().some((row) => row.dirty);
     }
     async createNew(insertAt, opts = { editing: true }) {
         // Avoid multiple call (only one editing row is allowed)
@@ -34138,6 +34130,16 @@ class EntitiesTableDataSource extends TableDataSource {
             this.loadingSubject.next(false);
         }
     }
+    markAsSaving() {
+        if (this.savingSubject.value !== true) {
+            this.savingSubject.next(true);
+        }
+    }
+    markAsSaved() {
+        if (this.savingSubject.value !== false) {
+            this.savingSubject.next(false);
+        }
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: EntitiesTableDataSource, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: EntitiesTableDataSource, usesInheritance: true, ngImport: i0 });
 }
@@ -36623,11 +36625,11 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
     _entityName;
     _debug = false;
     _creating = false;
-    _saving = false;
     _fetchMoreFn = null;
     _waitingNetworkResult;
     _stopWatchSubject = new Subject();
     loadingSubject = new BehaviorSubject(undefined);
+    savingSubject = new BehaviorSubject(false);
     get watchAllOptions() {
         return this.config.watchAllOptions;
     }
@@ -36641,10 +36643,13 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
         this.config.saveAllOptions = value;
     }
     get loaded() {
-        return this.loadingSubject.value === false; // Should be false when undefined (initial state)
+        return this.loadingSubject.getValue() === false; // Should be false when undefined (initial state)
     }
     get loading() {
-        return this.loadingSubject.value !== false; // Should be true when undefined (initial state)
+        return this.loadingSubject.getValue() !== false; // Should be true when undefined (initial state)
+    }
+    get saving() {
+        return this.savingSubject.getValue();
     }
     /**
      * Creates a new TableDataSource instance, that can be used as datasource of `@angular/cdk` data-table.
@@ -36674,7 +36679,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
         this.markAsLoading();
         this._waitingNetworkResult = (this.watchAllOptions?.fetchPolicy || this.dataService?.defaultFetchPolicy) === 'cache-and-network';
         return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.watchAllOptions).pipe(catchError((err) => this.handleError(err, 'ERROR.LOAD_DATA_ERROR')), map((res) => {
-            if (this._saving) {
+            if (this.saving) {
                 console.info(`[entities-table-datasource] Received ${this._entityName} data (from service), but still saving: skip`);
             }
             else {
@@ -36710,12 +36715,11 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
             return false;
         }
         // Saving twice (should never occur)
-        if (this._saving) {
+        if (this.saving) {
             console.warn(`[entities-table-datasource] Trying to save ${this._entityName} rows twice. Skip`);
             return false;
         }
-        this._saving = true;
-        this.markAsLoading();
+        this.markAsSaving();
         const onlyDirtyRows = this.config.saveOnlyDirtyRows;
         try {
             if (this._debug)
@@ -36765,7 +36769,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
             if (this._debug)
                 console.debug(`[entities-table-datasource] Saving ${this._entityName} data [OK]`);
             // LP 23/03/2021: update datasource is necessary but can be changed to a refetch() on QueryRef (must be created and registered in GraphqlService.watchQuery)
-            this.updateDatasource(data, { emitEvent: false });
+            this.updateDatasource(data);
             return true;
         }
         catch (error) {
@@ -36774,8 +36778,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
             throw error;
         }
         finally {
-            this._saving = false;
-            this.markAsLoaded();
+            this.markAsSaved();
         }
     }
     updateDatasource(data, opts) {
@@ -36834,7 +36837,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
             console.warn('[entities-table-datasource] Row still has {editing: true} after confirmCreate()! Force editing to false');
             row.validator.disable({ onlySelf: true, emitEvent: false });
         }
-        return confirmed;
+        return true;
     }
     async confirmEdit(row) {
         const confirmed = await super.confirmEdit(row);
@@ -36850,7 +36853,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
         const editing = await super.startEdit(row);
         if (!editing)
             return false;
-        if (!row.editing && row.validator) {
+        if (row.validator?.disabled) {
             console.warn('[entities-table-datasource] Row still has {editing: false} after startEdit()! Force editing');
             row.validator.enable({ onlySelf: true, emitEvent: false });
         }
@@ -36925,7 +36928,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
         return super.getRow(id);
     }
     getRows() {
-        return this.rowsSubject.value || [];
+        return this.rowsSubject.getValue() || [];
     }
     getEditingRows() {
         return this.getRows().filter((row) => row.editing);
@@ -37002,6 +37005,16 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
             this.loadingSubject.next(false);
         }
     }
+    markAsSaving() {
+        if (this.savingSubject.value !== true) {
+            this.savingSubject.next(true);
+        }
+    }
+    markAsSaved() {
+        if (this.savingSubject.value !== false) {
+            this.savingSubject.next(false);
+        }
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: EntitiesAsyncTableDataSource, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "18.2.13", type: EntitiesAsyncTableDataSource, usesInheritance: true, ngImport: i0 });
 }