From 849bff75f4844e14888f84211b0ac87dd0104072 Mon Sep 17 00:00:00 2001
From: Keyur Doshi <keyur.doshi@harness.io>
Date: Fri, 31 Oct 2025 02:45:40 +0530
Subject: [PATCH 1/3] Admin's view of crAPI fixed

---
 services/web/src/components/layout/layout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/web/src/components/layout/layout.tsx b/services/web/src/components/layout/layout.tsx
index 3285c58c..519561e2 100644
--- a/services/web/src/components/layout/layout.tsx
+++ b/services/web/src/components/layout/layout.tsx
@@ -108,7 +108,7 @@ const AfterLogin: React.FC<AfterLoginProps> = ({
     return <Navigate to="/login" />;
   }
 
-  if (!componentRole || (componentRole && componentRole === userRole)) {
+  if (!componentRole || (componentRole && componentRole === userRole) || (componentRole && componentRole === roleTypes.ROLE_USER && userRole && userRole === roleTypes.ROLE_ADMIN)) {
     return <Component />;
   }
 

From f6100c9d2750a964ccd64a2e2ea18e95a527856d Mon Sep 17 00:00:00 2001
From: Keyur Doshi <keyur.doshi@harness.io>
Date: Fri, 31 Oct 2025 03:18:06 +0530
Subject: [PATCH 2/3] lint fix

---
 services/web/src/components/layout/layout.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/web/src/components/layout/layout.tsx b/services/web/src/components/layout/layout.tsx
index 519561e2..0866af43 100644
--- a/services/web/src/components/layout/layout.tsx
+++ b/services/web/src/components/layout/layout.tsx
@@ -108,7 +108,14 @@ const AfterLogin: React.FC<AfterLoginProps> = ({
     return <Navigate to="/login" />;
   }
 
-  if (!componentRole || (componentRole && componentRole === userRole) || (componentRole && componentRole === roleTypes.ROLE_USER && userRole && userRole === roleTypes.ROLE_ADMIN)) {
+  if (
+    !componentRole ||
+    (componentRole && componentRole === userRole) ||
+    (componentRole &&
+      componentRole === roleTypes.ROLE_USER &&
+      userRole &&
+      userRole === roleTypes.ROLE_ADMIN)
+  ) {
     return <Component />;
   }
 

From a9cb00d8c15a7d834a66cf0acb1cec1e5aea9b26 Mon Sep 17 00:00:00 2001
From: Keyur Doshi <keyur.doshi@harness.io>
Date: Sun, 2 Nov 2025 12:46:52 +0530
Subject: [PATCH 3/3] updated changes after merging develop

---
 services/web/src/components/layout/layout.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/src/components/layout/layout.tsx b/services/web/src/components/layout/layout.tsx
index d3646d30..fa57240d 100644
--- a/services/web/src/components/layout/layout.tsx
+++ b/services/web/src/components/layout/layout.tsx
@@ -110,8 +110,8 @@ const AfterLogin: React.FC<AfterLoginProps> = ({
 
   if (
     !componentRole ||
-    (componentRole && componentRole === userRole) ||
-    (userRole && userRole === roleTypes.ROLE_ADMIN)
+    componentRole === userRole ||
+    (componentRole === roleTypes.ROLE_USER && userRole === roleTypes.ROLE_ADMIN)
   ) {
     return <Component />;
   }