Skip to content

fixing fetching invitations for specific organization #515

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

Merged
merged 1 commit into from
Oct 3, 2024
Merged

fixing fetching invitations for specific organization #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/pages/invitation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,15 @@ function Invitation() {

useEffect(() => {
if (filterVariables.role || filterVariables.status) {
filterInvitations();
filterInvitations({
variables: {
role: filterVariables.role || null,
status: typeof filterVariables.status === 'string' ? filterVariables.status : null,
orgToken: organizationToken,
},
});
}
}, [filterVariables, filterInvitations]);
}, [filterVariables, filterInvitations,organizationToken]);

// Consolidated effect to handle query and search data
useEffect(() => {
Expand Down Expand Up @@ -278,7 +284,10 @@ function Invitation() {
setError(null);
setLoading(false);

setFilterVariables({ role: selectedRole, status: selectedStatus });
setFilterVariables({
role: selectedRole,
status: typeof selectedStatus === 'string' ? selectedStatus : '',
});
};

const toggleOptions = (row: string) => {
Expand Down
4 changes: 2 additions & 2 deletions src/queries/invitation.queries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export const GET_INVITATIONS = gql`
`;

export const GET_ROLES_AND_STATUSES = gql`
query filterInvitations($limit: Int, $offset: Int, $role: String, $status: String) {
filterInvitations(limit: $limit, offset: $offset, role: $role, status: $status) {
query filterInvitations($limit: Int, $offset: Int, $role: String, $status: String, $orgToken: String!) {
filterInvitations(limit: $limit, offset: $offset, role: $role, status: $status, orgToken: $orgToken) {
invitations {
invitees {
email
Expand Down
Loading