Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
rename util functions
Matheus Nogueira7a89fee9d35b
diff --git a/frontend/src/helpers/project.ts b/frontend/src/helpers/project.tsindex 0c496dddf7..1ee85515a7 100644--- a/frontend/src/helpers/project.ts+++ b/frontend/src/helpers/project.ts@@ -129,18 +129,18 @@ const ORG_SCOPED_PRODUCT_TYPES = new Set<ProjectType>([ProjectType.PAM, ProjectTexport const isOrgScopedProduct = (type: ProjectType) => ORG_SCOPED_PRODUCT_TYPES.has(type);-// One active project per org but still a $projectId in the URL, so shared project pages name the product-// instead of saying "project".-const SINGLE_PROJECT_PRODUCT_NAMES: Partial<Record<ProjectType, string>> = {+// This does not include PAM and Agent Vault because they use different+// components for each type of project. They don't reuse the shared components+const PROJECTLESS_PRODUCT_NAMES: Partial<Record<ProjectType, string>> = {[ProjectType.CertificateManager]: "Certificate Manager",[ProjectType.SecretScanning]: "Secret Scanning"};-export const getSingleProjectProductName = (type?: ProjectType) =>- type ? SINGLE_PROJECT_PRODUCT_NAMES[type] : undefined;+export const hidesProjects = (type?: ProjectType) =>+ Boolean(type && PROJECTLESS_PRODUCT_NAMES[type]);-export const isSingleProjectProduct = (type?: ProjectType) =>- Boolean(getSingleProjectProductName(type));+export const getProjectLabel = (type?: ProjectType) =>+ (type && PROJECTLESS_PRODUCT_NAMES[type]) || "Project";const PRODUCTS_WITHOUT_ASSUME_PRIVILEGES = new Set<ProjectType>([ProjectType.AgentVault]);diff --git a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsxindex f6d731c8d0..79b9deeb14 100644--- a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx+++ b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx@@ -11,7 +11,7 @@ import {TabsTrigger} from "@app/components/v3";import { useOrganization, useProject } from "@app/context";-import { getProjectBaseURL, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectBaseURL, hidesProjects } from "@app/helpers/project";import { ProjectType } from "@app/hooks/api/projects/types";import { ProjectAccessControlTabs } from "@app/types/project";@@ -45,7 +45,7 @@ const Page = () => {const isSecretManager = currentProject.type === ProjectType.SecretManager;const isCertManager = currentProject.type === ProjectType.CertificateManager;- const isSingleProject = isSingleProjectProduct(currentProject.type);+ const projectsHidden = hidesProjects(currentProject.type);const hasTabs = isCertManager || isSecretManager;const renderTabContent = () => {@@ -69,9 +69,9 @@ const Page = () => {<div className="mx-auto mb-6 flex w-full max-w-8xl flex-col"><PageHeaderscope={currentProject.type}- title={isSingleProject ? "Access Control" : "Project Access Control"}+ title={projectsHidden ? "Access Control" : "Project Access Control"}description={- isSingleProject+ projectsHidden? "Manage access for users, groups, and machine identities.": "Manage fine-grained access for users, groups, roles, and machine identities within your project resources."}diff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsxindex 213b3cd119..b573c39cc0 100644--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupModal.tsx@@ -26,7 +26,7 @@ import {Skeleton} from "@app/components/v3";import { useOrganization, useProject } from "@app/context";-import { getSingleProjectProductName } from "@app/helpers/project";+import { getProjectLabel } from "@app/helpers/project";import { useDebounce } from "@app/hooks";import {useAddGroupToWorkspace,@@ -55,7 +55,7 @@ type Props = {const Content = ({ onClose }: { onClose: () => void }) => {const { currentOrg } = useOrganization();const { currentProject } = useProject();- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";+ const productLabel = getProjectLabel(currentProject?.type);const orgId = currentOrg?.id || "";@@ -285,7 +285,7 @@ const Content = ({ onClose }: { onClose: () => void }) => {export const GroupModal = ({ popUp, handlePopUpToggle }: Props) => {const { currentProject } = useProject();- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";+ const productLabel = getProjectLabel(currentProject?.type);return (<Dialogdiff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsxindex 7789247a72..0ec00ec452 100644--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx@@ -20,7 +20,7 @@ import {useProject,useSubscription} from "@app/context";-import { getSingleProjectProductName, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectLabel, hidesProjects } from "@app/helpers/project";import { usePopUp } from "@app/hooks";import { useDeleteGroupFromWorkspace } from "@app/hooks/api";@@ -30,8 +30,8 @@ import { GroupTable } from "./GroupsTable";export const GroupsSection = () => {const { subscription } = useSubscription();const { currentProject } = useProject();- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const productLabel = getProjectLabel(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const { mutateAsync: deleteMutateAsync, isPending: isRemovingGroup } =useDeleteGroupFromWorkspace();@@ -79,7 +79,7 @@ export const GroupsSection = () => {<Card><CardHeader><CardTitle>- {isSingleProject ? "Groups" : `${productLabel} Groups`}+ {projectsHidden ? "Groups" : `${productLabel} Groups`}<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/groups#user-groups" /></CardTitle><CardDescription>{`Add and manage ${productLabel.toLowerCase()} groups`}</CardDescription>@@ -95,7 +95,7 @@ export const GroupsSection = () => {isDisabled={!isAllowed}><PlusIcon />- {isSingleProject ? "Add Group" : `Add Group to ${productLabel}`}+ {projectsHidden ? "Add Group" : `Add Group to ${productLabel}`}</Button>)}</ProjectPermissionCan>diff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsxindex d309ff38f1..42e99bb9f8 100644--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx@@ -35,8 +35,8 @@ import {} from "@app/context";import {getProjectBaseURL,- getSingleProjectProductName,- isSingleProjectProduct+ getProjectLabel,+ hidesProjects} from "@app/helpers/project";import {getUserTablePreference,@@ -68,8 +68,8 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {const { currentOrg } = useOrganization();const { currentProject } = useProject();const navigate = useNavigate();- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const productLabel = getProjectLabel(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const {search,@@ -130,8 +130,8 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {<InputGroupInputvalue={search}onChange={(e) => setSearch(e.target.value)}- placeholder={isSingleProject ? "Search groups..." : "Search project groups..."}- aria-label={isSingleProject ? "Search groups" : "Search project groups"}+ placeholder={projectsHidden ? "Search groups..." : "Search project groups..."}+ aria-label={projectsHidden ? "Search groups" : "Search project groups"}/></InputGroup></div>@@ -141,10 +141,10 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {<EmptyTitle>{/* eslint-disable-next-line no-nested-ternary */}{search- ? isSingleProject+ ? projectsHidden? "No groups match search": "No project groups match search"- : isSingleProject+ : projectsHidden? "No groups found": "No project groups found"}</EmptyTitle>diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsxindex 1be9ad1859..e6505459b2 100644--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx@@ -70,8 +70,8 @@ import {} from "@app/context";import {getProjectBaseURL,- getSingleProjectProductName,- isSingleProjectProduct+ getProjectLabel,+ hidesProjects} from "@app/helpers/project";import {getUserTablePreference,@@ -103,8 +103,8 @@ export const IdentityTab = withProjectPermission(const { currentProject, projectId } = useProject();const navigate = useNavigate();const { isSubOrganization, currentOrg } = useOrganization();- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const productLabel = getProjectLabel(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const {offset,@@ -221,7 +221,7 @@ export const IdentityTab = withProjectPermission(<Card><CardHeader><CardTitle>- {isSingleProject ? "Machine Identities" : `${productLabel} Machine Identities`}+ {projectsHidden ? "Machine Identities" : `${productLabel} Machine Identities`}<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/identities/machine-identities" /></CardTitle><CardDescription>@@ -239,7 +239,7 @@ export const IdentityTab = withProjectPermission(isDisabled={!isAllowed}><PlusIcon />- {isSingleProject+ {projectsHidden? "Add Machine Identity": `Add Machine Identity to ${productLabel}`}</Button>@@ -258,7 +258,7 @@ export const IdentityTab = withProjectPermission(value={search}onChange={(e) => setSearch(e.target.value)}placeholder={- isSingleProject+ projectsHidden? "Search machine identities by name...": "Search project machine identities by name..."}@@ -275,7 +275,7 @@ export const IdentityTab = withProjectPermission(</DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuLabel>- {isSingleProject ? "Filter by Role" : `Filter by ${productLabel} Role`}+ {projectsHidden ? "Filter by Role" : `Filter by ${productLabel} Role`}</DropdownMenuLabel>{projectRoles?.map(({ id, slug, name }) => (<DropdownMenuCheckboxItem@@ -299,7 +299,7 @@ export const IdentityTab = withProjectPermission({/* eslint-disable-next-line no-nested-ternary */}{debouncedSearch.trim().length > 0 || isTableFiltered? "No machine identities match search"- : isSingleProject+ : projectsHidden? "No machine identities have been added": "No machine identities have been added to this project"}</EmptyTitle>@@ -337,7 +337,7 @@ export const IdentityTab = withProjectPermission(/></TableHead><TableHead className="w-1/4">- {isSingleProject ? "Role" : `${productLabel} Role`}+ {projectsHidden ? "Role" : `${productLabel} Role`}</TableHead><TableHead>Managed by</TableHead><TableHead className="w-5">diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsxindex c120016e27..5887d5a3af 100644--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/AddMemberModal.tsx@@ -36,7 +36,7 @@ import {useProject,useProjectPermission} from "@app/context";-import { getSingleProjectProductName, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectLabel, hidesProjects } from "@app/helpers/project";import {useAddUserToWsNonE2EE,useGetOrgUsers,@@ -82,8 +82,8 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {const orgId = currentOrg?.id || "";const projectId = currentProject?.id || "";- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const productLabel = getProjectLabel(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const {data: members,@@ -208,7 +208,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {}}createNotification({- text: `Successfully added user to ${isSingleProject ? productLabel : "the project"}`,+ text: `Successfully added user to ${projectsHidden ? productLabel : "the project"}`,type: "success"});handlePopUpToggle("addMember", false);@@ -263,7 +263,7 @@ export const AddMemberModal = ({ popUp, handlePopUpToggle }: Props) => {<DialogContent className="sm:max-w-xl"><DialogHeader><DialogTitle>- {isSingleProject+ {projectsHidden? `Add Members to ${productLabel}`: (t("section.members.add-dialog.add-member-to-project") as string)}</DialogTitle>diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsxindex e7390062e1..76794cecd2 100644--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersSection.tsx@@ -25,7 +25,7 @@ import {useOrganization,useProject} from "@app/context";-import { getSingleProjectProductName, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectLabel, hidesProjects } from "@app/helpers/project";import { usePopUp } from "@app/hooks";import { useDeleteUserFromWorkspace } from "@app/hooks/api";import { ActorType } from "@app/hooks/api/auditLogs/enums";@@ -36,8 +36,8 @@ import { MembersTable } from "./MembersTable";export const MembersSection = () => {const { currentOrg } = useOrganization();const { currentProject } = useProject();- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const productLabel = getProjectLabel(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const removeUserMutation = useDeleteUserFromWorkspace();@@ -72,7 +72,7 @@ export const MembersSection = () => {<Card><CardHeader><CardTitle>- {isSingleProject ? "Users" : `${productLabel} Users`}+ {projectsHidden ? "Users" : `${productLabel} Users`}<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/identities/user-identities" /></CardTitle><CardDescription>@@ -91,7 +91,7 @@ export const MembersSection = () => {isDisabled={!isAllowed}><UserPlusIcon />- {isSingleProject ? "Add Users" : `Add Users to ${productLabel}`}+ {projectsHidden ? "Add Users" : `Add Users to ${productLabel}`}</Button>);diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsxindex 83d8bb61a6..d464a0daa7 100644--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MembersTable.tsx@@ -60,8 +60,8 @@ import {} from "@app/context";import {getProjectBaseURL,- getSingleProjectProductName,- isSingleProjectProduct+ getProjectLabel,+ hidesProjects} from "@app/helpers/project";import { formatProjectRoleName } from "@app/helpers/roles";import {@@ -103,8 +103,8 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {const filterRoles = useMemo(() => filter.roles, [filter.roles]);const isCertManager = currentProject?.type === ProjectType.CertificateManager;- const productLabel = getSingleProjectProductName(currentProject?.type) ?? "Project";- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const productLabel = getProjectLabel(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const userId = user?.id || "";const projectId = currentProject?.id || "";const {@@ -223,7 +223,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {<InputGroupInputvalue={search}onChange={(e) => setSearch(e.target.value)}- placeholder={isSingleProject ? "Search users..." : "Search project users..."}+ placeholder={projectsHidden ? "Search users..." : "Search project users..."}/></InputGroup><DropdownMenu>@@ -238,7 +238,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {</DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuLabel>- {isSingleProject ? "Filter by Role" : `Filter by ${productLabel} Role`}+ {projectsHidden ? "Filter by Role" : `Filter by ${productLabel} Role`}</DropdownMenuLabel>{projectRoles?.map(({ id, slug, name }) => (<DropdownMenuCheckboxItem@@ -297,10 +297,10 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {<EmptyTitle>{/* eslint-disable-next-line no-nested-ternary */}{search || isTableFiltered- ? isSingleProject+ ? projectsHidden? "No users match search": "No project users match search"- : isSingleProject+ : projectsHidden? "No users found": "No project users found"}</EmptyTitle>@@ -348,7 +348,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {)}/></TableHead>- <TableHead>{isSingleProject ? "Role" : `${productLabel} Role`}</TableHead>+ <TableHead>{projectsHidden ? "Role" : `${productLabel} Role`}</TableHead><TableHead variant="action" /></TableRow></TableHeader>diff --git a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsxindex f0355e3c66..a66daefbf0 100644--- a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx+++ b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx@@ -49,7 +49,7 @@ import {type TableSortDirection} from "@app/components/v3";import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";-import { getProjectBaseURL, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectBaseURL, hidesProjects } from "@app/helpers/project";import { isCustomProjectRole } from "@app/helpers/roles";import {getUserTablePreference,@@ -86,7 +86,7 @@ export const ProjectRoleList = () => {const { currentProject } = useProject();const projectId = currentProject?.id || "";const isCertManager = currentProject?.type === ProjectType.CertificateManager;- const isSingleProject = isSingleProjectProduct(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const { data: roles, isPending: isRolesLoading } = useGetProjectRoles(projectId,@@ -175,7 +175,7 @@ export const ProjectRoleList = () => {<Card><CardHeader><CardTitle>- {isSingleProject ? "Roles" : "Project Roles"}+ {projectsHidden ? "Roles" : "Project Roles"}<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/access-controls/role-based-access-controls#project-level-access-controls" /></CardTitle><CardDescription>@@ -196,7 +196,7 @@ export const ProjectRoleList = () => {isDisabled={!isAllowed}><PlusIcon />- {isSingleProject ? "Add Role" : "Add Project Role"}+ {projectsHidden ? "Add Role" : "Add Project Role"}</Button>)}</ProjectPermissionCan>@@ -212,7 +212,7 @@ export const ProjectRoleList = () => {<InputGroupInputvalue={search}onChange={(e) => setSearch(e.target.value)}- placeholder={isSingleProject ? "Search roles..." : "Search project roles..."}+ placeholder={projectsHidden ? "Search roles..." : "Search project roles..."}/></InputGroup></div>@@ -222,10 +222,10 @@ export const ProjectRoleList = () => {<EmptyTitle>{/* eslint-disable-next-line no-nested-ternary */}{roles?.length- ? isSingleProject+ ? projectsHidden? "No roles match search": "No project roles match search"- : isSingleProject+ : projectsHidden? "No roles available": "This project does not have any roles"}</EmptyTitle>diff --git a/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsx b/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsxindex f8e7551aee..58612cf993 100644--- a/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsx+++ b/frontend/src/pages/project/AuditLogsPage/AuditLogsPage.tsx@@ -3,24 +3,24 @@ import { Helmet } from "react-helmet";import { LookingForOrgPageLink } from "@app/components/v3";import { PageHeader } from "@app/components/v3/platform";import { useProject } from "@app/context";-import { isSingleProjectProduct } from "@app/helpers/project";+import { hidesProjects } from "@app/helpers/project";import { ProjectAuditLogsTabs } from "./components";export const AuditLogsPage = () => {const { currentProject } = useProject();- const isSingleProject = isSingleProjectProduct(currentProject.type);+ const projectsHidden = hidesProjects(currentProject.type);return (<div className="mx-auto flex flex-col justify-between bg-page text-foreground-inverse"><Helmet>- <title>{isSingleProject ? "Audit Logs" : "Project Audit Logs"}</title>+ <title>{projectsHidden ? "Audit Logs" : "Project Audit Logs"}</title><link rel="icon" href="/infisical.ico" /></Helmet><div className="flex h-full w-full justify-center bg-page text-foreground-inverse"><div className="w-full max-w-8xl"><PageHeaderscope={currentProject.type}- title={isSingleProject ? "Audit logs" : "Project Audit logs"}+ title={projectsHidden ? "Audit logs" : "Project Audit logs"}description="Audit logs for security and compliance teams to monitor information access."><LookingForOrgPageLink page="auditLogs" />diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsxindex b4c09424b1..3a173ca811 100644--- a/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx+++ b/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx@@ -25,7 +25,7 @@ import {useOrganization,useProject} from "@app/context";-import { getProjectBaseURL, getSingleProjectProductName } from "@app/helpers/project";+import { getProjectBaseURL, getProjectLabel, hidesProjects } from "@app/helpers/project";import { usePopUp } from "@app/hooks";import { useDeleteGroupFromWorkspace } from "@app/hooks/api";import { useGetWorkspaceGroupMembershipDetails } from "@app/hooks/api/projects/queries";@@ -72,7 +72,7 @@ const Page = () => {createNotification({text: `Successfully removed group from ${- getSingleProjectProductName(currentProject.type)?.toLowerCase() ?? "project"+ getProjectLabel(currentProject.type).toLowerCase()}`,type: "success"});@@ -91,8 +91,7 @@ const Page = () => {});};- const singleProjectProductName = getSingleProjectProductName(currentProject.type);- const productLabel = singleProjectProductName ?? "Project";+ const productLabel = getProjectLabel(currentProject.type);if (isPending) {return (@@ -125,7 +124,7 @@ const Page = () => {selectedTab: ProjectAccessControlTabs.Groups}} as const;- const backLinkLabel = singleProjectProductName ? "Groups" : "Project Groups";+ const backLinkLabel = hidesProjects(currentProject.type) ? "Groups" : "Project Groups";return (<div className="@container mx-auto flex max-w-8xl flex-col">diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsxindex dfaea6d570..58ef332e1a 100644--- a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx+++ b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx@@ -18,7 +18,7 @@ import {TooltipTrigger} from "@app/components/v3";import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context";-import { getSingleProjectProductName } from "@app/helpers/project";+import { getProjectLabel } from "@app/helpers/project";import { useTimedReset } from "@app/hooks";import { TGroupMembership } from "@app/hooks/api/groups/types";import { GroupRoles } from "@app/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles";@@ -30,7 +30,7 @@ type Props = {export const GroupDetailsSection = ({ groupMembership }: Props) => {const { group } = groupMembership;const { currentProject } = useProject();- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);+ const projectLabel = getProjectLabel(currentProject?.type);// eslint-disable-next-line @typescript-eslint/naming-convention,@typescript-eslint/no-unused-varsconst [_, isCopyingId, setCopyTextId] = useTimedReset<string>({@@ -72,7 +72,7 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {</DetailValue></Detail><Detail>- <DetailLabel>{`${singleProjectProductName ?? "Project"} Role`}</DetailLabel>+ <DetailLabel>{`${projectLabel} Role`}</DetailLabel><DetailValue><ProjectPermissionCanI={ProjectPermissionActions.Edit}@@ -91,7 +91,7 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {</Detail><Detail><DetailLabel>- {`Joined ${singleProjectProductName?.toLowerCase() ?? "project"}`}+ {`Joined ${projectLabel.toLowerCase()}`}</DetailLabel><DetailValue>{format(groupMembership.createdAt, "PPpp")}</DetailValue></Detail>diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsxindex 4017ea6503..e1a4d7c7d3 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx@@ -56,7 +56,8 @@ import {} from "@app/context";import {getProjectBaseURL,- getSingleProjectProductName,+ getProjectLabel,+ hidesProjects,supportsAssumePrivileges} from "@app/helpers/project";import { usePopUp } from "@app/hooks";@@ -117,12 +118,12 @@ const Page = () => {removeMenuItemLabel = "Remove From Agent Vault";}- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);- const namesProduct = isStandaloneProduct || Boolean(singleProjectProductName);+ const projectsHidden = hidesProjects(currentProject?.type);+ const namesProduct = isStandaloneProduct || projectsHidden;let accessControlLabel = "project";- if (singleProjectProductName) {- accessControlLabel = singleProjectProductName.toLowerCase();+ if (projectsHidden) {+ accessControlLabel = getProjectLabel(currentProject?.type).toLowerCase();} else if (isPam) {accessControlLabel = "PAM";} else if (isAgentVault) {diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsxindex 2c820f5868..d899076055 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/IdentityProjectAdditionalPrivilegeSection/IdentityProjectAdditionalPrivilegeSection.tsx@@ -48,7 +48,7 @@ import {useProject,useProjectPermission} from "@app/context";-import { getSingleProjectProductName } from "@app/helpers/project";+import { getProjectLabel } from "@app/helpers/project";import { usePopUp } from "@app/hooks";import { useDeleteIdentityProjectAdditionalPrivilege } from "@app/hooks/api";import { IdentityProjectMembershipV1 } from "@app/hooks/api/identities/types";@@ -74,7 +74,7 @@ export const IdentityProjectAdditionalPrivilegeSection = ({ identityMembershipDeconst { permission } = useProjectPermission();const identityId = identityMembershipDetails?.identity?.id;const { projectId, currentProject } = useProject();- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);+ const projectLabel = getProjectLabel(currentProject?.type);const { mutateAsync: deletePrivilege } = useDeleteIdentityProjectAdditionalPrivilege();@@ -117,7 +117,7 @@ export const IdentityProjectAdditionalPrivilegeSection = ({ identityMembershipDe<Card><CardHeader><CardTitle>- {`${singleProjectProductName ?? "Project"} Additional Privileges`}+ {`${projectLabel} Additional Privileges`}<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/access-controls/additional-privileges#api" /></CardTitle><CardDescription>Assign one-off policies to this machine identity</CardDescription>diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsxindex 6cee44d4e3..ccd2a5494d 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/components/ProjectIdentityDetailsSection.tsx@@ -30,7 +30,7 @@ import {TooltipTrigger} from "@app/components/v3";import { ProjectPermissionIdentityActions, ProjectPermissionSub, useProject } from "@app/context";-import { getSingleProjectProductName } from "@app/helpers/project";+import { getProjectLabel, hidesProjects } from "@app/helpers/project";import { usePopUp, useTimedReset } from "@app/hooks";import { identityAuthToNameMap, TProjectIdentity } from "@app/hooks/api";import { IdentityProjectMembershipV1 } from "@app/hooks/api/identities/types";@@ -51,13 +51,13 @@ export const ProjectIdentityDetailsSection = ({membership}: Props) => {const { currentProject } = useProject();- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);+ const projectsHidden = hidesProjects(currentProject?.type);const isPam = currentProject?.type === ProjectType.PAM;const isAgentVault = currentProject?.type === ProjectType.AgentVault;let productLabel = "Project";- if (singleProjectProductName) {- productLabel = singleProjectProductName;+ if (projectsHidden) {+ productLabel = getProjectLabel(currentProject?.type);} else if (isPam) {productLabel = "PAM";} else if (isAgentVault) {@@ -65,8 +65,8 @@ export const ProjectIdentityDetailsSection = ({}let joinedLabel = "Joined project";- if (singleProjectProductName) {- joinedLabel = `Joined ${singleProjectProductName.toLowerCase()}`;+ if (projectsHidden) {+ joinedLabel = `Joined ${getProjectLabel(currentProject?.type).toLowerCase()}`;} else if (isPam) {joinedLabel = "Joined PAM";} else if (isAgentVault) {diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsxindex 8004330abb..d038f2e9aa 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx@@ -48,7 +48,8 @@ import {} from "@app/context";import {getProjectBaseURL,- getSingleProjectProductName,+ getProjectLabel,+ hidesProjects,supportsAssumePrivileges} from "@app/helpers/project";import { usePopUp } from "@app/hooks";@@ -149,7 +150,7 @@ export const Page = () => {const isOwnProjectMembershipDetails = currentUserId === membershipDetails?.user?.id;const isCertManager = currentProject?.type === ProjectType.CertificateManager;- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);+ const projectLabel = getProjectLabel(currentProject?.type);const isSecretManager = currentProject.type === ProjectType.SecretManager;const hasFolderRbacPlan = Boolean(subscription?.secretsFolderRbac);const canAssumePrivileges = !isCertManager && supportsAssumePrivileges(currentProject.type);@@ -169,7 +170,7 @@ export const Page = () => {<PageHeaderscope={currentProject.type}title={memberDisplayName}- description={`Configure and manage ${singleProjectProductName?.toLowerCase() ?? "project"} access control`}+ description={`Configure and manage ${projectLabel.toLowerCase()} access control`}backLink={<Linkto={`${getProjectBaseURL(currentProject.type)}/access-management`}@@ -182,7 +183,7 @@ export const Page = () => {}}><ChevronLeftIcon aria-hidden className="size-4" />- {singleProjectProductName ? "Users" : "Project Users"}+ {hidesProjects(currentProject?.type) ? "Users" : "Project Users"}</Link>}>@@ -198,11 +199,11 @@ export const Page = () => {<TooltipTrigger asChild><Badge variant="info" className="ml-2"><InfoIcon />{" "}- {singleProjectProductName ? "Your membership" : "Your project membership"}+ {hidesProjects(currentProject?.type) ? "Your membership" : "Your project membership"}</Badge></TooltipTrigger><TooltipContent side="right">- {`You cannot modify your own membership. Ask a ${singleProjectProductName ?? "project"} admin to make changes to your membership.`}+ {`You cannot modify your own membership. Ask a ${hidesProjects(currentProject?.type) ? projectLabel : "project"} admin to make changes to your membership.`}</TooltipContent></Tooltip>) : (@@ -267,7 +268,7 @@ export const Page = () => {isDisabled={!isAllowed}onClick={() => handlePopUpOpen("removeMember")}>- {`Remove User From ${singleProjectProductName ?? "Project"}`}+ {`Remove User From ${projectLabel}`}</DropdownMenuItem>)}</ProjectPermissionCan>@@ -318,7 +319,7 @@ export const Page = () => {onOpenChange={(isOpen) => {handlePopUpToggle("removeMember", isOpen);}}- title={`Remove ${memberDisplayName} from the ${singleProjectProductName?.toLowerCase() ?? "project"}?`}+ title={`Remove ${memberDisplayName} from the ${projectLabel.toLowerCase()}?`}description={<Alert variant="danger" appearance="borderless"><AlertDescription>diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsxindex 06d519945b..f07758db4b 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberProjectAdditionalPrivilegeSection/MemberProjectAdditionalPrivilegeSection.tsx@@ -62,7 +62,7 @@ import {useProjectPermission,useUser} from "@app/context";-import { getSingleProjectProductName } from "@app/helpers/project";+import { getProjectLabel } from "@app/helpers/project";import { usePopUp } from "@app/hooks";import {useDeleteProjectUserAdditionalPrivilege,@@ -149,14 +149,14 @@ export const MemberProjectAdditionalPrivilegeSection = ({ membershipDetails }: P};const hasAdditionalPrivileges = Boolean(userProjectPrivileges?.length);- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);+ const projectLabel = getProjectLabel(currentProject?.type);return (<><Card><CardHeader><CardTitle>- {`${singleProjectProductName ?? "Project"} Additional Privileges`}+ {`${projectLabel} Additional Privileges`}<DocumentationLinkBadge href="https://infisical.com/docs/documentation/platform/access-controls/additional-privileges#api" /></CardTitle><CardDescription>Assign one-off policies to this user</CardDescription>diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsxindex 737e47520d..8e5602db56 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/MemberRoleDetailsSection/MemberRoleDetailsSection.tsx@@ -65,7 +65,7 @@ import {useProjectPermission,useUser} from "@app/context";-import { getProjectBaseURL, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectBaseURL, hidesProjects } from "@app/helpers/project";import { formatProjectRoleName } from "@app/helpers/roles";import { usePopUp } from "@app/hooks";import { useUpdateUserWorkspaceRole } from "@app/hooks/api";@@ -166,7 +166,7 @@ export const MemberRoleDetailsSection = ({<Card><CardHeader><CardTitle>- {isSingleProjectProduct(currentProject?.type) ? "Roles" : "Project Roles"}+ {hidesProjects(currentProject?.type) ? "Roles" : "Project Roles"}</CardTitle><CardDescription>Manage roles assigned to this user</CardDescription>{!isOwnProjectMembershipDetails && hasRoles && (diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/components/ProjectMemberDetailsSection.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/components/ProjectMemberDetailsSection.tsxindex 7ae97783d7..740019900d 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/components/ProjectMemberDetailsSection.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/components/ProjectMemberDetailsSection.tsx@@ -17,7 +17,7 @@ import {TooltipTrigger} from "@app/components/v3";import { useProject } from "@app/context";-import { getSingleProjectProductName } from "@app/helpers/project";+import { getProjectLabel } from "@app/helpers/project";import { useTimedReset } from "@app/hooks";import { TWorkspaceUser } from "@app/hooks/api/types";@@ -27,7 +27,7 @@ type Props = {export const ProjectMemberDetailsSection = ({ membership }: Props) => {const { currentProject } = useProject();- const singleProjectProductName = getSingleProjectProductName(currentProject?.type);+ const projectLabel = getProjectLabel(currentProject?.type);// eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/naming-conventionconst [_copyId, isCopyingId, setCopyTextId] = useTimedReset<string>({@@ -115,7 +115,7 @@ export const ProjectMemberDetailsSection = ({ membership }: Props) => {)}<Detail><DetailLabel>- {`Joined ${singleProjectProductName?.toLowerCase() ?? "project"}`}+ {`Joined ${projectLabel.toLowerCase()}`}</DetailLabel><DetailValue>{format(membership.createdAt, "PPpp")}</DetailValue></Detail>diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsxindex 5a4e588959..376020e6ce 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx@@ -30,7 +30,7 @@ import {useProject,useProjectPermission} from "@app/context";-import { getProjectBaseURL, isSingleProjectProduct } from "@app/helpers/project";+import { getProjectBaseURL, hidesProjects } from "@app/helpers/project";import { useDeleteProjectRole, useGetProjectRoleBySlug } from "@app/hooks/api";import { ProjectType } from "@app/hooks/api/projects/types";import { ProjectMembershipRole } from "@app/hooks/api/roles/types";@@ -120,7 +120,7 @@ const Page = () => {}}><ChevronLeftIcon aria-hidden className="size-4" />- {isSingleProjectProduct(currentProject?.type) ? "Roles" : "Project Roles"}+ {hidesProjects(currentProject?.type) ? "Roles" : "Project Roles"}</Link>}>