@sumaris-net/ngx-components 1.15.9 → 1.15.10

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

@@ -21324,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,
@@ -24110,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);
@@ -24536,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();