fixed ready handling for network list; fix #SNRGY-3007

SENERGY-Platform · Dec 1, 2023 · ddff1a0 · ddff1a0
1 parent 4c13c20
commit ddff1a0
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/src/app/modules/devices/networks/networks.component.ts b/src/app/modules/devices/networks/networks.component.ts
@@ -126,7 +126,14 @@ export class NetworksComponent implements OnInit, OnDestroy {
         this.paginator.page.subscribe(()=>{
             this.pageSize = this.paginator.pageSize
             this.offset = this.paginator.pageSize * this.paginator.pageIndex;
-            this.getNetworks().subscribe();
+            this.getNetworks().subscribe({
+                next: (_) => {
+                    this.ready = true
+                },
+                error: (_) => {
+                    this.ready = true
+                }
+            });
         });
     }
 
@@ -152,16 +159,21 @@ export class NetworksComponent implements OnInit, OnDestroy {
                 .subscribe((deleteNetwork: boolean) => {
                     if (deleteNetwork) {
                         setTimeout(() => {
-                            this.getNetworks().subscribe();
+                            this.getNetworks().subscribe({
+                                next: (_) => {
+                                    this.ready = true
+                                },
+                                error: (_) => {
+                                    this.ready = true
+                                }
+                            });
                         }, 1000);
                     }
                 });
         });
     }
 
     private getNetworks(): Observable<NetworksModel[]> {
-        this.ready = false;
-
         return this.networksService
             .searchNetworks(this.searchText, this.pageSize, this.offset, this.sortBy, this.sortDirection)
             .pipe(
@@ -178,9 +190,14 @@ export class NetworksComponent implements OnInit, OnDestroy {
         this.ready = false;
         this.selectionClear();
 
-        forkJoin([this.getNetworks(), this.getTotalCount()]).subscribe(_ => {
-            this.ready = true;
-        })
+        forkJoin([this.getNetworks(), this.getTotalCount()]).subscribe({
+            next: (_) => {
+                this.ready = true
+            },
+            error: (_) => {
+                this.ready = true
+            }
+        });
     }
 
     isAllSelected() {