Skip to content
Merged
Changes from all commits
Commits
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
54 changes: 36 additions & 18 deletions apps/app/pages/[workspaceSlug]/settings/members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,30 +115,48 @@ const MembersSettings: NextPage = () => {
handleDelete={async () => {
if (!workspaceSlug) return;
if (selectedRemoveMember) {
await workspaceService.deleteWorkspaceMember(
workspaceSlug as string,
selectedRemoveMember
);
mutateMembers(
(prevData) => prevData?.filter((item) => item.id !== selectedRemoveMember),
false
);
workspaceService
.deleteWorkspaceMember(workspaceSlug as string, selectedRemoveMember)
.catch((err) => {
const error = err?.error;
setToastAlert({
type: "error",
title: "Error",
message: error || "Something went wrong",
});
})
.finally(() => {
mutateMembers((prevData) =>
prevData?.filter((item) => item.id !== selectedRemoveMember)
);
});
}
if (selectedInviteRemoveMember) {
await workspaceService.deleteWorkspaceInvitations(
workspaceSlug as string,
selectedInviteRemoveMember
);
mutateInvitations(
(prevData) => prevData?.filter((item) => item.id !== selectedInviteRemoveMember),
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);
setSelectedInviteRemoveMember(null);
}}
Expand Down Expand Up @@ -276,7 +294,7 @@ const MembersSettings: NextPage = () => {
}
}}
>
Remove member
{user?.id === member.memberId ? "Leave" : "Remove member"}
</CustomMenu.MenuItem>
</CustomMenu>
</div>
Expand Down