diff --git a/src/pages/users/components/UserList/UserItem.tsx b/src/pages/users/components/UserList/UserItem.tsx index 305aa02..faf9d9e 100644 --- a/src/pages/users/components/UserList/UserItem.tsx +++ b/src/pages/users/components/UserList/UserItem.tsx @@ -27,21 +27,23 @@ const UserItem: React.FC = ({ user, onEdit, onDelete }) => { userStore: { me }, } = useRootStore(); - /** - * The user with role TEACHER can edit users with only STUDENT role - */ - const isDisabledActions = () => { + const isDisabledActions = (() => { + /** + * Disable editing when rendering on account item + */ + if (me !== null && me.id === user.id) return true; + + /** + * Disable editing based on user roles + */ if (helpres.userContainRoles(user.roles, [UserRoleEnum.ADMIN, UserRoleEnum.TEACHER]) && me !== null) { - /** - * Disable editing - */ if (me.isTeacher || me.isStudent) { return true; } else return false; } else { return false; } - }; + })(); return ( @@ -60,7 +62,7 @@ const UserItem: React.FC = ({ user, onEdit, onDelete }) => { onEdit(user)} aria-label='Edit' variant='ghost' @@ -68,7 +70,7 @@ const UserItem: React.FC = ({ user, onEdit, onDelete }) => { icon={} /> onDelete(user)} colorScheme='red' aria-label='Delete'