Improved way to load server for server dashboard #131

kdb-web/src/app/modules/view/dashboard/components/dashboard/dashboard.component.ts

@@ -6,7 +6,6 @@ import { LazyLoadEvent } from "primeng/api";
 import { debounceTime, throwError } from "rxjs";
 import { ConfirmationDialogService } from "src/app/services/confirmation-dialog/confirmation-dialog.service";
 import { DataService } from "src/app/services/data/data.service";
-import { ServerService } from "src/app/services/data/server.service";
 import { SpinnerService } from "src/app/services/spinner/spinner.service";
 import { ToastService } from "src/app/services/toast/toast.service";
 import { Server } from "../../../../../models/data/server.model";
@@ -50,7 +49,7 @@ export class DashboardComponent implements OnInit {
     private fb: FormBuilder,
     private translate: TranslateService,
     private router: Router,
-    private serverService: ServerService
+    // private serverService: ServerService
   ) {
   }
 
@@ -85,7 +84,7 @@ export class DashboardComponent implements OnInit {
 
   loadNextPage() {
     this.spinnerService.showSpinner();
-    this.data.query<Query>(Queries.serverInfoQuery,{
+    this.data.query<Query>(Queries.serversListQuery,{
       filter: this.filter,
       page: this.page,
       sort: this.sort,
@@ -122,8 +121,8 @@ export class DashboardComponent implements OnInit {
   }
 
   selectServer(server: Server) {
-    this.serverService.server$.next(server);
-    this.router.navigate(["/server"]);
+    // this.serverService.server$.next(server);
+    this.router.navigate(["/server", server.id]);
   }
 
 }

kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html

@@ -1,5 +1,5 @@
 <h1>
-    {{'view.dashboard.header' | translate}}
+    {{'view.server.dashboard.header' | translate}}
 </h1>
 <div class="content-wrapper">
     <div class="content-header">

kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.ts

@@ -2,13 +2,14 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Server } from "src/app/models/data/server.model";
 import { DataService } from "src/app/services/data/data.service";
-import { ServerService } from "src/app/services/data/server.service";
 import { SpinnerService } from "src/app/services/spinner/spinner.service";
+import { Queries } from "../../../../models/graphql/queries.model";
+import { Query } from "../../../../models/graphql/query.model";
 
 @Component({
-  selector: 'app-server-dashboard',
-  templateUrl: './server-dashboard.component.html',
-  styleUrls: ['./server-dashboard.component.scss']
+  selector: "app-server-dashboard",
+  templateUrl: "./server-dashboard.component.html",
+  styleUrls: ["./server-dashboard.component.scss"]
 })
 export class ServerDashboardComponent implements OnInit {
 
@@ -19,20 +20,22 @@ export class ServerDashboardComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private data: DataService,
-    private spinner: SpinnerService,
-    private serverService: ServerService
-  ) { }
+    private spinner: SpinnerService
+  ) {
+  }
 
   ngOnInit(): void {
     this.spinner.showSpinner();
-    if (!this.serverService.server$.value) {
+    this.data.query<Server>(Queries.serversQuery, {
+        filter: { id: this.route.snapshot.params["id"] }
+      },
+      function(data: Query) {
+        return data.servers.length > 0 ? data.servers[0] : null;
+      }
+    ).subscribe(server => {
+      this.server = server;
       this.spinner.hideSpinner();
-      this.router.navigate(['/dashboard']);
-      return;
-    }
-
-    this.server = this.serverService.server$.value;
-    this.spinner.hideSpinner();
+    });
   }
 
 }