Fixed table loading #220

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

@@ -26,6 +26,7 @@ export class Queries {
 
   static serversQuery = `
     query ServerInfo($filter: ServerFilter, $page: Page, $sort: Sort) {
+      serverCount
       servers(filter: $filter, page: $page, sort: $sort) {
         id
         name
@@ -46,114 +47,76 @@ export class Queries {
   `;
 
   static levelQuery = `
-    query LevelsList($filter: LevelFilter, $page: Page, $sort: Sort) {
-      levelCount
-      levels(filter: $filter, page: $page, sort: $sort) {
-        id
-        name
-        color
-        minXp
-        permissions
-        server {
+    query LevelsList($serverId: ID, $filter: LevelFilter, $page: Page, $sort: Sort) {
+      servers(filter: {id: $serverId}) {
+        levelCount
+        levels(filter: $filter, page: $page, sort: $sort) {
           id
           name
+          color
+          minXp
+          permissions
+          server {
+            id
+            name
+          }
+          createdAt
+          modifiedAt
         }
-        createdAt
-        modifiedAt
       }
     }
   `;
 
   static usersQuery = `
-    query UsersList($filter: UserFilter, $page: Page, $sort: Sort) {
-      userCount
-      users(filter: $filter, page: $page, sort: $sort) {
-        id
-        discordId
-        name
-        xp
-        ontime
-        level {
+    query UsersList($serverId: ID, $filter: UserFilter, $page: Page, $sort: Sort) {
+      servers(filter: {id: $serverId}) {
+        userCount
+        users(filter: $filter, page: $page, sort: $sort) {
           id
+          discordId
           name
-        }
-        server {
-          id
-          name
-        }
-        leftServer
+          xp
+          ontime
+          minecraftId
+          level {
+            id
+            name
+          }
+          leftServer
+          server {
+            id
+            name
+          }
 
-        joinedServerCount
-        joinedServers {
-          id
-        }
+          joinedServerCount
+          joinedServers {
+            id
+            joinedOn
+            leavedOn
+          }
 
-        joinedVoiceChannelCount
-        joinedVoiceChannels {
-          id
-          channelId
-          channelName
-        }
+          joinedVoiceChannelCount
+          joinedVoiceChannels {
+            id
+            channelId
+            channelName
+            time
+            joinedOn
+            leavedOn
+          }
 
-        userJoinedGameServerCount
-        userJoinedGameServers {
-          id
-          gameServer
-        }
+          userJoinedGameServerCount
+          userJoinedGameServers {
+            id
+            gameServer
+            time
+            joinedOn
+            leavedOn
+          }
 
-        createdAt
-        modifiedAt
-      }
-    }
-  `;
-
-  static singleUserQuery = `
-    query singleUserQuery($filter: UserFilter) {
-      users(filter: $filter) {
-        id
-        discordId
-        name
-        xp
-        ontime
-        minecraftId
-        level {
-          id
-          name
+          createdAt
+          modifiedAt
         }
-        leftServer
-        server {
-          id
-          name
-        }
-
-        joinedServerCount
-        joinedServers {
-          id
-          joinedOn
-          leavedOn
-        }
-
-        joinedVoiceChannelCount
-        joinedVoiceChannels {
-          id
-          channelId
-          channelName
-          time
-          joinedOn
-          leavedOn
-        }
-
-        userJoinedGameServerCount
-        userJoinedGameServers {
-          id
-          gameServer
-          time
-          joinedOn
-          leavedOn
-        }
-
-        createdAt
-        modifiedAt
       }
     }
   `;

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

@@ -1,14 +1,19 @@
 import { User } from "../data/user.model";
 import { AutoRole, AutoRoleRule } from "../data/auto_role.model";
 import { Level } from "../data/level.model";
+import { Server } from "../data/server.model";
 
 export interface GraphQLResult {
-  data: any;
+  data: {
+    servers?: Server[];
+  };
   errors?: [];
 }
 
 export interface QueryResult {
-  data: any;
+  data: {
+    servers?: Server[];
+  };
 }
 
 export interface UpdateUserMutationResult {