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
feat(ui): show page breadcrumbs in the top navigation on every route (#8747)
Andrew Huangc2283db052e7
diff --git a/frontend/src/layouts/NavbarSwitcher.tsx b/frontend/src/layouts/NavbarSwitcher.tsxindex 8feab6c9c2..58e5a99e58 100644--- a/frontend/src/layouts/NavbarSwitcher.tsx+++ b/frontend/src/layouts/NavbarSwitcher.tsx@@ -4,6 +4,16 @@ import { ChevronsUpDown } from "lucide-react";import { IconButton, Popover, PopoverContent, PopoverTrigger } from "@app/components/v3";import { cn } from "@app/components/v3/utils";+const NavbarBlock = ({ className, ...props }: React.ComponentProps<"div">) => (+ <div+ className={cn(+ "flex h-full min-w-0 items-center gap-1 border-border-soft pr-2 pl-4 not-first:border-l",+ className+ )}+ {...props}+ />+);+const NavbarSwitcher = (props: React.ComponentProps<typeof Popover>) => <Popover {...props} />;type NavbarSwitcherTriggerProps = Omit<React.ComponentProps<"button">, "children"> & {@@ -27,4 +37,4 @@ const NavbarSwitcherContent = ({ className, ...props }: NavbarSwitcherContentPro<PopoverContent align="start" className={cn("p-0", className)} {...props} />);-export { NavbarSwitcher, NavbarSwitcherContent, NavbarSwitcherTrigger };+export { NavbarBlock, NavbarSwitcher, NavbarSwitcherContent, NavbarSwitcherTrigger };diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsxindex 4017b2a4cd..18a459ad81 100644--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx@@ -71,7 +71,6 @@ import { SidebarTrigger } from "@app/components/v3/generic/Sidebar";import { type Theme, useTheme } from "@app/components/v3/platform/ThemeProvider";import { envConfig } from "@app/config/env";import {- OrgPermissionBillingActions,OrgPermissionMemberActions,OrgPermissionSubjects,useOrganization,@@ -91,6 +90,7 @@ import { getAuthToken } from "@app/hooks/api/reactQuery";import { Organization } from "@app/hooks/api/types";import { AuthMethod } from "@app/hooks/api/users/types";import {+ NavbarBlock,NavbarSwitcher,NavbarSwitcherContent,NavbarSwitcherTrigger@@ -103,8 +103,8 @@ import { TypeSelect } from "@app/layouts/ProjectLayout/components/TypeSelect";import { navigateUserToOrg } from "@app/pages/auth/LoginPage/Login.utils";import { ServerAdminsPanel } from "../ServerAdminsPanel/ServerAdminsPanel";+import { NavbarPageBreadcrumbs } from "./NavbarPageBreadcrumbs";import { NotificationDropdown } from "./NotificationDropdown";-import { OrganizationProductPlans } from "./OrganizationProductPlans";import { VersionBadge } from "./VersionBadge";const getFormattedSupportEmailLink = (variables: {@@ -407,14 +407,14 @@ export const Navbar = () => {</div>) : (<>- <div+ <NavbarBlockclassName={twMerge(- "flex h-full min-w-0 items-center overflow-hidden border-border-soft pr-2 pl-4 transition-all duration-300 ease-in-out",- isProjectScope ? "mr-2 max-w-52 border-r" : "mr-4 max-w-96"+ "overflow-hidden transition-all duration-300 ease-in-out",+ isProjectScope ? "max-w-52" : "max-w-96")}><NavbarSwitcher open={isOrgSelectOpen} onOpenChange={setIsOrgSelectOpen}>- <div className="group mr-1 flex min-w-0 cursor-pointer items-center gap-2 overflow-hidden text-sm text-foreground transition-all duration-100">+ <div className="group flex min-w-0 cursor-pointer items-center gap-2 overflow-hidden text-sm text-foreground transition-all duration-100"><buttonclassName="flex cursor-pointer items-center gap-x-2 truncate whitespace-nowrap"type="button"@@ -618,21 +618,7 @@ export const Navbar = () => {</Command></NavbarSwitcherContent></NavbarSwitcher>- </div>- {!isProjectScope && (- <OrgPermissionCan- I={OrgPermissionBillingActions.Read}- a={OrgPermissionSubjects.Billing}- >- {(isAllowed) => (- <OrganizationProductPlans- plans={subscription.productPlans}- isSubOrganization={isSubOrganization}- billingOrgId={isAllowed ? (currentOrg.rootOrgId ?? currentOrg.id) : undefined}- />- )}- </OrgPermissionCan>- )}+ </NavbarBlock>{isProjectScope && (<><TypeSelect />@@ -640,6 +626,7 @@ export const Navbar = () => {<ApplicationSelect /></>)}+ <NavbarPageBreadcrumbs /></>)}</div>diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/NavbarPageBreadcrumbs.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/NavbarPageBreadcrumbs.tsxnew file mode 100644index 0000000000..f1c0f27f73--- /dev/null+++ b/frontend/src/layouts/OrganizationLayout/components/NavBar/NavbarPageBreadcrumbs.tsx@@ -0,0 +1,61 @@+import { Fragment } from "react";+import { Link, type LinkProps, useRouterState } from "@tanstack/react-router";++import {+ Breadcrumb,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbList,+ BreadcrumbPage,+ BreadcrumbSeparator+} from "@app/components/v3";+import { NavbarBlock } from "@app/layouts/NavbarSwitcher";++export type TNavBreadcrumb = {+ label: string;+ link?: LinkProps;+};++export const useNavBreadcrumbs = () =>+ useRouterState({+ select: (state) => {+ const context = state.matches[state.matches.length - 1]?.context as+ | { breadcrumbs?: TNavBreadcrumb[] }+ | undefined;+ return context?.breadcrumbs ?? [];+ }+ });++export const NavbarPageBreadcrumbs = () => {+ const breadcrumbs = useNavBreadcrumbs();++ if (!breadcrumbs.length) return null;++ return (+ <NavbarBlock className="hidden md:flex">+ <Breadcrumb className="min-w-0">+ <BreadcrumbList className="min-w-0 flex-nowrap">+ {breadcrumbs.map((crumb, index) => {+ const isCurrentPage = index === breadcrumbs.length - 1;+ return (+ <Fragment key={`${crumb.label}-${index + 1}`}>+ {index > 0 && <BreadcrumbSeparator />}+ <BreadcrumbItem className="min-w-0">+ {isCurrentPage && (+ <BreadcrumbPage className="truncate">{crumb.label}</BreadcrumbPage>+ )}+ {!isCurrentPage && crumb.link && (+ <BreadcrumbLink asChild className="truncate">+ <Link {...crumb.link}>{crumb.label}</Link>+ </BreadcrumbLink>+ )}+ {!isCurrentPage && !crumb.link && <span className="truncate">{crumb.label}</span>}+ </BreadcrumbItem>+ </Fragment>+ );+ })}+ </BreadcrumbList>+ </Breadcrumb>+ </NavbarBlock>+ );+};diff --git a/frontend/src/layouts/OrganizationLayout/components/NavBar/OrganizationProductPlans.tsx b/frontend/src/layouts/OrganizationLayout/components/NavBar/OrganizationProductPlans.tsxdeleted file mode 100644index d2dd79b43f..0000000000--- a/frontend/src/layouts/OrganizationLayout/components/NavBar/OrganizationProductPlans.tsx+++ /dev/null@@ -1,59 +0,0 @@-import { useState } from "react";-import { Link } from "@tanstack/react-router";-import { ChevronDown, CreditCard } from "lucide-react";--import { getProductPlanSummaries } from "@app/components/license/product-plan-summary";-import { ProductPlanSummaryList } from "@app/components/license/ProductPlanSummaryList";-import { Button, Popover, PopoverContent, PopoverTrigger, Separator } from "@app/components/v3";-import { SubscriptionPlan } from "@app/hooks/api/subscriptions/types";--type Props = {- plans: SubscriptionPlan["productPlans"];- billingOrgId?: string;- isSubOrganization: boolean;-};--export const OrganizationProductPlans = ({ plans, billingOrgId, isSubOrganization }: Props) => {- const [isOpen, setIsOpen] = useState(false);- const summaries = getProductPlanSummaries(plans);- if (!summaries.length) return null;-- return (- <Popover open={isOpen} onOpenChange={setIsOpen}>- <PopoverTrigger asChild>- <Button variant="ghost" size="xs" aria-label="View Product Plans" className="shrink-0">- <CreditCard />- <span className="max-sm:hidden">Product Plans</span>- <ChevronDown />- </Button>- </PopoverTrigger>- <PopoverContent align="start" side="bottom" collisionPadding={16}>- <div className="flex flex-col gap-4">- <div>- <p className="text-sm font-medium">Product Plans</p>- <p className="mt-1 text-xs text-muted">- {isSubOrganization- ? "Shared with your root organization."- : "Your organization's current product subscriptions."}- </p>- </div>- <ProductPlanSummaryList plans={summaries} />- {billingOrgId && (- <>- <Separator />- <Button variant="outline" size="xs" className="self-end" asChild>- <Link- to="/organizations/$orgId/billing"- params={{ orgId: billingOrgId }}- onClick={() => setIsOpen(false)}- >- View Billing- </Link>- </Button>- </>- )}- </div>- </PopoverContent>- </Popover>- );-};diff --git a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ApplicationSelect.tsx b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ApplicationSelect.tsxindex 600abc2d55..f1184d12e4 100644--- a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ApplicationSelect.tsx+++ b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ApplicationSelect.tsx@@ -15,6 +15,7 @@ import {import { useListPkiApplications } from "@app/hooks/api/pkiApplications";import { useDebounce } from "@app/hooks/useDebounce";import {+ NavbarBlock,NavbarSwitcher,NavbarSwitcherContent,NavbarSwitcherTrigger@@ -65,7 +66,7 @@ const ApplicationSelectInner = ({};return (- <div className="mr-2 flex min-w-16 items-center gap-1 pr-1 pl-1">+ <NavbarBlock className="min-w-16"><NavbarSwitcheropen={open}onOpenChange={(nextOpen) => {@@ -134,7 +135,7 @@ const ApplicationSelectInner = ({</Command></NavbarSwitcherContent></NavbarSwitcher>- </div>+ </NavbarBlock>);};diff --git a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsxindex e7afbaadff..88046bd8cf 100644--- a/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx+++ b/frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx@@ -31,6 +31,7 @@ import { ProjectType } from "@app/hooks/api/projects/types";import { useUpdateUserProjectFavorites } from "@app/hooks/api/users/mutation";import { useGetUserProjectFavorites } from "@app/hooks/api/users/queries";import {+ NavbarBlock,NavbarSwitcher,NavbarSwitcherContent,NavbarSwitcherTrigger@@ -133,7 +134,7 @@ const ProjectSelectInner = () => {}return (- <div className="mr-2 flex min-w-16 items-center gap-1 pr-1 pl-1">+ <NavbarBlock className="min-w-16"><NavbarSwitcheropen={open}onOpenChange={(nextOpen) => {@@ -266,7 +267,7 @@ const ProjectSelectInner = () => {onOpenChange={(isOpen) => handlePopUpToggle("addNewWs", isOpen)}projectType={currentWorkspace.type}/>- </div>+ </NavbarBlock>);};diff --git a/frontend/src/layouts/ProjectLayout/components/TypeSelect/TypeSelect.tsx b/frontend/src/layouts/ProjectLayout/components/TypeSelect/TypeSelect.tsxindex 321ba87d17..ad733b3f91 100644--- a/frontend/src/layouts/ProjectLayout/components/TypeSelect/TypeSelect.tsx+++ b/frontend/src/layouts/ProjectLayout/components/TypeSelect/TypeSelect.tsx@@ -1,5 +1,5 @@import { useMemo, useState } from "react";-import { useLocation, useNavigate, useParams, useSearch } from "@tanstack/react-router";+import { useLocation, useNavigate, useParams } from "@tanstack/react-router";import { Check } from "lucide-react";import { PreviewBadge } from "@app/components/agent-vault/PreviewBadge";@@ -25,6 +25,7 @@ import { useCertManagerInstanceState } from "@app/hooks/api/certManagerInstance"import { ProjectType } from "@app/hooks/api/projects/types";import { useGetSecretScanningInstanceState } from "@app/hooks/api/secretScanningV2";import {+ NavbarBlock,NavbarSwitcher,NavbarSwitcherContent,NavbarSwitcherTrigger@@ -41,14 +42,14 @@ const PRODUCT_TYPES: ProjectType[] = [ProjectType.AgentVault];+const ORG_PRODUCT_PAGE_PATH_RE = /^\/organizations\/[^/]+\/projects\/([^/]+)\//;+const TypeSelectInner = ({currentType,- currentProjectName,- showDivider+ currentProjectName}: {currentType: ProjectType;currentProjectName?: string;- showDivider?: boolean;}) => {const [open, setOpen] = useState(false);const [isCertManagerSetupOpen, setIsCertManagerSetupOpen] = useState(false);@@ -119,9 +120,7 @@ const TypeSelectInner = ({const ProductIcon = getProjectLucideIcon(currentType);return (- <div- className={`flex h-full min-w-16 items-center gap-1 pr-2 pl-1 ${showDivider ? "mr-2 border-r border-border-soft" : "mr-2"}`}- >+ <NavbarBlock className="min-w-16"><NavbarSwitcher open={open} onOpenChange={setOpen}><buttontype="button"@@ -185,14 +184,13 @@ const TypeSelectInner = ({isOpen={isCertManagerSetupOpen}onOpenChange={setIsCertManagerSetupOpen}/>- </div>+ </NavbarBlock>);};export const TypeSelect = () => {const params = useParams({ strict: false });const { pathname } = useLocation();- const search = useSearch({ strict: false }) as { fromApplication?: string };const implicitProjectId = useImplicitProjectId();const { data: projects = [] } = useGetUserProjects();const { data: certManagerInstance, isPending: isCertManagerInstancePending } =@@ -209,8 +207,6 @@ export const TypeSelect = () => {const orgScopedProduct = getOrgScopedProductFromPath(pathname);if (orgScopedProduct === ProjectType.CertificateManager) {- const applicationName =- (params as { applicationName?: string }).applicationName ?? search.fromApplication;const project = projects.find((p) => p.id === implicitProjectId);// Only orgs with several legacy instances can be viewing one that is not the active instance.const isLegacyCertManagerProject =@@ -221,7 +217,6 @@ export const TypeSelect = () => {<TypeSelectInnercurrentType={ProjectType.CertificateManager}currentProjectName={isLegacyCertManagerProject ? project?.name : undefined}- showDivider={Boolean(applicationName)}/>);}@@ -247,8 +242,15 @@ export const TypeSelect = () => {if (params.projectId) {const project = projects.find((p) => p.id === params.projectId);if (project) {- return <TypeSelectInner currentType={project.type} showDivider />;+ return <TypeSelectInner currentType={project.type} />;}+ return null;+ }++ const orgProductSlug = pathname.match(ORG_PRODUCT_PAGE_PATH_RE)?.[1];+ const orgProductType = orgProductSlug ? urlSlugToProjectType(orgProductSlug) : null;+ if (orgProductType) {+ return <TypeSelectInner currentType={orgProductType} />;}return null;diff --git a/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/route.tsx b/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/route.tsxindex 864b8e4f82..42aa7d1118 100644--- a/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/route.tsx+++ b/frontend/src/pages/agent-vault/AgentVaultAccessBundleDetailPage/route.tsx@@ -1,4 +1,4 @@-import { createFileRoute } from "@tanstack/react-router";+import { createFileRoute, linkOptions } from "@tanstack/react-router";import { AgentVaultAccessBundleDetailPage } from "./AgentVaultAccessBundleDetailPage";@@ -6,7 +6,19 @@ export const Route = createFileRoute("/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/agent-vault/_agent-vault-layout/access-bundles/$accessBundleId")({component: AgentVaultAccessBundleDetailPage,- beforeLoad: ({ context }) => {- return { breadcrumbs: [...context.breadcrumbs, { label: "Access Bundle" }] };+ beforeLoad: ({ context, params }) => {+ return {+ breadcrumbs: [+ ...context.breadcrumbs,+ {+ label: "Access Bundles",+ link: linkOptions({+ to: "/organizations/$orgId/agent-vault/access-bundles",+ params: { orgId: params.orgId }+ })+ },+ { label: "Access Bundle" }+ ]+ };}});diff --git a/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/route.tsxindex f5bd640f63..ae58b1e3be 100644--- a/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/route.tsx+++ b/frontend/src/pages/cert-manager/ApplicationDetailsByIDPage/route.tsx@@ -1,4 +1,4 @@-import { createFileRoute, stripSearchParams } from "@tanstack/react-router";+import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router";import { zodValidator } from "@tanstack/zod-adapter";import { z } from "zod";@@ -18,7 +18,17 @@ export const Route = createFileRoute(component: ApplicationDetailsByIDPage,validateSearch: zodValidator(SearchSchema),search: { middlewares: [stripSearchParams({ selectedTab: ApplicationTab.Certificates })] },- beforeLoad: ({ context }) => ({- breadcrumbs: [...context.breadcrumbs, { label: "Applications" }, { label: "Application" }]+ beforeLoad: ({ context, params }) => ({+ breadcrumbs: [+ ...context.breadcrumbs,+ {+ label: "Applications",+ link: linkOptions({+ to: "/organizations/$orgId/cert-manager/applications",+ params: { orgId: params.orgId }+ })+ },+ { label: "Application" }+ ]})});diff --git a/frontend/src/pages/cert-manager/ApprovalRequestDetailPage/route.tsx b/frontend/src/pages/cert-manager/ApprovalRequestDetailPage/route.tsxindex d2fc43c538..5c5b9fba51 100644--- a/frontend/src/pages/cert-manager/ApprovalRequestDetailPage/route.tsx+++ b/frontend/src/pages/cert-manager/ApprovalRequestDetailPage/route.tsx@@ -1,4 +1,4 @@-import { createFileRoute } from "@tanstack/react-router";+import { createFileRoute, linkOptions } from "@tanstack/react-router";import { zodValidator } from "@tanstack/zod-adapter";import { z } from "zod";@@ -18,10 +18,28 @@ export const Route = createFileRoute()({component: ApprovalRequestDetailPage,validateSearch: zodValidator(ApprovalRequestSearchSchema),- beforeLoad: ({ context }) => {+ beforeLoad: ({ context, params, search }) => {+ const parent =+ search.policyType === ApprovalPolicyType.CertCodeSigning+ ? {+ label: "Requests",+ link: linkOptions({+ to: "/organizations/$orgId/cert-manager/requests",+ params: { orgId: params.orgId },+ search: { selectedTab: "signing-requests" as const }+ })+ }+ : {+ label: "Approvals",+ link: linkOptions({+ to: "/organizations/$orgId/cert-manager/approvals",+ params: { orgId: params.orgId }+ })+ };return {breadcrumbs: [...context.breadcrumbs,+ parent,{label: "Approval Request"}diff --git a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsxindex 8e7ae100d8..92c818f51c 100644--- a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsx+++ b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsx@@ -28,6 +28,9 @@ export const Route = createFileRoute(orgId: params.orgId}})+ },+ {+ label: "Certificate Authority"}]};diff --git a/frontend/src/pages/cert-manager/CertificatePolicyDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/CertificatePolicyDetailsByIDPage/route.tsxindex 51c8337c38..d1cd3a240b 100644--- a/frontend/src/pages/cert-manager/CertificatePolicyDetailsByIDPage/route.tsx+++ b/frontend/src/pages/cert-manager/CertificatePolicyDetailsByIDPage/route.tsx@@ -28,6 +28,9 @@ export const Route = createFileRoute(orgId: params.orgId}})+ },+ {+ label: "Certificate Policy"}]};diff --git a/frontend/src/pages/cert-manager/CertificateProfileDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/CertificateProfileDetailsByIDPage/route.tsxindex 6acb2f756e..43b04beec0 100644--- a/frontend/src/pages/cert-manager/CertificateProfileDetailsByIDPage/route.tsx+++ b/frontend/src/pages/cert-manager/CertificateProfileDetailsByIDPage/route.tsx@@ -26,6 +26,9 @@ export const Route = createFileRoute(orgId: params.orgId}})+ },+ {+ label: "Certificate Profile"}]};diff --git a/frontend/src/pages/cert-manager/HsmConnectorDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/HsmConnectorDetailsByIDPage/route.tsxindex 8745b0403f..4ced9d559a 100644--- a/frontend/src/pages/cert-manager/HsmConnectorDetailsByIDPage/route.tsx+++ b/frontend/src/pages/cert-manager/HsmConnectorDetailsByIDPage/route.tsx@@ -19,6 +19,9 @@ export const Route = createFileRoute(},search: { selectedTab: "hsm-connectors" }})+ },+ {+ label: "HSM Connector"}]};diff --git a/frontend/src/pages/cert-manager/SignerDetailPage/route.tsx b/frontend/src/pages/cert-manager/SignerDetailPage/route.tsxindex ac0721d7a5..4c27b76f3b 100644--- a/frontend/src/pages/cert-manager/SignerDetailPage/route.tsx+++ b/frontend/src/pages/cert-manager/SignerDetailPage/route.tsx@@ -1,4 +1,4 @@-import { createFileRoute } from "@tanstack/react-router";+import { createFileRoute, linkOptions } from "@tanstack/react-router";import { zodValidator } from "@tanstack/zod-adapter";import { z } from "zod";@@ -13,12 +13,16 @@ export const Route = createFileRoute()({component: SignerDetailPage,validateSearch: zodValidator(SignerDetailSearchSchema),- beforeLoad: ({ context }) => {+ beforeLoad: ({ context, params }) => {return {breadcrumbs: [...context.breadcrumbs,{- label: "Code Signing"+ label: "Code Signing",+ link: linkOptions({+ to: "/organizations/$orgId/cert-manager/code-signing",+ params: { orgId: params.orgId }+ })},{label: "Signer Details"diff --git a/frontend/src/pages/cert-manager/SigningOperationDetailPage/route.tsx b/frontend/src/pages/cert-manager/SigningOperationDetailPage/route.tsxindex 7c5ab664f8..69cd62abda 100644--- a/frontend/src/pages/cert-manager/SigningOperationDetailPage/route.tsx+++ b/frontend/src/pages/cert-manager/SigningOperationDetailPage/route.tsx@@ -1,4 +1,4 @@-import { createFileRoute } from "@tanstack/react-router";+import { createFileRoute, linkOptions } from "@tanstack/react-router";import { SigningOperationDetailPage } from "./SigningOperationDetailPage";@@ -6,12 +6,16 @@ export const Route = createFileRoute("/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/cert-manager/_cert-manager-layout/code-signing/$signerId/operations/$operationId")({component: SigningOperationDetailPage,- beforeLoad: ({ context }) => {+ beforeLoad: ({ context, params }) => {return {breadcrumbs: [...context.breadcrumbs,{- label: "Code Signing"+ label: "Code Signing",+ link: linkOptions({+ to: "/organizations/$orgId/cert-manager/code-signing",+ params: { orgId: params.orgId }+ })},{label: "Signing Operation"diff --git a/frontend/src/pages/organization/BillingPage/route.tsx b/frontend/src/pages/organization/BillingPage/route.tsxindex c271351c1d..1cd46a308c 100644--- a/frontend/src/pages/organization/BillingPage/route.tsx+++ b/frontend/src/pages/organization/BillingPage/route.tsx@@ -18,7 +18,7 @@ export const Route = createFileRoute(return {breadcrumbs: [{- label: "Billing"+ label: "Usage & Billing"}]};diff --git a/frontend/src/pages/organization/GroupDetailsByIDPage/route.tsx b/frontend/src/pages/organization/GroupDetailsByIDPage/route.tsxindex c98453fbc0..f6907609a1 100644--- a/frontend/src/pages/organization/GroupDetailsByIDPage/route.tsx+++ b/frontend/src/pages/organization/GroupDetailsByIDPage/route.tsx@@ -1,5 +1,7 @@import { createFileRoute, linkOptions } from "@tanstack/react-router";+import { OrgAccessControlTabSections } from "@app/types/org";+import { GroupDetailsByIDPage } from "./GroupDetailsByIDPage";export const Route = createFileRoute(@@ -12,11 +14,12 @@ export const Route = createFileRoute(label: "Access Control",link: linkOptions({to: "/organizations/$orgId/access-management" as const,- params+ params,+ search: { selectedTab: OrgAccessControlTabSections.Groups }})},{- label: "groups"+ label: "Group"}]})diff --git a/frontend/src/pages/organization/IdentityDetailsByIDPage/route.tsx b/frontend/src/pages/organization/IdentityDetailsByIDPage/route.tsxindex 9cee884a2d..5f941bc5da 100644--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/route.tsx+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/route.tsx@@ -1,5 +1,7 @@import { createFileRoute, linkOptions } from "@tanstack/react-router";+import { OrgAccessControlTabSections } from "@app/types/org";+import { IdentityDetailsByIDPage } from "./IdentityDetailsByIDPage";export const Route = createFileRoute(@@ -10,10 +12,14 @@ export const Route = createFileRoute(breadcrumbs: [{label: "Access Control",- link: linkOptions({ to: "/organizations/$orgId/access-management" as const, params })+ link: linkOptions({+ to: "/organizations/$orgId/access-management" as const,+ params,+ search: { selectedTab: OrgAccessControlTabSections.Identities }+ })},{- label: "Identities"+ label: "Machine Identity"}]})diff --git a/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/route.tsx b/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/route.tsxindex d38a3bdab1..f8d2195b3f 100644--- a/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/route.tsx+++ b/frontend/src/pages/organization/KmipServersPage/KmipServerDetailsByIDPage/route.tsx@@ -14,6 +14,9 @@ export const Route = createFileRoute(to: "/organizations/$orgId/projects/kms/kmip-servers" as const,params})+ },+ {+ label: "KMIP Server"}]})diff --git a/frontend/src/pages/organization/NetworkingPage/GatewayDetailsByIDPage/route.tsx b/frontend/src/pages/organization/NetworkingPage/GatewayDetailsByIDPage/route.tsxindex 29860cf28c..234b1b4a6d 100644--- a/frontend/src/pages/organization/NetworkingPage/GatewayDetailsByIDPage/route.tsx+++ b/frontend/src/pages/organization/NetworkingPage/GatewayDetailsByIDPage/route.tsx@@ -10,10 +10,14 @@ export const Route = createFileRoute(breadcrumbs: [{label: "Networking",- link: linkOptions({ to: "/organizations/$orgId/networking" as const, params })+ link: linkOptions({+ to: "/organizations/$orgId/networking" as const,+ params,+ search: { selectedTab: "gateways" }+ })},{- label: "Gateways"+ label: "Gateway"}]})diff --git a/frontend/src/pages/organization/NetworkingPage/RelayDetailsByIDPage/route.tsx b/frontend/src/pages/organization/NetworkingPage/RelayDetailsByIDPage/route.tsxindex 5d3284c4b2..a1d98edb82 100644--- a/frontend/src/pages/organization/NetworkingPage/RelayDetailsByIDPage/route.tsx+++ b/frontend/src/pages/organization/NetworkingPage/RelayDetailsByIDPage/route.tsx@@ -10,10 +10,14 @@ export const Route = createFileRoute(breadcrumbs: [{label: "Networking",- link: linkOptions({ to: "/organizations/$orgId/networking" as const, params })+ link: linkOptions({+ to: "/organizations/$orgId/networking" as const,+ params,+ search: { selectedTab: "relays" }+ })},{- label: "Relays"+ label: "Relay"}]})diff --git a/frontend/src/pages/organization/ProductSettingsPage/ProjectTemplates/project-templates/route.tsx b/frontend/src/pages/organization/ProductSettingsPage/ProjectTemplates/project-templates/route.tsxindex 4ad2c06be6..ee79edf462 100644--- a/frontend/src/pages/organization/ProductSettingsPage/ProjectTemplates/project-templates/route.tsx+++ b/frontend/src/pages/organization/ProductSettingsPage/ProjectTemplates/project-templates/route.tsx@@ -27,7 +27,7 @@ export const Route = createFileRoute(})},{- label: "Project Templates"+ label: "Project Template"}]}),diff --git a/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/project-templates/route.tsx b/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/project-templates/route.tsxindex 726edda282..10b870c07a 100644--- a/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/project-templates/route.tsx+++ b/frontend/src/pages/organization/ProductSettingsPage/SecretsManagement/project-templates/route.tsx@@ -32,7 +32,7 @@ export const Route = createFileRoute(})},{- label: "Project Templates"+ label: "Project Template"}]})diff --git a/frontend/src/pages/organization/ProjectsPage/route.tsx b/frontend/src/pages/organization/ProjectsPage/route.tsxindex c3e684569c..df2de1dab9 100644--- a/frontend/src/pages/organization/ProjectsPage/route.tsx+++ b/frontend/src/pages/organization/ProjectsPage/route.tsx@@ -8,7 +8,7 @@ export const Route = createFileRoute(context: () => ({breadcrumbs: [{- label: "Projects"+ label: "Home"}]}),diff --git a/frontend/src/pages/organization/RoleByIDPage/route.tsx b/frontend/src/pages/organization/RoleByIDPage/route.tsxindex 94664fb51f..0737fb0f02 100644--- a/frontend/src/pages/organization/RoleByIDPage/route.tsx+++ b/frontend/src/pages/organization/RoleByIDPage/route.tsx@@ -1,5 +1,7 @@import { createFileRoute, linkOptions } from "@tanstack/react-router";+import { OrgAccessControlTabSections } from "@app/types/org";+import { RoleByIDPage } from "./RoleByIDPage";export const Route = createFileRoute(@@ -12,11 +14,12 @@ export const Route = createFileRoute(label: "Access Control",link: linkOptions({to: "/organizations/$orgId/access-management",- params: { orgId: params.orgId }+ params: { orgId: params.orgId },+ search: { selectedTab: OrgAccessControlTabSections.Roles }})},{- label: "Roles"+ label: "Role"}]})diff --git a/frontend/src/pages/organization/UserDetailsByIDPage/route.tsx b/frontend/src/pages/organization/UserDetailsByIDPage/route.tsxindex 7293066f84..35521aedd9 100644--- a/frontend/src/pages/organization/UserDetailsByIDPage/route.tsx+++ b/frontend/src/pages/organization/UserDetailsByIDPage/route.tsx@@ -1,5 +1,7 @@import { createFileRoute, linkOptions } from "@tanstack/react-router";+import { OrgAccessControlTabSections } from "@app/types/org";+import { UserDetailsByIDPage } from "./UserDetailsByIDPage";export const Route = createFileRoute(@@ -10,10 +12,14 @@ export const Route = createFileRoute(breadcrumbs: [{label: "Access Control",- link: linkOptions({ to: "/organizations/$orgId/access-management" as const, params })+ link: linkOptions({+ to: "/organizations/$orgId/access-management" as const,+ params,+ search: { selectedTab: OrgAccessControlTabSections.Member }+ })},{- label: "Users"+ label: "User"}]})diff --git a/frontend/src/pages/secret-manager/OverviewPage/route.tsx b/frontend/src/pages/secret-manager/OverviewPage/route.tsxindex 9e0d4d413a..c755118899 100644--- a/frontend/src/pages/secret-manager/OverviewPage/route.tsx+++ b/frontend/src/pages/secret-manager/OverviewPage/route.tsx@@ -1,4 +1,4 @@-import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router";+import { createFileRoute, stripSearchParams } from "@tanstack/react-router";import { zodValidator } from "@tanstack/zod-adapter";import { z } from "zod";@@ -34,16 +34,12 @@ export const Route = createFileRoute(})]},- beforeLoad: ({ context, params }) => ({+ beforeLoad: ({ context }) => ({...context,breadcrumbs: [...context.breadcrumbs,{- label: "Secrets",- link: linkOptions({- to: "/organizations/$orgId/projects/secret-management/$projectId/overview",- params- })+ label: "Secrets"}]})