From ad153f5f632fe1eb76ac25b2ba6cda28a777becc Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 2 May 2021 15:03:15 -0400 Subject: [PATCH] Fix User delete button not showing --- ui/src/user/UserEdit.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/src/user/UserEdit.js b/ui/src/user/UserEdit.js index 52b4145ee..eafe84aaa 100644 --- a/ui/src/user/UserEdit.js +++ b/ui/src/user/UserEdit.js @@ -29,10 +29,10 @@ const UserTitle = ({ record }) => { return } -const UserToolbar = (props) => ( +const UserToolbar = ({ showDelete, ...props }) => ( <Toolbar {...props} classes={useStyles()}> <SaveButton disabled={props.pristine} /> - {props.permissions === 'admin' && <DeleteUserButton />} + {showDelete && <DeleteUserButton />} </Toolbar> ) @@ -40,16 +40,18 @@ const UserEdit = (props) => { const { permissions } = props const translate = useTranslate() + const isMyself = props.id === localStorage.getItem('userId') const getNameHelperText = () => - props.id === localStorage.getItem('userId') && { + isMyself && { helperText: translate('resources.user.helperTexts.name'), } + const canDelete = permissions === 'admin' && !isMyself return ( <Edit title={<UserTitle />} {...props}> <SimpleForm variant={'outlined'} - toolbar={<UserToolbar />} + toolbar={<UserToolbar showDelete={canDelete} />} redirect={permissions === 'admin' ? 'list' : false} > {permissions === 'admin' && (