From ce7339022f4b17f4fe1c5c97753efd448502ff7a Mon Sep 17 00:00:00 2001
From: David Veszelovszki <veszelovszki@gmail.com>
Date: Wed, 19 Jun 2024 17:39:32 +0200
Subject: [PATCH] Fixes

---
 client/web/src/cody/management/api/client.ts       |  2 +-
 .../src/cody/management/api/react-query/invites.ts | 14 +++++++-------
 client/web/src/cody/team/CodyManageTeamPage.tsx    |  4 ++--
 client/web/src/cody/team/TeamMemberList.tsx        |  1 -
 4 files changed, 10 insertions(+), 11 deletions(-)

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..3917a0a7a2d04 100644
--- a/client/web/src/cody/management/api/react-query/invites.ts
+++ b/client/web/src/cody/management/api/react-query/invites.ts
@@ -27,21 +27,21 @@ export const useInvite = ({
         },
     })
 
-export const useTeamInvites = (): UseQueryResult<ListTeamInvitesResponse | undefined> =>
+export const useTeamInvites = (): UseQueryResult<Omit<TeamInvite, 'sentBy'>[] | undefined> =>
     useQuery({
         queryKey: queryKeys.invites.teamInvites(),
         queryFn: async () => {
             const response = await callCodyProApi(Client.getTeamInvites())
-            return response.json()
+            return ((await response.json()) as ListTeamInvitesResponse).invites
         },
     })
 
-export const useSendInvite = (): UseMutationResult<TeamInvite, Error, CreateTeamInviteRequest> => {
+export const useSendInvite = (): UseMutationResult<Omit<TeamInvite, 'sentBy'>, Error, CreateTeamInviteRequest> => {
     const queryClient = useQueryClient()
     return useMutation({
         mutationFn: async requestBody => (await callCodyProApi(Client.sendInvite(requestBody))).json(),
-        onSuccess: (newInvite: TeamInvite) => {
-            queryClient.setQueryData(queryKeys.invites.teamInvites(), (prevInvites: TeamInvite[]) => [
+        onSuccess: (newInvite: Omit<TeamInvite, 'sentBy'>) => {
+            queryClient.setQueryData(queryKeys.invites.teamInvites(), (prevInvites: Omit<TeamInvite, 'sentBy'>[]) => [
                 ...prevInvites,
                 newInvite,
             ])
@@ -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/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])
diff --git a/client/web/src/cody/team/TeamMemberList.tsx b/client/web/src/cody/team/TeamMemberList.tsx
index de89cc5331d1e..391b4c3d0d6af 100644
--- a/client/web/src/cody/team/TeamMemberList.tsx
+++ b/client/web/src/cody/team/TeamMemberList.tsx
@@ -137,7 +137,6 @@ export const TeamMemberList: FunctionComponent<TeamMemberListProps> = ({
     )
 
     const adminCount = useMemo(() => teamMembers?.filter(member => member.role === 'admin').length ?? 0, [teamMembers])
-    console.log(adminCount)
 
     if (!teamMembers) {
         return null