fix: showing alert on error while deleting workspace member or invited member (#1746)

style: showing 'Leave' for current user
This commit is contained in:
Dakshesh Jain 2023-08-01 15:32:42 +05:30 committed by GitHub
parent 98c7453741
commit a66a0680df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -115,30 +115,48 @@ const MembersSettings: NextPage = () => {
handleDelete={async () => { handleDelete={async () => {
if (!workspaceSlug) return; if (!workspaceSlug) return;
if (selectedRemoveMember) { if (selectedRemoveMember) {
await workspaceService.deleteWorkspaceMember( workspaceService
workspaceSlug as string, .deleteWorkspaceMember(workspaceSlug as string, selectedRemoveMember)
selectedRemoveMember .catch((err) => {
); const error = err?.error;
mutateMembers( setToastAlert({
(prevData) => prevData?.filter((item) => item.id !== selectedRemoveMember), type: "error",
false title: "Error",
); message: error || "Something went wrong",
});
})
.finally(() => {
mutateMembers((prevData) =>
prevData?.filter((item) => item.id !== selectedRemoveMember)
);
});
} }
if (selectedInviteRemoveMember) { if (selectedInviteRemoveMember) {
await workspaceService.deleteWorkspaceInvitations(
workspaceSlug as string,
selectedInviteRemoveMember
);
mutateInvitations( mutateInvitations(
(prevData) => prevData?.filter((item) => item.id !== selectedInviteRemoveMember), (prevData) => prevData?.filter((item) => item.id !== selectedInviteRemoveMember),
false false
); );
workspaceService
.deleteWorkspaceInvitations(workspaceSlug as string, selectedInviteRemoveMember)
.then(() => {
setToastAlert({
type: "success",
title: "Success",
message: "Member removed successfully",
});
})
.catch((err) => {
const error = err?.error;
setToastAlert({
type: "error",
title: "Error",
message: error || "Something went wrong",
});
})
.finally(() => {
mutateInvitations();
});
} }
setToastAlert({
type: "success",
title: "Success",
message: "Member removed successfully",
});
setSelectedRemoveMember(null); setSelectedRemoveMember(null);
setSelectedInviteRemoveMember(null); setSelectedInviteRemoveMember(null);
}} }}
@ -276,7 +294,7 @@ const MembersSettings: NextPage = () => {
} }
}} }}
> >
Remove member {user?.id === member.memberId ? "Leave" : "Remove member"}
</CustomMenu.MenuItem> </CustomMenu.MenuItem>
</CustomMenu> </CustomMenu>
</div> </div>