@sumaris-net/ngx-components 1.19.16 → 1.19.19

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

@@ -1089,6 +1089,7 @@ const isMobile = (win) => {
     if (_cache.mobile === null || _cache.mobile === undefined) {
         _cache.mobile = isCordova(window)
             || isAndroid(win) || isIOS(window)
+            // Workaround, for MS Windows touch screen (detected as mobile, but forced as desktop)
             || (isTouchUi(win) && !isWindows(win));
     }
     return _cache.mobile;
@@ -2995,7 +2996,7 @@ class SharedValidators {
                 return null;
             }
             if (isNotNil(value) && value !== '' && !regexp.test(value)) {
-                return isNotNil(opts === null || opts === void 0 ? void 0 : opts.maxDecimals) ? { maxDecimals: { max: opts.maxDecimals } } : { decimal: true };
+                return isNotNil(opts === null || opts === void 0 ? void 0 : opts.maxDecimals) ? { maxDecimals: { maxDecimals: opts.maxDecimals } } : { decimal: true };
             }
             return null;
         };
@@ -12217,6 +12218,33 @@ class EntitiesStorage extends StartableService {
     get dirty() {
         return this._dirty || Object.values(this._data).some(store => store.dirty);
     }
+    ngOnStart() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = Date.now();
+            console.info(`[entities-storage] Starting entity storage...`);
+            // Restore stores
+            yield this.restoreLocally();
+            // Start a save timer
+            this.registerSubscription(merge(this._$save, timer(this._saveTimerPeriod, this._saveTimerPeriod))
+                .pipe(
+            // Avoid to many call (e.g. when $save AND timer are triggered
+            throttleTime(this._saveTimerPeriod))
+                .subscribe(() => this.storeLocally({ skipIfPristine: true })));
+            // Save, when platform is in pause
+            this.registerSubscription(this.platform.pause.subscribe(() => __awaiter(this, void 0, void 0, function* () {
+                console.warn(`[entities-storage] Platform will pause: saving...`);
+                yield this.storeLocally({ skipIfPristine: true });
+                console.warn(`[entities-storage] Platform will pause: saving [OK]`);
+            })));
+            console.info(`[entities-storage] Starting [OK] in ${Date.now() - now}ms`);
+            return this._data;
+        });
+    }
+    ngOnStop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.storeLocally({ skipIfPristine: true });
+        });
+    }
     watchAll(entityName, variables, opts) {
         // Make sure store is ready
         if (!this.started) {
@@ -12483,34 +12511,8 @@ class EntitiesStorage extends StartableService {
         });
     }
     persist(opts = { skipIfPristine: true }) {
-        // Skip if pristine
-        if (opts.skipIfPristine && !this._dirty)
-            return Promise.resolve();
         return this.storeLocally(opts);
     }
-    ngOnStart() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = Date.now();
-            console.info(`[entities-storage] Starting entity storage...`);
-            // Restore sequences
-            yield this.restoreLocally();
-            // Start a save timer
-            this.registerSubscription(merge(this._$save, timer(this._saveTimerPeriod, this._saveTimerPeriod))
-                .pipe(
-            // Avoid to many call (e.g. when $save AND timer are triggered
-            throttleTime(this._saveTimerPeriod))
-                .subscribe(() => this.storeLocally()));
-            console.info(`[entities-storage] Starting [OK] in ${Date.now() - now}ms`);
-            return this._data;
-        });
-    }
-    ngOnStop() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.dirty) {
-                yield this.storeLocally();
-            }
-        });
-    }
     /* -- protected methods -- */
     getEntityStore(name, opts) {
         let store = this._data[name];
@@ -16000,7 +16002,7 @@ class PlatformService extends StartableService {
         switch (platformName) {
             case 'mobile':
             case 'mobileweb':
-                // Exclude Windows touch screens - see SUMARIS issue #323
+                // Exclude Windows touch screens - see sumaris-app issues #323 and #346
                 return this.platform.is(platformName) && !isWindows(window);
             default:
                 return this.platform.is(platformName);
@@ -16054,6 +16056,7 @@ class PlatformService extends StartableService {
                 this._cordova = this.is('cordova');
                 this._android = this.is('android');
                 this._ios = this.is('ios');
+                this.configureHtmlClassList(this._mobile);
                 this.configureCordovaPlugins();
                 // Force some settings
                 this.settings.mobile = this._mobile;
@@ -16088,7 +16091,7 @@ class PlatformService extends StartableService {
                     this.accountService.tokenType = tokenType;
                 });
                 // Hide the splashscreen (if mobile) - after 1s - and play start sound
-                if (this.mobile) {
+                if (this._mobile) {
                     setTimeout(() => {
                         var _a;
                         (_a = this.splashScreen) === null || _a === void 0 ? void 0 : _a.hide();
@@ -16190,6 +16193,17 @@ class PlatformService extends StartableService {
         //}
     }
     /* -- protected methods -- */
+    configureHtmlClassList(mobile, win = window) {
+        if (mobile)
+            return; // Nothing to do
+        // Workaround, for MS Windows touch screen (detected as mobile, but forced as desktop)
+        if (!mobile && (win.document.documentElement.classList.contains('plt-mobile')
+            || win.document.documentElement.classList.contains('plt-mobileweb'))) {
+            console.warn('[platform] Force class list to: <html class="plt-desktop">. Workaround for Windows touch screen.');
+            win.document.documentElement.classList.remove('plt-mobile', 'plt-mobileweb');
+            win.document.documentElement.classList.add('plt-desktop');
+        }
+    }
     configureCordovaPlugins() {
         console.info('[platform] Configuring Cordova plugins...');
         if (this.statusBar) {
@@ -19236,9 +19250,21 @@ class AccountPage extends AppForm {
         this.form.controls.pubkey.disable();
         // Always disable some additional fields
         this.additionalFields
-            .filter(field => field.extra && field.extra.account && field.extra.account.disabled || false)
             .forEach(field => {
-            this.form.controls[field.key].disable();
+            var _a, _b;
+            const control = this.form.controls[field.key];
+            if (!control)
+                return; // Skip
+            const disabled = ((_a = field.extra) === null || _a === void 0 ? void 0 : _a.account) && field.extra.account.disabled || false;
+            if (disabled && control.enabled) {
+                control.disable();
+            }
+            const required = ((_b = field.extra) === null || _b === void 0 ? void 0 : _b.account) && field.extra.account.required || false;
+            if (!field.required && required) {
+                control.setValidators(control.validator
+                    ? Validators.compose([control.validator, Validators.required])
+                    : Validators.required);
+            }
         });
         this.markForCheck();
     }