diff --git a/jsapp/js/account/organization/MemberActionsDropdown.tsx b/jsapp/js/account/organization/MemberActionsDropdown.tsx index 60cca2d796..ae9dc55ef0 100644 --- a/jsapp/js/account/organization/MemberActionsDropdown.tsx +++ b/jsapp/js/account/organization/MemberActionsDropdown.tsx @@ -12,6 +12,7 @@ import {useSession} from 'jsapp/js/stores/useSession'; import {getSimpleMMOLabel} from './organization.utils'; import envStore from 'jsapp/js/envStore'; import subscriptionStore from 'jsapp/js/account/subscriptionStore'; +import {useRemoveOrganizationMember} from './membersQuery'; // Constants and types import {OrganizationUserRole} from './organizationQuery'; @@ -20,6 +21,7 @@ import {OrganizationUserRole} from './organizationQuery'; import styles from './memberActionsDropdown.module.scss'; interface MemberActionsDropdownProps { + orgId: string; /** Target member username. */ username: string; /** @@ -27,16 +29,16 @@ interface MemberActionsDropdownProps { * wants to do the actions (not the role of the target member). */ currentUserRole: OrganizationUserRole; - onRequestRemove: (username: string) => void; } /** * A dropdown with all actions that can be taken towards an organization member. */ export default function MemberActionsDropdown( - {username, currentUserRole, onRequestRemove}: MemberActionsDropdownProps + {orgId, username, currentUserRole}: MemberActionsDropdownProps ) { const session = useSession(); + const removeMember = useRemoveOrganizationMember(orgId); const [isRemoveModalVisible, setIsRemoveModalVisible] = useState(false); // Wait for session @@ -78,7 +80,7 @@ export default function MemberActionsDropdown( isRemovingSelf={isAdminRemovingSelf} onConfirm={() => { setIsRemoveModalVisible(false); - onRequestRemove(username); + removeMember.mutateAsync(username); }} onCancel={() => setIsRemoveModalVisible(false)} /> diff --git a/jsapp/js/account/organization/MembersRoute.tsx b/jsapp/js/account/organization/MembersRoute.tsx index 4010a07cf0..95262f0da3 100644 --- a/jsapp/js/account/organization/MembersRoute.tsx +++ b/jsapp/js/account/organization/MembersRoute.tsx @@ -21,7 +21,6 @@ import styles from './membersRoute.module.scss'; export default function MembersRoute() { const orgQuery = useOrganizationQuery(); - const removeMember = useRemoveOrganizationMember(); if (!orgQuery.data) { return ( @@ -101,11 +100,9 @@ export default function MembersRoute() { return ( { - removeMember.mutateAsync({orgId: orgQuery.data.id, username: username}); - }} /> ); },