Merge pull request 'Ausgewählter Server besser darstellen #131' (#196) from #131 into 1.0.0

Reviewed-on: sh-edraft.de/kd_discord_bot#196
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #131

kdb-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "0.3.dev162-2",
+    "version": "0.3.dev162-3",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node-esm update-version.ts",

kdb-web/src/app/app-routing.module.ts

@@ -7,7 +7,7 @@ import { AuthGuard } from './modules/shared/guards/auth/auth.guard';
 const routes: Routes = [
   { path: '', redirectTo: 'dashboard', pathMatch: 'full' },
   { path: 'dashboard', loadChildren: () => import('./modules/view/dashboard/dashboard.module').then(m => m.DashboardModule), canActivate: [AuthGuard] },
-  { path: 'server', loadChildren: () => import('./modules/view/server/server.module').then(m => m.ServerModule), canActivate: [AuthGuard] },
+  { path: 'server/:serverId', loadChildren: () => import('./modules/view/server/server.module').then(m => m.ServerModule), canActivate: [AuthGuard] },
   { path: 'change-password', loadChildren: () => import('./modules/view/change-password/change-password.module').then(m => m.ChangePasswordModule), canActivate: [AuthGuard] },
   { path: 'user-settings', loadChildren: () => import('./modules/view/user-settings/user-settings.module').then(m => m.UserSettingsModule), canActivate: [AuthGuard] },
   { path: 'auth', loadChildren: () => import('./modules/auth/auth.module').then(m => m.AuthModule) },

kdb-web/src/app/components/sidebar/sidebar.component.ts

@@ -1,47 +1,37 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute } from '@angular/router';
+import { LangChangeEvent, TranslateService } from "@ngx-translate/core";
-import { LangChangeEvent, TranslateService } from '@ngx-translate/core';
+import { MenuItem } from "primeng/api";
-import { MenuItem } from 'primeng/api';
+import { AuthService } from "src/app/services/auth/auth.service";
-import { AuthRoles } from 'src/app/models/auth/auth-roles.enum';
+import { ThemeService } from "src/app/services/theme/theme.service";
-import { AuthService } from 'src/app/services/auth/auth.service';
+import { SidebarService } from "../../services/sidebar/sidebar.service";
-import { ServerService } from 'src/app/services/data/server.service';
-import { ThemeService } from 'src/app/services/theme/theme.service';
 
 @Component({
-  selector: 'app-sidebar',
+  selector: "app-sidebar",
-  templateUrl: './sidebar.component.html',
+  templateUrl: "./sidebar.component.html",
-  styleUrls: ['./sidebar.component.scss']
+  styleUrls: ["./sidebar.component.scss"]
 })
 export class SidebarComponent implements OnInit {
 
-  isSidebarOpen: boolean = true;
+  isSidebarOpen!: boolean;
   menuItems!: MenuItem[];
 
-  private serverId?: number;
-
   constructor(
     private authService: AuthService,
     private translateService: TranslateService,
     private themeService: ThemeService,
-    private route: ActivatedRoute,
+    private sidebar: SidebarService
-    private serverService: ServerService
   ) {
+    this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
+      this.sidebar.setMenu();
+    });
+
     this.themeService.isSidebarOpen$.subscribe(value => {
       this.isSidebarOpen = value;
-      this.setMenu();
+      this.sidebar.setMenu();
     });
 
-    this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
+    this.sidebar.menuItems$.subscribe(value => {
-      this.setMenu();
+      this.menuItems = value;
-    });
-
-    this.serverService.server$.subscribe(server => {
-      if (!server) {
-        return;
-      }
-
-      this.serverId = server.id;
-      this.setMenu();
     });
   }
 
@@ -49,44 +39,4 @@ export class SidebarComponent implements OnInit {
     this.themeService.loadMenu();
   }
 
-  setMenu() {
-    this.authService.hasUserPermission(AuthRoles.Admin).then(hasPermission => {
-      this.menuItems = [];
-      this.menuItems = [
-        { label: this.isSidebarOpen ? this.translateService.instant('sidebar.dashboard') : '', icon: 'pi pi-th-large', routerLink: 'dashboard' }
-      ];
-
-      if (this.serverId) {
-        this.addServerMenu();
-      }
-
-      if (hasPermission) {
-        this.addAdminMenu();
-      }
-      this.menuItems = this.menuItems.slice();
-    });
-  }
-
-  addServerMenu() {
-    this.menuItems.push(
-      {
-        label: this.isSidebarOpen ? this.translateService.instant('sidebar.server') : '', icon: 'pi pi-server', items: [
-          { label: this.isSidebarOpen ? this.translateService.instant('sidebar.settings') : '', icon: 'pi pi-cog', routerLink: 'server/settings' },
-          { label: this.isSidebarOpen ? this.translateService.instant('sidebar.members') : '', icon: 'pi pi-users', routerLink: 'server/members' },
-        ]
-      }
-    );
-  }
-
-  addAdminMenu() {
-    this.menuItems.push(
-      {
-        label: this.isSidebarOpen ? this.translateService.instant('sidebar.administration') : '', icon: 'pi pi-cog', items: [
-          { label: this.isSidebarOpen ? this.translateService.instant('sidebar.config') : '', icon: 'pi pi-cog', routerLink: '/admin/settings' },
-          { label: this.isSidebarOpen ? this.translateService.instant('sidebar.auth_user_list') : '', icon: 'pi pi-user-edit', routerLink: '/admin/users' },
-        ]
-      },
-    );
-  }
-
 }

kdb-web/src/app/models/graphql/queries.model.ts

@@ -1,5 +1,5 @@
 export class Queries {
-  static serverInfoQuery = `
+  static serversListQuery = `
     query ServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
       serverCount
       servers(filter: $filter, page: $page, sort: $sort) {
@@ -10,4 +10,15 @@ export class Queries {
       }
     }
   `;
+
+  static serversQuery = `
+    query ServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
+      servers(filter: $filter, page: $page, sort: $sort) {
+        id
+        name
+        iconURL
+        userCount
+      }
+    }
+  `;
 }

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";
@@ -15,6 +14,7 @@ import { Queries } from "../../../../../models/graphql/queries.model";
 import { Page } from "../../../../../models/graphql/filter/page.model";
 import { Sort } from "../../../../../models/graphql/filter/sort.model";
 import { Query } from "../../../../../models/graphql/query.model";
+import { SidebarService } from "../../../../../services/sidebar/sidebar.service";
 
 @Component({
   selector: "app-dashboard",
@@ -50,7 +50,7 @@ export class DashboardComponent implements OnInit {
     private fb: FormBuilder,
     private translate: TranslateService,
     private router: Router,
-    private serverService: ServerService
+    private sidebar: SidebarService,
   ) {
   }
 
@@ -85,7 +85,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 +122,8 @@ export class DashboardComponent implements OnInit {
   }
 
   selectServer(server: Server) {
-    this.serverService.server$.next(server);
+    this.sidebar.serverName$.next(server.name ?? "");
-    this.router.navigate(["/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,15 @@ 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";
+import { SidebarService } from "../../../../services/sidebar/sidebar.service";
 
 @Component({
-  selector: 'app-server-dashboard',
+  selector: "app-server-dashboard",
-  templateUrl: './server-dashboard.component.html',
+  templateUrl: "./server-dashboard.component.html",
-  styleUrls: ['./server-dashboard.component.scss']
+  styleUrls: ["./server-dashboard.component.scss"]
 })
 export class ServerDashboardComponent implements OnInit {
 
@@ -20,19 +22,29 @@ export class ServerDashboardComponent implements OnInit {
     private router: Router,
     private data: DataService,
     private spinner: SpinnerService,
-    private serverService: ServerService
+    private sidebar: SidebarService
-  ) { }
+  ) {
+  }
 
   ngOnInit(): void {
     this.spinner.showSpinner();
-    if (!this.serverService.server$.value) {
+    if (!this.route.snapshot.params["serverId"]) {
       this.spinner.hideSpinner();
       this.router.navigate(['/dashboard']);
       return;
     }
 
-    this.server = this.serverService.server$.value;
+    this.data.query<Server>(Queries.serversQuery, {
-    this.spinner.hideSpinner();
+        filter: { id: this.route.snapshot.params["serverId"] }
+      },
+      function(data: Query) {
+        return data.servers.length > 0 ? data.servers[0] : null;
+      }
+    ).subscribe(server => {
+      this.server = server;
+      this.sidebar.serverName$.next(server.name ?? "");
+      this.spinner.hideSpinner();
+    });
   }
 
 }

kdb-web/src/app/services/data/data.service.ts

@@ -27,13 +27,14 @@ export class DataService {
   //   );
   // }
 
-  public query<T>(query: string, variables?: Variables): Observable<T> {
+  public query<T>(query: string, variables?: Variables, f?: Function): Observable<T> {
     return this.http
       .post<{ data: T }>(`${this.appsettings.getApiURL()}/api/graphql`, {
         query: query,
         variables: variables
       })
-      .pipe(map((d) => d.data));
+      .pipe(map((d) => d.data))
+      .pipe(map((d) => f ? f(d) : d));
   }
 
 }

kdb-web/src/app/services/data/server.service.ts

@@ -1,23 +0,0 @@
-import { Injectable } from "@angular/core";
-import { BehaviorSubject } from "rxjs";
-import { Server } from "src/app/models/data/server.model";
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ServerService {
-
-  private server!: Server;
-  server$ = new BehaviorSubject<Server | null>(null);
-
-  constructor() {
-    this.server$.subscribe(server => {
-      if (!server) {
-        return;
-      }
-      this.server = server;
-    });
-  }
-
-
-}

kdb-web/src/app/services/sidebar/sidebar.service.spec.ts

@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ServerService } from './server.service';
+import { SidebarService } from './sidebar.service';
 
-describe('ServerService', () => {
+describe('SidebarService', () => {
-  let service: ServerService;
+  let service: SidebarService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(ServerService);
+    service = TestBed.inject(SidebarService);
   });
 
   it('should be created', () => {

kdb-web/src/app/services/sidebar/sidebar.service.ts

@@ -0,0 +1,73 @@
+import { Injectable } from "@angular/core";
+import { MenuItem } from "primeng/api";
+import { BehaviorSubject } from "rxjs";
+import { AuthRoles } from "../../models/auth/auth-roles.enum";
+import { AuthService } from "../auth/auth.service";
+import { TranslateService } from "@ngx-translate/core";
+import { ActivatedRoute, NavigationEnd, Router } from "@angular/router";
+import { ThemeService } from "../theme/theme.service";
+
+@Injectable({
+  providedIn: "root"
+})
+export class SidebarService {
+
+  isSidebarOpen: boolean = true;
+  menuItems$: BehaviorSubject<MenuItem[]> = new BehaviorSubject(new Array<MenuItem>());
+  serverName$: BehaviorSubject<string> = new BehaviorSubject("");
+
+  constructor(
+    private themeService: ThemeService,
+    private authService: AuthService,
+    private translateService: TranslateService,
+    private router: Router,
+  ) {
+    this.themeService.isSidebarOpen$.subscribe(value => {
+      this.isSidebarOpen = value;
+      this.setMenu();
+    });
+
+
+    this.serverName$.subscribe(value => {
+      this.setMenu();
+    });
+
+    this.router.events.subscribe(event => {
+      if (!(event instanceof NavigationEnd)) {
+        return;
+      }
+    });
+  }
+
+  setMenu() {
+    this.authService.hasUserPermission(AuthRoles.Admin).then(hasPermission => {
+      let menuItems: MenuItem[] = [
+        { label: this.isSidebarOpen ? this.translateService.instant("sidebar.dashboard") : "", icon: "pi pi-th-large", routerLink: "dashboard" }
+      ];
+
+      const serverMenu = {
+        label: this.isSidebarOpen ? this.serverName$.value : "", icon: "pi pi-server", items: [
+          { label: this.isSidebarOpen ? this.translateService.instant("sidebar.settings") : "", icon: "pi pi-cog", routerLink: "server/settings" },
+          { label: this.isSidebarOpen ? this.translateService.instant("sidebar.members") : "", icon: "pi pi-users", routerLink: "server/members" }
+        ]
+      };
+      if (this.serverName$.value != "") {
+        menuItems.push(serverMenu);
+      } else if (menuItems.find(x => x.icon == "pi pi-server")) {
+        menuItems.splice(menuItems.indexOf(serverMenu), 1);
+      }
+
+      if (hasPermission) {
+        menuItems.push(
+          {
+            label: this.isSidebarOpen ? this.translateService.instant("sidebar.administration") : "", icon: "pi pi-cog", items: [
+              { label: this.isSidebarOpen ? this.translateService.instant("sidebar.config") : "", icon: "pi pi-cog", routerLink: "/admin/settings" },
+              { label: this.isSidebarOpen ? this.translateService.instant("sidebar.auth_user_list") : "", icon: "pi pi-user-edit", routerLink: "/admin/users" }
+            ]
+          }
+        );
+      }
+      this.menuItems$.next(menuItems);
+    });
+  }
+}

kdb-web/src/assets/i18n/de.json

@@ -151,7 +151,10 @@
       }
     },
     "server": {
-      "header": "Server"
+      "header": "Server",
+      "dashboard": {
+        "header": "Server dashboard"
+      }
     },
     "user-list": {},
     "change-password": {

kdb-web/src/styles/primeng-fixes.scss

@@ -1,102 +1,106 @@
 @import "./constants.scss";
 
 .btn {
-    &:focus {
+  &:focus {
-        box-shadow: none !important;
+    box-shadow: none !important;
-    }
+  }
 }
 
 .p-menu,
 .p-panelmenu {
-    background: none !important;
+  background: none !important;
-    border: none !important;
+  border: none !important;
-    width: auto !important;
+  width: auto !important;
-    border-radius: 0px !important;
+  border-radius: 0px !important;
-    padding: 0 !important;
+  padding: 0 !important;
 
-    .p-menuitem-link,
+  .p-menuitem-link,
-    .p-panelmenu-header > a,
+  .p-panelmenu-header > a,
-    .p-panelmenu-content .p-menuitem .p-menuitem-link {
+  .p-panelmenu-content .p-menuitem .p-menuitem-link {
-        $distance: 10px;
+    $distance: 10px;
-        padding: $distance 0px $distance $distance !important;
+    padding: $distance 0px $distance $distance !important;
-        margin: 4px 0px 4px 6px !important;
+    margin: 4px 0px 4px 6px !important;
-    }
+  }
 }
 
 header,
 .app {
-    .p-menu-overlay {
+  .p-menu-overlay {
-        top: $headerHeight !important;
+    top: $headerHeight !important;
-    }
+  }
 }
 
 .p-panelmenu {
-    .p-panelmenu-icon {
+  .p-panelmenu-icon {
-        order: 1; // to be the first item on right side.
+    order: 1; // to be the first item on right side.
-    }
+  }
-    .p-menuitem-text {
-        flex-grow: 1; // to fill the whole space and push the icon to the end
-    }
 
-    .p-panelmenu-header > a {
+  .p-menuitem-text {
-        border: none !important;
+    flex-grow: 1; // to fill the whole space and push the icon to the end
-        border-radius: none !important;
+    white-space: nowrap;
-        font-weight: none !important;
+    overflow: hidden;
-        transition: none !important;
+    text-overflow: ellipsis;
-    }
+  }
 
-    .p-panelmenu-content {
+  .p-panelmenu-header > a {
-        border: none !important;
+    border: none !important;
-        background: none !important;
+    border-radius: none !important;
-    }
+    font-weight: none !important;
+    transition: none !important;
+  }
 
-    .p-menuitem-text {
+  .p-panelmenu-content {
-        line-height: normal !important;
+    border: none !important;
-    }
+    background: none !important;
+  }
+
+  .p-menuitem-text {
+    line-height: normal !important;
+  }
 }
 
 ui-menu .ui-menu-parent .ui-menu-child {
-    width: 400px; /* exagerated !! */
+  width: 400px; /* exagerated !! */
 }
 
 .p-toast-detail {
-    white-space: pre-line;
+  white-space: pre-line;
 }
 
 .p-datatable .p-sortable-column:focus {
-    box-shadow: none !important;
+  box-shadow: none !important;
 }
 
 .p-password {
-    padding: 0px !important;
+  padding: 0px !important;
 }
 
 .p-paginator {
-    background-color: transparent !important;
+  background-color: transparent !important;
-    border: none !important;
+  border: none !important;
 }
 
 p-table {
-    .p-datatable .p-datatable-header {
+  .p-datatable .p-datatable-header {
-        border: none !important;
+    border: none !important;
-    }
+  }
 
-    .p-datatable .p-datatable-header,
+  .p-datatable .p-datatable-header,
-    .p-datatable .p-datatable-tbody > tr,
+  .p-datatable .p-datatable-tbody > tr,
-    .p-datatable .p-datatable-thead > tr > th {
+  .p-datatable .p-datatable-thead > tr > th {
-        background-color: transparent !important;
+    background-color: transparent !important;
-        color: inherit !important;
+    color: inherit !important;
-    }
+  }
 }
 
 .pi-sort-alt:before {
-    content: "\e915" !important;
+  content: "\e915" !important;
 }
 
 .pi-sort-amount-up-alt:before {
-    content: "\e914" !important;
+  content: "\e914" !important;
 }
 
 .pi-sort-amount-down:before {
-    content: "\e913" !important;
+  content: "\e913" !important;
 }