refactor data

bisohns · Nov 19, 2022 · 95e95d7 · 95e95d7
1 parent 58e9dfa
commit 95e95d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/web/src/hooks/useSocket.tsx b/web/src/hooks/useSocket.tsx
@@ -32,9 +32,8 @@ export default function useSocket(options = {}) {
  (group: any, server: any) => {
  const { Message } = server;
  const { Name,Host } = Message;
- group[Name] = group[Name] ?? [];
- group[Name].host = Host;
- group[Name].push(server);
+ group[Name] = group[Name] ?? { data: [], Host };
+ group[Name].data.push(server);
  return group;
  },
  {}

diff --git a/web/src/server/ServerDetail.tsx b/web/src/server/ServerDetail.tsx
@@ -61,7 +61,7 @@ export default function ServerDetail({
  {Object.keys(servicesGroupedByName)
  ?.sort()
  ?.map((serverName: string, index: number) => {
- if (host !== servicesGroupedByName[serverName].host) return null;
+ if (host !== servicesGroupedByName[serverName].Host) return null;
 
  return (
  <div key={index}>
@@ -71,7 +71,7 @@ export default function ServerDetail({
  serverData={
  servicesGroupedByName[
  serverName as ServerServiceNameType
- ]?.at(-1) as ServerResponseType
+ ]?.data?.at(-1) as ServerResponseType
  } // get the last object of service
  />
  )}

diff --git a/web/src/server/ServerType.tsx b/web/src/server/ServerType.tsx
@@ -59,5 +59,9 @@ export interface ServerGroupedByHostResponseType {
 }
 
 export interface ServerGroupedByNameResponseType {
- [Name: string]: ServerResponseType[];
+ [Name: string]: {
+ data:ServerResponseType[];
+ Host:string;
+ }
+
 }