@sumaris-net/ngx-components 2.4.24 → 2.4.25-rc2

package/fesm2020/sumaris-net.ngx-components.mjs

@@ -15302,6 +15302,13 @@ class NetworkService extends StartableObservableService {
             if (await this.checkPeerAlive(detectedPeer)) {
                 return detectedPeer;
             }
+            // Peer not alive, but should be at the same URL, retrying each 1s
+            if (this.environment.sameUrlPeer) {
+                return await timer(1000, 1000)
+                    .pipe(takeUntil(this.stopSubject), tap(() => console.warn(`[network-service] Waiting peer be be alive, at {${detectedPeer.url}} ...`)), mergeMap(() => this.checkPeerAlive(detectedPeer)), filter(alive => !!alive), map(() => detectedPeer), first()).toPromise();
+                // Stop
+                throw new Error('Service have been stopped');
+            }
         }
         return undefined;
     }
@@ -28140,7 +28147,6 @@ class AppEntityEditor extends AppTabEditor {
     }
     ngOnDestroy() {
         super.ngOnDestroy();
-        this._listenChangesSubscription = null; // already unsubscribe in the super function
         this.$title.complete();
         this.$title.unsubscribe();
         this.onUpdateView.complete();
@@ -28214,7 +28220,7 @@ class AppEntityEditor extends AppTabEditor {
                 this._usageMode = this.computeUsageMode(data);
                 await this.onEntityLoaded(data, opts);
                 await this.updateView(data, opts);
-                this.startListenRemoteChanges();
+                this.startListenChanges();
             }
             catch (err) {
                 this.setError(err);
@@ -28228,18 +28234,17 @@ class AppEntityEditor extends AppTabEditor {
     canUserWrite(data, opts) {
         return this.dataService.canUserWrite(data, opts);
     }
-    startListenRemoteChanges() {
+    startListenChanges() {
         // Skip if disable, or already listening
         if (this._listenChangesSubscription || !this._enableListenChanges)
             return;
-        // Skip if new or local data
-        if (this.isNewData || EntityUtils.isLocal(this.data))
+        // Skip if new (nothing to listen)
+        if (this.isNewData)
             return;
         // Listen for changes on server
-        this._listenChangesSubscription = this.listenChanges(this.data.id, {
+        const subscription = this.listenChanges(this.data.id, {
             interval: this._listenIntervalInSeconds
-        })
-            .pipe(filter(isNotNil), mergeMap((data) => this.saving
+        })?.pipe(filter(isNotNil), mergeMap((data) => this.saving
             // If saving, wait end, to avoid to detect self changes
             ? firstFalse(this.savingSubject).pipe(mapTo(data), debounceTime(500))
             : of(data)))
@@ -28260,16 +28265,19 @@ class AppEntityEditor extends AppTabEditor {
                 this.showToast({ message: 'ERROR.DATA_UPDATE_DATE_CHANGED', type: 'warning', showCloseButton: true });
             }
         });
-        this._listenChangesSubscription.add(() => this._listenChangesSubscription = null);
-        this.registerSubscription(this._listenChangesSubscription);
-    }
-    stopListenRemoteChanges() {
-        if (this._listenChangesSubscription) {
-            this.unregisterSubscription(this._listenChangesSubscription);
-            this._listenChangesSubscription.unsubscribe();
-            this._listenChangesSubscription = null;
+        // Register subscription
+        if (subscription) {
+            this._listenChangesSubscription = subscription;
+            this.registerSubscription(this._listenChangesSubscription);
+            subscription.add(() => {
+                this.unregisterSubscription(subscription);
+                this._listenChangesSubscription = null;
+            });
         }
     }
+    stopListenChanges() {
+        this._listenChangesSubscription?.unsubscribe();
+    }
     async updateView(data, opts) {
         const idChanged = isNotNil(data.id)
             && this.previousDataId !== undefined // Ignore if first loading (=undefined)
@@ -28400,7 +28408,7 @@ class AppEntityEditor extends AppTabEditor {
             });
             // Subscribe to remote changes
             if (!this._listenChangesSubscription)
-                this.startListenRemoteChanges();
+                this.startListenChanges();
             this.submitted = false;
             return true;
         }
@@ -28488,7 +28496,7 @@ class AppEntityEditor extends AppTabEditor {
     }
     async unload(opts) {
         await super.unload(opts);
-        this.stopListenRemoteChanges();
+        this.stopListenChanges();
         this.form.reset();
         this.registerForms();
         this.data = null;