@sumaris-net/ngx-components 1.19.17 → 1.19.18

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

@@ -1366,6 +1366,7 @@
         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;
@@ -13869,6 +13870,58 @@
             enumerable: false,
             configurable: true
         });
+        EntitiesStorage.prototype.ngOnStart = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var now;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            now = Date.now();
+                            console.info("[entities-storage] Starting entity storage...");
+                            // Restore stores
+                            return [4 /*yield*/, this.restoreLocally()];
+                        case 1:
+                            // Restore stores
+                            _a.sent();
+                            // Start a save timer
+                            this.registerSubscription(rxjs.merge(this._$save, rxjs.timer(this._saveTimerPeriod, this._saveTimerPeriod))
+                                .pipe(
+                            // Avoid to many call (e.g. when $save AND timer are triggered
+                            operators.throttleTime(this._saveTimerPeriod))
+                                .subscribe(function () { return _this.storeLocally({ skipIfPristine: true }); }));
+                            // Save, when platform is in pause
+                            this.registerSubscription(this.platform.pause.subscribe(function () { return __awaiter(_this, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            console.warn("[entities-storage] Platform will pause: saving...");
+                                            return [4 /*yield*/, this.storeLocally({ skipIfPristine: true })];
+                                        case 1:
+                                            _a.sent();
+                                            console.warn("[entities-storage] Platform will pause: saving [OK]");
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            }); }));
+                            console.info("[entities-storage] Starting [OK] in " + (Date.now() - now) + "ms");
+                            return [2 /*return*/, this._data];
+                    }
+                });
+            });
+        };
+        EntitiesStorage.prototype.ngOnStop = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.storeLocally({ skipIfPristine: true })];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         EntitiesStorage.prototype.watchAll = function (entityName, variables, opts) {
             var _this = this;
             // Make sure store is ready
@@ -14279,52 +14332,8 @@
         };
         EntitiesStorage.prototype.persist = function (opts) {
             if (opts === void 0) { opts = { skipIfPristine: true }; }
-            // Skip if pristine
-            if (opts.skipIfPristine && !this._dirty)
-                return Promise.resolve();
             return this.storeLocally(opts);
         };
-        EntitiesStorage.prototype.ngOnStart = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                var now;
-                var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            now = Date.now();
-                            console.info("[entities-storage] Starting entity storage...");
-                            // Restore sequences
-                            return [4 /*yield*/, this.restoreLocally()];
-                        case 1:
-                            // Restore sequences
-                            _a.sent();
-                            // Start a save timer
-                            this.registerSubscription(rxjs.merge(this._$save, rxjs.timer(this._saveTimerPeriod, this._saveTimerPeriod))
-                                .pipe(
-                            // Avoid to many call (e.g. when $save AND timer are triggered
-                            operators.throttleTime(this._saveTimerPeriod))
-                                .subscribe(function () { return _this.storeLocally(); }));
-                            console.info("[entities-storage] Starting [OK] in " + (Date.now() - now) + "ms");
-                            return [2 /*return*/, this._data];
-                    }
-                });
-            });
-        };
-        EntitiesStorage.prototype.ngOnStop = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!this.dirty) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.storeLocally()];
-                        case 1:
-                            _a.sent();
-                            _a.label = 2;
-                        case 2: return [2 /*return*/];
-                    }
-                });
-            });
-        };
         /* -- protected methods -- */
         EntitiesStorage.prototype.getEntityStore = function (name, opts) {
             var store = this._data[name];
@@ -18275,7 +18284,7 @@
             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);
@@ -18348,6 +18357,7 @@
                             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;
@@ -18393,7 +18403,7 @@
                                 _this.accountService.tokenType = tokenType;
                             });
                             // Hide the splashscreen (if mobile) - after 1s - and play start sound
-                            if (this.mobile) {
+                            if (this._mobile) {
                                 setTimeout(function () {
                                     var _a;
                                     (_a = _this.splashScreen) === null || _a === void 0 ? void 0 : _a.hide();
@@ -18498,6 +18508,16 @@
             //}
         };
         /* -- protected methods -- */
+        PlatformService.prototype.configureHtmlClassList = function (mobile, win) {
+            if (win === void 0) { 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')) {
+                console.warn('[platform] Force class list to: <html class="plt-desktop">. Workaround for Windows touch screen.');
+                win.document.documentElement.classList.replace('plt-mobile', 'plt-desktop');
+            }
+        };
         PlatformService.prototype.configureCordovaPlugins = function () {
             console.info('[platform] Configuring Cordova plugins...');
             if (this.statusBar) {
@@ -22013,7 +22033,7 @@
         };
         AccountPage.prototype.refresh = function (event) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     this.disable();
                     this.markAsLoading();
                     return [2 /*return*/, this.accountService.reload()];
@@ -22034,8 +22054,8 @@
         AccountPage.prototype.sendConfirmationEmail = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var json, err_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             json = this.form.value;
                             json.email = this.form.controls['email'].value;
@@ -22045,17 +22065,17 @@
                             }
                             this.email.sending = true;
                             console.debug('[account] Sending confirmation email...');
-                            _b.label = 1;
+                            _c.label = 1;
                         case 1:
-                            _b.trys.push([1, 3, , 4]);
+                            _c.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, this.accountService.sendConfirmationEmail(json.email, json.settings && json.settings.locale || this.translate.currentLang)];
                         case 2:
-                            _b.sent();
+                            _c.sent();
                             console.debug('[account] Confirmation email sent.');
                             this.email.sending = false;
                             return [3 /*break*/, 4];
                         case 3:
-                            err_1 = _b.sent();
+                            err_1 = _c.sent();
                             this.email.sending = false;
                             this.email.error = err_1 && err_1.message || err_1;
                             return [3 /*break*/, 4];
@@ -22067,38 +22087,38 @@
         AccountPage.prototype.save = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var newAccount, err_2;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             if (this.saving)
                                 return [2 /*return*/, false];
                             if (!!this.form.valid) return [3 /*break*/, 2];
                             return [4 /*yield*/, AppFormUtils.waitWhilePending(this.form)];
                         case 1:
-                            _b.sent();
+                            _c.sent();
                             if (this.form.invalid) {
                                 AppFormUtils.logFormErrors(this.form);
                                 this.form.markAllAsTouched();
                                 return [2 /*return*/, false];
                             }
-                            _b.label = 2;
+                            _c.label = 2;
                         case 2:
                             this.submitted = true;
                             this.saving = true;
                             this.error = undefined;
                             newAccount = exports.Account.fromObject(Object.assign(Object.assign({}, (this.accountService.account.asObject())), (this.form.value)));
                             console.debug('[account] Saving account...', newAccount);
-                            _b.label = 3;
+                            _c.label = 3;
                         case 3:
-                            _b.trys.push([3, 5, 6, 7]);
+                            _c.trys.push([3, 5, 6, 7]);
                             this.disable();
                             return [4 /*yield*/, this.accountService.save(newAccount)];
                         case 4:
-                            _b.sent();
+                            _c.sent();
                             this.markAsPristine();
                             return [2 /*return*/, true];
                         case 5:
-                            err_2 = _b.sent();
+                            err_2 = _c.sent();
                             console.error(err_2);
                             this.error = err_2 && err_2.message || err_2;
                             return [2 /*return*/, false];
@@ -22120,9 +22140,21 @@
             this.form.controls.pubkey.disable();
             // Always disable some additional fields
             this.additionalFields
-                .filter(function (field) { return field.extra && field.extra.account && field.extra.account.disabled || false; })
                 .forEach(function (field) {
-                _this.form.controls[field.key].disable();
+                var _a, _b;
+                var control = _this.form.controls[field.key];
+                if (!control)
+                    return; // Skip
+                var disabled = ((_a = field.extra) === null || _a === void 0 ? void 0 : _a.account) && field.extra.account.disabled || false;
+                if (disabled && control.enabled) {
+                    control.disable();
+                }
+                var 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
+                        ? i1.Validators.compose([control.validator, i1.Validators.required])
+                        : i1.Validators.required);
+                }
             });
             this.markForCheck();
         };
@@ -22131,7 +22163,7 @@
                 cancel: { get: function () { return _super_1.prototype.cancel; } }
             });
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_b) {
+                return __generator(this, function (_c) {
                     _super.cancel.call(this);
                     return [2 /*return*/];
                 });