IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

noBasicRole feature: Change RolePickerInput to not show the "None" role (#76300)

Browse Source 
Change RolePickerInput to only show the basic role when it's not the None role (no basic role feature)
This commit is contained in:
Aaron Godin 2023-10-11 09:42:09 -05:00 committed by GitHub
parent 2049ffc718
commit c2cbb0a924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/core/components/RolePicker/RolePickerInput.tsx
View File

@ -49,18 +49,22 @@ export const RolePickerInput = ({
onQueryChange(query); onQueryChange(query);
}; };
const numberOfRoles = appliedRoles.length; const showBasicRoleOnLabel = showBasicRole && basicRole !== 'None';
return !isFocused ? ( return !isFocused ? (
// TODO: fix keyboard a11y // TODO: fix keyboard a11y
// eslint-disable-next-line jsx-a11y/no-static-element-interactions // eslint-disable-next-line jsx-a11y/no-static-element-interactions
<div className={cx(styles.wrapper, styles.selectedRoles)} onMouseDown={onOpen}> <div className={cx(styles.wrapper, styles.selectedRoles)} onMouseDown={onOpen}>
{showBasicRole && <ValueContainer>{basicRole}</ValueContainer>} {showBasicRoleOnLabel && <ValueContainer>{basicRole}</ValueContainer>}
<RolesLabel appliedRoles={appliedRoles} numberOfRoles={numberOfRoles} showBuiltInRole={showBasicRole} /> <RolesLabel
appliedRoles={appliedRoles}
numberOfRoles={appliedRoles.length}
showBuiltInRole={showBasicRoleOnLabel}
/>
</div> </div>
) : ( ) : (
<div className={styles.wrapper}> <div className={styles.wrapper}>
{showBasicRole && <ValueContainer>{basicRole}</ValueContainer>} {showBasicRoleOnLabel && <ValueContainer>{basicRole}</ValueContainer>}
{appliedRoles.map((role) => ( {appliedRoles.map((role) => (
<ValueContainer key={role.uid}>{role.displayName || role.name}</ValueContainer> <ValueContainer key={role.uid}>{role.displayName || role.name}</ValueContainer>
))} ))}