From b9424a9284bda6cd346a9628b5c0b1cb06da76a4 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Fri, 24 Nov 2023 00:06:30 +1100
Subject: [PATCH] Improve handling of checkUserRole (#5976)

---
 src/frontend/src/states/UserState.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/src/states/UserState.tsx b/src/frontend/src/states/UserState.tsx
index 0fdd27691a..e973f8c936 100644
--- a/src/frontend/src/states/UserState.tsx
+++ b/src/frontend/src/states/UserState.tsx
@@ -83,8 +83,9 @@ export const useUserState = create<UserStateProps>((set, get) => ({
     if (user?.is_superuser) return true;
     if (user?.roles === undefined) return false;
     if (user?.roles[role] === undefined) return false;
+    if (user?.roles[role] === null) return false;
 
-    return user?.roles[role].includes(permission);
+    return user?.roles[role]?.includes(permission) ?? false;
   },
   hasDeleteRole: (role: UserRoles) => {
     return get().checkUserRole(role, UserPermissions.delete);