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
improvement(frontend): migrate org settings headers and tabs to v3 (#8070)
claude[bot]7d352e4bc182
diff --git a/DESIGN.md b/DESIGN.mdindex b6f2e6d6c7..0e0c5300ec 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -127,7 +127,7 @@ font or substitute one role for another:| Role | Class | Notes || ----------------------- | ------------------------------------------------------------------------- | ------------------------------------------------------------------ || Page title (h1) | `text-2xl font-medium underline underline-offset-4 decoration-<scope>/90` | In `PageHeader`; scope icon (size 26) sits inline before the title |-| Page description | `text-label` | Sits under the title, `mt-1.5` |+| Page description | `text-label` | Sits under the title, separated by the header's `gap-2` || Card title | `text-lg font-semibold leading-none` | `flex gap-1.5` so badges can sit inline || Card description | `text-sm text-accent` | || Body | `text-sm` | Default for table cells, form values, dialog content |diff --git a/frontend/src/components/v3/platform/PageHeader/PageHeader.stories.tsx b/frontend/src/components/v3/platform/PageHeader/PageHeader.stories.tsxindex b2d1cc0a05..6aa5f1f9de 100644--- a/frontend/src/components/v3/platform/PageHeader/PageHeader.stories.tsx+++ b/frontend/src/components/v3/platform/PageHeader/PageHeader.stories.tsx@@ -1,5 +1,5 @@import type { Meta, StoryObj } from "@storybook/react-vite";-import { FingerprintIcon, PlusIcon } from "lucide-react";+import { ChevronLeftIcon, FingerprintIcon, PlusIcon } from "lucide-react";import { ProjectType } from "@app/hooks/api/projects/types";@@ -56,7 +56,7 @@ export const SupportedScopes: Story = {render: () => (<div className="flex flex-col gap-10">{SCOPES.map(({ label, scope }) => (- <PageHeader key={scope} scope={scope} title={label} className="mb-0" />+ <PageHeader key={scope} scope={scope} title={label} />))}</div>),@@ -124,6 +124,26 @@ export const WithDescriptionAndActions: Story = {}};+export const WithBackLink: Story = {+ name: "Example: Back Link",+ args: {+ backLink: (+ <a href="#page-header-stories">+ <ChevronLeftIcon aria-hidden className="size-4" />+ All Projects+ </a>+ )+ },+ parameters: {+ docs: {+ description: {+ story:+ "Pass a native anchor or router link to render consistent back navigation above the page title."+ }+ }+ }+};+export const LongTitle: Story = {name: "Example: Long Title",decorators: [diff --git a/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx b/frontend/src/components/v3/platform/PageHeader/PageHeader.tsxindex 8f1be914bb..b5639e278f 100644--- a/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx+++ b/frontend/src/components/v3/platform/PageHeader/PageHeader.tsx@@ -1,4 +1,5 @@-import type { ComponentProps, ReactNode } from "react";+import { type ComponentProps, type ReactElement, type ReactNode } from "react";+import { Slot } from "@radix-ui/react-slot";import type { LucideIcon } from "lucide-react";import { ProjectType } from "@app/hooks/api/projects/types";@@ -11,6 +12,7 @@ export type TPageHeaderScope = "org" | "namespace" | "instance" | ProjectType |export type TPageHeaderProps = Omit<ComponentProps<"header">, "title"> & {title: ReactNode;description?: ReactNode;+ backLink?: ReactElement;scope: TPageHeaderScope;icon?: LucideIcon;};@@ -72,6 +74,7 @@ const PAGE_HEADER_SCOPE_CONFIG: Record<NonNullable<TPageHeaderScope>, TPageHeadeexport const PageHeader = ({title,description,+ backLink,children,className,scope,@@ -82,36 +85,50 @@ export const PageHeader = ({const ResolvedIcon = icon ?? scopeConfig?.icon;return (- <header data-slot="page-header" className={cn("mb-10 w-full", className)} {...props}>- <div data-slot="page-header-row" className="flex w-full justify-between">- <div className="mr-4 flex min-w-0 flex-1 items-center">- <h1- data-slot="page-header-title"- className={cn(- "truncate text-2xl font-medium text-foreground underline underline-offset-4",- scopeConfig?.titleClassName ?? "no-underline"- )}- >- {ResolvedIcon && (- <ResolvedIcon- aria-hidden- focusable="false"- size={26}- className={cn("mr-3 mb-1 inline-block", scopeConfig?.iconClassName)}- />- )}- {title}- </h1>- </div>- <div data-slot="page-header-actions" className="flex items-center gap-2">- {children}+ <header+ data-slot="page-header"+ className={cn("flex w-full flex-col gap-5", className)}+ {...props}+ >+ {backLink && (+ <Slot+ data-slot="page-header-back-link"+ className="flex w-fit items-center gap-1 text-sm text-accent transition-colors hover:text-foreground focus-visible:rounded-sm focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"+ >+ {backLink}+ </Slot>+ )}+ <div data-slot="page-header-content" className="flex flex-col gap-2">+ <div data-slot="page-header-row" className="flex w-full justify-between">+ <div className="mr-4 flex min-w-0 flex-1 items-center">+ <h1+ data-slot="page-header-title"+ className={cn(+ "truncate text-2xl font-medium text-foreground underline underline-offset-4",+ scopeConfig?.titleClassName ?? "no-underline"+ )}+ >+ {ResolvedIcon && (+ <ResolvedIcon+ aria-hidden+ focusable="false"+ size={26}+ className={cn("mr-3 mb-1 inline-block", scopeConfig?.iconClassName)}+ />+ )}+ {title}+ </h1>+ </div>+ <div data-slot="page-header-actions" className="flex items-center gap-2">+ {children}+ </div></div>+ {description && (+ <div data-slot="page-header-description" className="text-label">+ {description}+ </div>+ )}</div>- {description && (- <div data-slot="page-header-description" className="mt-1.5 text-label">- {description}- </div>- )}</header>);};diff --git a/frontend/src/pages/admin/IntegrationsPage/IntegrationsPage.tsx b/frontend/src/pages/admin/IntegrationsPage/IntegrationsPage.tsxindex 15c1b66e8d..ef06be2faa 100644--- a/frontend/src/pages/admin/IntegrationsPage/IntegrationsPage.tsx+++ b/frontend/src/pages/admin/IntegrationsPage/IntegrationsPage.tsx@@ -14,7 +14,7 @@ export const IntegrationsPage = () => {<title>{t("common.head-title", { title: "Admin" })}</title></Helmet><div className="mx-auto flex flex-col justify-between">- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><PageHeaderscope="instance"title="Integrations"diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/AgentVaultAccessBundleDetailPage.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/AgentVaultAccessBundleDetailPage.tsxindex b4896553a4..0d11f95981 100644--- a/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/AgentVaultAccessBundleDetailPage.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/AgentVaultAccessBundleDetailPage.tsx@@ -79,25 +79,25 @@ export const AgentVaultAccessBundleDetailPage = () => {}return (- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><Helmet><title>{t("common.head-title", { title: accessBundle.name })}</title></Helmet>- <Link- to="/organizations/$orgId/agent-vault/access-bundles"- params={{ orgId: currentOrg.id }}- className="mb-4 flex w-fit items-center gap-x-1 text-sm text-mineshaft-400 transition hover:text-mineshaft-400/80"- >- <ChevronLeftIcon size={16} />- Access Bundles- </Link>-<PageHeaderscope={ProjectType.AgentVault}icon={PackageIcon}title={accessBundle.name}description={accessBundle.description || "No description"}+ backLink={+ <Link+ to="/organizations/$orgId/agent-vault/access-bundles"+ params={{ orgId: currentOrg.id }}+ >+ <ChevronLeftIcon aria-hidden className="size-4" />+ Access Bundles+ </Link>+ }>{isAdmin && (<DropdownMenu>diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessBundlesPage/AgentVaultAccessBundlesPage.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessBundlesPage/AgentVaultAccessBundlesPage.tsxindex 249a52b58a..5fb34594e1 100644--- a/frontend/src/pages/agent-vault/AgentVaultAccessBundlesPage/AgentVaultAccessBundlesPage.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultAccessBundlesPage/AgentVaultAccessBundlesPage.tsx@@ -143,7 +143,7 @@ export const AgentVaultAccessBundlesPage = () => {}return (- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><Helmet><title>{t("common.head-title", { title: "Access Bundles" })}</title></Helmet>diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/AgentVaultAccessControlPage.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/AgentVaultAccessControlPage.tsxindex ea7f12c15d..3b40a9f8eb 100644--- a/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/AgentVaultAccessControlPage.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultAccessControlPage/AgentVaultAccessControlPage.tsx@@ -44,7 +44,7 @@ const AgentVaultAccessControlPageContent = () => {};return (- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><Helmet><title>{t("common.head-title", { title: "Access Control" })}</title></Helmet>diff --git a/frontend/src/pages/agent-vault/AgentVaultAuditLogsPage/AgentVaultAuditLogsPage.tsx b/frontend/src/pages/agent-vault/AgentVaultAuditLogsPage/AgentVaultAuditLogsPage.tsxindex c307808519..73ecf927c6 100644--- a/frontend/src/pages/agent-vault/AgentVaultAuditLogsPage/AgentVaultAuditLogsPage.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultAuditLogsPage/AgentVaultAuditLogsPage.tsx@@ -12,7 +12,7 @@ export const AgentVaultAuditLogsPage = () => {const { currentProject } = useProject();return (- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><Helmet><title>{t("common.head-title", { title: "Audit Logs" })}</title></Helmet>diff --git a/frontend/src/pages/agent-vault/AgentVaultProxiesPage/AgentVaultProxiesPage.tsx b/frontend/src/pages/agent-vault/AgentVaultProxiesPage/AgentVaultProxiesPage.tsxindex 91f689bace..9f4b20a812 100644--- a/frontend/src/pages/agent-vault/AgentVaultProxiesPage/AgentVaultProxiesPage.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultProxiesPage/AgentVaultProxiesPage.tsx@@ -212,7 +212,7 @@ export const AgentVaultProxiesPage = () => {};return (- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><Helmet><title>{t("common.head-title", { title: "Proxies" })}</title></Helmet>diff --git a/frontend/src/pages/agent-vault/AgentVaultSessionsPage/AgentVaultSessionsPage.tsx b/frontend/src/pages/agent-vault/AgentVaultSessionsPage/AgentVaultSessionsPage.tsxindex 46d8d29216..42e6ab44e1 100644--- a/frontend/src/pages/agent-vault/AgentVaultSessionsPage/AgentVaultSessionsPage.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultSessionsPage/AgentVaultSessionsPage.tsx@@ -135,7 +135,7 @@ export const AgentVaultSessionsPage = () => {}return (- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><Helmet><title>{t("common.head-title", { title: "Sessions" })}</title></Helmet>diff --git a/frontend/src/pages/cert-manager/IntegrationsListPage/IntegrationsListPage.tsx b/frontend/src/pages/cert-manager/IntegrationsListPage/IntegrationsListPage.tsxindex 3e3db873d9..d5b0090b6d 100644--- a/frontend/src/pages/cert-manager/IntegrationsListPage/IntegrationsListPage.tsx+++ b/frontend/src/pages/cert-manager/IntegrationsListPage/IntegrationsListPage.tsx@@ -46,7 +46,7 @@ export const IntegrationsListPage = () => {<meta name="og:description" content="Sync and manage PKI certificates across services" /></Helmet><div className="relative mx-auto max-w-8xl pb-12 text-white">- <div className="mb-8">+ <div className="mb-8 flex flex-col gap-8"><PageHeaderscope={ProjectType.CertificateManager}title="Project Integrations"diff --git a/frontend/src/pages/organization/IntegrationsPage/IntegrationsPage.tsx b/frontend/src/pages/organization/IntegrationsPage/IntegrationsPage.tsxindex 7653421465..5bbce7191f 100644--- a/frontend/src/pages/organization/IntegrationsPage/IntegrationsPage.tsx+++ b/frontend/src/pages/organization/IntegrationsPage/IntegrationsPage.tsx@@ -93,7 +93,7 @@ export const IntegrationsPage = () => {<meta property="og:image" content="/images/message.png" /></Helmet><div className="flex w-full justify-center bg-bunker-800 text-white">- <div className="w-full max-w-8xl">+ <div className="flex w-full max-w-8xl flex-col gap-8"><PageHeaderscope={isSubOrganization ? "namespace" : "org"}title="Integrations"diff --git a/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/KmipServerDetailsByIDPage.tsx b/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/KmipServerDetailsByIDPage.tsxindex cf1e88551c..7a9dd77530 100644--- a/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/KmipServerDetailsByIDPage.tsx+++ b/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/KmipServerDetailsByIDPage.tsx@@ -62,16 +62,17 @@ const Page = () => {}return (- <div className="mx-auto flex max-w-8xl flex-col">- <Link- to="/organizations/$orgId/projects/kms/kmip-servers"- params={{ orgId }}- className="mb-4 flex w-fit items-center gap-x-1 text-sm text-muted transition hover:text-label"- >- <ChevronLeftIcon size={16} />- KMIP Servers- </Link>- <KmipServerPageHeader kmipServer={kmipServer} orgId={orgId} />+ <div className="mx-auto flex max-w-8xl flex-col gap-8">+ <KmipServerPageHeader+ kmipServer={kmipServer}+ orgId={orgId}+ backLink={+ <Link to="/organizations/$orgId/projects/kms/kmip-servers" params={{ orgId }}>+ <ChevronLeftIcon aria-hidden className="size-4" />+ KMIP Servers+ </Link>+ }+ /><div className="flex flex-col gap-8 lg:flex-row"><div className="w-full min-w-0 shrink-0 lg:w-96"><KmipServerDetailsCard kmipServer={kmipServer} />diff --git a/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/components/KmipServerPageHeader/KmipServerPageHeader.tsx b/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/components/KmipServerPageHeader/KmipServerPageHeader.tsxindex 4e57ab5941..a4e889cd16 100644--- a/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/components/KmipServerPageHeader/KmipServerPageHeader.tsx+++ b/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/components/KmipServerPageHeader/KmipServerPageHeader.tsx@@ -1,3 +1,4 @@+import type { ReactElement } from "react";import { useNavigate } from "@tanstack/react-router";import { BanIcon, CopyIcon, EllipsisIcon, TrashIcon } from "lucide-react";@@ -31,7 +32,7 @@ import { usePopUp } from "@app/hooks";import { useDeleteKmipServerById, useRevokeKmipServerAccess } from "@app/hooks/api/kmipServers";import { TKmipServerWithAuthMethod } from "@app/hooks/api/kmipServers/types";-export const KmipServerPageHeader = ({ kmipServer, orgId }: Props) => {+export const KmipServerPageHeader = ({ kmipServer, orgId, backLink }: Props) => {const navigate = useNavigate();const { isSubOrganization } = useOrganization();const { mutateAsync: deleteKmipServer, isPending: isDeleting } = useDeleteKmipServerById();@@ -68,6 +69,7 @@ export const KmipServerPageHeader = ({ kmipServer, orgId }: Props) => {scope={isSubOrganization ? "namespace" : "org"}title={kmipServer.name}description="KMIP server configuration and authentication"+ backLink={backLink}><DropdownMenu><DropdownMenuTrigger asChild>@@ -174,4 +176,5 @@ export const KmipServerPageHeader = ({ kmipServer, orgId }: Props) => {type Props = {kmipServer: TKmipServerWithAuthMethod;orgId: string;+ backLink: ReactElement;};diff --git a/frontend/src/pages/organization/NetworkingPage/NetworkingPage.tsx b/frontend/src/pages/organization/NetworkingPage/NetworkingPage.tsxindex 0fc6bbc985..f68aa7528e 100644--- a/frontend/src/pages/organization/NetworkingPage/NetworkingPage.tsx+++ b/frontend/src/pages/organization/NetworkingPage/NetworkingPage.tsx@@ -1,6 +1,6 @@import { Helmet } from "react-helmet";-import { PageHeader } from "@app/components/v2";+import { PageHeader } from "@app/components/v3";import { useOrganization } from "@app/context";import { NetworkingTabGroup } from "./components/NetworkingTabGroup/NetworkingTabGroup";@@ -15,7 +15,7 @@ export const NetworkingPage = () => {<meta property="og:image" content="/images/message.png" /></Helmet><div className="flex w-full justify-center bg-bunker-800 text-white">- <div className="w-full max-w-8xl">+ <div className="flex w-full max-w-8xl flex-col gap-8"><PageHeaderscope={isSubOrganization ? "namespace" : "org"}title="Networking"diff --git a/frontend/src/pages/organization/OauthApplicationsPage/OauthApplicationsPage.tsx b/frontend/src/pages/organization/OauthApplicationsPage/OauthApplicationsPage.tsxindex 12d853654b..d6c3852b01 100644--- a/frontend/src/pages/organization/OauthApplicationsPage/OauthApplicationsPage.tsx+++ b/frontend/src/pages/organization/OauthApplicationsPage/OauthApplicationsPage.tsx@@ -1,6 +1,6 @@import { Helmet } from "react-helmet";-import { PageHeader } from "@app/components/v2";+import { PageHeader } from "@app/components/v3";import { useOrganization } from "@app/context";import { OrgOauthClientsTab } from "@app/pages/organization/SettingsPage/components/OrgOauthClientsTab";@@ -15,7 +15,7 @@ export const OauthApplicationsPage = () => {<meta property="og:image" content="/images/message.png" /></Helmet><div className="flex w-full justify-center bg-bunker-800 text-white">- <div className="w-full max-w-8xl">+ <div className="flex w-full max-w-8xl flex-col gap-8"><PageHeaderscope={isSubOrganization ? "namespace" : "org"}title="OAuth Applications"diff --git a/frontend/src/pages/organization/SettingsPage/components/OrgTabGroup/OrgTabGroup.tsx b/frontend/src/pages/organization/SettingsPage/components/OrgTabGroup/OrgTabGroup.tsxindex f6f9432e82..dc21ee0d15 100644--- a/frontend/src/pages/organization/SettingsPage/components/OrgTabGroup/OrgTabGroup.tsx+++ b/frontend/src/pages/organization/SettingsPage/components/OrgTabGroup/OrgTabGroup.tsx@@ -3,12 +3,12 @@ import { useTranslation } from "react-i18next";import { Link, useSearch } from "@tanstack/react-router";import { InfoIcon } from "lucide-react";-import { PageHeader, TabPanel, Tabs } from "@app/components/v2";import {AlertDescription,AlertTitle,DismissableAlert,- LookingForOrgPageLink+ LookingForOrgPageLink,+ PageHeader} from "@app/components/v3";import { ROUTE_PATHS } from "@app/const/routes";import { useOrganization, useSubscription } from "@app/context";@@ -85,12 +85,13 @@ export const OrgTabGroup = () => {defaultTab): defaultTab;const activeTab = visibleTabs.find((item) => item.key === selectedTab);+ const ActiveTabComponent = activeTab?.component;const selectedTabName = activeTab?.name;const settingsTitle = `${isSubOrganization ? "Sub-Organization" : "Organization"} Settings`;const pageTitle = selectedTabName ? `${selectedTabName} - ${settingsTitle}` : settingsTitle;return (- <>+ <div className="flex w-full flex-col gap-8"><Helmet><title>{t("common.head-title", { title: pageTitle })}</title></Helmet>@@ -104,47 +105,38 @@ export const OrgTabGroup = () => {><LookingForOrgPageLink page="settings" target="root" /></PageHeader>- {selectedTab === "tab-org-general" && (- <DismissableAlert- variant="info"- className="mb-6"- actionKey="org_general_settings_moved_banner_dismissed"- >- <InfoIcon />- <AlertTitle>Some Settings Have Moved</AlertTitle>- <AlertDescription>- <p>- Audit log streams now live under{" "}- <Link- to="/organizations/$orgId/audit-logs"- params={{ orgId: currentOrg.id }}- search={{ selectedTab: "streams" }}- className="underline hover:opacity-80"- >- Audit Logs- </Link>- , and workflow integrations, OAuth applications, and external migrations have moved to{" "}- <Link- to="/organizations/$orgId/integrations"- params={{ orgId: currentOrg.id }}- className="underline hover:opacity-80"- >- Integrations- </Link>- .- </p>- </AlertDescription>- </DismissableAlert>- )}- <Tabs orientation="vertical" value={selectedTab}>- {visibleTabs- .filter((tab) => !tab.requiresFeature)- .map(({ key, component: Component }) => (- <TabPanel value={key} key={`tab-panel-${key}`}>- <Component />- </TabPanel>- ))}- </Tabs>- </>+ <div className="flex flex-col gap-6">+ {selectedTab === "tab-org-general" && (+ <DismissableAlert variant="info" actionKey="org_general_settings_moved_banner_dismissed">+ <InfoIcon />+ <AlertTitle>Some Settings Have Moved</AlertTitle>+ <AlertDescription>+ <p>+ Audit log streams now live under{" "}+ <Link+ to="/organizations/$orgId/audit-logs"+ params={{ orgId: currentOrg.id }}+ search={{ selectedTab: "streams" }}+ className="underline hover:opacity-80"+ >+ Audit Logs+ </Link>+ , and workflow integrations, OAuth applications, and external migrations have moved+ to{" "}+ <Link+ to="/organizations/$orgId/integrations"+ params={{ orgId: currentOrg.id }}+ className="underline hover:opacity-80"+ >+ Integrations+ </Link>+ .+ </p>+ </AlertDescription>+ </DismissableAlert>+ )}+ {ActiveTabComponent && <ActiveTabComponent />}+ </div>+ </div>);};diff --git a/frontend/src/pages/organization/SsoPage/SsoPage.tsx b/frontend/src/pages/organization/SsoPage/SsoPage.tsxindex a612a7b8ea..f0ef19e586 100644--- a/frontend/src/pages/organization/SsoPage/SsoPage.tsx+++ b/frontend/src/pages/organization/SsoPage/SsoPage.tsx@@ -1,7 +1,7 @@import { Helmet } from "react-helmet";import { useNavigate, useSearch } from "@tanstack/react-router";-import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";+import { PageHeader, Tabs, TabsContent, TabsList, TabsTrigger } from "@app/components/v3";import { ROUTE_PATHS } from "@app/const/routes";import { useOrganization } from "@app/context";import { OrgProvisioningTab } from "@app/pages/organization/SettingsPage/components/OrgProvisioningTab";@@ -39,28 +39,27 @@ export const SsoPage = () => {<meta property="og:image" content="/images/message.png" /></Helmet><div className="flex w-full justify-center bg-bunker-800 text-white">- <div className="w-full max-w-8xl">+ <div className="flex w-full max-w-8xl flex-col gap-8"><PageHeaderscope={isSubOrganization ? "namespace" : "org"}title="SSO & Provisioning"description="Configure how users sign in and how accounts are provisioned in your organization."/><Tabs value={activeTab} onValueChange={updateSelectedTab}>- <TabList>+ <TabsList+ variant={isSubOrganization ? "sub-org" : "org"}+ aria-label="SSO and provisioning sections"+ >{tabs.map(({ key, label }) => (- <Tab- variant={isSubOrganization ? "namespace" : "org"}- value={key}- key={`tab-${key}`}- >+ <TabsTrigger value={key} key={`tab-${key}`}>{label}- </Tab>+ </TabsTrigger>))}- </TabList>+ </TabsList>{tabs.map(({ key, component: Component }) => (- <TabPanel value={key} key={`tab-panel-${key}`}>+ <TabsContent value={key} key={`tab-panel-${key}`}><Component />- </TabPanel>+ </TabsContent>))}</Tabs></div>diff --git a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsxindex 04775522f9..673430ae8b 100644--- a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx+++ b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx@@ -65,9 +65,8 @@ const Page = () => {return (<div className="mx-auto flex flex-col justify-between text-foreground">- <div className="mx-auto mb-6 w-full max-w-8xl">+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><PageHeader- className={hasTabs ? "mb-6" : undefined}scope={currentProject.type}title={isCertManager ? "Access Control" : "Project Access Control"}description={diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsxindex 6341767262..aa53ccbf16 100644--- a/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx+++ b/frontend/src/pages/project/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx@@ -116,22 +116,20 @@ const Page = () => {);}+ const backLinkProps = {+ to: `${getProjectBaseURL(currentProject.type)}/access-management`,+ params: {+ projectId: currentProject.id,+ orgId: currentOrg.id+ },+ search: {+ selectedTab: ProjectAccessControlTabs.Groups+ }+ } as const;+ const backLinkLabel = isCertManager ? "Groups" : "Project Groups";+return (- <div className="mx-auto flex max-w-8xl flex-col">- <Link- to={`${getProjectBaseURL(currentProject.type)}/access-management`}- params={{- projectId: currentProject.id,- orgId: currentOrg.id- }}- search={{- selectedTab: ProjectAccessControlTabs.Groups- }}- className="mb-4 flex w-fit items-center gap-x-1 text-sm text-muted transition-colors hover:text-foreground focus-visible:rounded-sm focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"- >- <ChevronLeftIcon size={16} />- {isCertManager ? "Groups" : "Project Groups"}- </Link>+ <div className="mx-auto flex max-w-8xl flex-col gap-8">{groupMembership ? (<><PageHeader@@ -142,6 +140,12 @@ const Page = () => {? "Configure and manage certificate manager access control": "Configure and manage project access control"}+ backLink={+ <Link {...backLinkProps}>+ <ChevronLeftIcon aria-hidden className="size-4" />+ {backLinkLabel}+ </Link>+ }><DropdownMenu><DropdownMenuTrigger asChild>@@ -186,15 +190,24 @@ const Page = () => {</div></>) : (- <Empty className="border">- <EmptyHeader>- <EmptyTitle>Group Not Found</EmptyTitle>- <EmptyDescription>- This group is unavailable or is no longer assigned to the {productLabel.toLowerCase()}- .- </EmptyDescription>- </EmptyHeader>- </Empty>+ <>+ <Link+ {...backLinkProps}+ className="flex w-fit items-center gap-1 text-sm text-muted transition-colors hover:text-foreground focus-visible:rounded-sm focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"+ >+ <ChevronLeftIcon aria-hidden className="size-4" />+ {backLinkLabel}+ </Link>+ <Empty className="border">+ <EmptyHeader>+ <EmptyTitle>Group Not Found</EmptyTitle>+ <EmptyDescription>+ This group is unavailable or is no longer assigned to the{" "}+ {productLabel.toLowerCase()}.+ </EmptyDescription>+ </EmptyHeader>+ </Empty>+ </>)}<DeleteConfirmDialogisOpen={popUp.deleteGroup.isOpen}diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsxindex c4c52b4ca0..cc318f3096 100644--- a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx@@ -212,27 +212,28 @@ const Page = () => {currentOrg.rootOrgId !== identityMembershipDetails?.identity.orgId;return (- <div className="mx-auto flex max-w-8xl flex-col">+ <div className="mx-auto flex max-w-8xl flex-col gap-8">{identityMembershipDetails ? (<>- <Link- to={`${getProjectBaseURL(currentProject.type)}/access-management`}- params={{- projectId,- orgId: currentOrg.id- }}- search={{- selectedTab: ProjectAccessControlTabs.Identities- }}- className="mb-4 flex w-fit items-center gap-x-1 text-sm text-muted transition duration-100 hover:text-foreground"- >- <ChevronLeftIcon size={16} />- {isStandaloneProduct ? "Machine Identities" : "Project Machine Identities"}- </Link><PageHeaderscope={currentProject.type}description={pageDescription}title={identityMembershipDetails.identity.name}+ backLink={+ <Link+ to={`${getProjectBaseURL(currentProject.type)}/access-management`}+ params={{+ projectId,+ orgId: currentOrg.id+ }}+ search={{+ selectedTab: ProjectAccessControlTabs.Identities+ }}+ >+ <ChevronLeftIcon aria-hidden className="size-4" />+ {isStandaloneProduct ? "Machine Identities" : "Project Machine Identities"}+ </Link>+ }><div className="flex items-center gap-2">{isProjectIdentity ? (diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsxindex 7f3462cb90..87c86e204c 100644--- a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx+++ b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx@@ -154,23 +154,9 @@ export const Page = () => {}return (- <div className="mx-auto flex max-w-8xl flex-col">+ <div className="mx-auto flex max-w-8xl flex-col gap-8">{membershipDetails ? (<>- <Link- to={`${getProjectBaseURL(currentProject.type)}/access-management`}- params={{- projectId: currentProject.id,- orgId: currentOrg.id- }}- search={{- selectedTab: ProjectAccessControlTabs.Member- }}- className="mb-4 flex w-fit items-center gap-x-1 text-sm text-muted transition-colors hover:text-foreground"- >- <ChevronLeftIcon className="size-4" />- {isCertManager ? "Users" : "Project Users"}- </Link><PageHeaderscope={currentProject.type}title={memberDisplayName}@@ -179,6 +165,21 @@ export const Page = () => {? "Configure and manage certificate manager access control": "Configure and manage project access control"}+ backLink={+ <Link+ to={`${getProjectBaseURL(currentProject.type)}/access-management`}+ params={{+ projectId: currentProject.id,+ orgId: currentOrg.id+ }}+ search={{+ selectedTab: ProjectAccessControlTabs.Member+ }}+ >+ <ChevronLeftIcon aria-hidden className="size-4" />+ {isCertManager ? "Users" : "Project Users"}+ </Link>+ }><div className="flex items-center gap-2">{!isCertManager && (diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsxindex 1458e2ef9b..90f7abf4c6 100644--- a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx@@ -99,21 +99,7 @@ const Page = () => {return (<div className="mx-auto flex flex-col justify-between text-foreground">{data && (- <div className="mx-auto mb-6 w-full max-w-8xl">- <Link- to={`${getProjectBaseURL(currentProject.type)}/access-management`}- params={{- projectId,- orgId- }}- search={{- selectedTab: ProjectAccessControlTabs.Roles- }}- className="mb-4 flex items-center gap-x-2 text-sm text-muted"- >- <ChevronLeftIcon className="size-4" />- {isCertManager ? "Roles" : "Project Roles"}- </Link>+ <div className="mx-auto mb-6 flex w-full max-w-8xl flex-col gap-8"><PageHeaderscope={currentProject.type}title={displayName}@@ -122,6 +108,21 @@ const Page = () => {{data.slug} {data.description && `- ${data.description}`}</>}+ backLink={+ <Link+ to={`${getProjectBaseURL(currentProject.type)}/access-management`}+ params={{+ projectId,+ orgId+ }}+ search={{+ selectedTab: ProjectAccessControlTabs.Roles+ }}+ >+ <ChevronLeftIcon aria-hidden className="size-4" />+ {isCertManager ? "Roles" : "Project Roles"}+ </Link>+ }>{isCustomRole && (<DropdownMenu>diff --git a/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.tsx b/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.tsxindex 669508426a..79b59b09ee 100644--- a/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.tsx+++ b/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.tsx@@ -72,7 +72,7 @@ export const IntegrationsListPage = () => {<meta name="og:description" content={t("integrations.description") as string} /></Helmet><div className="relative mx-auto max-w-8xl pb-12 text-white">- <div className="mb-8">+ <div className="mb-8 flex flex-col gap-8"><PageHeaderscope={ProjectType.SecretManager}title="Project Integrations"diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsxindex 8b158ce809..cfb1b60ded 100644--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/SecretApprovalsPage.tsx@@ -81,7 +81,7 @@ export const SecretApprovalsPage = () => {<meta property="og:title" content={String(t("approval.og-title"))} /><meta name="og:description" content={String(t("approval.og-description"))} /></Helmet>- <div className="mx-auto h-full w-full max-w-8xl text-white">+ <div className="mx-auto flex h-full w-full max-w-8xl flex-col gap-8 text-white"><PageHeaderscope={ProjectType.SecretManager}title="Approval Workflows"