@sumaris-net/ngx-components 18.20.1 → 18.21.0

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

@@ -20582,6 +20582,8 @@ class GraphqlService extends StartableService {
         }
         const res = await firstValueFrom(this.apollo
             .mutate({
+            refetchQueries: opts?.refetchQueries,
+            awaitRefetchQueries: opts?.awaitRefetchQueries,
             mutation: opts.mutation,
             variables: opts.variables,
             context: opts.context,
@@ -21276,8 +21278,8 @@ class BaseGraphqlService extends StartableService {
     }
     insertIntoMutableCachedQueries(cache, opts) {
         const queries = this.findMutableWatchQueries(opts);
-        if (!queries.length)
-            return;
+        if (isEmptyArray(queries))
+            return; // No query found
         queries.forEach((query) => {
             if (Array.isArray(opts.data)) {
                 // Filter values, if a filter function exists
@@ -21365,26 +21367,20 @@ class BaseGraphqlService extends StartableService {
         return [queryName, opts.arrayFieldName, variablesKey].join('|');
     }
     findMutableWatchQueries(opts) {
-        // Search by queryName
-        if (opts.queryName) {
-            return this._mutableWatchQueries.filter((q) => q.id.startsWith(opts.queryName + '|'));
-        }
-        if (opts.queryNames) {
-            return (opts.queryNames
+        // Search by query names
+        const queryNames = opts.queryName ? [opts.queryName] : opts.queryNames;
+        if (queryNames) {
+            return queryNames
                 .map((queryName) => this._mutableWatchQueries.filter((q) => q.id.startsWith(queryName + '|')))
-                // flatMap
-                .reduce((res, array) => res.concat(...array), []));
+                .flat();
         }
-        // Search by query
-        if (opts.query) {
-            return this._mutableWatchQueries.filter((q) => q.query === opts.query);
-        }
-        if (opts.queries) {
-            return (opts.queries
+        // Search by query objects
+        const queries = opts.query ? [opts.query] : opts.queries;
+        if (queries) {
+            return queries
                 .filter(isNotNil)
                 .map((query) => this._mutableWatchQueries.filter((q) => q.query === query))
-                // flatMap
-                .reduce((res, array) => res.concat(...array), []));
+                .flat();
         }
         throw Error('Invalid options: only one property must be set');
     }
@@ -25436,6 +25432,7 @@ class BaseEntityService extends BaseGraphqlService {
     defaultSortBy;
     defaultSortDirection;
     watchQueriesUpdatePolicy;
+    watchQueriesDeletePolicy;
     get defaultFetchPolicy() {
         return this.graphql.defaultFetchPolicy;
     }
@@ -25453,6 +25450,7 @@ class BaseEntityService extends BaseGraphqlService {
         this.defaultSortBy = options.defaultSortBy || 'id';
         this.defaultSortDirection = options.defaultSortDirection || 'asc';
         this.watchQueriesUpdatePolicy = options.watchQueriesUpdatePolicy || 'update-cache';
+        this.watchQueriesDeletePolicy = options.watchQueriesDeletePolicy || 'refetch-queries';
         const obj = new dataType();
         this._typename = obj.__typename || 'UnknownVO';
         this._logTypeName = removeEnd(this._typename, 'VO');
@@ -25634,6 +25632,7 @@ class BaseEntityService extends BaseGraphqlService {
                         });
                     }
                 }
+                // Call update function, if any
                 if (opts?.update) {
                     opts.update(cache, { data }, { context, variables });
                 }
@@ -25683,6 +25682,7 @@ class BaseEntityService extends BaseGraphqlService {
                         data: savedEntity,
                     });
                 }
+                // Call update function, if any
                 if (opts?.update) {
                     opts.update(cache, { data }, { context, variables });
                 }
@@ -25713,13 +25713,13 @@ class BaseEntityService extends BaseGraphqlService {
             console.debug(this._logPrefix + `Deleting ${this._logTypeName}...`, ids);
         await this.graphql.mutate({
             mutation: this.mutations.deleteAll,
-            refetchQueries: this.getRefetchQueriesForMutation(opts),
+            refetchQueries: this.getRefetchQueriesForMutation({ policy: this.watchQueriesDeletePolicy, ...opts }),
             awaitRefetchQueries: opts && opts.awaitRefetchQueries,
             variables: { ids },
             error: { code: ErrorCodes.DELETE_DATA_ERROR, message: 'ERROR.DELETE_DATA_ERROR' },
             update: (cache, res) => {
                 // Remove from cache
-                if (this.watchQueriesUpdatePolicy === 'update-cache') {
+                if (this.watchQueriesDeletePolicy === 'update-cache') {
                     this.removeFromMutableCachedQueriesByIds(cache, {
                         queries: this.getLoadQueries(),
                         ids,
@@ -25752,13 +25752,13 @@ class BaseEntityService extends BaseGraphqlService {
             console.debug(this._logPrefix + `Deleting ${this._logTypeName} {${id}}...`);
         await this.graphql.mutate({
             mutation: this.mutations.delete,
-            refetchQueries: this.getRefetchQueriesForMutation(opts),
+            refetchQueries: this.getRefetchQueriesForMutation({ policy: this.watchQueriesDeletePolicy, ...opts }),
             awaitRefetchQueries: opts && opts.awaitRefetchQueries,
             variables: { id },
             error: { code: ErrorCodes.DELETE_DATA_ERROR, message: 'ERROR.DELETE_DATA_ERROR' },
             update: (proxy, res) => {
                 // Remove from cache
-                if (this.watchQueriesUpdatePolicy === 'update-cache') {
+                if (this.watchQueriesDeletePolicy === 'update-cache') {
                     this.removeFromMutableCachedQueriesByIds(proxy, {
                         queries: this.getLoadQueries(),
                         ids: [id],
@@ -25867,13 +25867,14 @@ class BaseEntityService extends BaseGraphqlService {
         return source.asObject(opts);
     }
     getRefetchQueriesForMutation(opts) {
-        if (opts && opts.refetchQueries)
+        if (opts?.refetchQueries)
             return opts.refetchQueries;
         // Skip if update policy not used refecth queries
-        if (this.watchQueriesUpdatePolicy !== 'refetch-queries')
+        const watchQueriesPolicy = opts?.policy ?? this.watchQueriesUpdatePolicy;
+        if (watchQueriesPolicy !== 'refetch-queries')
             return undefined;
         const queries = this.getLoadQueries();
-        if (!queries.length)
+        if (isEmptyArray(queries))
             return undefined; // Skip if empty
         // Find the refetch queries definition
         return this.findRefetchQueries({ queries });