@sumaris-net/ngx-components 1.13.2 → 1.14.0

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

@@ -11206,7 +11206,18 @@
                     switch (_a.label) {
                         case 0:
                             // Add headers
-                            opts = Object.assign({}, opts);
+                            opts = Object.assign({}, opts
+                            //headers: new HttpHeaders(),
+                            //.append('X-App-Name', environment.name)
+                            //.append('X-App-Version', environment.version),
+                            );
+                            // Force no cache
+                            if (opts.nocache === true) {
+                                opts.headers = (opts.headers instanceof i2$1.HttpHeaders ? opts.headers : new i2$1.HttpHeaders(opts.headers));
+                                opts.headers
+                                    .append('Cache-Control', 'no-cache')
+                                    .append('Pragma', 'no-cache');
+                            }
                             _a.label = 1;
                         case 1:
                             _a.trys.push([1, 3, , 4]);
@@ -11264,6 +11275,7 @@
     }());
     VersionUtils.compare = compareVersionNumbers;
     VersionUtils.isCompatible = isVersionCompatible;
+    VersionUtils.isSame = isSameVersion;
     /**
      * Compare two software version numbers (e.g. 1.7.1)
      * Returns:
@@ -11332,6 +11344,9 @@
         //console.debug(`[http] Checking actual version {${actualVersion}} is compatible with min expected version {${minVersion}}`);
         return compareVersionNumbers(minVersion, actualVersion) <= 0;
     }
+    function isSameVersion(v1, v2) {
+        return compareVersionNumbers(v1, v2) === 0;
+    }
 
     var SelectPeerModal = /** @class */ (function () {
         function SelectPeerModal(viewCtrl, cd, http, environment) {
@@ -12470,15 +12485,81 @@
             });
         };
         NetworkService.prototype.getNodeInfo = function (peer) {
+            var path = this.computePeerPath(peer, '/api/node/info');
+            return this.get(path);
+        };
+        NetworkService.prototype.getAppManifest = function (peer, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var path, err_3;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, , 3]);
+                            path = this.computePeerPath(peer, 'manifest.json');
+                            if (opts === null || opts === void 0 ? void 0 : opts.nocache) {
+                                path += '?t=' + Date.now();
+                            }
+                            return [4 /*yield*/, this.get(path, opts)];
+                        case 1: return [2 /*return*/, _b.sent()];
+                        case 2:
+                            err_3 = _b.sent();
+                            if (this.environment.production)
+                                console.error('[network] Cannot load file \'manifest.json\'. Please make sure webserver config allow CORS access', err_3);
+                            else
+                                console.error('[network] Cannot load file \'manifest.json\'.', err_3);
+                            return [3 /*break*/, 3];
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        NetworkService.prototype.getAppVersion = function (peer, opts) {
+            return __awaiter(this, void 0, void 0, function () {
+                var path, appVersion, err_4, manifest;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, , 3]);
+                            path = this.computePeerPath(peer, 'version.appup');
+                            if (opts === null || opts === void 0 ? void 0 : opts.nocache) {
+                                path += '?t=' + Date.now();
+                            }
+                            return [4 /*yield*/, this.get(path, opts)];
+                        case 1:
+                            appVersion = _b.sent();
+                            if (isNotNilOrBlank(appVersion))
+                                return [2 /*return*/, appVersion];
+                            return [3 /*break*/, 3];
+                        case 2:
+                            err_4 = _b.sent();
+                            if (this.environment.production)
+                                console.error('[network] Cannot load file \'version.appup\'. Please make sure webserver config allow CORS access');
+                            else
+                                console.error('[network] Cannot load file \'version.appup\'.', err_4);
+                            return [3 /*break*/, 3];
+                        case 3: return [4 /*yield*/, this.getAppManifest(peer, opts)];
+                        case 4:
+                            manifest = _b.sent();
+                            return [2 /*return*/, manifest === null || manifest === void 0 ? void 0 : manifest.version];
+                    }
+                });
+            });
+        };
+        NetworkService.prototype.computePeerPath = function (peer, path) {
             peer = peer || this.peer;
             if (!peer)
                 return undefined;
-            var peerUrl = isInstanceOf(peer, exports.Peer) ? peer.url : peer;
+            var peerUrl = (peer instanceof exports.Peer) ? peer.url : peer;
             // Remove trailing slash
             if (peerUrl.endsWith('/')) {
                 peerUrl = peerUrl.substr(0, peerUrl.length - 1);
             }
-            return this.get(peerUrl + '/api/node/info');
+            // Add first path
+            if (!path.startsWith('/')) {
+                path = '/' + path;
+            }
+            // Concat peer URL and path
+            return peerUrl + path;
         };
         /**
          * Allow to force offline mode
@@ -15860,8 +15941,6 @@
         };
         AccountService.prototype.canUserWriteDataForDepartment = function (recorderDepartment) {
             if (ReferentialUtils.isEmpty(recorderDepartment)) {
-                if (!this.isAdmin())
-                    console.warn('Unable to check if user has right: invalid recorderDepartment', recorderDepartment);
                 return this.isAdmin();
             }
             // Should be login, and status ENABLE
@@ -17167,6 +17246,12 @@
             key: 'sumaris.android.install.url',
             label: 'CONFIGURATION.OPTIONS.ANDROID_INSTALL_URL',
             type: 'string'
+        },
+        DB_TIMEZONE: {
+            key: 'sumaris.persistence.db.timezone',
+            label: 'DB Timezone (readonly)',
+            type: 'string',
+            isTransient: true // ONly on server, cannot be set
         }
     });
 
@@ -17656,18 +17741,19 @@
             return this.platform.height();
         };
         PlatformService.prototype.ngOnStart = function () {
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var now, storage, err_1;
+                var now, storage, intervalMs, err_1;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             now = Date.now();
                             this.accountService.tokenType = undefined;
                             console.info('[platform] Starting platform...');
-                            _b.label = 1;
+                            _d.label = 1;
                         case 1:
-                            _b.trys.push([1, 6, , 7]);
+                            _d.trys.push([1, 7, , 8]);
                             this._mobile = this.is('mobile');
                             this._cordova = this.is('cordova');
                             this._android = this.is('android');
@@ -17679,29 +17765,37 @@
                             return [4 /*yield*/, this.configureTranslate()];
                         case 2:
                             // Configure translation
-                            _b.sent();
+                            _d.sent();
                             return [4 /*yield*/, this.storageReady()];
                         case 3:
-                            storage = _b.sent();
+                            storage = _d.sent();
                             return [4 /*yield*/, this.migrateStorage(storage)];
                         case 4:
-                            _b.sent();
+                            _d.sent();
                             // Start root services
                             return [4 /*yield*/, Promise.all([
                                     this.entitiesStorage.ready(),
-                                    this.cache.ready().then(function () { return _this.configureCache(); }),
+                                    this.cache.ready(),
                                     this.settings.ready(),
                                     this.networkService.ready(),
                                     this.audioProvider.ready()
                                 ])];
                         case 5:
                             // Start root services
-                            _b.sent();
-                            console.info("[platform] Starting platform [OK] {mobile: " + this._mobile + ", downloader: " + this.canDownload + ", fileOpener: " + this.canOpenFile + "} in " + (Date.now() - now) + "ms");
+                            _d.sent();
+                            return [4 /*yield*/, Promise.all([
+                                    this.configureCache(),
+                                    this.checkAppVersion({ canReload: true })
+                                ])];
+                        case 6:
+                            _d.sent();
                             // Update cache configuration when network changed
                             this.networkService.onNetworkStatusChanges
-                                .pipe(operators.skip(1)) // Skip the first event (behavior subject send event immediately)
-                                .subscribe(function (type) { return _this.configureCache(type !== 'none'); });
+                                .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();
+                            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
                                 .pipe(operators.map(function (config) { return config === null || config === void 0 ? void 0 : config.getProperty(CORE_CONFIG_OPTIONS.AUTH_TOKEN_TYPE); }), operators.filter(isNotNilOrBlank), operators.distinctUntilChanged())
@@ -17718,12 +17812,21 @@
                                     _this.audioProvider.playStartupSound();
                                 }, 1000);
                             }
-                            return [3 /*break*/, 7];
-                        case 6:
-                            err_1 = _b.sent();
+                            // 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*/ }); });
+                                }
+                            }
+                            return [3 /*break*/, 8];
+                        case 7:
+                            err_1 = _d.sent();
                             // Manage startup error
                             return [2 /*return*/, this.onStartupError(err_1)];
-                        case 7: return [2 /*return*/];
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -17844,16 +17947,88 @@
             this.cache.setDefaultTTL(cacheTTL);
             this.cache.setOfflineInvalidate(false); // Do not invalidate cache when offline
         };
+        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;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (this.networkService.offline || !this.isWeb())
+                                return [2 /*return*/]; // Skip
+                            silent = (opts === null || opts === void 0 ? void 0 : opts.silent) === true;
+                            production = this.environment.production;
+                            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.');
+                                (_a = this.checkAppVersionTimer) === null || _a === void 0 ? void 0 : _a.unsubscribe(); // Stop timer if exists
+                                return [2 /*return*/]; // Skip
+                            }
+                            peer = undefined;
+                            return [4 /*yield*/, this.networkService.getAppVersion(peer)];
+                        case 1:
+                            remoteVersion = _d.sent();
+                            if (isNilOrBlank(remoteVersion)) {
+                                if (production && !silent)
+                                    console.error('[platform] Cannot load remote app version. Skipping version check');
+                                (_b = this.checkAppVersionTimer) === null || _b === void 0 ? void 0 : _b.unsubscribe(); // Stop timer if exists
+                                return [2 /*return*/];
+                            }
+                            if (VersionUtils.isCompatible(remoteVersion, actualVersion)) {
+                                if (!silent)
+                                    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) {
+                                if (canAutoReload)
+                                    console.error("[platform] Reloaded page failed, because version still mismatch! Please check version.appup file (expected app version: " + actualVersion + ")");
+                                (_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];
+                            location.href = reloadPath;
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, this.showToast({
+                                message: 'CONFIRM.RELOAD_APP',
+                                messageParams: { version: remoteVersion, name: this.environment.name },
+                                type: 'info', duration: -1,
+                                buttons: [
+                                    // Reload button
+                                    { text: this.translate.instant('COMMON.BTN_RELOAD'),
+                                        side: 'end', handler: function () {
+                                            location.href = reloadPath;
+                                            return true;
+                                        }
+                                    }
+                                ]
+                            })];
+                        case 3:
+                            _d.sent();
+                            _d.label = 4;
+                        case 4: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         PlatformService.prototype.storageReady = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var forage, driver;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             console.info("[platform] Starting storage...");
                             return [4 /*yield*/, this.storage.ready()];
                         case 1:
-                            forage = _b.sent();
+                            forage = _d.sent();
                             driver = forage.driver();
                             if (isNil(driver)) {
                                 console.error('[platform] NO DRIVER DEFINED IN STORAGE. Local storage cannot be used !');
@@ -17869,8 +18044,8 @@
         PlatformService.prototype.migrateStorage = function (storage) {
             return __awaiter(this, void 0, void 0, function () {
                 var canMigrate, oldForage, keys, now, toast_1, duration, err_2;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             canMigrate = storage &&
                                 ((storage.driver() === 'cordovaSQLiteDriver' && (storage.supports(storage.INDEXEDDB) || storage.supports(storage.WEBSQL))) ||
@@ -17884,26 +18059,26 @@
                             });
                             return [4 /*yield*/, oldForage.keys()];
                         case 1:
-                            keys = _b.sent();
+                            keys = _d.sent();
                             if (!isEmptyArray(keys)) return [3 /*break*/, 3];
                             // Drop the old instance (not need anymore)
                             console.debug("[platform] Old storage is empty: dropping unused instance {name: '" + storage.config().name + "', driver: '" + oldForage.driver() + "'}");
                             return [4 /*yield*/, oldForage.dropInstance()];
                         case 2:
-                            _b.sent();
+                            _d.sent();
                             return [3 /*break*/, 12];
                         case 3:
                             now = Date.now();
                             console.info("[platform] Starting storage migration...");
                             return [4 /*yield*/, this.showToast({ message: 'INFO.DATA_MIGRATION_STARTED', type: 'info', duration: 30000 })];
                         case 4:
-                            toast_1 = _b.sent();
-                            _b.label = 5;
+                            toast_1 = _d.sent();
+                            _d.label = 5;
                         case 5:
-                            _b.trys.push([5, 9, , 12]);
+                            _d.trys.push([5, 9, , 12]);
                             return [4 /*yield*/, StorageUtils.copy(oldForage, storage, { keys: keys, deleteAfterCopy: false })];
                         case 6:
-                            _b.sent();
+                            _d.sent();
                             duration = Date.now() - now;
                             setTimeout(function () { return toast_1.dismiss(); }, Math.max(2000 - duration, 0));
                             return [4 /*yield*/, this.showToast({ message: 'INFO.DATA_MIGRATION_SUCCEED',
@@ -17911,26 +18086,26 @@
                                     showCloseButton: true
                                 })];
                         case 7:
-                            _b.sent();
+                            _d.sent();
                             console.info('[platform] Starting storage migration [OK]');
                             // Drop the old instance
                             console.info("[platform] Drop old storage {name: '" + storage.config().name + "', driver: '" + oldForage.driver() + "'}");
                             return [4 /*yield*/, oldForage.dropInstance()];
                         case 8:
-                            _b.sent();
+                            _d.sent();
                             return [3 /*break*/, 12];
                         case 9:
-                            err_2 = _b.sent();
+                            err_2 = _d.sent();
                             console.error(err_2 && err_2.message || err_2, err_2);
                             return [4 /*yield*/, toast_1.dismiss()];
                         case 10:
-                            _b.sent();
+                            _d.sent();
                             return [4 /*yield*/, this.showToast({ message: 'ERROR.DATA_MIGRATION_FAILED',
                                     type: 'error',
                                     showCloseButton: true
                                 })];
                         case 11:
-                            _b.sent();
+                            _d.sent();
                             return [3 /*break*/, 12];
                         case 12: return [2 /*return*/];
                     }
@@ -17946,8 +18121,8 @@
         PlatformService.prototype.onStartupError = function (err) {
             return __awaiter(this, void 0, void 0, function () {
                 var message, detailsMessage;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             console.error('[platform] Failed starting the platform! ', err);
                             message = err && err.message || err;
@@ -17959,14 +18134,14 @@
                             if (!this.translate) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.translate.get(message).toPromise()];
                         case 1:
-                            message = _b.sent();
+                            message = _d.sent();
                             if (err && err.code) {
                                 message += " {code: " + err.code + "}";
                             }
                             return [3 /*break*/, 3];
                         case 2:
                             message = "Fatal error: Please contact your administrator.\n\n{code: " + (err && err.code || 'null') + ", message: \"" + message + "\"}";
-                            _b.label = 3;
+                            _d.label = 3;
                         case 3:
                             if (!this.toastController) return [3 /*break*/, 5];
                             if (detailsMessage) {
@@ -17979,7 +18154,7 @@
                                     message: message
                                 })];
                         case 4:
-                            _b.sent();
+                            _d.sent();
                             return [3 /*break*/, 6];
                         case 5:
                             if (window) {
@@ -17993,7 +18168,7 @@
                                 if (err && err.details)
                                     console.error('cause', err.details);
                             }
-                            _b.label = 6;
+                            _d.label = 6;
                         case 6: return [2 /*return*/];
                     }
                 });
@@ -18123,6 +18298,13 @@
         }
         return FileResponse;
     }());
+    function isProgressEvent(event) {
+        return event.type === i2$1.HttpEventType.UploadProgress
+            || event.type === i2$1.HttpEventType.DownloadProgress;
+    }
+    function isResponseEvent(event) {
+        return event.type === i2$1.HttpEventType.Response;
+    }
 
     var UploadFileComponent = /** @class */ (function () {
         function UploadFileComponent(cd, translate) {
@@ -18289,7 +18471,7 @@
                     operators.switchMap(function (file) { return _this.uploadFn(file)
                         .pipe(operators.map(function (event) {
                         // Progress event
-                        if ((event === null || event === void 0 ? void 0 : event.type) === i2$1.HttpEventType.UploadProgress || event.type === i2$1.HttpEventType.User) {
+                        if (isProgressEvent(event)) {
                             if (isNotNil(event.loaded) && event.loaded >= 0) {
                                 file.progress = Math.min(1, event.loaded / (event.total || 1));
                             }
@@ -18297,15 +18479,20 @@
                                 file.progress = -1; // Indeterminate progression
                             }
                         }
+                        // User event
+                        else if (event.type === i2$1.HttpEventType.User) {
+                            file.progress = -1; // Indeterminate progression
+                        }
                         // Response event
-                        else if (event instanceof i2$1.HttpResponse || event instanceof FileResponse) {
+                        else if (isResponseEvent(event)) {
                             file.progress = 1;
                             file.response = event;
                             console.debug("[upload-file] " + file.name + ": " + (event.statusText || 'OK'), file.response);
                         }
-                        // Other events
+                        // Other events: ignore
                         else {
-                            console.warn('[upload-file] Unknown event, returned by uploadFn\'s observable:', event);
+                            // DEBUG
+                            console.debug('[upload-file] Ignoring a file event: ', event);
                         }
                         return file;
                     }), operators.catchError(function (err) {
@@ -31136,6 +31323,8 @@
     exports.isNotNilString = isNotNilString;
     exports.isNumber = isNumber;
     exports.isNumberRange = isNumberRange;
+    exports.isProgressEvent = isProgressEvent;
+    exports.isResponseEvent = isResponseEvent;
     exports.isTouchUi = isTouchUi;
     exports.isWindow = isWindow;
     exports.joinProperties = joinProperties;