Implemented bulk endpoint, SWRHook implementation ongoing

gchq · Dec 13, 2024 · 4a2e023 · 4a2e023
1 parent 0873985
commit 4a2e023
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 17 deletions.
diff --git a/backend/src/connectors/authentication/Base.ts b/backend/src/connectors/authentication/Base.ts
@@ -22,6 +22,9 @@ export abstract class BaseAuthenticationConnector {
   abstract getEntities(user: UserInterface): Promise<Array<string>>
   abstract getUserInformation(userEntity: string): Promise<UserInformation>
   abstract getEntityMembers(entity: string): Promise<Array<string>>
+  async getMultipleUsersInformation(entities: string[]): Promise<UserInformation[]> {
+    return Promise.all(entities.map(async (entity) => await this.getUserInformation(entity)))
+  }
 
   async getUserInformationList(entity: string): Promise<UserInformation[]> {
     const entities = await this.getEntityMembers(entity)

diff --git a/backend/src/routes.ts b/backend/src/routes.ts
@@ -180,7 +180,7 @@ server.get('/api/v2/model/:modelId/permissions/mine', ...getModelCurrentUserPerm
 server.get('/api/v2/entities', ...getEntities)
 server.get('/api/v2/entities/me', ...getCurrentUser)
 server.get('/api/v2/entity/:dn/lookup', ...getEntityLookup)
-server.get('/api/v2/entities/:dnList/lookup', getEntitiesLookup)
+server.get('/api/v2/entities/:dnList/lookup', ...getEntitiesLookup)
 
 server.get('/api/v2/config/ui', ...getUiConfig)
 

diff --git a/backend/src/routes/v2/entities/getEntitiesLookup.ts b/backend/src/routes/v2/entities/getEntitiesLookup.ts
@@ -42,8 +42,12 @@ export const getEntitiesLookup = [
     const {
       params: { dnList },
     } = parse(req, getEntitiesLookupSchema)
-
-    const informationList = await authentication.getUserInformationList(toEntity('user', dnList)) //TODO WORK OUT HOW THIS WORKS? WHAT IS THIS ACTUALLY RETURNING?
+    //TODO check that contains []
+    const dnListArray = dnList
+      .slice(1, -1)
+      .split(',')
+      .map((dnListMember) => toEntity('user', dnListMember))
+    const informationList = await authentication.getMultipleUsersInformation(dnListArray)
 
     return res.json({ entities: informationList })
   },

diff --git a/frontend/actions/user.ts b/frontend/actions/user.ts
@@ -63,6 +63,25 @@ export function useGetUserInformation(dn: string) {
   }
 }
 
+interface MultipleUserInformationResponse {
+  userInformationList: UserInformation[]
+}
+
+export function useGetMultipleUserInformation(dnList: string[]) {
+  const dnListAsString = '[' + dnList.join(',') + ']'
+  const { data, isLoading, error, mutate } = useSWR<MultipleUserInformationResponse, ErrorInfo>(
+    `/api/v2/entities/${dnListAsString}/lookup`,
+    fetcher,
+  )
+
+  return {
+    mutateUserInformation: mutate,
+    userInformation: data?.userInformationList || undefined,
+    isUserInformationLoading: isLoading,
+    isUserInformationError: error,
+  }
+}
+
 interface GetUserTokensResponse {
   tokens: TokenInterface[]
 }

diff --git a/frontend/src/reviews/ReactionDisplay.tsx b/frontend/src/reviews/ReactionDisplay.tsx
@@ -1,5 +1,7 @@
 import { Button, Tooltip } from '@mui/material'
+import { useGetMultipleUserInformation } from 'actions/user'
 import { ReactNode, useMemo } from 'react'
+import Loading from 'src/common/Loading'
 import { ReactionKindKeys } from 'types/types'
 import { plural } from 'utils/stringUtils'
 
@@ -11,21 +13,36 @@ type ReactionDisplayProps = {
 }
 
 export default function ReactionDisplay({ kind, icon, users, onReactionClick }: ReactionDisplayProps) {
+  const { userInformation, isUserInformationLoading } = useGetMultipleUserInformation(users)
   const title = useMemo(() => {
     let text = ''
-    if (users.length > 3) {
-      text = `${users[0]}, ${users[1]}, ${users[2]} + ${users.length - 3} more`
-    } else {
-      users.forEach((user, index) => {
-        text += `${user}`
-        if (index !== users.length - 1) {
-          text += ', '
-        }
-      })
+    if (userInformation) {
+      if (userInformation.length > 3) {
+        text = `${userInformation[0]}, ${userInformation[1]}, ${userInformation[2]} + ${userInformation.length - 3} more`
+      } else {
+        userInformation.forEach((user, index) => {
+          text += `${user}`
+          if (index !== users.length - 1) {
+            text += ', '
+          }
+        })
+      }
     }
+    //   // if (userList.length > 3) {
+    //   //   text = `${userList[0]}, ${userList[1]}, ${userList[2]} + ${userList.length - 3} more`
+    //   // } else {
+    //   //   userList.forEach((user, index) => {
+    //   //     text += `${user}`
+    //   //     if (index !== users.length - 1) {
+    //   //       text += ', '
+    //   //     }
+    //   //   })
+    //   // }
     return text
-  }, [users])
-
+  }, [userInformation, users.length])
+  if (isUserInformationLoading) {
+    return <Loading />
+  }
   return (
     <Tooltip title={title}>
       <Button
@@ -34,9 +51,7 @@ export default function ReactionDisplay({ kind, icon, users, onReactionClick }:
         onClick={() => onReactionClick(kind)}
         variant='outlined'
         startIcon={icon}
-      >
-        <Button>{'test'}</Button>
-      </Button>
+      ></Button>
     </Tooltip>
   )
 }