bot/src/bot_graphql/graphql/server.gql

@@ -38,7 +38,7 @@ type Server implements TableWithHistoryQuery {
     config: ServerConfig
     hasFeatureFlag(flag: String): FeatureFlag
 
-#    statistic(date: String): ServerStatistic
+    statistic(date: String): ServerStatistic
 
     createdAt: String
     modifiedAt: String

bot/src/bot_graphql/queries/server_query.py

@@ -108,7 +108,7 @@ class ServerQuery(DataQueryWithHistoryABC):
             "hasFeatureFlag",
             lambda server, *_, **kwargs: self._resolve_has_feature_flag(server, *_, **kwargs),
         )
-        # self.set_field("statistic", lambda server, *_, **kwargs: ServerStatistics(server, kwargs))
+        self.set_field("statistic", lambda server, *_, **kwargs: ServerStatistics(server, kwargs))
 
     @staticmethod
     def resolve_id(server: Server, *_):

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

@@ -62,19 +62,6 @@ export class Queries {
   static serversQuery = `
     query ServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
       serverCount
-      servers(filter: $filter, page: $page, sort: $sort) {
-        id
-        discordId
-        name
-        iconURL
-        userCount
-        activeUserCount
-      }
-    }
-  `;
-
-  static serversDashboardQuery = `
-    query DetailedServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
       servers(filter: $filter, page: $page, sort: $sort) {
         id
         discordId
@@ -92,23 +79,22 @@ export class Queries {
           receivedCommandCount
           movedUsersCount
         }
+        statistic {
+          achievementsAchieved
+          messageCount
+          userCount
+          activeUserCount
+          userJoinedVoiceChannelCount
+          userJoinedVoiceChannelOntime
+          userJoinedGameServerCount
+          userJoinedGameServerOntime
+          userWarningCount
+          activityScore
+        }
       }
     }
   `;
 
-  // statistic {
-  //   achievementsAchieved
-  //   messageCount
-  //   userCount
-  //   activeUserCount
-  //   userJoinedVoiceChannelCount
-  //   userJoinedVoiceChannelOntime
-  //   userJoinedGameServerCount
-  //   userJoinedGameServerOntime
-  //   userWarningCount
-  //   activityScore
-  // }
-
   static hasServerFeatureFlag = `
     query HasServerFeatureFlag($filter: ServerFilter, $flag: String) {
       servers(filter: $filter) {

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

@@ -12,7 +12,7 @@
   <div class="content">
     <div class="server-list-wrapper">
       <div class="server-list">
-        <div class="server" *ngIf="server">
+        <div class="server">
           <div class="logo">
             <img *ngIf="server ? server.iconURL : ''" [src]="server ? server.iconURL : ''">
           </div>

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

@@ -5,10 +5,6 @@ import { DataService } from "src/app/services/data/data.service";
 import { SpinnerService } from "src/app/services/spinner/spinner.service";
 import { SidebarService } from "../../../../services/sidebar/sidebar.service";
 import { ServerService } from "../../../../services/server.service";
-import { Query } from "../../../../models/graphql/query.model";
-import { Queries } from "../../../../models/graphql/queries.model";
-import { catchError } from "rxjs/operators";
-import { throwError } from "rxjs";
 
 @Component({
   selector: "app-server-dashboard",
@@ -31,30 +27,14 @@ export class ServerDashboardComponent implements OnInit {
 
   ngOnInit(): void {
     this.data.getServerFromRoute(this.route).then(server => {
-      // this.server = server;
+      this.server = server;
-
-      this.loadServer(server.id);
     });
 
     this.serverService.server$.subscribe(server => {
       if (!server) {
         return;
       }
-      this.loadServer(server.id);
+      this.server = server;
-    });
-  }
-
-  loadServer(id?: number): void {
-    this.data.query<Query>(Queries.serversDashboardQuery, {
-      filter: {
-        id: id
-      }
-    }).pipe(catchError(err => {
-      this.spinner.hideSpinner();
-      return throwError(() => err);
-    })).subscribe(data => {
-      this.server = data.servers[0];
-      this.spinner.hideSpinner();
     });
   }
 

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

@@ -29,18 +29,6 @@ export class DataService {
   ) {
   }
 
-  public getServerIdFromRoute(route: ActivatedRoute): Promise<number> {
-    return new Promise((resolve, reject) => {
-      this.spinner.showSpinner();
-      if (!route.snapshot.params["serverId"] || route.snapshot.params["serverId"] == "undefined") {
-        this.spinner.hideSpinner();
-        this.router.navigate(["/dashboard"]);
-        reject();
-      }
-      resolve(route.snapshot.params["serverId"]);
-    });
-  }
-
   public getServerFromRoute(route: ActivatedRoute): Promise<Server> {
     return new Promise((resolve, reject) => {
       this.spinner.showSpinner();
@@ -62,6 +50,7 @@ export class DataService {
         resolve(server);
       });
     });
+
   }
 
   public query<T>(query: string, variables?: Variables, f?: Function): Observable<T> {