@sumaris-net/ngx-components 2.2.1-rc8 → 2.2.1-rc9

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

@@ -8727,10 +8727,10 @@ class MatChipsField {
         return this.formControl.value || [];
     }
     get disabled() {
-        return this.readonly || this.formControl.disabled;
+        return this.readonly || this.formControl?.disabled || false;
     }
     get enabled() {
-        return !this.readonly && this.formControl.enabled;
+        return !this.readonly && this.formControl?.enabled || false;
     }
     get loading() {
         return isNil(this.$filteredItems.value);
@@ -8775,7 +8775,7 @@ class MatChipsField {
         this.displayColumnNames = this.displayAttributes.map((attr, index) => this.displayColumnNames && this.displayColumnNames[index] ||
             (this.i18nPrefix + changeCaseToUnderscore(attr).toUpperCase()));
         this.mobile = toBoolean(this.mobile, false);
-        this.equals = this.equals || ((o1, o2) => o1 && o2 && o1.id === o2.id);
+        this.equals = this.equals || MatAutocompleteFieldUtils.defaultEquals;
         const classList = this.classList?.split(' ');
         this.panelWidth = this.panelWidth || (classList && ((classList.includes('min-width-medium') && '300px')
             || (classList.includes('min-width-large') && '400px')
@@ -24577,10 +24577,11 @@ class BaseEntityService extends BaseGraphqlService {
     watch(id, opts) {
         if (this._debug)
             console.debug(this._logPrefix + `Watching ${this._logTypeName} {${id}}...`);
+        const variables = opts?.variables || { id };
         const query = opts && opts.query || this.queries.load;
         return this.graphql.watchQuery({
             query,
-            variables: { id },
+            variables,
             fetchPolicy: opts && opts.fetchPolicy || undefined,
             error: { code: ErrorCodes.LOAD_DATA_ERROR, message: 'REFERENTIAL.ERROR.LOAD_DATA_ERROR' }
         })
@@ -24591,10 +24592,11 @@ class BaseEntityService extends BaseGraphqlService {
     async load(id, opts) {
         if (this._debug)
             console.debug(this._logPrefix + `Loading ${this._logTypeName} {${id}}...`);
-        const query = opts && opts.query || this.queries.load;
+        const variables = opts?.variables || { id };
+        const query = opts?.query || this.queries.load;
         const { data } = await this.graphql.query({
             query,
-            variables: { id },
+            variables,
             fetchPolicy: opts && opts.fetchPolicy || undefined,
             error: { code: ErrorCodes.LOAD_DATA_ERROR, message: 'REFERENTIAL.ERROR.LOAD_DATA_ERROR' }
         });
@@ -24606,6 +24608,7 @@ class BaseEntityService extends BaseGraphqlService {
     watchAll(offset, size, sortBy, sortDirection, filter, opts) {
         filter = this.asFilter(filter);
         const variables = {
+            ...(opts?.variables || {}),
             offset: offset || 0,
             size: size || 100,
             sortBy: sortBy || this.defaultSortBy,
@@ -24620,12 +24623,13 @@ class BaseEntityService extends BaseGraphqlService {
             // Or get loadAll or loadAllWithTotal query
             || (withTotal ? this.queries.loadAllWithTotal : this.queries.loadAll);
         return this.mutableWatchQuery({
-            queryName: withTotal ? 'LoadAllWithTotal' : 'LoadAll',
             query,
+            variables,
+            // Force cached mutable query
+            queryName: withTotal ? 'LoadAllWithTotal' : 'LoadAll',
             arrayFieldName: 'data',
             totalFieldName: withTotal ? 'total' : undefined,
             insertFilterFn: filter && filter.asFilterFn(),
-            variables,
             error: { code: ErrorCodes.LOAD_DATA_ERROR, message: 'REFERENTIAL.ERROR.LOAD_DATA_ERROR' },
             fetchPolicy: opts && opts.fetchPolicy || undefined
         })
@@ -24645,6 +24649,7 @@ class BaseEntityService extends BaseGraphqlService {
         const debug = this._debug && (!opts || opts.debug !== false);
         filter = this.asFilter(filter);
         const variables = {
+            ...(opts?.variables || {}),
             offset: offset || 0,
             size: size || 100,
             sortBy: sortBy || 'id',
@@ -24655,7 +24660,8 @@ class BaseEntityService extends BaseGraphqlService {
         if (debug)
             console.debug(this._logPrefix + `Loading ${this._logTypeName}...`, variables);
         const withTotal = (!opts || opts.withTotal !== false) && this.queries.loadAllWithTotal && true;
-        const query = (opts && opts.query) // use given query
+        // use given query
+        const query = opts?.query
             // Or get loadAll or loadAllWithTotal query
             || (withTotal ? this.queries.loadAllWithTotal : this.queries.loadAll);
         const { data, total } = await this.graphql.query({
@@ -24684,7 +24690,7 @@ class BaseEntityService extends BaseGraphqlService {
     }
     async countAll(filter, opts) {
         // If no countAll query
-        if (!this.queries.countAll) {
+        if (!this.queries.countAll && !opts?.query) {
             // Fail if no loadAll (cannot count)
             if (!this.queries.loadAllWithTotal)
                 throw new Error('Not implemented');
@@ -24692,11 +24698,14 @@ class BaseEntityService extends BaseGraphqlService {
             return (await this.loadAll(0, 1, null, null, filter, { withTotal: true }))?.total || 0;
         }
         filter = this.asFilter(filter);
+        const variables = {
+            ...(opts?.variables || {}),
+            filter: filter && filter.asPodObject()
+        };
+        const query = opts?.query || this.queries.countAll;
         const res = await this.graphql.query({
-            query: this.queries.countAll,
-            variables: {
-                filter: filter && filter.asPodObject()
-            },
+            query,
+            variables,
             error: { code: ErrorCodes.LOAD_DATA_ERROR, message: 'ERROR.COUNT_DATA_ERROR' },
             fetchPolicy: opts && opts.fetchPolicy || 'network-only'
         });