From ec0603a464b4af33787fbc6cc8bf09f1081a6981 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 2 Jul 2025 01:16:16 +0530 Subject: [PATCH] feat: resolved merge reviews --- .../components/ProjectSelect/ProjectSelect.tsx | 17 +++++++++++++---- .../IdentityProjectRow.tsx | 1 - .../IdentityProjectsTable.tsx | 1 - .../UserProjectsSection/UserProjectRow.tsx | 5 +---- .../UserProjectsSection/UserProjectsTable.tsx | 1 - 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx index d7a7d5a64..1efcf3939 100644 --- a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx +++ b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx @@ -21,7 +21,8 @@ import { DropdownMenuItem, DropdownMenuTrigger, IconButton, - Input + Input, + Tooltip } from "@app/components/v2"; import { OrgPermissionActions, @@ -112,7 +113,11 @@ export const ProjectSelect = () => {
-
{currentWorkspace?.name}
+ +
+ {currentWorkspace?.name} +
+
@@ -170,8 +175,12 @@ export const ProjectSelect = () => { } >
-
- {workspace.name} +
+ +
+ {workspace.name} +
+
- {project.name} {`${formatProjectRoleName(roles[0].role, roles[0].customRoleName)}${ roles.length > 1 ? ` (+${roles.length - 1})` : "" }`} diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsTable.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsTable.tsx index ef70d1f96..4dcc1996e 100644 --- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsTable.tsx +++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsTable.tsx @@ -118,7 +118,6 @@ export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) =>
- Type Role Added On diff --git a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx index db8d570cd..34a6a316d 100644 --- a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx +++ b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx @@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { useNavigate } from "@tanstack/react-router"; import { createNotification } from "@app/components/notifications"; -import { IconButton, Tag, Td, Tooltip, Tr } from "@app/components/v2"; +import { IconButton, Td, Tooltip, Tr } from "@app/components/v2"; import { formatProjectRoleName } from "@app/helpers/roles"; import { useGetUserWorkspaces } from "@app/hooks/api"; import { TWorkspaceUser } from "@app/hooks/api/types"; @@ -61,9 +61,6 @@ export const UserProjectRow = ({ }} > {project.name} - - {project.type} - {`${formatProjectRoleName(roles[0].role, roles[0].customRoleName)}${ roles.length > 1 ? ` (+${roles.length - 1})` : "" }`} diff --git a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectsTable.tsx b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectsTable.tsx index 9e6042c03..bb752624f 100644 --- a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectsTable.tsx +++ b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectsTable.tsx @@ -123,7 +123,6 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
- Type Role