Skip to content

Prevent self deletion in users page - issue 309 #241

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 3 commits into from
Oct 13, 2021
Merged

Prevent self deletion in users page - issue 309 #241

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e41ebe
Prevent self deletion in users page
suratdas Oct 8, 2021
ebbe0d3
Fixed review comments
suratdas Oct 8, 2021
e6f1ba7
Fixed review comments
suratdas Oct 8, 2021
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
39 changes: 23 additions & 16 deletions src/components/UserList/ActionButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const ActionButtons: React.FunctionComponent = () => {
const props = useGridSlotComponentProps();
const { enqueueSnackbar } = useSnackbar();
const userDispatch = useUserDispatch();
const { userList } = useUserState();
const { userList, user } = useUserState();

const ids: GridRowId[] = React.useMemo(
() => Object.values(props.state.selection),
Expand All @@ -23,22 +23,29 @@ export const ActionButtons: React.FunctionComponent = () => {
<IconButton
disabled={!ids.length}
onClick={() => {
usersService
.remove(ids)
.then(() => {
enqueueSnackbar(`Removed`, {
variant: "success",
});
userDispatch({
type: "getAll",
payload: userList.filter((user) => !ids.includes(user.id)),
});
})
.catch((err) =>
enqueueSnackbar(err, {
variant: "error",
const currentUserId = user?.id;
if (currentUserId && ids.includes(currentUserId)) {
enqueueSnackbar(`You cannot delete yourself.`, {
variant: "error",
});
} else {
usersService
.remove(ids)
.then(() => {
enqueueSnackbar(`Removed`, {
variant: "success",
});
userDispatch({
type: "getAll",
payload: userList.filter((user) => !ids.includes(user.id)),
});
})
);
.catch((err) =>
enqueueSnackbar(err, {
variant: "error",
})
);
}
}}
>
<Delete />
Expand Down