From 02085ce9022081568afd486b94a42aff25dd2c29 Mon Sep 17 00:00:00 2001 From: Sheen Capadngan Date: Fri, 20 Sep 2024 14:45:43 +0800 Subject: [PATCH] fix: addressed overlooked update --- .../components/UserProjectsSection/UserGroupsRow.tsx | 1 + .../components/UserProjectsSection/UserGroupsSection.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsRow.tsx b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsRow.tsx index 620fe5b7e..3287cabae 100644 --- a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsRow.tsx +++ b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsRow.tsx @@ -30,6 +30,7 @@ export const UserGroupsRow = ({ group, handlePopUpOpen }: Props) => { onClick={(e) => { e.stopPropagation(); handlePopUpOpen("removeUserFromGroup", { + groupId: group.id, groupSlug: group.slug }); }} diff --git a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsSection.tsx b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsSection.tsx index 2967348a2..3947c6ddc 100644 --- a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsSection.tsx +++ b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserGroupsSection.tsx @@ -19,9 +19,10 @@ export const UserGroupsSection = ({ orgMembership }: Props) => { const { mutateAsync: removeUserFromGroup } = useRemoveUserFromGroup(); - const handleRemoveUserFromGroup = useCallback(async (groupSlug: string) => { + const handleRemoveUserFromGroup = useCallback(async (groupId: string, groupSlug: string) => { try { await removeUserFromGroup({ + groupId, slug: groupSlug, username: orgMembership.user.username }); @@ -57,10 +58,11 @@ export const UserGroupsSection = ({ orgMembership }: Props) => { deleteKey="confirm" onDeleteApproved={() => { const popupData = popUp?.removeUserFromGroup?.data as { + groupId: string; groupSlug: string; }; - return handleRemoveUserFromGroup(popupData.groupSlug); + return handleRemoveUserFromGroup(popupData.groupId, popupData.groupSlug); }} />