From 47269bc95bbc80ed5773870fc1a0348a5115e754 Mon Sep 17 00:00:00 2001
From: = <akhilmhdh@gmail.com>
Date: Fri, 13 Dec 2024 00:17:48 +0530
Subject: [PATCH] feat: resolved undefined redirect

---
 .../components/IdentityProjectsSection/IdentityProjectRow.tsx | 4 ++--
 .../components/UserProjectsSection/UserProjectRow.tsx         | 2 +-
 frontend/src/views/Project/MembersPage/MembersPage.tsx        | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/Org/IdentityPage/components/IdentityProjectsSection/IdentityProjectRow.tsx b/frontend/src/views/Org/IdentityPage/components/IdentityProjectsSection/IdentityProjectRow.tsx
index 3a4bbb3b6..a6342dbaf 100644
--- a/frontend/src/views/Org/IdentityPage/components/IdentityProjectsSection/IdentityProjectRow.tsx
+++ b/frontend/src/views/Org/IdentityPage/components/IdentityProjectsSection/IdentityProjectRow.tsx
@@ -33,7 +33,7 @@ export const IdentityProjectRow = ({
   membership: { id, createdAt, identity, project, roles },
   handlePopUpOpen
 }: Props) => {
-  const { workspaces, currentWorkspace } = useWorkspace();
+  const { workspaces } = useWorkspace();
   const router = useRouter();
 
   const isAccessible = useMemo(() => {
@@ -53,7 +53,7 @@ export const IdentityProjectRow = ({
       onClick={() => {
         if (isAccessible) {
           router.push(
-            `/${currentWorkspace?.type}/${project.id}/members?selectedTab=${TabSections.Identities}`
+            `/${project?.type}/${project.id}/members?selectedTab=${TabSections.Identities}`
           );
           return;
         }
diff --git a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx
index 9f8a74cd5..b7f952b81 100644
--- a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx
+++ b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx
@@ -48,7 +48,7 @@ export const UserProjectRow = ({
       key={`user-project-membership-${id}`}
       onClick={() => {
         if (isAccessible) {
-          router.push(`/project/${project.id}/members?selectedTab=${TabSections.Member}`);
+          router.push(`/${project.type}/${project.id}/members?selectedTab=${TabSections.Member}`);
           return;
         }
 
diff --git a/frontend/src/views/Project/MembersPage/MembersPage.tsx b/frontend/src/views/Project/MembersPage/MembersPage.tsx
index f05997f87..5ca2b16b1 100644
--- a/frontend/src/views/Project/MembersPage/MembersPage.tsx
+++ b/frontend/src/views/Project/MembersPage/MembersPage.tsx
@@ -54,7 +54,9 @@ export const MembersPage = withProjectPermission(
                   <p>Machine Identities</p>
                 </div>
               </Tab>
-              <Tab value={TabSections.ServiceTokens}>Service Tokens</Tab>
+              {currentWorkspace?.type === ProjectType.SecretManager && (
+                <Tab value={TabSections.ServiceTokens}>Service Tokens</Tab>
+              )}
               <Tab value={TabSections.Roles}>Project Roles</Tab>
             </TabList>
             <TabPanel value={TabSections.Member}>