From 0f4e123de0d5d432d9c282a1031d16fc5808e7a0 Mon Sep 17 00:00:00 2001
From: Ieva <ieva.vasiljeva@grafana.com>
Date: Thu, 11 Jan 2024 11:01:19 +0000
Subject: [PATCH] RBAC: prioritise directly applied permissions over inherited
 permissions (#80212)

show directly applied permissions over inherited permissions
---
 public/app/core/components/AccessControl/PermissionList.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/app/core/components/AccessControl/PermissionList.tsx b/public/app/core/components/AccessControl/PermissionList.tsx
index baadf95b0c7..a56c98c4d32 100644
--- a/public/app/core/components/AccessControl/PermissionList.tsx
+++ b/public/app/core/components/AccessControl/PermissionList.tsx
@@ -27,6 +27,12 @@ export const PermissionList = ({ title, items, compareKey, permissionLevels, can
 
       if (item.actions.length > keep[key].actions.length) {
         keep[key] = item;
+        continue;
+      }
+
+      // If the same permission has been inherited and applied directly, keep the one that is applied directly
+      if (item.actions.length === keep[key].actions.length && !item.isInherited) {
+        keep[key] = item;
       }
     }
     return Object.keys(keep).map((k) => keep[k]);