@sumaris-net/ngx-components 1.9.2 → 1.9.5

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

@@ -10614,8 +10614,6 @@
         defaultLocale: 'fr',
         defaultLatLongFormat: 'DDMM',
         apolloFetchPolicy: 'cache-first',
-        // FIXME: GraphQL subscription never unsubscribe...
-        listenRemoteChanges: false,
         // FIXME: enable cache
         persistCache: false,
         // TODO: make this works
@@ -10668,6 +10666,13 @@
             // username: 'admq2', password: 'q22006'
             // Token auth (using Person.pubkey)
             username: 'admin@sumaris.net', password: 'admin',
+        },
+        account: {
+            enableListenChanges: true,
+            listenIntervalInSecond: 30
+        },
+        entityEditor: {
+            enableListenChanges: false
         }
     });
 
@@ -14913,8 +14918,6 @@
                                 }
                                 var headers = new i2$1.HttpHeaders()
                                     .append('Authorization', authorization);
-                                //.append('X-App-Name', environment.name)
-                                //.append('X-App-Version', environment.version)
                                 // Use the setContext method to set the HTTP headers.
                                 operation.setContext(Object.assign(Object.assign({}, operation.getContext()), { headers: headers }));
                                 // Call the next link in the middleware chain.
@@ -15443,7 +15446,7 @@
             _this.onChange = new rxjs.Subject();
             _this.onAuthTokenChange = new rxjs.Subject();
             _this.onAuthBasicChange = new rxjs.Subject();
-            _this._stopWatching$ = new rxjs.Subject();
+            _this._listenChangesSubscription = null;
             _this._cache = {
                 loaded: false,
                 keypair: null,
@@ -15456,6 +15459,7 @@
             };
             _this._$additionalFields = new rxjs.BehaviorSubject([]);
             _this._tokenType$ = new rxjs.BehaviorSubject(undefined);
+            _this._enableListenChanges = (!environment.account || environment.account.enableListenChanges !== false);
             _this._debug = !environment.production;
             if (_this._debug)
                 console.debug('[account-service] Creating service');
@@ -15699,6 +15703,9 @@
                             // Emit events
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
+                            // Listen remote changes
+                            if (this._enableListenChanges)
+                                this.startListenChanges();
                             return [2 /*return*/, this._data];
                         case 6:
                             error_1 = _b.sent();
@@ -15853,13 +15860,16 @@
                             // Emit event to observers
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
+                            if (this._enableListenChanges)
+                                this.startListenChanges();
                             return [2 /*return*/, this._data];
                     }
                 });
             });
         };
-        AccountService.prototype.refresh = function () {
+        AccountService.prototype.reload = function () {
             return __awaiter(this, void 0, void 0, function () {
+                var now;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
@@ -15867,13 +15877,15 @@
                                 throw new Error('User not logged');
                             if (this.network.offline)
                                 throw new Error('Cannot check account in offline mode');
+                            now = Date.now();
+                            console.debug("[account] Reloading account...");
                             return [4 /*yield*/, this.loadData()];
                         case 1:
                             _b.sent();
                             return [4 /*yield*/, this.saveLocally()];
                         case 2:
                             _b.sent();
-                            console.debug('[account] Successfully reload account');
+                            console.debug("[account] Reloading account [OK] in " + (Date.now() - now) + "ms");
                             // Emit login event to subscribers
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
@@ -15970,7 +15982,7 @@
                             if (hadAuthBasic)
                                 this.onAuthBasicChange.next(undefined);
                             this.onChange.next(undefined);
-                            this._stopWatching$.next();
+                            this.stopListenChanges();
                             return [2 /*return*/];
                     }
                 });
@@ -16130,62 +16142,10 @@
                 });
             });
         };
-        AccountService.prototype.watch = function () {
-            var _this = this;
-            if (!this._cache.pubkey)
-                throw new Error('Not logged in');
-            if (!this.started) {
-                // Wait service ready, then loop
-                return rxjs.from(this.ready())
-                    .pipe(operators.switchMap(function () { return _this.watch(); }));
-            }
-            this._stopWatching$.next(); // Stop previous listening
-            console.debug('[account] [WS] Watching changes');
-            return this.graphql.subscribe({
-                query: AccountSubscriptions.listenChanges,
-                variables: {
-                    interval: 10
-                },
-                error: {
-                    code: ErrorCodes$2.SUBSCRIBE_ACCOUNT_ERROR,
-                    message: 'ERROR.ACCOUNT.SUBSCRIBE_ACCOUNT_ERROR'
-                }
-            })
-                .pipe(
-            // Stop this pipe next time we call watch()
-            operators.takeUntil(this._stopWatching$), operators.map(function (_b) {
-                var data = _b.data;
-                var _a;
-                if (!data)
-                    return;
-                var existingUpdateDate = toDateISOString((_a = _this._data) === null || _a === void 0 ? void 0 : _a.updateDate);
-                if (existingUpdateDate === data.updateDate)
-                    return;
-                console.debug("[account] [WS] Detected update on {" + data.updateDate + "}");
-                return exports.Account.fromObject(data);
-            }), operators.filter(isNotNil));
-        };
-        AccountService.prototype.listenChanges = function () {
-            var self = this;
-            var subscription = this.watch()
-                .subscribe({
-                next: function (data) { return self.refresh(); },
-                error: function (err) {
-                    if (err && +err.code === ServerErrorCodes.NOT_FOUND) {
-                        console.info('[account] Account not exists anymore: force user to logout...', err);
-                        self.logout();
-                    }
-                    else if (err && +err.code === ServerErrorCodes.UNAUTHORIZED) {
-                        console.info('[account] Account not authorized: force user to logout...', err);
-                        self.logout();
-                    }
-                    else {
-                        console.warn('[account] [WS] Received error:', err);
-                    }
-                }
-            });
-            subscription.add(function () { return console.debug('[account] [WS] Stop listening changes'); });
-            return subscription;
+        AccountService.prototype.listenChanges = function (opts) {
+            if (this._enableListenChanges)
+                return new rxjs.Subscription(); // Already started: skip
+            return this.startListenChanges(opts);
         };
         Object.defineProperty(AccountService.prototype, "additionalFields", {
             get: function () {
@@ -16215,6 +16175,7 @@
         };
         /* -- protected method -- */
         AccountService.prototype.resetData = function () {
+            this.stopListenChanges();
             this._cache.loaded = false;
             this._cache.keypair = null;
             this._cache.authToken = null;
@@ -16365,6 +16326,8 @@
                             // Emit event
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
+                            if (this._enableListenChanges)
+                                this.startListenChanges();
                             if (this._debug)
                                 console.debug("[account] Account restoration [OK] {pubkey: " + pubkey.substr(0, 8) + "}, {profile: " + this._cache.mainProfile + "}");
                             return [2 /*return*/, account];
@@ -16614,6 +16577,79 @@
                 });
             });
         };
+        AccountService.prototype.startListenChanges = function (opts) {
+            var _this = this;
+            if (this._listenChangesSubscription)
+                this.stopListenChanges(); // Stop previous subscription
+            if (this.network.offline)
+                return new rxjs.Subscription(); // Offline: skip
+            var subscription = this.watchChanges(opts)
+                .subscribe({
+                next: function (data) {
+                    console.debug("[account] Remote update detected at " + data.updateDate);
+                    _this.reload();
+                },
+                error: function (err) {
+                    if (err && +err.code === ServerErrorCodes.NOT_FOUND) {
+                        console.info('[account] [WS] Account not exists anymore: force user to logout...', err);
+                        _this.logout();
+                    }
+                    else if (err && +err.code === ServerErrorCodes.UNAUTHORIZED) {
+                        console.info('[account] [WS] Account not authorized: force user to logout...', err);
+                        _this.logout();
+                    }
+                    else {
+                        console.warn('[account] [WS] Received error:', err);
+                    }
+                }
+            });
+            // Add close log
+            subscription.add(function () { return console.debug("[account] Stop watching remote changes"); });
+            this._listenChangesSubscription = subscription;
+            // Make sure to use the stop function, when unsubscribe
+            return new rxjs.Subscription(function () { return _this.stopListenChanges(); });
+        };
+        AccountService.prototype.stopListenChanges = function () {
+            if (this._listenChangesSubscription) {
+                this._listenChangesSubscription.unsubscribe();
+                this._listenChangesSubscription = null;
+            }
+        };
+        AccountService.prototype.watchChanges = function (opts) {
+            var _this = this;
+            var _a;
+            if (!this.started) {
+                // Wait service ready, then loop
+                return rxjs.from(this.ready())
+                    .pipe(operators.switchMap(function () { return _this.watchChanges(opts); }));
+            }
+            if (!this._cache.pubkey)
+                throw new Error('Not logged in');
+            if (this.network.offline)
+                throw new Error('Cannot watch account changes: network is offline.');
+            var variables = {
+                interval: Math.max(0, (opts === null || opts === void 0 ? void 0 : opts.intervalInSecond) || ((_a = this.environment.account) === null || _a === void 0 ? void 0 : _a.listenIntervalInSecond) || 0)
+            };
+            console.debug("[account] Watching remote changes, every " + variables.interval + "s");
+            return this.graphql.subscribe({
+                query: AccountSubscriptions.listenChanges,
+                variables: variables,
+                error: {
+                    code: ErrorCodes$2.SUBSCRIBE_ACCOUNT_ERROR,
+                    message: 'ERROR.ACCOUNT.SUBSCRIBE_ACCOUNT_ERROR'
+                }
+            }).pipe(operators.map(function (_b) {
+                var data = _b.data;
+                return data;
+            }), 
+            // Keep only if newer
+            operators.filter(function (data) {
+                var _a;
+                var currentUpdateDate = fromDateISOString((_a = _this._data) === null || _a === void 0 ? void 0 : _a.updateDate);
+                var remoteUpdateDate = fromDateISOString(data === null || data === void 0 ? void 0 : data.updateDate);
+                return (remoteUpdateDate && (!currentUpdateDate || !remoteUpdateDate.isSame(currentUpdateDate, 'millisecond')));
+            }));
+        };
         AccountService.prototype.copyIdAndUpdateDate = function (source, target) {
             if (!source)
                 return;
@@ -20903,7 +20939,7 @@
                         case 4:
                             confirmed = _a.sent();
                             if (!(confirmed && this.isLogin)) return [3 /*break*/, 6];
-                            return [4 /*yield*/, this.accountService.refresh()];
+                            return [4 /*yield*/, this.accountService.reload()];
                         case 5:
                             _a.sent();
                             _a.label = 6;
@@ -21155,7 +21191,7 @@
                 return __generator(this, function (_b) {
                     this.disable();
                     this.markAsLoading();
-                    return [2 /*return*/, this.accountService.refresh()];
+                    return [2 /*return*/, this.accountService.reload()];
                 });
             });
         };
@@ -25059,7 +25095,7 @@
             rxjs.merge(
             // Listen sort events
             this.sort && this.sort.sortChange
-                .pipe(operators.filter(function () { return !_this.sort.disabled; }), operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_d) {
+                .pipe(operators.filter(function () { return !_this.sort.disabled; }), operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_e) {
                 return [2 /*return*/, this.saveBeforeAction('sort')];
             }); }); }), operators.filter(function (res) { return res === true; }), 
             // Save sort in settings
@@ -25070,7 +25106,7 @@
                 || rxjs.EMPTY, 
             // Listen paginator events
             this.paginator && this.paginator.page
-                .pipe(operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_d) {
+                .pipe(operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_e) {
                 return [2 /*return*/, this.saveBeforeAction('sort')];
             }); }); }), operators.filter(function (res) { return res === true; }), 
             // Save page size
@@ -25115,7 +25151,7 @@
         };
         AppTable.prototype.updateView = function (res, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
+                return __generator(this, function (_e) {
                     if (!res)
                         return [2 /*return*/]; // Skip (e.g error)
                     if (res && res.data) {
@@ -25224,8 +25260,8 @@
         AppTable.prototype.editRowById = function (event, id, opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var row;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (id < 0)
                                 return [2 /*return*/];
@@ -25235,9 +25271,9 @@
                             return [3 /*break*/, 3];
                         case 1: return [4 /*yield*/, this.dataSource.getRow(id)];
                         case 2:
-                            row = _d.sent();
+                            row = _e.sent();
                             this.editRow(event, row, opts);
-                            _d.label = 3;
+                            _e.label = 3;
                         case 3: return [2 /*return*/];
                     }
                 });
@@ -25322,11 +25358,11 @@
             return true;
         };
         AppTable.prototype.save = function (opts) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             return __awaiter(this, void 0, void 0, function () {
                 var previouslyEditedData, isOK, err_1;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             opts = Object.assign({ keepEditing: this.keepEditedRowOnSave }, opts);
                             if (this.readOnly) {
@@ -25334,27 +25370,27 @@
                             }
                             this.resetError();
                             // Keep edited row id (should be done BEFORE confirmEditCreate() )
-                            this.previouslyEditedRowId = opts.keepEditing && ((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) ? this.editedRow.id : undefined;
-                            previouslyEditedData = isNotNil(this.previouslyEditedRowId) && this.editedRow.currentData || ((_b = this.singleSelectedRow) === null || _b === void 0 ? void 0 : _b.currentData);
+                            this.previouslyEditedRowId = opts.keepEditing && ((((_a = this.editedRow) === null || _a === void 0 ? void 0 : _a.editing) ? this.editedRow.id : undefined) || ((_b = this.singleSelectedRow) === null || _b === void 0 ? void 0 : _b.id));
+                            previouslyEditedData = isNotNil(this.previouslyEditedRowId) && ((_c = this.editedRow) === null || _c === void 0 ? void 0 : _c.currentData) || ((_d = this.singleSelectedRow) === null || _d === void 0 ? void 0 : _d.currentData);
                             if (!this.confirmEditCreate()) {
                                 throw { code: ErrorCodes$2.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                             }
                             // Mark as saving
                             this.markAsSaving();
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _d.trys.push([1, 3, 4, 7]);
+                            _e.trys.push([1, 3, 4, 7]);
                             // Calling service save()
                             if (this.debug)
                                 console.debug('[table] Calling dataSource.save()...');
                             return [4 /*yield*/, this._dataSource.save()];
                         case 2:
-                            isOK = _d.sent();
+                            isOK = _e.sent();
                             if (isOK)
                                 this.markAsPristine();
                             return [2 /*return*/, isOK];
                         case 3:
-                            err_1 = _d.sent();
+                            err_1 = _e.sent();
                             this.setError(err_1 && err_1.message || err_1);
                             throw err_1;
                         case 4:
@@ -25362,8 +25398,8 @@
                             if (!isNotNil(this.previouslyEditedRowId)) return [3 /*break*/, 6];
                             return [4 /*yield*/, this.selectRowByIdOrData(this.previouslyEditedRowId, previouslyEditedData)];
                         case 5:
-                            _d.sent();
-                            _d.label = 6;
+                            _e.sent();
+                            _e.label = 6;
                         case 6: return [7 /*endfinally*/];
                         case 7: return [2 /*return*/];
                     }
@@ -25388,8 +25424,8 @@
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var newRow, json, newData_1;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             event === null || event === void 0 ? void 0 : event.stopPropagation();
                             row = row || this.singleSelectedRow;
@@ -25398,7 +25434,7 @@
                             }
                             return [4 /*yield*/, this.addRowToTable(row.id + 1)];
                         case 1:
-                            newRow = _d.sent();
+                            newRow = _e.sent();
                             json = Object.assign(Object.assign({}, row.currentData), { id: null });
                             // Reset some properties (e.g. rankOrder, etc)
                             if (opts && opts.skipProperties) {
@@ -25437,8 +25473,8 @@
             return __awaiter(this, void 0, void 0, function () {
                 var rows;
                 var _this = this;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (this.loading)
                                 return [2 /*return*/];
@@ -25447,9 +25483,9 @@
                             return [3 /*break*/, 3];
                         case 1: return [4 /*yield*/, this._dataSource.getRows()];
                         case 2:
-                            rows = _d.sent();
+                            rows = _e.sent();
                             rows.forEach(function (row) { return _this.selection.select(row); });
-                            _d.label = 3;
+                            _e.label = 3;
                         case 3: return [2 /*return*/];
                     }
                 });
@@ -25467,11 +25503,11 @@
         AppTable.prototype.deleteRow = function (event, row, opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var deleteCount;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0: return [4 /*yield*/, this.deleteRows(event, [row], opts)];
                         case 1:
-                            deleteCount = _d.sent();
+                            deleteCount = _e.sent();
                             return [2 /*return*/, deleteCount === 1];
                     }
                 });
@@ -25488,8 +25524,8 @@
             return __awaiter(this, void 0, void 0, function () {
                 var confirmed, canDelete, saved, rowsToDelete, deleteCount, err_2;
                 var _this = this;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (this.readOnly) {
                                 throw { code: ErrorCodes$2.TABLE_READ_ONLY, message: 'ERROR.TABLE_READ_ONLY' };
@@ -25509,7 +25545,7 @@
                             }
                             return [4 /*yield*/, this.canDeleteRows(rows, opts)];
                         case 1:
-                            canDelete = _d.sent();
+                            canDelete = _e.sent();
                             if (!canDelete)
                                 return [2 /*return*/, 0]; // Cannot delete
                             if (!this.saveBeforeDelete) return [3 /*break*/, 3];
@@ -25531,12 +25567,12 @@
                                 return [2 /*return*/, 0];
                             return [4 /*yield*/, this.saveBeforeAction('delete')];
                         case 2:
-                            saved = _d.sent();
+                            saved = _e.sent();
                             if (!saved) {
                                 // Stop if save cancelled or save failed
                                 return [2 /*return*/];
                             }
-                            _d.label = 3;
+                            _e.label = 3;
                         case 3:
                             if (this.debug)
                                 console.debug('[table] Delete selection...');
@@ -25545,13 +25581,13 @@
                                 // This is a workaround, need because row.delete() has async execution
                                 // and index cache is updated with a delay)
                                 .sort(function (a, b) { return a.id > b.id ? -1 : 1; });
-                            _d.label = 4;
+                            _e.label = 4;
                         case 4:
-                            _d.trys.push([4, 6, , 7]);
+                            _e.trys.push([4, 6, , 7]);
                             deleteCount = rowsToDelete.length;
                             return [4 /*yield*/, this._dataSource.deleteAll(rowsToDelete)];
                         case 5:
-                            _d.sent();
+                            _e.sent();
                             // DO not update manually, because watchALl().subscribe() will update this count
                             //this.totalRowCount -= deleteCount;
                             //this.visibleRowCount -= deleteCount;
@@ -25562,7 +25598,7 @@
                             this.onAfterDeletedRows.next(rowsToDelete);
                             return [2 /*return*/, deleteCount];
                         case 6:
-                            err_2 = _d.sent();
+                            err_2 = _e.sent();
                             this.setError(err_2 && err_2.message || err_2);
                             throw err_2;
                         case 7: return [2 /*return*/];
@@ -25573,14 +25609,14 @@
         AppTable.prototype.selectRowById = function (id) {
             return __awaiter(this, void 0, void 0, function () {
                 var row;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (id === undefined)
                                 return [2 /*return*/, false];
                             return [4 /*yield*/, this.waitIdle()];
                         case 1:
-                            _d.sent();
+                            _e.sent();
                             row = this.dataSource.getRow(id);
                             return [2 /*return*/, this.clickRow(null, row)];
                     }
@@ -25595,17 +25631,17 @@
             return __awaiter(this, void 0, void 0, function () {
                 var row;
                 var _this = this;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (data === undefined)
                                 return [2 /*return*/, Promise.resolve(false)];
                             return [4 /*yield*/, this.waitIdle()];
                         case 1:
-                            _d.sent();
+                            _e.sent();
                             return [4 /*yield*/, this.dataSource.getRows()];
                         case 2:
-                            row = ((_d.sent()) || [])
+                            row = ((_e.sent()) || [])
                                 .find(function (row) { return _this.equals(row.currentData, data); });
                             return [2 /*return*/, row && this.clickRow(null, row)];
                     }
@@ -25647,11 +25683,11 @@
         };
         AppTable.prototype.ready = function () {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0: return [4 /*yield*/, firstTruePromise(this.readySubject)];
                         case 1:
-                            _d.sent();
+                            _e.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -25659,11 +25695,11 @@
         };
         AppTable.prototype.waitIdle = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0: return [4 /*yield*/, firstFalsePromise(this.loadingSubject)];
                         case 1:
-                            _d.sent();
+                            _e.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -25672,28 +25708,28 @@
         AppTable.prototype.openSelectColumnsModal = function (event) {
             return __awaiter(this, void 0, void 0, function () {
                 var columns, hasTopModal, modal, data, userColumns;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             columns = this.getCurrentColumns();
                             return [4 /*yield*/, this.modalCtrl.getTop()];
                         case 1:
-                            hasTopModal = !!(_d.sent());
+                            hasTopModal = !!(_e.sent());
                             return [4 /*yield*/, this.modalCtrl.create({
                                     component: TableSelectColumnsComponent,
                                     componentProps: { columns: columns },
                                     cssClass: hasTopModal && 'stack-modal'
                                 })];
                         case 2:
-                            modal = _d.sent();
+                            modal = _e.sent();
                             // Open the modal
                             return [4 /*yield*/, modal.present()];
                         case 3:
                             // Open the modal
-                            _d.sent();
+                            _e.sent();
                             return [4 /*yield*/, modal.onDidDismiss()];
                         case 4:
-                            data = (_d.sent()).data;
+                            data = (_e.sent()).data;
                             if (!data)
                                 return [2 /*return*/]; // CANCELLED
                             userColumns = (data || []).filter(function (c) { return c.canHide === false || c.visible; }).map(function (c) { return c.name; }) || [];
@@ -25703,7 +25739,7 @@
                             return [4 /*yield*/, this.settings.savePageSetting(this.settingsId, userColumns, SETTINGS_DISPLAY_COLUMNS)];
                         case 5:
                             // Update user settings
-                            _d.sent();
+                            _e.sent();
                             return [2 /*return*/];
                     }
                 });
@@ -25718,11 +25754,11 @@
             // When target wait for a complete (e.g. IonRefresher)
             if ((event === null || event === void 0 ? void 0 : event.target) && event.target.complete) {
                 setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_d) {
-                        switch (_d.label) {
+                    return __generator(this, function (_e) {
+                        switch (_e.label) {
                             case 0: return [4 /*yield*/, this.waitIdle()];
                             case 1:
-                                _d.sent();
+                                _e.sent();
                                 event.target.complete();
                                 return [2 /*return*/];
                         }
@@ -25807,33 +25843,33 @@
         AppTable.prototype.selectRowByIdOrData = function (id, data) {
             return __awaiter(this, void 0, void 0, function () {
                 var done, err_3;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             done = false;
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _d.trys.push([1, 6, , 7]);
+                            _e.trys.push([1, 6, , 7]);
                             if (!(isNotNil(id) || id !== -1)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.selectRowById(id)];
                         case 2:
-                            done = _d.sent();
+                            done = _e.sent();
                             if (done)
                                 return [2 /*return*/, true];
                             console.warn('[app-table] Save: Cannot reselect row by row.id: ', id);
-                            _d.label = 3;
+                            _e.label = 3;
                         case 3:
                             if (!data) return [3 /*break*/, 5];
                             return [4 /*yield*/, this.selectRowByData(data)];
                         case 4:
-                            done = _d.sent();
+                            done = _e.sent();
                             if (done)
                                 return [2 /*return*/, true];
                             console.warn('[app-table] Save: Cannot reselect row by data: ', data);
-                            _d.label = 5;
+                            _e.label = 5;
                         case 5: return [2 /*return*/, false];
                         case 6:
-                            err_3 = _d.sent();
+                            err_3 = _e.sent();
                             // Log, but continue
                             console.error(err_3 && err_3.message || err_3);
                             return [2 /*return*/, false];
@@ -25856,23 +25892,23 @@
         AppTable.prototype.canDeleteRows = function (rows, opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var canDelete, err_4;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (!(this.onBeforeDeleteRows.observers.length > 0)) return [3 /*break*/, 4];
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _d.trys.push([1, 3, , 4]);
+                            _e.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, emitPromiseEvent(this.onBeforeDeleteRows, 'canDelete', {
                                     detail: { rows: rows }
                                 })];
                         case 2:
-                            canDelete = _d.sent();
+                            canDelete = _e.sent();
                             if (!canDelete)
                                 return [2 /*return*/, false];
                             return [3 /*break*/, 4];
                         case 3:
-                            err_4 = _d.sent();
+                            err_4 = _e.sent();
                             if (err_4 === 'CANCELLED')
                                 return [2 /*return*/, false]; // User cancel
                             console.error('Error while checking if can delete rows', err_4);
@@ -25889,35 +25925,35 @@
         };
         AppTable.prototype.canCancelRows = function (rows, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var _d, isCancel, err_5;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                var _e, isCancel, err_5;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
-                            _d = rows;
-                            if (_d) return [3 /*break*/, 2];
+                            _e = rows;
+                            if (_e) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.dataSource.getRows()];
                         case 1:
-                            _d = (_e.sent()).filter(function (row) { var _a; return (_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty; });
-                            _e.label = 2;
+                            _e = (_f.sent()).filter(function (row) { var _a; return (_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty; });
+                            _f.label = 2;
                         case 2:
                             // Get dirty rows
-                            rows = _d;
+                            rows = _e;
                             if (isEmptyArray(rows))
                                 return [2 /*return*/, true]; // No dirty: OK
                             if (!(this.onBeforeCancelRows.observers.length > 0)) return [3 /*break*/, 6];
-                            _e.label = 3;
+                            _f.label = 3;
                         case 3:
-                            _e.trys.push([3, 5, , 6]);
+                            _f.trys.push([3, 5, , 6]);
                             return [4 /*yield*/, emitPromiseEvent(this.onBeforeCancelRows, 'canCancel', {
                                     detail: { rows: rows }
                                 })];
                         case 4:
-                            isCancel = _e.sent();
+                            isCancel = _f.sent();
                             if (!isCancel)
                                 return [2 /*return*/, false];
                             return [3 /*break*/, 6];
                         case 5:
-                            err_5 = _e.sent();
+                            err_5 = _f.sent();
                             if (err_5 === 'CANCELLED')
                                 return [2 /*return*/, false]; // User cancel
                             console.error('Error while checking if can cancel rows', err_5);
@@ -25935,8 +25971,8 @@
         AppTable.prototype.saveBeforeAction = function (saveAction) {
             return __awaiter(this, void 0, void 0, function () {
                 var save, confirmed, res, err_6, saved;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (!this.dirty) {
                                 // Continue without save
@@ -25958,19 +25994,19 @@
                             confirmed = true;
                             if (!save) return [3 /*break*/, 4];
                             if (!(this.onBeforeSave.observers.length > 0)) return [3 /*break*/, 4];
-                            _d.label = 1;
+                            _e.label = 1;
                         case 1:
-                            _d.trys.push([1, 3, , 4]);
+                            _e.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, emitPromiseEvent(this.onBeforeSave, 'beforeSave', {
                                     detail: { action: saveAction, valid: this.valid }
                                 })];
                         case 2:
-                            res = _d.sent();
+                            res = _e.sent();
                             confirmed = res.confirmed;
                             save = res.save;
                             return [3 /*break*/, 4];
                         case 3:
-                            err_6 = _d.sent();
+                            err_6 = _e.sent();
                             if (err_6 === 'CANCELLED')
                                 return [2 /*return*/, false]; // User cancel
                             console.error('Error while checking if can delete rows', err_6);
@@ -25980,7 +26016,7 @@
                             if (!save) return [3 /*break*/, 6];
                             return [4 /*yield*/, this.save()];
                         case 5:
-                            saved = _d.sent();
+                            saved = _e.sent();
                             this.markAsDirty(); // Restore dirty flag
                             return [2 /*return*/, saved];
                         case 6: return [2 /*return*/, true]; // No save but continue action
@@ -25998,8 +26034,8 @@
          */
         AppTable.prototype.openRow = function (id, row) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (!this.allowRowDetail) return [3 /*break*/, 2];
                             if (this.debug && this.dirty) {
@@ -26018,7 +26054,7 @@
                                     relativeTo: this.route,
                                     queryParams: {}
                                 })];
-                        case 1: return [2 /*return*/, _d.sent()];
+                        case 1: return [2 /*return*/, _e.sent()];
                         case 2: return [2 /*return*/, false];
                     }
                 });
@@ -26026,8 +26062,8 @@
         };
         AppTable.prototype.openNewRowDetail = function (event) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (!this.allowRowDetail)
                                 return [2 /*return*/, false];
@@ -26038,7 +26074,7 @@
                             return [4 /*yield*/, this.router.navigate(['new'], {
                                     relativeTo: this.route
                                 })];
-                        case 1: return [2 /*return*/, _d.sent()];
+                        case 1: return [2 /*return*/, _e.sent()];
                     }
                 });
             });
@@ -26119,13 +26155,13 @@
         };
         AppTable.prototype.addRowToTable = function (insertAt) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             this.focusFirstColumn = true;
                             return [4 /*yield*/, this._dataSource.asyncCreateNew(insertAt)];
                         case 1:
-                            _d.sent();
+                            _e.sent();
                             this.editedRow = this._dataSource.getRow(-1);
                             // Emit start editing event
                             this.onStartEditingRow.emit(this.editedRow);
@@ -26189,7 +26225,7 @@
         };
         AppTable.prototype.askDeleteConfirmation = function (event, rows) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
+                return __generator(this, function (_e) {
                     if (this.undoableDeletion) {
                         // Special message, for undoable deletion
                         return [2 /*return*/, Alerts.askConfirmation((rows === null || rows === void 0 ? void 0 : rows.length) === 1 ? 'CONFIRM.DELETE_ROW' : 'CONFIRM.DELETE_ROWS', this.alertCtrl, this.translate, event)];
@@ -26201,21 +26237,21 @@
         };
         AppTable.prototype.askCancelConfirmation = function (event, rows) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
+                return __generator(this, function (_e) {
                     return [2 /*return*/, Alerts.askConfirmation((rows === null || rows === void 0 ? void 0 : rows.length) === 1 ? 'CONFIRM.CANCEL_ROW' : 'CONFIRM.CANCEL_ROWS', this.alertCtrl, this.translate, event)];
                 });
             });
         };
         AppTable.prototype.askRestoreConfirmation = function (event) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
+                return __generator(this, function (_e) {
                     return [2 /*return*/, Alerts.askActionConfirmation(this.alertCtrl, this.translate, false, event)];
                 });
             });
         };
         AppTable.prototype.showToast = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_d) {
+                return __generator(this, function (_e) {
                     if (!this.toastController)
                         throw new Error('Missing toastController in component\'s constructor');
                     return [2 /*return*/, Toasts.show(this.toastController, this.translate, opts)];
@@ -26310,14 +26346,14 @@
         AppTable.prototype.checkIfPristine = function (opts) {
             return __awaiter(this, void 0, void 0, function () {
                 var rows, pristine;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             if (!this.dirty)
                                 return [2 /*return*/]; // Already pristine
                             return [4 /*yield*/, this._dataSource.getRows()];
                         case 1:
-                            rows = _d.sent();
+                            rows = _e.sent();
                             pristine = (rows || []).findIndex(function (row) { var _a; return (_a = row.validator) === null || _a === void 0 ? void 0 : _a.dirty; }) === -1;
                             if (pristine)
                                 this.markAsPristine(opts);
@@ -27158,16 +27194,17 @@
     var AppEntityEditor = /** @class */ (function (_super) {
         __extends(AppEntityEditor, _super);
         function AppEntityEditor(injector, dataType, dataService, options) {
-            var _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
+            var _this = this;
+            var _a;
+            _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
             _this.dataType = dataType;
             _this.dataService = dataService;
             _this.saving = false;
-            _this.hasRemoteListener = false;
             _this.$title = new rxjs.Subject();
             _this.onUpdateView = new i0.EventEmitter();
             options = Object.assign({
                 // Default options
-                enableListenChanges: (injector.get(ENVIRONMENT).listenRemoteChanges === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
+                enableListenChanges: (((_a = injector.get(ENVIRONMENT).entityEditor) === null || _a === void 0 ? void 0 : _a.enableListenChanges) === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
             }, options);
             _this.settings = injector.get(LocalSettingsService);
             _this.errorTranslator = injector.get(FormErrorTranslator);
@@ -27264,6 +27301,7 @@
         };
         AppEntityEditor.prototype.ngOnDestroy = function () {
             _super.prototype.ngOnDestroy.call(this);
+            this.listenRemoteSubscription = null; // already unsubscribe in the super function
             this.$title.complete();
             this.$title.unsubscribe();
             this.onUpdateView.complete();
@@ -27360,11 +27398,10 @@
         AppEntityEditor.prototype.startListenRemoteChanges = function () {
             var _this = this;
             // Skip if disable, or already listening
-            if (this.hasRemoteListener || !this._enableListenChanges || this.isNewData)
+            if (this.listenRemoteSubscription || !this._enableListenChanges || this.isNewData)
                 return;
             // Listen for changes on server
-            this.hasRemoteListener = true;
-            this.registerSubscription(this.dataService.listenChanges(this.data.id)
+            this.listenRemoteSubscription = this.dataService.listenChanges(this.data.id)
                 .pipe(operators.filter(isNotNil))
                 .subscribe(function (data) {
                 if (data.updateDate && data.updateDate.isAfter(_this.data.updateDate)) {
@@ -27378,8 +27415,16 @@
                             console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}, but page is dirty: skip reloading.");
                     }
                 }
-            })
-                .add(function () { return _this.hasRemoteListener = false; }));
+            });
+            this.listenRemoteSubscription.add(function () { return _this.listenRemoteSubscription = null; });
+            this.registerSubscription(this.listenRemoteSubscription);
+        };
+        AppEntityEditor.prototype.stopListenRemoteChanges = function () {
+            if (this.listenRemoteSubscription) {
+                this.unregisterSubscription(this.listenRemoteSubscription);
+                this.listenRemoteSubscription.unsubscribe();
+                this.listenRemoteSubscription = null;
+            }
         };
         AppEntityEditor.prototype.updateView = function (data, opts) {
             return __awaiter(this, void 0, void 0, function () {
@@ -27575,7 +27620,7 @@
                             // Update the view (e.g metadata)
                             _b.sent();
                             // Subscribe to remote changes
-                            if (!this.hasRemoteListener)
+                            if (!this.listenRemoteSubscription)
                                 this.startListenRemoteChanges();
                             this.submitted = false;
                             return [2 /*return*/, true];
@@ -27773,6 +27818,7 @@
         AppEntityEditor.prototype.unload = function () {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_b) {
+                    this.stopListenRemoteChanges();
                     this.form.reset();
                     this.registerForms();
                     this._dirty = false;