@sumaris-net/ngx-components 1.15.9 → 1.15.10

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

@@ -24624,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,
@@ -27962,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; });
@@ -28517,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();