From e7bc913dfdbcabb5565c388a10e161d5ea611daa Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Wed, 20 Dec 2023 10:16:33 +0100
Subject: [PATCH] ServiceAccounts: Lock role picker for external service
 accounts (#79727)

---
 .../serviceaccounts/components/ServiceAccountRoleRow.tsx        | 2 +-
 .../serviceaccounts/components/ServiceAccountsListItem.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx b/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx
index b5b549fdd0e..aab6b4bf0ae 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountRoleRow.tsx
@@ -31,7 +31,7 @@ export const ServiceAccountRoleRow = ({ label, serviceAccount, roleOptions, onRo
             onBasicRoleChange={onRoleChange}
             roleOptions={roleOptions}
             basicRoleDisabled={!canUpdateRole}
-            disabled={serviceAccount.isDisabled}
+            disabled={serviceAccount.isExternal || serviceAccount.isDisabled}
           />
         </td>
       ) : (
diff --git a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
index 81166afd6f3..0aa2938cded 100644
--- a/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
+++ b/public/app/features/serviceaccounts/components/ServiceAccountsListItem.tsx
@@ -83,7 +83,7 @@ const ServiceAccountListItemComponent = memo(
                 onBasicRoleChange={(newRole) => onRoleChange(newRole, serviceAccount)}
                 roleOptions={roleOptions}
                 basicRoleDisabled={!canUpdateRole}
-                disabled={serviceAccount.isDisabled}
+                disabled={serviceAccount.isExternal || serviceAccount.isDisabled}
                 width={40}
               />
             )}