From 5760cd237f59c1e091fa231d89fb19a78b3e8956 Mon Sep 17 00:00:00 2001
From: Niraj Raut <84171890+rautniraj@users.noreply.github.com>
Date: Tue, 18 Mar 2025 14:41:37 +0530
Subject: [PATCH 1/3] Removed extra checks from isAdmin variable

We dont need these two checks : currentUser && currentUser.role

We are already handling this very safe : currentUser?.role.name === 'Administrator';
---
 app/javascript/components/shared_components/Footer.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/components/shared_components/Footer.jsx b/app/javascript/components/shared_components/Footer.jsx
index 2b30506e3c..4201809c52 100644
--- a/app/javascript/components/shared_components/Footer.jsx
+++ b/app/javascript/components/shared_components/Footer.jsx
@@ -26,7 +26,7 @@ export default function Footer() {
   const { data: env } = useEnv();
   const { data: links } = useSiteSetting(['Terms', 'PrivacyPolicy']);
   const currentUser = useAuth();
-  const isAdmin = currentUser && currentUser.role && currentUser?.role.name === 'Administrator';
+  const isAdmin = currentUser?.role.name === 'Administrator';
 
   return (
     <footer id="footer" className="footer background-whitesmoke text-center">

From c111369fb6d2389f62187cbc41a46f54d05fcbc6 Mon Sep 17 00:00:00 2001
From: Niraj Raut <84171890+rautniraj@users.noreply.github.com>
Date: Tue, 18 Mar 2025 15:18:59 +0530
Subject: [PATCH 2/3] added missing conditional check to role

---
 app/javascript/components/shared_components/Footer.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/components/shared_components/Footer.jsx b/app/javascript/components/shared_components/Footer.jsx
index 4201809c52..1c80f3753d 100644
--- a/app/javascript/components/shared_components/Footer.jsx
+++ b/app/javascript/components/shared_components/Footer.jsx
@@ -26,7 +26,7 @@ export default function Footer() {
   const { data: env } = useEnv();
   const { data: links } = useSiteSetting(['Terms', 'PrivacyPolicy']);
   const currentUser = useAuth();
-  const isAdmin = currentUser?.role.name === 'Administrator';
+  const isAdmin = currentUser?.role?.name === 'Administrator';
 
   return (
     <footer id="footer" className="footer background-whitesmoke text-center">

From 51e92435a1eff297d832b8f02f375b4dd37b6d4a Mon Sep 17 00:00:00 2001
From: "niraj.kumar" <nirajk@cdot.in>
Date: Thu, 8 May 2025 14:00:03 +0530
Subject: [PATCH 3/3] extended isAdmin logic to check role name as
 Administrator OR SuperAdmin, while considering for admin privilege

---
 .../components/rooms/room/shared_access/SharedAccess.jsx        | 2 +-
 app/javascript/components/shared_components/Footer.jsx          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/components/rooms/room/shared_access/SharedAccess.jsx b/app/javascript/components/rooms/room/shared_access/SharedAccess.jsx
index a0d484c42d..14a1a8a180 100644
--- a/app/javascript/components/rooms/room/shared_access/SharedAccess.jsx
+++ b/app/javascript/components/rooms/room/shared_access/SharedAccess.jsx
@@ -39,7 +39,7 @@ export default function SharedAccess() {
   const deleteSharedAccess = useDeleteSharedAccess(friendlyId);
   const { data: room } = useRoom(friendlyId);
   const currentUser = useAuth();
-  const isAdmin = currentUser?.role.name === 'Administrator';
+  const isAdmin = currentUser?.role.name === 'Administrator' || currentUser?.role.name === 'SuperAdmin';
 
   if (sharedUsers?.length || searchInput) {
     return (
diff --git a/app/javascript/components/shared_components/Footer.jsx b/app/javascript/components/shared_components/Footer.jsx
index 1c80f3753d..247a3bcba8 100644
--- a/app/javascript/components/shared_components/Footer.jsx
+++ b/app/javascript/components/shared_components/Footer.jsx
@@ -26,7 +26,7 @@ export default function Footer() {
   const { data: env } = useEnv();
   const { data: links } = useSiteSetting(['Terms', 'PrivacyPolicy']);
   const currentUser = useAuth();
-  const isAdmin = currentUser?.role?.name === 'Administrator';
+  const isAdmin = currentUser?.role?.name === 'Administrator' || currentUser?.role?.name === 'SuperAdmin';
 
   return (
     <footer id="footer" className="footer background-whitesmoke text-center">