From 89148497337033a893b0c85233ef2f64c4803b4b Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Tue, 24 Oct 2023 13:02:17 +0100 Subject: [PATCH] Revert "RBAC: Allow the basic role None as option of the org role #76335 (#77033) Revert "RBAC: Allow the basic role None as option of the org role selector (#76335)" This reverts commit 43928d38af2d4129a25676e4e09551dd58935d66. --- public/app/features/admin/OrgRolePicker.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/app/features/admin/OrgRolePicker.tsx b/public/app/features/admin/OrgRolePicker.tsx index bfc0752bdd1..65f55db0f1f 100644 --- a/public/app/features/admin/OrgRolePicker.tsx +++ b/public/app/features/admin/OrgRolePicker.tsx @@ -13,7 +13,8 @@ interface Props { width?: number | 'auto'; } -const options = Object.keys(OrgRole).map((key) => ({ label: key, value: key })); +const basicRoles = Object.values(OrgRole).filter((r) => r !== OrgRole.None); +const options = basicRoles.map((r) => ({ label: r, value: r })); export function OrgRolePicker({ value, onChange, 'aria-label': ariaLabel, inputId, autoFocus, ...restProps }: Props) { return (