diff --git a/web/sdk/react/hooks/useOrganizationMembers.ts b/web/sdk/react/hooks/useOrganizationMembers.ts index 3206b0c5e..fbc36cf81 100644 --- a/web/sdk/react/hooks/useOrganizationMembers.ts +++ b/web/sdk/react/hooks/useOrganizationMembers.ts @@ -6,8 +6,7 @@ import { useQuery } from '@connectrpc/connect-query'; import { FrontierServiceQueries, ListOrganizationUsersRequestSchema, ListRolesRequestSchema, ListOrganizationInvitationsRequestSchema } from '@raystack/proton/frontier'; import { create } from '@bufbuild/protobuf'; - -export type MemberWithInvite = User & Invitation & { invited?: boolean }; +export type MemberWithInvite = Partial & Partial & { invited?: boolean }; export interface UseOrganizationMembersReturn { isFetching: boolean; @@ -22,7 +21,6 @@ export const useOrganizationMembers = ({ showInvitations = false }): UseOrganizationMembersReturn => { const [users, setUsers] = useState([]); - const [invitations, setInvitations] = useState([]); const [memberRoles, setMemberRoles] = useState>({}); @@ -73,24 +71,19 @@ export const useOrganizationMembers = ({ { enabled: !!organization?.id && showInvitations } ); - useEffect(() => { - if (invitationsData) { - const invitedUsers: MemberWithInvite[] = (invitationsData.invitations || []).map((user: User) => ({ - ...user, - invited: true - })); - setInvitations(invitedUsers); - } - }, [invitationsData]); - - const isFetching = isUsersLoading || isInvitationsLoading || isRolesLoading; const hasError = usersError || rolesError || invitationsError; - const updatedUsers = useMemo(() => - [...users, ...invitations], - [users, invitations] - ); + const updatedUsers = useMemo(() => { + const invitations = (invitationsData?.invitations || []).map(user => { + return { + ...user, + email: user.userId, + invited: true + }; + }); + return [...users, ...invitations] as unknown as MemberWithInvite[]; + }, [users, invitationsData?.invitations]); const refetch = useCallback(() => { // Trigger refetch of all queries diff --git a/web/sdk/react/views/members/member-columns.tsx b/web/sdk/react/views/members/member-columns.tsx index eb35c413e..c8df5c238 100644 --- a/web/sdk/react/views/members/member-columns.tsx +++ b/web/sdk/react/views/members/member-columns.tsx @@ -62,12 +62,9 @@ export const getColumns = ( { header: 'Title', accessorKey: 'title', - cell: ({ row, getValue }) => { const title = getValue() as string; - const email = row.original.invited - ? row.original.userId - : row.original.email; + const email = row.original.email; return (