@sumaris-net/ngx-components 1.20.12 → 1.20.15

package/fesm2015/sumaris-net.ngx-components.js

@@ -2916,15 +2916,15 @@ const moment$2 = momentImported;
 class SharedValidators {
     static getDoubleRegexp(maxDecimals) {
         if (isNil(maxDecimals))
-            return this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS.NO_LIMIT;
+            return this._DOUBLE_REGEXP_CACHE.NO_LIMIT;
         if (maxDecimals < 0)
             throw new Error(`Invalid maxDecimals value: ${maxDecimals}`);
-        const regexp = this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals];
+        const regexp = this._DOUBLE_REGEXP_CACHE[maxDecimals];
         if (regexp)
             return regexp;
-        // New regexp: add it to cache
-        this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals] = new RegExp(`^[-]?[0-9]+([.,][0-9]{1,${maxDecimals}})?$`);
-        return this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals];
+        // New: add to cache
+        this._DOUBLE_REGEXP_CACHE[maxDecimals] = new RegExp(`^-?\\d+([.,]\\d{1,${maxDecimals}})?$`);
+        return this._DOUBLE_REGEXP_CACHE[maxDecimals];
     }
     static latitude(control) {
         const value = control.value;
@@ -3022,8 +3022,10 @@ class SharedValidators {
         const errorCode = msg ? 'msg' : 'dateRange';
         const error = msg ? { msg } : { dateRange: true };
         return (control) => {
-            var _a;
-            const startControl = (_a = control.parent) === null || _a === void 0 ? void 0 : _a.get(startDateFieldName);
+            // Form group not created yet: skip
+            if (!control.parent)
+                return null;
+            const startControl = control.parent.get(startDateFieldName);
             if (!startControl) {
                 console.warn(`Cannot find brother control '${startDateFieldName}' in the parent form`);
                 return null;
@@ -3043,8 +3045,10 @@ class SharedValidators {
         const errorCode = msg ? 'msg' : 'dateRange';
         const error = msg ? { msg } : { dateRange: true };
         return (control) => {
-            var _a;
-            const endDateControl = (_a = control.parent) === null || _a === void 0 ? void 0 : _a.get(endDateFieldName);
+            // Form group not created yet: skip
+            if (!control.parent)
+                return null;
+            const endDateControl = control.parent.get(endDateFieldName);
             if (!endDateControl) {
                 console.warn(`Cannot find control '${endDateFieldName}' in the parent form`);
                 return null;
@@ -3065,7 +3069,13 @@ class SharedValidators {
             // Skip if control already has some errors
             if (control.errors)
                 return null;
-            const errors = control.parent && control.parent.errors;
+            // Skip if parent form group not created yet
+            if (!control.parent)
+                return null;
+            // Form group not created yet
+            if (!control.parent)
+                return null;
+            const errors = control.parent.errors;
             // No errors, or copy all errors
             if (!errors || isEmptyArray(errorNames))
                 return errors;
@@ -3095,13 +3105,11 @@ class SharedValidators {
         }
     }
 }
-SharedValidators._REGEXP_CACHE = {
-    DOUBLE_BY_MAX_DECIMALS: {
-        NO_LIMIT: /^[-]?[0-9]+([.,][0-9]*)?$/,
-        1: /^[-]?[0-9]+([.,][0-9])?$/,
-        2: /^[-]?[0-9]+([.,][0-9]{1,2})?$/,
-        3: /^[-]?[0-9]+([.,][0-9]{1,2})?$/,
-    }
+SharedValidators._DOUBLE_REGEXP_CACHE = {
+    NO_LIMIT: /^-?\d+([.,]\d*)?$/,
+    1: /^-?\d+([.,]\d)?$/,
+    2: /^-?\d+([.,]\d{1,2})?$/,
+    3: /^-?\d+([.,]\d{1,3})?$/ // 3 decimals max
 };
 SharedValidators.I18N_ERROR_KEYS = {
     required: 'ERROR.FIELD_REQUIRED',
@@ -21095,11 +21103,11 @@ class MenuComponent {
                 .pipe(distinctUntilChanged())
                 .subscribe((value) => value ? this.open() : this.close());
             // Update component when refresh is need (=login events or config changed)
-            this._subscription.add(merge(this.accountService.onLogin, this.accountService.onLogout, this.configService.config
-                .pipe(tap(config => this._config = config)))
+            this._subscription.add(merge(merge(this.accountService.onLogin, this.accountService.onLogout)
                 .pipe(
             // Wait account service ready (can be restarted)
-            mergeMap(() => this.accountService.ready()), map(() => this.accountService.isLogin()), distinctUntilChanged())
+            mergeMap(() => this.accountService.ready()), map(() => this.accountService.isLogin()), distinctUntilChanged()), this.configService.config
+                .pipe(tap(config => this._config = config), mergeMap(() => this.accountService.ready()), map(() => this.accountService.isLogin())))
                 .subscribe(login => {
                 if (login) {
                     this.onLogin(this.accountService.account);
@@ -21112,7 +21120,7 @@ class MenuComponent {
     }
     onLogin(account) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.info('[menu] Update using logged account');
+            console.info('[menu] Update (login)');
             this.accountAvatar = account.avatar;
             this.accountName = account.displayName;
             this.accountEmail = account.email;
@@ -21126,8 +21134,12 @@ class MenuComponent {
     }
     onLogout(skipRedirect) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!skipRedirect)
-                console.debug('[menu] logout');
+            if (!skipRedirect) {
+                console.debug('[menu] Logout');
+            }
+            else {
+                console.debug('[menu] Update (logout)');
+            }
             this.isLogin = false;
             this.accountAvatar = null;
             this.accountEmail = null;