@sumaris-net/ngx-components 18.9.0 → 18.9.2

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

@@ -24427,6 +24427,9 @@ class BaseEntityService extends BaseGraphqlService {
     defaultSortBy;
     defaultSortDirection;
     watchQueriesUpdatePolicy;
+    get defaultFetchPolicy() {
+        return this.graphql.defaultFetchPolicy;
+    }
     constructor(graphql, platform, dataType, filterType, options) {
         super(graphql, environment);
         this.graphql = graphql;
@@ -26966,6 +26969,9 @@ class InMemoryEntitiesService extends StartableObservableService {
     _onSaveFn;
     _equalsFn;
     _filterFnFactory;
+    get defaultFetchPolicy() {
+        return 'cache-only';
+    }
     set value(data) {
         this.setValue(data);
     }
@@ -33245,21 +33251,9 @@ class EntitiesTableDataSource extends TableDataSource {
     _creating = false;
     _saving = false;
     _fetchMoreFn = null;
+    _waitingNetworkResult;
     _stopWatchSubject = new Subject();
     loadingSubject = new BehaviorSubject(undefined);
-    /**
-     * @deprecated Use watchAllOptions or saveAllOptions
-     */
-    get serviceOptions() {
-        return this.config.dataServiceOptions || { ...this.watchAllOptions, ...this.saveAllOptions };
-    }
-    /**
-     * @deprecated Use watchAllOptions or saveAllOptions
-     */
-    set serviceOptions(value) {
-        console.warn("dataSource.serviceOptions is deprecated! Please use 'watchAllOptions' or 'saveAllOptions' instead");
-        this.config.dataServiceOptions = value;
-    }
     get watchAllOptions() {
         return this.config.watchAllOptions;
     }
@@ -33283,9 +33277,8 @@ class EntitiesTableDataSource extends TableDataSource {
      *
      * @param dataService A service to load and save data
      * @param dataType Type of data contained by the Table. If not specified, then `data` with at least one element must be specified.
-     * @param environment
      * @param validatorService Service that create instances of the FormGroup used to validate row fields.
-     * @param config Additional configuration for table.
+     * @param options Additional options
      */
     constructor(dataType, dataService, validatorService, options) {
         super([], dataType, validatorService, {
@@ -33299,31 +33292,21 @@ class EntitiesTableDataSource extends TableDataSource {
         this._entityName = removeEnd(new dataType().__typename || 'UnknownVO', 'VO');
         this._debug = options?.suppressErrors === false && !environment.production;
     }
-    /**
-     * @deprecated use disconnect
-     */
     ngOnDestroy() {
-        this.close();
+        this.disconnect();
     }
     /**
      * @deprecated use disconnect
      */
     close() {
-        if (!this._stopWatchSubject.closed) {
-            if (this._debug)
-                console.debug('[entities-table-datasource] Closing...');
-            this._stopWatchSubject.next();
-            this._stopWatchSubject.complete();
-            this._stopWatchSubject.unsubscribe();
-            this.loadingSubject.complete();
-            this.loadingSubject.unsubscribe();
-        }
+        this.disconnect();
     }
     watchAll(offset, size, sortBy, sortDirection, filter) {
         this._stopWatchSubject.next();
         this._fetchMoreFn = null;
         this.markAsLoading();
-        return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions).pipe(catchError((err) => this.handleError(err, 'ERROR.LOAD_DATA_ERROR')), map((res) => {
+        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) {
                 console.info(`[entities-table-datasource] Received ${this._entityName} data (from service), but still saving: skip`);
             }
@@ -33334,6 +33317,8 @@ class EntitiesTableDataSource extends TableDataSource {
                 this.updateDatasource((res.data || []));
                 this._fetchMoreFn = res.fetchMore;
             }
+            // Reset _waitingNetworkResult to false
+            this._waitingNetworkResult = false;
             return res;
         }), 
         // Stop this pipe next time we call watchAll()
@@ -33409,7 +33394,7 @@ class EntitiesTableDataSource extends TableDataSource {
             }
             if (this._debug)
                 console.debug(`[entities-table-datasource] Asking service to save this ${this._entityName} data:`, dataToSave);
-            await this.dataService.saveAll(dataToSave, this.serviceOptions);
+            await this.dataService.saveAll(dataToSave, this.saveAllOptions);
             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)
@@ -33439,15 +33424,40 @@ class EntitiesTableDataSource extends TableDataSource {
         //console.debug("[entities-datasource] connect");
         return super.connect(collectionViewer);
     }
+    /**
+     * Disconnects the data source, cleaning up any resources and subscriptions.
+     *
+     * @param {CollectionViewer} [collectionViewer] - Optional parameter representing the collection viewer to disconnect from.
+     * @return {void} - This method does not return a value.
+     */
     disconnect(collectionViewer) {
         if (this._debug)
             console.debug('[entities-table-datasource] Disconnecting...');
         super.disconnect(collectionViewer);
-        this.close();
+        if (!this._stopWatchSubject.closed) {
+            this._stopWatchSubject.next();
+            this._stopWatchSubject.complete();
+            this._stopWatchSubject.unsubscribe();
+            this.loadingSubject.complete();
+            this.loadingSubject.unsubscribe();
+        }
     }
-    waitIdle(debounceTimeMs) {
-        return firstFalsePromise(this.loadingSubject.asObservable().pipe(debounceTime(debounceTimeMs || 100) // if not started yet, wait
-        ));
+    /**
+     * Waits for the idle state based on the provided options.
+     *
+     * @param {number | { debounceTimeMs?: number } & FirstOptions} [opts] Options for controlling the wait behavior.
+     *   - If a number is provided, it is treated as the debounce time in milliseconds.
+     *   - If an object is provided, it can include the following properties:
+     *     - debounceTimeMs: The debounce time in milliseconds. Defaults to 100 if not specified.
+     *     - Additional options from `FirstOptions` interface.
+     * @return {Promise<any>} A Promise that resolves when the idle state is reached.
+     */
+    waitIdle(opts) {
+        const debounceTimeMs = typeof opts === 'number' ? opts : opts?.debounceTimeMs || 100; /* in case was not started */
+        opts = typeof opts === 'number' ? undefined : opts;
+        return firstFalsePromise(this.loadingSubject.asObservable().pipe(
+        // Skip loaded event, if waiting a result from network (e.g. when fetch policy is 'cache-and-network')
+        filter((loading) => loading || !this._waitingNetworkResult), debounceTime(debounceTimeMs)), opts);
     }
     confirmCreate(row) {
         const confirmed = super.confirmCreate(row);
@@ -33505,7 +33515,7 @@ class EntitiesTableDataSource extends TableDataSource {
         const superDelete = super.delete;
         const self = this;
         this.dataService
-            .deleteAll([row.currentData], this.serviceOptions)
+            .deleteAll([row.currentData], this.saveAllOptions)
             .catch((err) => this.handleServiceError(err))
             .then(() => {
             setTimeout(() => {
@@ -33522,7 +33532,7 @@ class EntitiesTableDataSource extends TableDataSource {
         const data = this.getDataFromRows(rows);
         try {
             // Call service deletion
-            await this.dataService.deleteAll(data, this.serviceOptions);
+            await this.dataService.deleteAll(data, this.saveAllOptions);
             await sleep(300); // Wait propagation (e.g. update cache, then received update from dataService.watchAll())
             // Workaround, to be sure all rows have been deleted
             // Sometime, the service miss deletion, or GraphQl cache remove failed.
@@ -36099,6 +36109,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
     _creating = false;
     _saving = false;
     _fetchMoreFn = null;
+    _waitingNetworkResult;
     _stopWatchSubject = new Subject();
     loadingSubject = new BehaviorSubject(undefined);
     get watchAllOptions() {
@@ -36124,9 +36135,8 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
      *
      * @param dataService A service to load and save data
      * @param dataType Type of data contained by the Table. If not specified, then `data` with at least one element must be specified.
-     * @param environment
      * @param validatorService Service that create instances of the FormGroup used to validate row fields.
-     * @param config Additional configuration for table.
+     * @param options Additional options
      */
     constructor(dataType, dataService, validatorService, options) {
         super([], dataType, validatorService, {
@@ -36146,6 +36156,7 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
         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) {
                 console.info(`[entities-table-datasource] Received ${this._entityName} data (from service), but still saving: skip`);
@@ -36157,6 +36168,8 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
                 this.updateDatasource((res.data || []));
                 this._fetchMoreFn = res.fetchMore;
             }
+            // Reset _waitingNetworkResult to false
+            this._waitingNetworkResult = false;
             return res;
         }), 
         // Stop this pipe next time we call watchAll()
@@ -36262,13 +36275,17 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
         //console.debug("[entities-datasource] connect");
         return super.connect(collectionViewer);
     }
+    /**
+     * Disconnects the data source, cleaning up any resources and subscriptions.
+     *
+     * @param {CollectionViewer} [collectionViewer] - Optional parameter representing the collection viewer to disconnect from.
+     * @return {void} - This method does not return a value.
+     */
     disconnect(collectionViewer) {
         if (this._debug)
             console.debug('[entities-table-datasource] Disconnecting...');
         super.disconnect(collectionViewer);
         if (!this._stopWatchSubject.closed) {
-            if (this._debug)
-                console.debug('[entities-table-datasource] Closing...');
             this._stopWatchSubject.next();
             this._stopWatchSubject.complete();
             this._stopWatchSubject.unsubscribe();
@@ -36276,9 +36293,22 @@ class EntitiesAsyncTableDataSource extends AsyncTableDataSource {
             this.loadingSubject.unsubscribe();
         }
     }
-    waitIdle(debounceTimeMs) {
-        return firstFalsePromise(this.loadingSubject.asObservable().pipe(debounceTime(debounceTimeMs || 100) // if not started yet, wait
-        ));
+    /**
+     * Waits for the idle state based on the provided options.
+     *
+     * @param {number | { debounceTimeMs?: number } & FirstOptions} [opts] Options for controlling the wait behavior.
+     *   - If a number is provided, it is treated as the debounce time in milliseconds.
+     *   - If an object is provided, it can include the following properties:
+     *     - debounceTimeMs: The debounce time in milliseconds. Defaults to 100 if not specified.
+     *     - Additional options from `FirstOptions` interface.
+     * @return {Promise<any>} A Promise that resolves when the idle state is reached.
+     */
+    waitIdle(opts) {
+        const debounceTimeMs = typeof opts === 'number' ? opts : opts?.debounceTimeMs || 100; /* in case was not started */
+        opts = typeof opts === 'number' ? undefined : opts;
+        return firstFalsePromise(this.loadingSubject.asObservable().pipe(
+        // Skip loaded event, if waiting a result from network (e.g. when fetch policy is 'cache-and-network')
+        filter((loading) => loading || !this._waitingNetworkResult), debounceTime(debounceTimeMs)), opts);
     }
     async confirmCreate(row) {
         const confirmed = await super.confirmCreate(row);