@sumaris-net/ngx-components 1.15.8 → 1.15.11

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

@@ -10928,7 +10928,7 @@ class NetworkService extends StartableService {
         this.onNetworkStatusChanges = new BehaviorSubject(null);
         this.onResetNetworkCache = new EventEmitter(true);
         this._listeners = {};
-        this._mobile = this.platform.is('mobile');
+        this._mobile = this.settings.mobile;
         if (this._mobile) {
             this._timerRefreshPeriod = NetworkRefreshTimerPeriod.MOBILE;
             this._timerRefreshCondition = () => this.online; // Check only when online, and stop when offline
@@ -11253,7 +11253,7 @@ class NetworkService extends StartableService {
     /* -- protected functions -- */
     ngOnStart() {
         return __awaiter(this, void 0, void 0, function* () {
-            console.info('[network] Starting network...', this._startingPeer);
+            console.info('[network] Starting network...');
             // Restoring local settings
             let peer = this._startingPeer || (yield this.restoreLocally());
             // Make sure to hide the splashscreen, before open the modal
@@ -13777,7 +13777,9 @@ class BaseGraphqlService extends StartableService {
             return this._mutableWatchQueries.filter(q => q.id.startsWith(opts.queryName + '|'));
         }
         if (opts.queryNames) {
-            return opts.queryNames.reduce((res, queryName) => res.concat(this._mutableWatchQueries.filter(q => q.id.startsWith(queryName + '|'))), []);
+            return opts.queryNames.map(queryName => this._mutableWatchQueries.filter(q => q.id.startsWith(queryName + '|')))
+                // flatMap
+                .reduce((res, array) => res.concat(...array), []);
         }
         // Search by query
         if (opts.query) {
@@ -13786,7 +13788,9 @@ class BaseGraphqlService extends StartableService {
         if (opts.queries) {
             return opts.queries
                 .filter(isNotNil)
-                .reduce((res, query) => res.concat(this._mutableWatchQueries.filter(q => q.query === query)), []);
+                .map(query => this._mutableWatchQueries.filter(q => q.query === query))
+                // flatMap
+                .reduce((res, array) => res.concat(...array), []);
         }
         throw Error('Invalid options: only one property must be set');
     }
@@ -15376,12 +15380,12 @@ class ConfigService extends BaseGraphqlService {
         return __awaiter(this, void 0, void 0, function* () {
             const now = Date.now();
             console.debug('[config] Clear server cache...');
-            const variables = { name: opts && opts.cacheName } || undefined;
+            const variables = opts && opts.cacheName && { name: opts.cacheName } || undefined;
             const res = yield this.graphql.query({
                 query: ClearCache,
                 variables,
                 error: { code: ErrorCodes$2.LOAD_CONFIG_ERROR, message: 'ERROR.LOAD_CONFIG_ERROR' },
-                fetchPolicy: 'network-only'
+                fetchPolicy: 'no-cache'
             });
             const data = res && res.clearCache || undefined;
             console.info(`[config] Clear server cache in ${Date.now() - now}ms:`, data);
@@ -21320,6 +21324,7 @@ class BaseEntityService extends BaseGraphqlService {
             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,
             error: {
                 code: ErrorCodes$2.SUBSCRIBE_DATA_ERROR,
@@ -24106,23 +24111,31 @@ class AppEntityEditor extends AppTabEditor {
     }
     startListenRemoteChanges() {
         // 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(filter(isNotNil))
             .subscribe((data) => {
-            if (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 ?)
-                }
+            const isNewer = 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(() => this._listenChangesSubscription = null);
@@ -24532,7 +24545,10 @@ class AppEntityEditor extends AppTabEditor {
         return parentUrl;
     }
     listenChanges(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));
     }
     markForCheck() {
         this.cd.markForCheck();