@sumaris-net/ngx-components 1.9.2 → 1.9.3

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

@@ -21935,7 +21935,7 @@ class AppTable {
         return true;
     }
     save(opts) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             opts = Object.assign({ keepEditing: this.keepEditedRowOnSave }, opts);
             if (this.readOnly) {
@@ -21943,8 +21943,8 @@ class AppTable {
             }
             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;
-            const 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));
+            const 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' };
             }
@@ -23447,7 +23447,6 @@ class AppEntityEditor extends AppTabEditor {
         this.dataType = dataType;
         this.dataService = dataService;
         this.saving = false;
-        this.hasRemoteListener = false;
         this.$title = new Subject();
         this.onUpdateView = new EventEmitter();
         options = Object.assign({ 
@@ -23526,6 +23525,7 @@ class AppEntityEditor extends AppTabEditor {
     }
     ngOnDestroy() {
         super.ngOnDestroy();
+        this.listenRemoteSubscription = null; // already unsubscribe in the super function
         this.$title.complete();
         this.$title.unsubscribe();
         this.onUpdateView.complete();
@@ -23604,11 +23604,10 @@ class AppEntityEditor extends AppTabEditor {
     }
     startListenRemoteChanges() {
         // 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(filter(isNotNil))
             .subscribe((data) => {
             if (data.updateDate && data.updateDate.isAfter(this.data.updateDate)) {
@@ -23622,8 +23621,16 @@ class AppEntityEditor extends AppTabEditor {
                         console.debug(`[data-editor] Changes detected on server, at {${data.updateDate}}, but page is dirty: skip reloading.`);
                 }
             }
-        })
-            .add(() => this.hasRemoteListener = false));
+        });
+        this.listenRemoteSubscription.add(() => this.listenRemoteSubscription = null);
+        this.registerSubscription(this.listenRemoteSubscription);
+    }
+    stopListenRemoteChanges() {
+        if (this.listenRemoteSubscription) {
+            this.unregisterSubscription(this.listenRemoteSubscription);
+            this.listenRemoteSubscription.unsubscribe();
+            this.listenRemoteSubscription = null;
+        }
     }
     updateView(data, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -23767,7 +23774,7 @@ class AppEntityEditor extends AppTabEditor {
                 // Update the view (e.g metadata)
                 yield this.updateView(updatedData, opts);
                 // Subscribe to remote changes
-                if (!this.hasRemoteListener)
+                if (!this.listenRemoteSubscription)
                     this.startListenRemoteChanges();
                 this.submitted = false;
                 return true;
@@ -23922,6 +23929,7 @@ class AppEntityEditor extends AppTabEditor {
     }
     unload() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.stopListenRemoteChanges();
             this.form.reset();
             this.registerForms();
             this._dirty = false;