@sumaris-net/ngx-components 18.9.0 → 18.9.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "18.9.0",
+  "version": "18.9.2",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/src/app/core/services/base-entity-service.class.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ApolloCache, InternalRefetchQueriesInclude, MutationUpdaterFn, MutationUpdaterFunction } from '@apollo/client/core';
+import { ApolloCache, InternalRefetchQueriesInclude, MutationUpdaterFn, MutationUpdaterFunction, WatchQueryFetchPolicy } from '@apollo/client/core';
 import { SortDirection } from '@angular/material/sort';
 import { BaseGraphqlService } from './base-graphql-service.class';
 import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, EntityServiceListenChangesOptions, IEntitiesService, IEntityService, LoadResult } from '../../shared/services/entity-service.class';
@@ -72,6 +72,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     protected readonly defaultSortBy: keyof T;
     protected readonly defaultSortDirection: SortDirection;
     protected readonly watchQueriesUpdatePolicy: MutableWatchQueriesUpdatePolicy;
+    get defaultFetchPolicy(): WatchQueryFetchPolicy;
     protected constructor(graphql: GraphqlService, platform: PlatformService, dataType: new () => T, filterType: new () => F, options: BaseEntityServiceOptions<T, ID, Q, M, S>);
     watch(id: number, opts?: WO): Observable<T>;
     load(id: ID, opts?: LO): Promise<T>;

package/src/app/core/table/entities-async-table-datasource.class.d.ts

@@ -5,6 +5,7 @@ import { OnDestroy } from '@angular/core';
 import { SortDirection } from '@angular/material/sort';
 import { CollectionViewer } from '@angular/cdk/collections';
 import { EntitiesServiceWatchOptions, FetchMoreFn, IEntitiesService, LoadResult } from '../../shared/services/entity-service.class';
+import { FirstOptions } from '../../shared/observables';
 import { IEntitiesTableDataSource } from './table.model';
 import * as i0 from "@angular/core";
 export interface EntitiesAsyncTableDataSourceConfig<T extends IEntity<T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions, SO = any> extends TableDataSourceConfig {
@@ -26,6 +27,7 @@ export declare class EntitiesAsyncTableDataSource<T extends IEntity<T, ID>, F =
     protected _creating: boolean;
     protected _saving: boolean;
     protected _fetchMoreFn: FetchMoreFn<LoadResult<T>>;
+    protected _waitingNetworkResult: boolean;
     protected _stopWatchSubject: Subject<void>;
     loadingSubject: BehaviorSubject<boolean>;
     get watchAllOptions(): WO;
@@ -39,9 +41,8 @@ export declare class EntitiesAsyncTableDataSource<T extends IEntity<T, ID>, F =
      *
      * @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: new () => T, dataService: IEntitiesService<T, F, WO>, validatorService?: V, options?: C);
     ngOnDestroy(): void;
@@ -52,8 +53,26 @@ export declare class EntitiesAsyncTableDataSource<T extends IEntity<T, ID>, F =
         emitEvent: boolean;
     }): void;
     connect(collectionViewer: CollectionViewer): Observable<R[] | ReadonlyArray<R>>;
+    /**
+     * 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?: CollectionViewer): void;
-    waitIdle(debounceTimeMs?: number): Promise<any>;
+    /**
+     * 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?: number | ({
+        debounceTimeMs?: number;
+    } & FirstOptions)): Promise<any>;
     confirmCreate(row: R): Promise<boolean>;
     confirmEdit(row: R): Promise<boolean>;
     startEdit(row: R): Promise<boolean>;

package/src/app/core/table/entities-table-datasource.class.d.ts

@@ -5,6 +5,7 @@ import { OnDestroy } from '@angular/core';
 import { SortDirection } from '@angular/material/sort';
 import { CollectionViewer } from '@angular/cdk/collections';
 import { EntitiesServiceWatchOptions, FetchMoreFn, IEntitiesService, LoadResult } from '../../shared/services/entity-service.class';
+import { FirstOptions } from '../../shared/observables';
 import { IEntitiesTableDataSource } from './table.model';
 import * as i0 from "@angular/core";
 export interface EntitiesTableDataSourceConfig<T extends IEntity<T, ID>, ID = number, WO extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions, SO = any> extends TableDataSourceConfig {
@@ -27,16 +28,9 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
     protected _creating: boolean;
     protected _saving: boolean;
     protected _fetchMoreFn: FetchMoreFn<LoadResult<T>>;
+    protected _waitingNetworkResult: boolean;
     protected _stopWatchSubject: Subject<void>;
     loadingSubject: BehaviorSubject<boolean>;
-    /**
-     * @deprecated Use watchAllOptions or saveAllOptions
-     */
-    get serviceOptions(): WO & SO;
-    /**
-     * @deprecated Use watchAllOptions or saveAllOptions
-     */
-    set serviceOptions(value: WO & SO);
     get watchAllOptions(): WO;
     set watchAllOptions(value: WO);
     get saveAllOptions(): SO;
@@ -48,14 +42,10 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
      *
      * @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: new () => T, dataService: IEntitiesService<T, F, WO>, validatorService?: V, options?: C);
-    /**
-     * @deprecated use disconnect
-     */
     ngOnDestroy(): void;
     /**
      * @deprecated use disconnect
@@ -68,8 +58,26 @@ export declare class EntitiesTableDataSource<T extends IEntity<T, ID>, F = any,
         emitEvent: boolean;
     }): void;
     connect(collectionViewer: CollectionViewer): Observable<R[] | ReadonlyArray<R>>;
+    /**
+     * 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?: CollectionViewer): void;
-    waitIdle(debounceTimeMs?: number): Promise<any>;
+    /**
+     * 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?: number | ({
+        debounceTimeMs?: number;
+    } & FirstOptions)): Promise<any>;
     confirmCreate(row: R): boolean;
     confirmEdit(row: R): boolean;
     startEdit(row: R): boolean;

package/src/app/shared/services/entity-service.class.d.ts

@@ -62,6 +62,7 @@ export declare interface EntitiesServiceWatchOptions<T = any> extends EntityServ
     withTotal?: boolean;
 }
 export declare interface IEntitiesService<T, F, O extends EntitiesServiceWatchOptions = EntitiesServiceWatchOptions<T>> {
+    readonly defaultFetchPolicy?: WatchQueryFetchPolicy;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>, options?: O): Observable<LoadResult<T>>;
     saveAll(data: T[], opts?: any): Promise<T[]>;
     deleteAll(data: T[], opts?: any): Promise<any>;

package/src/app/shared/services/memory-entity-service.class.d.ts

@@ -33,6 +33,7 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
     private readonly _onSaveFn;
     private readonly _equalsFn;
     private readonly _filterFnFactory;
+    get defaultFetchPolicy(): 'cache-only';
     set value(data: T[]);
     get value(): T[];
     get saving(): boolean;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "18.9.0",
+  "version": "18.9.2",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{