From 6285daa89b311c38ee0347290239884dbd7c3639 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:53:08 +0300
Subject: [PATCH] [v9.5.x] Auth: Fix set basicrole to the previous role in UI
 on error from backend (#74511)

Auth: Fix set basicrole to the previous role in UI on error from backend (#74395)

fix: onchange effect to set basicrole when error from backend
(cherry picked from commit 87e8b654a259ac2e6b3b97606ee545b465e3ae21)

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
---
 public/app/core/components/RolePicker/RolePicker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/core/components/RolePicker/RolePicker.tsx b/public/app/core/components/RolePicker/RolePicker.tsx
index f640b9965b1..ba5d398603d 100644
--- a/public/app/core/components/RolePicker/RolePicker.tsx
+++ b/public/app/core/components/RolePicker/RolePicker.tsx
@@ -49,7 +49,7 @@ export const RolePicker = ({
   useEffect(() => {
     setSelectedBuiltInRole(basicRole);
     setSelectedRoles(appliedRoles);
-  }, [appliedRoles, basicRole]);
+  }, [appliedRoles, basicRole, onBasicRoleChange]);
 
   useEffect(() => {
     const dimensions = ref?.current?.getBoundingClientRect();