@sumaris-net/ngx-components 1.14.0 → 1.14.1

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

@@ -17741,9 +17741,9 @@
             return this.platform.height();
         };
         PlatformService.prototype.ngOnStart = function () {
-            var _a, _b;
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var now, storage, intervalMs, err_1;
+                var now, storage, checkIntervalMs, err_1;
                 var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -17753,7 +17753,7 @@
                             console.info('[platform] Starting platform...');
                             _d.label = 1;
                         case 1:
-                            _d.trys.push([1, 7, , 8]);
+                            _d.trys.push([1, 8, , 9]);
                             this._mobile = this.is('mobile');
                             this._cordova = this.is('cordova');
                             this._android = this.is('android');
@@ -17775,7 +17775,7 @@
                             // Start root services
                             return [4 /*yield*/, Promise.all([
                                     this.entitiesStorage.ready(),
-                                    this.cache.ready(),
+                                    this.cache.ready().then(function () { return _this.configureCache(); }),
                                     this.settings.ready(),
                                     this.networkService.ready(),
                                     this.audioProvider.ready()
@@ -17783,18 +17783,17 @@
                         case 5:
                             // Start root services
                             _d.sent();
-                            return [4 /*yield*/, Promise.all([
-                                    this.configureCache(),
-                                    this.checkAppVersion({ canReload: true })
-                                ])];
+                            if (!(this.isWeb() && this.environment.production)) return [3 /*break*/, 7];
+                            return [4 /*yield*/, this.checkAppVersion({ canReload: true })];
                         case 6:
                             _d.sent();
+                            _d.label = 7;
+                        case 7:
                             // Update cache configuration when network changed
                             this.networkService.onNetworkStatusChanges
-                                .pipe(operators.skip(1), operators.map(function (type) { return type !== 'none'; }), operators.debounceTime(1000), operators.distinctUntilChanged(), 
-                            // Configure the cache
-                            operators.tap(function (online) { return _this.configureCache(online); }))
-                                .subscribe();
+                                .pipe(operators.skip(1) // Olready done once, so we skip the first event
+                            )
+                                .subscribe(function (type) { return _this.configureCache(type !== 'none'); });
                             console.info("[platform] Starting platform [OK] {mobile: " + this._mobile + ", web: " + this.isWeb() + ", downloader: " + this.canDownload + ", fileOpener: " + this.canOpenFile + "} in " + (Date.now() - now) + "ms");
                             // Update authentication type
                             this.configService.config
@@ -17812,21 +17811,19 @@
                                     _this.audioProvider.playStartupSound();
                                 }, 1000);
                             }
-                            // Check if new version, every 1 min
-                            if (this.isWeb()) {
-                                intervalMs = (((_a = this.environment) === null || _a === void 0 ? void 0 : _a.checkAppVersionIntervalInSeconds) || 0) * 1000;
-                                if (intervalMs > 0) {
-                                    (_b = this.checkAppVersionTimer) === null || _b === void 0 ? void 0 : _b.unsubscribe();
-                                    this.checkAppVersionTimer = rxjs.timer(intervalMs, intervalMs)
-                                        .subscribe(function (_) { return _this.checkAppVersion({ silent: true, canReload: false /*do NOT auto reload, when app is started*/ }); });
-                                }
+                            checkIntervalMs = (this.environment.checkAppVersionIntervalInSeconds || 0) * 1000;
+                            if (this.isWeb() && this.environment.production && checkIntervalMs > 0) {
+                                (_a = this.checkAppVersionTimer) === null || _a === void 0 ? void 0 : _a.unsubscribe();
+                                this.checkAppVersionTimer = rxjs.timer(checkIntervalMs, checkIntervalMs)
+                                    .subscribe(function (_) { return _this.checkAppVersion({ silent: true, canReload: false /*do NOT auto reload, when app is started*/ }); });
+                                this.registerSubscription(this.checkAppVersionTimer);
                             }
-                            return [3 /*break*/, 8];
-                        case 7:
+                            return [3 /*break*/, 9];
+                        case 8:
                             err_1 = _d.sent();
                             // Manage startup error
                             return [2 /*return*/, this.onStartupError(err_1)];
-                        case 8: return [2 /*return*/];
+                        case 9: return [2 /*return*/];
                     }
                 });
             });
@@ -17950,7 +17947,7 @@
         PlatformService.prototype.checkAppVersion = function (opts) {
             var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function () {
-                var silent, production, actualVersion, peer, remoteVersion, canAutoReload, reloadPath;
+                var silent, production, canAutoReload, actualVersion, peer, remoteVersion, reloadPath;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -17958,11 +17955,12 @@
                                 return [2 /*return*/]; // Skip
                             silent = (opts === null || opts === void 0 ? void 0 : opts.silent) === true;
                             production = this.environment.production;
+                            canAutoReload = !opts || opts.canReload !== false;
                             if (!silent)
                                 console.info('[platform] Checking remote app version...');
                             actualVersion = this.environment.version;
                             if (isNilOrBlank(actualVersion)) {
-                                console.warn('[platform] Missing required value for \'environment.version\'. Cannot check remote app version.');
+                                console.error('[platform] Missing required value for \'environment.version\'. Cannot check remote app version.');
                                 (_a = this.checkAppVersionTimer) === null || _a === void 0 ? void 0 : _a.unsubscribe(); // Stop timer if exists
                                 return [2 /*return*/]; // Skip
                             }
@@ -17981,20 +17979,20 @@
                                     console.info('[platform] Checking remote app version [OK]');
                                 return [2 /*return*/];
                             }
-                            canAutoReload = !opts || opts.canReload !== false;
-                            // Avoid infinite loop, if already reloaded
-                            if (location.href.indexOf('?version=' + remoteVersion) !== -1) {
+                            reloadPath = location.href.replace(/[&]?version=[0-9.]+/gi, '');
+                            reloadPath += (reloadPath.indexOf('?') === -1) ? '?' : '&'; // Add query param separator
+                            reloadPath += 'version=' + remoteVersion; // Add version (to avoid a reload infinite loop)
+                            // Already try to reload, but version still bad
+                            if (reloadPath === location.href) {
                                 if (canAutoReload)
                                     console.error("[platform] Reloaded page failed, because version still mismatch! Please check version.appup file (expected app version: " + actualVersion + ")");
+                                // Stop timer, to avoid infinite loop
                                 (_c = this.checkAppVersionTimer) === null || _c === void 0 ? void 0 : _c.unsubscribe();
                                 return [2 /*return*/];
                             }
                             console.warn("[platform] More recent version detected (remote: " + remoteVersion + ", actual: " + actualVersion);
-                            reloadPath = location.href.replace(/[&?]{1}[a-z_-]=[0-9.]+/gi, '');
-                            reloadPath += (reloadPath.indexOf('?') === -1) ? '?' : '&'; // Add query param separator
-                            reloadPath += 'version=' + remoteVersion; // Add version (to avoid a reload infinite loop)
-                            console.info('[platform] Will reloading at ' + reloadPath);
                             if (!canAutoReload) return [3 /*break*/, 2];
+                            console.info('[platform] Will reloading at ' + reloadPath);
                             location.href = reloadPath;
                             return [3 /*break*/, 4];
                         case 2: return [4 /*yield*/, this.showToast({