@sumaris-net/ngx-components 1.15.8 → 1.15.11

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

@@ -12314,7 +12314,7 @@
             _this.onNetworkStatusChanges = new rxjs.BehaviorSubject(null);
             _this.onResetNetworkCache = new i0.EventEmitter(true);
             _this._listeners = {};
-            _this._mobile = _this.platform.is('mobile');
+            _this._mobile = _this.settings.mobile;
             if (_this._mobile) {
                 _this._timerRefreshPeriod = NetworkRefreshTimerPeriod.MOBILE;
                 _this._timerRefreshCondition = function () { return _this.online; }; // Check only when online, and stop when offline
@@ -12744,7 +12744,7 @@
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            console.info('[network] Starting network...', this._startingPeer);
+                            console.info('[network] Starting network...');
                             _b = this._startingPeer;
                             if (_b) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.restoreLocally()];
@@ -15746,7 +15746,9 @@
                 return this._mutableWatchQueries.filter(function (q) { return q.id.startsWith(opts.queryName + '|'); });
             }
             if (opts.queryNames) {
-                return opts.queryNames.reduce(function (res, queryName) { return res.concat(_this._mutableWatchQueries.filter(function (q) { return q.id.startsWith(queryName + '|'); })); }, []);
+                return opts.queryNames.map(function (queryName) { return _this._mutableWatchQueries.filter(function (q) { return q.id.startsWith(queryName + '|'); }); })
+                    // flatMap
+                    .reduce(function (res, array) { return res.concat.apply(res, __spread(array)); }, []);
             }
             // Search by query
             if (opts.query) {
@@ -15755,7 +15757,9 @@
             if (opts.queries) {
                 return opts.queries
                     .filter(isNotNil)
-                    .reduce(function (res, query) { return res.concat(_this._mutableWatchQueries.filter(function (q) { return q.query === query; })); }, []);
+                    .map(function (query) { return _this._mutableWatchQueries.filter(function (q) { return q.query === query; }); })
+                    // flatMap
+                    .reduce(function (res, array) { return res.concat.apply(res, __spread(array)); }, []);
             }
             throw Error('Invalid options: only one property must be set');
         };
@@ -17525,12 +17529,12 @@
                         case 0:
                             now = Date.now();
                             console.debug('[config] Clear server cache...');
-                            variables = { name: opts && opts.cacheName } || undefined;
+                            variables = opts && opts.cacheName && { name: opts.cacheName } || undefined;
                             return [4 /*yield*/, this.graphql.query({
                                     query: ClearCache,
                                     variables: variables,
                                     error: { code: ErrorCodes$2.LOAD_CONFIG_ERROR, message: 'ERROR.LOAD_CONFIG_ERROR' },
-                                    fetchPolicy: 'network-only'
+                                    fetchPolicy: 'no-cache'
                                 })];
                         case 1:
                             res = _a.sent();
@@ -24620,6 +24624,7 @@
                 console.debug(this._logPrefix + ("[WS] Listening for changes on " + this._logTypeName + " {" + id + "}..."));
             return this.graphql.subscribe({
                 query: opts && opts.query || this.subscriptions.listenChanges,
+                fetchPolicy: opts && opts.fetchPolicy || 'no-cache',
                 variables: variables,
                 error: {
                     code: ErrorCodes$2.SUBSCRIBE_DATA_ERROR,
@@ -27958,23 +27963,31 @@
         AppEntityEditor.prototype.startListenRemoteChanges = function () {
             var _this = this;
             // Skip if disable, or already listening
-            if (this._listenChangesSubscription || !this._enableListenChanges || this.isNewData)
+            if (this._listenChangesSubscription || !this._enableListenChanges)
+                return;
+            // Skip if new or local data
+            if (this.isNewData || EntityUtils.isLocal(this.data))
                 return;
             // Listen for changes on server
-            this._listenChangesSubscription = this.listenChanges(this.data.id, { interval: this._listenIntervalInSeconds })
+            this._listenChangesSubscription = this.listenChanges(this.data.id, {
+                interval: this._listenIntervalInSeconds
+            })
                 .pipe(operators.filter(isNotNil))
                 .subscribe(function (data) {
-                if (momentImported.isMoment(data.updateDate) && data.updateDate.isAfter(_this.data.updateDate)) {
-                    if (!_this.dirty) {
-                        if (_this.debug)
-                            console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}: reloading page...");
-                        _this.updateView(data);
-                    }
-                    else {
-                        if (_this.debug)
-                            console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}, but page is dirty: skip reloading.");
-                        // TODO: alter user (with a toast ?)
-                    }
+                var isNewer = momentImported.isMoment(data.updateDate) && data.updateDate.isAfter(_this.data.updateDate);
+                if (!isNewer)
+                    return; // Skip
+                // Editor has no changes: reload
+                if (!_this.dirty) {
+                    if (_this.debug)
+                        console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}: reloading page...");
+                    _this.reload();
+                }
+                // Cannot reload: alert the user
+                else {
+                    if (_this.debug)
+                        console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}, but page is dirty: skip reloading.");
+                    _this.showToast({ message: 'ERROR.DATA_UPDATE_DATE_CHANGED', type: 'warning', showCloseButton: true });
                 }
             });
             this._listenChangesSubscription.add(function () { return _this._listenChangesSubscription = null; });
@@ -28513,7 +28526,11 @@
             return parentUrl;
         };
         AppEntityEditor.prototype.listenChanges = function (id, opts) {
-            return this.dataService.listenChanges(this.data.id, opts);
+            return this.dataService.listenChanges(this.data.id, Object.assign({
+                // Make sure to skip cache, because NOT the full graph will be fetched by subscription
+                // When a changes occur, we call reload() to force refetching the full graph
+                fetchPolicy: 'no-cache'
+            }, opts));
         };
         AppEntityEditor.prototype.markForCheck = function () {
             this.cd.markForCheck();