@sumaris-net/ngx-components 1.20.11 → 1.20.14

package/bundles/sumaris-net.ngx-components.umd.js

@@ -3371,15 +3371,15 @@
         }
         SharedValidators.getDoubleRegexp = function (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);
-            var regexp = this._REGEXP_CACHE.DOUBLE_BY_MAX_DECIMALS[maxDecimals];
+            var 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];
         };
         SharedValidators.latitude = function (control) {
             var value = control.value;
@@ -3551,13 +3551,11 @@
         };
         return 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',
@@ -24302,11 +24300,11 @@
                                 .pipe(operators.distinctUntilChanged())
                                 .subscribe(function (value) { return value ? _this.open() : _this.close(); });
                             // Update component when refresh is need (=login events or config changed)
-                            this._subscription.add(rxjs.merge(this.accountService.onLogin, this.accountService.onLogout, this.configService.config
-                                .pipe(operators.tap(function (config) { return _this._config = config; })))
+                            this._subscription.add(rxjs.merge(rxjs.merge(this.accountService.onLogin, this.accountService.onLogout)
                                 .pipe(
                             // Wait account service ready (can be restarted)
-                            operators.mergeMap(function () { return _this.accountService.ready(); }), operators.map(function () { return _this.accountService.isLogin(); }), operators.distinctUntilChanged())
+                            operators.mergeMap(function () { return _this.accountService.ready(); }), operators.map(function () { return _this.accountService.isLogin(); }), operators.distinctUntilChanged()), this.configService.config
+                                .pipe(operators.tap(function (config) { return _this._config = config; }), operators.mergeMap(function () { return _this.accountService.ready(); }), operators.map(function () { return _this.accountService.isLogin(); })))
                                 .subscribe(function (login) {
                                 if (login) {
                                     _this.onLogin(_this.accountService.account);
@@ -24326,7 +24324,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            console.info('[menu] Update using logged account');
+                            console.info('[menu] Update (login)');
                             this.accountAvatar = account.avatar;
                             this.accountName = account.displayName;
                             this.accountEmail = account.email;
@@ -24348,8 +24346,12 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            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;