Skip to content
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

DBP-1028 Hide the Administrator role from users with a different role #10

Merged
merged 1 commit into from
Nov 19, 2024
Merged

DBP-1028 Hide the Administrator role from users with a different role #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions app/javascript/components/users/user/forms/UpdateUserForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ export default function UpdateUserForm({ user }) {
methods.setValue('language', currentLanguage());
}, [currentLanguage()]);

// Check if the current user has a specific role
const hasSpecificRole = currentUser?.role.name === 'Administrator';

// Filter roles based on name and/or ID if the current user does not have the specific role
const filteredRoles = hasSpecificRole ? roles : roles?.filter(role => role.name !== 'Administrator');

return (
<Form methods={methods} onSubmit={updateUserAPI.mutate}>
<FormControl field={fields.name} type="text" />
Expand All @@ -77,10 +83,10 @@ export default function UpdateUserForm({ user }) {
Object.keys(locales || {}).map((code) => <Option key={code} value={code}>{locales[code]}</Option>)
}
</FormSelect>
{(canUpdateRole && roles) && (
{(canUpdateRole && filteredRoles) && (
<FormSelect field={fields.role_id} variant="dropdown">
{
roles.map((role) => <Option key={role.id} value={role.id}>{role.name}</Option>)
filteredRoles.map((role) => <Option key={role.id} value={role.id}>{role.name}</Option>)
}
</FormSelect>
)}
Expand Down
Loading