mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-05 18:26:42 +00:00
feat: resolved merge reviews
This commit is contained in:
@@ -21,7 +21,8 @@ import {
|
|||||||
DropdownMenuItem,
|
DropdownMenuItem,
|
||||||
DropdownMenuTrigger,
|
DropdownMenuTrigger,
|
||||||
IconButton,
|
IconButton,
|
||||||
Input
|
Input,
|
||||||
|
Tooltip
|
||||||
} from "@app/components/v2";
|
} from "@app/components/v2";
|
||||||
import {
|
import {
|
||||||
OrgPermissionActions,
|
OrgPermissionActions,
|
||||||
@@ -112,7 +113,11 @@ export const ProjectSelect = () => {
|
|||||||
<div>
|
<div>
|
||||||
<FontAwesomeIcon icon={faCube} className="text-xs" />
|
<FontAwesomeIcon icon={faCube} className="text-xs" />
|
||||||
</div>
|
</div>
|
||||||
<div className="max-w-32 overflow-hidden text-ellipsis">{currentWorkspace?.name}</div>
|
<Tooltip content={currentWorkspace.name}>
|
||||||
|
<div className="max-w-32 overflow-hidden text-ellipsis whitespace-nowrap">
|
||||||
|
{currentWorkspace?.name}
|
||||||
|
</div>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
<DropdownMenuTrigger asChild>
|
<DropdownMenuTrigger asChild>
|
||||||
@@ -170,8 +175,12 @@ export const ProjectSelect = () => {
|
|||||||
}
|
}
|
||||||
>
|
>
|
||||||
<div className="flex items-center">
|
<div className="flex items-center">
|
||||||
<div className="flex max-w-[165px] flex-1 items-center justify-between truncate">
|
<div className="flex flex-1 items-center justify-between overflow-hidden">
|
||||||
{workspace.name}
|
<Tooltip content={workspace.name}>
|
||||||
|
<div className="max-w-40 overflow-hidden truncate whitespace-nowrap">
|
||||||
|
{workspace.name}
|
||||||
|
</div>
|
||||||
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<FontAwesomeIcon
|
<FontAwesomeIcon
|
||||||
|
|||||||
-1
@@ -67,7 +67,6 @@ export const IdentityProjectRow = ({
|
|||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Td className="max-w-0 truncate">{project.name}</Td>
|
|
||||||
<Td>{`${formatProjectRoleName(roles[0].role, roles[0].customRoleName)}${
|
<Td>{`${formatProjectRoleName(roles[0].role, roles[0].customRoleName)}${
|
||||||
roles.length > 1 ? ` (+${roles.length - 1})` : ""
|
roles.length > 1 ? ` (+${roles.length - 1})` : ""
|
||||||
}`}</Td>
|
}`}</Td>
|
||||||
|
|||||||
-1
@@ -118,7 +118,6 @@ export const IdentityProjectsTable = ({ identityId, handlePopUpOpen }: Props) =>
|
|||||||
</div>
|
</div>
|
||||||
</Th>
|
</Th>
|
||||||
|
|
||||||
<Th>Type</Th>
|
|
||||||
<Th>Role</Th>
|
<Th>Role</Th>
|
||||||
<Th>Added On</Th>
|
<Th>Added On</Th>
|
||||||
<Th className="w-5" />
|
<Th className="w-5" />
|
||||||
|
|||||||
+1
-4
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
|
|||||||
import { useNavigate } from "@tanstack/react-router";
|
import { useNavigate } from "@tanstack/react-router";
|
||||||
|
|
||||||
import { createNotification } from "@app/components/notifications";
|
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 { formatProjectRoleName } from "@app/helpers/roles";
|
||||||
import { useGetUserWorkspaces } from "@app/hooks/api";
|
import { useGetUserWorkspaces } from "@app/hooks/api";
|
||||||
import { TWorkspaceUser } from "@app/hooks/api/types";
|
import { TWorkspaceUser } from "@app/hooks/api/types";
|
||||||
@@ -61,9 +61,6 @@ export const UserProjectRow = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Td className="max-w-0 truncate">{project.name}</Td>
|
<Td className="max-w-0 truncate">{project.name}</Td>
|
||||||
<Td>
|
|
||||||
<Tag size="xs">{project.type}</Tag>
|
|
||||||
</Td>
|
|
||||||
<Td>{`${formatProjectRoleName(roles[0].role, roles[0].customRoleName)}${
|
<Td>{`${formatProjectRoleName(roles[0].role, roles[0].customRoleName)}${
|
||||||
roles.length > 1 ? ` (+${roles.length - 1})` : ""
|
roles.length > 1 ? ` (+${roles.length - 1})` : ""
|
||||||
}`}</Td>
|
}`}</Td>
|
||||||
|
|||||||
-1
@@ -123,7 +123,6 @@ export const UserProjectsTable = ({ membershipId, handlePopUpOpen }: Props) => {
|
|||||||
</IconButton>
|
</IconButton>
|
||||||
</div>
|
</div>
|
||||||
</Th>
|
</Th>
|
||||||
<Th>Type</Th>
|
|
||||||
<Th>Role</Th>
|
<Th>Role</Th>
|
||||||
<Th className="w-5" />
|
<Th className="w-5" />
|
||||||
</Tr>
|
</Tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user