@sumaris-net/ngx-components 2.2.1-rc9 → 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 {
@@ -28787,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)
@@ -29140,6 +29162,9 @@ class AbstractUserEventService extends BaseGraphqlService {
         this.startListenCountChanges();
     }
     onLogout() {
+        // Reset counter
+        this._countSubject.next(0);
+        // Stop listening
         this.stopListenCountChanges();
     }
     startListenCountChanges() {