Skip to content

fix: search for invitation in members table #1457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rsbh wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −22
Open

fix: search for invitation in members table #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d9bc3
fix: search for invitation in members table
rsbh Mar 17, 2026
ea3f474
chore: refactor code
rsbh Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions web/sdk/react/hooks/useOrganizationMembers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<User> & Partial<Invitation> & { invited?: boolean };

export interface UseOrganizationMembersReturn {
isFetching: boolean;
Expand All @@ -22,7 +21,6 @@ export const useOrganizationMembers = ({
showInvitations = false
}): UseOrganizationMembersReturn => {
const [users, setUsers] = useState<User[]>([]);
const [invitations, setInvitations] = useState<MemberWithInvite[]>([]);

const [memberRoles, setMemberRoles] = useState<Record<string, Role[]>>({});

Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions web/sdk/react/views/members/member-columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<Flex direction="column" gap={2}>
<Label style={{ fontWeight: '$500' }}>{title}</Label>
Expand Down
Loading