Fixes

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])
 

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 }
  }
 

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)
  ),

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
 }

client/web/src/cody/team/CodyManageTeamPage.tsx

@@ -44,15 +44,15 @@ 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 ||
  teamMembersQueryResult.error?.message ||
  teamInvitesQueryResult.error?.message
 
  useEffect(() => {
- if (subscriptionQueryResult.data && subscriptionQueryResult.data.subscriptionStatus !== 'canceled') {
+ if (subscriptionQueryResult.data?.subscriptionStatus === 'canceled') {
  navigate('/cody/subscription')
  }
  }, [navigate, subscriptionQueryResult.data])