From 1f0e9cbbc8fd69f3b919309924f75b45e564acee Mon Sep 17 00:00:00 2001
From: David Veszelovszki <veszelovszki@gmail.com>
Date: Wed, 19 Jun 2024 16:59:51 +0200
Subject: [PATCH] Fixes

---
 client/web/src/cody/invites/useInviteState.ts             | 2 --
 client/web/src/cody/management/api/client.ts              | 2 +-
 client/web/src/cody/management/api/react-query/invites.ts | 8 ++++----
 client/web/src/cody/management/api/teamInvites.ts         | 3 +--
 client/web/src/cody/team/CodyManageTeamPage.tsx           | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/client/web/src/cody/invites/useInviteState.ts b/client/web/src/cody/invites/useInviteState.ts
index b1515d4b103a9..8a6093778444a 100644
--- a/client/web/src/cody/invites/useInviteState.ts
+++ b/client/web/src/cody/invites/useInviteState.ts
@@ -24,7 +24,6 @@ type UseInviteStateHook = (
     | {
           status: 'success'
           initialInviteStatus: TeamInvite['status']
-          sentBy: TeamInvite['sentBy']
           initialUserStatus: UserInviteStatus
       }
 
@@ -106,7 +105,6 @@ export const useInviteState: UseInviteStateHook = (teamId, inviteId) => {
             status: 'success',
             initialInviteStatus,
             initialUserStatus,
-            sentBy: inviteQuery.data.sentBy,
         }
     }, [inviteQuery.isError, inviteQuery.isSuccess, inviteQuery.data, initialInviteStatus, initialUserStatus])
 
diff --git a/client/web/src/cody/management/api/client.ts b/client/web/src/cody/management/api/client.ts
index bb11b4ed288d6..fc8ed5e2d3d77 100644
--- a/client/web/src/cody/management/api/client.ts
+++ b/client/web/src/cody/management/api/client.ts
@@ -66,7 +66,7 @@ export module Client {
         return { method: 'GET', urlSuffix: '/team/current/invites' }
     }
 
-    export function sendInvite(requestBody: types.CreateTeamInviteRequest): Call<types.TeamInvite> {
+    export function sendInvite(requestBody: types.CreateTeamInviteRequest): Call<types.ListTeamInvitesResponse> {
         return { method: 'POST', urlSuffix: '/team/current/invites', requestBody }
     }
 
diff --git a/client/web/src/cody/management/api/react-query/invites.ts b/client/web/src/cody/management/api/react-query/invites.ts
index 070b6d078a881..230dfcb6b5078 100644
--- a/client/web/src/cody/management/api/react-query/invites.ts
+++ b/client/web/src/cody/management/api/react-query/invites.ts
@@ -27,12 +27,12 @@ export const useInvite = ({
         },
     })
 
-export const useTeamInvites = (): UseQueryResult<ListTeamInvitesResponse | undefined> =>
+export const useTeamInvites = (): UseQueryResult<TeamInvite[] | undefined> =>
     useQuery({
         queryKey: queryKeys.invites.teamInvites(),
         queryFn: async () => {
             const response = await callCodyProApi(Client.getTeamInvites())
-            return response.json()
+            return ((await response.json()) as ListTeamInvitesResponse).invites
         },
     })
 
@@ -52,7 +52,7 @@ export const useSendInvite = (): UseMutationResult<TeamInvite, Error, CreateTeam
 export const useResendInvite = (): UseMutationResult<unknown, Error, { inviteId: string }> => {
     const queryClient = useQueryClient()
     return useMutation({
-        mutationFn: async ({ inviteId }) => (await callCodyProApi(Client.resendInvite(inviteId))).json(),
+        mutationFn: async ({ inviteId }) => callCodyProApi(Client.resendInvite(inviteId)),
         onSuccess: () => queryClient.invalidateQueries({ queryKey: queryKeys.invites.teamInvites() }),
     })
 }
@@ -74,7 +74,7 @@ export const useCancelInvite = (): UseMutationResult<unknown, Error, { teamId: s
     const queryClient = useQueryClient()
     return useMutation({
         mutationFn: async ({ teamId, inviteId }) => callCodyProApi(Client.cancelInvite(teamId, inviteId)),
-        onSuccess: (_, { teamId, inviteId }) =>
+        onSuccess: (_, { inviteId }) =>
             queryClient.setQueryData(queryKeys.invites.teamInvites(), (prevInvites: TeamInvite[]) =>
                 prevInvites.filter(invite => invite.id !== inviteId)
             ),
diff --git a/client/web/src/cody/management/api/teamInvites.ts b/client/web/src/cody/management/api/teamInvites.ts
index cfde66bad8746..762c0f616875a 100644
--- a/client/web/src/cody/management/api/teamInvites.ts
+++ b/client/web/src/cody/management/api/teamInvites.ts
@@ -12,7 +12,6 @@ export interface TeamInvite {
     error?: string
 
     sentAt: string
-    sentBy: string
     acceptedAt?: string
 }
 
@@ -22,6 +21,6 @@ export interface CreateTeamInviteRequest {
 }
 
 export interface ListTeamInvitesResponse {
-    invites: Omit<TeamInvite, 'sentBy'>[]
+    invites: TeamInvite[]
     continuationToken?: string
 }
diff --git a/client/web/src/cody/team/CodyManageTeamPage.tsx b/client/web/src/cody/team/CodyManageTeamPage.tsx
index fe8a63b925a01..0710f260d5268 100644
--- a/client/web/src/cody/team/CodyManageTeamPage.tsx
+++ b/client/web/src/cody/team/CodyManageTeamPage.tsx
@@ -44,7 +44,7 @@ const AuthenticatedCodyManageTeamPage: React.FunctionComponent<CodyManageTeamPag
     const teamMembersQueryResult = useTeamMembers()
     const teamMembers = teamMembersQueryResult.data?.members
     const teamInvitesQueryResult = useTeamInvites()
-    const teamInvites = teamInvitesQueryResult.data?.invites
+    const teamInvites = teamInvitesQueryResult.data
     const errorMessage =
         subscriptionQueryResult.error?.message ||
         subscriptionSummaryQueryResult.error?.message ||
@@ -52,7 +52,7 @@ const AuthenticatedCodyManageTeamPage: React.FunctionComponent<CodyManageTeamPag
         teamInvitesQueryResult.error?.message
 
     useEffect(() => {
-        if (subscriptionQueryResult.data && subscriptionQueryResult.data.subscriptionStatus !== 'canceled') {
+        if (subscriptionQueryResult.data?.subscriptionStatus === 'canceled') {
             navigate('/cody/subscription')
         }
     }, [navigate, subscriptionQueryResult.data])