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

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

@@ -4175,7 +4175,7 @@ function disableControls(form, paths, opts) {
     });
 }
 function addValueInArray(arrayControl, createControl, equals, isEmpty, value, options) {
-    options = options || { emitEvent: true };
+    const disabled = arrayControl.disabled;
     let hasChanged = false;
     let index = -1;
     // Search if value already exists
@@ -4195,11 +4195,17 @@ function addValueInArray(arrayControl, createControl, equals, isEmpty, value, op
     }
     else {
         const control = createControl(value);
-        arrayControl.push(control);
+        // Apply parent disabled state, before to push it into the array
+        // This is need to avoid parent form to be enabled
+        if (disabled && control.enabled)
+            control.disable({ emitEvent: false });
+        else if (!disabled && control.disabled)
+            control.enable({ emitEvent: false });
+        arrayControl.push(control, options);
         hasChanged = true;
     }
     if (hasChanged) {
-        if (isNil(options.emitEvent) || options.emitEvent) {
+        if (!options || options.emitEvent !== false) {
             // Mark array control dirty
             if (!isEmpty(value)) {
                 arrayControl.markAsDirty();
@@ -4611,11 +4617,15 @@ class AppFormArray extends UntypedFormArray {
         this.createControl = createControl;
         this.equals = equals;
         this.isEmpty = isEmpty;
-        this.options = options;
-        this.setAllowEmptyArray(toBoolean(options && options.allowEmptyArray, false));
+        this.options = {
+            allowEmptyArray: true,
+            allowReuseControls: true,
+            ...options
+        };
+        this.setAllowEmptyArray(this.options.allowEmptyArray);
     }
     get allowEmptyArray() {
-        return this._allowEmptyArray;
+        return this.options.allowEmptyArray;
     }
     set allowEmptyArray(value) {
         this.setAllowEmptyArray(value);
@@ -4626,16 +4636,29 @@ class AppFormArray extends UntypedFormArray {
      * @param options
      */
     setValue(values, options) {
-        if (this.options?.resizeStrategy === 'recreate') {
-            initArrayControlsFromValues(this, this.createControl, values, options);
+        if (this.options.allowReuseControls === false) {
+            const disabled = this.disabled;
+            // Clean all
+            this.resize(0, { emitEvent: options?.emitEvent });
+            // Recreate each control, with a default value
+            (values || []).forEach(value => {
+                const control = this.createControl(value);
+                // Apply parent disabled state, before to push it into the array
+                // This is need to avoid parent form to be enabled, after calling AppFormArray.patchValue() (e.g. in table's row validator)
+                if (disabled && control.enabled)
+                    control.disable({ emitEvent: false });
+                else if (!disabled && control.disabled)
+                    control.enable({ emitEvent: false });
+                this.push(control, options);
+            });
         }
         else {
-            this.resize(values?.length || 0);
+            this.resize(values?.length || 0, { emitEvent: false });
             super.setValue(values, options);
         }
     }
     patchValue(values, options) {
-        if (this.options?.resizeStrategy === 'recreate') {
+        if (this.options.allowReuseControls === false) {
             const disabled = this.disabled;
             // Clean all
             this.resize(0, { emitEvent: options?.emitEvent });
@@ -4695,14 +4718,13 @@ class AppFormArray extends UntypedFormArray {
     /**
      * @param value
      * @param options
-     * @deprecated Use push() instead
      */
     add(value, options) {
         addValueInArray(this, this.createControl, this.equals, this.isEmpty, value, options);
     }
     removeAt(index, options) {
         // Do not remove if last criterion
-        if (!this._allowEmptyArray && this.length === 1) {
+        if (this.options.allowEmptyArray === false && this.length === 1) {
             this.clearAt(index, options);
         }
         else {
@@ -4736,11 +4758,11 @@ class AppFormArray extends UntypedFormArray {
     }
     /* -- internal -- */
     setAllowEmptyArray(value) {
-        if (this._allowEmptyArray === value)
+        if (this.options.allowEmptyArray === value)
             return; // Skip if same
-        this._allowEmptyArray = value;
+        this.options.allowEmptyArray = value;
         // Set required (or reste) min length validator
-        if (this._allowEmptyArray) {
+        if (this.options.allowEmptyArray) {
             this.setValidators(this.options.validators || null);
         }
         else {
@@ -8727,10 +8749,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 +8797,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 +24599,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 +24614,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 +24630,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 +24645,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 +24671,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 +24682,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 +24712,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 +24720,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'
         });
@@ -28778,7 +28809,7 @@ class AbstractUserEventService extends BaseGraphqlService {
     }
     async ngOnStart() {
         // Update component when refresh is need (=login events)
-        this._subscriptions.add(merge(this.accountService.onLogin, this.accountService.onLogout, of() // Starts with -  first attempt if account is ready
+        this._subscriptions.add(merge(this.accountService.onLogin, this.accountService.onLogout, timer(1000) // Starts with -  first attempt if account is ready
         )
             .pipe(
         // Wait account service ready (can be restarted)
@@ -29131,6 +29162,9 @@ class AbstractUserEventService extends BaseGraphqlService {
         this.startListenCountChanges();
     }
     onLogout() {
+        // Reset counter
+        this._countSubject.next(0);
+        // Stop listening
         this.stopListenCountChanges();
     }
     startListenCountChanges() {