🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
fix(web): combine account and organization settings into one page (#18530)
Trang Nguyen97803c75128a
diff --git a/web/src/__tests__/account-settings-sign-out-all-sessions.clienttest.tsx b/web/src/__tests__/account-settings-sign-out-all-sessions.clienttest.tsxindex 2c20c4e940..407b1f1b01 100644--- a/web/src/__tests__/account-settings-sign-out-all-sessions.clienttest.tsx+++ b/web/src/__tests__/account-settings-sign-out-all-sessions.clienttest.tsx@@ -35,18 +35,6 @@ vi.mock("next/router", () => ({}),}));-vi.mock("@/src/components/layouts/container-page", () => ({- default: ({ children }: { children: React.ReactNode }) => <>{children}</>,-}));--vi.mock("@/src/components/PagedSettingsContainer", () => ({- PagedSettingsContainer: ({- pages,- }: {- pages: { content?: React.ReactNode }[];- }) => <>{pages[0]?.content}</>,-}));-vi.mock("@/src/features/auth/lib/signOut", () => ({signOutCleanly: signOutCleanlyMock,}));@@ -91,11 +79,12 @@ vi.mock("@/src/utils/api", () => ({reportNonTrpcError: reportNonTrpcErrorMock,}));-vi.mock("@/src/features/v4-migration/useV4UpgradeUiEnabled", () => ({- useV4UpgradeUiFlag: () => false,-}));+import { useAccountSettingsPages } from "@/src/features/account";-import AccountSettingsPage from "@/src/features/account/AccountSettingsPage";+function AccountSettingsPage() {+ const [general] = useAccountSettingsPages();+ return <>{general && "content" in general ? general.content : null}</>;+}describe("SignOutAllSessionsButton", () => {beforeEach(() => {diff --git a/web/src/components/PagedSettingsContainer.tsx b/web/src/components/PagedSettingsContainer.tsxindex 4e6ef4c7a4..0c193cd4a5 100644--- a/web/src/components/PagedSettingsContainer.tsx+++ b/web/src/components/PagedSettingsContainer.tsx@@ -1,7 +1,7 @@import { cn } from "@/src/utils/tailwind";import { ArrowUpRight } from "lucide-react";import Link from "next/link";-import { Fragment, type ReactNode } from "react";+import { type ReactNode } from "react";import {Select,SelectContent,@@ -13,47 +13,65 @@ import {} from "@/src/components/ui/select";import { useRouter } from "next/router";+type SettingsPage = {+ title: string;+ slug: string;+ section?: string;+ show?: boolean | (() => boolean);+} & (+ | { content: ReactNode }+ | {+ href: string;+ /** Hides the external-link arrow for links that stay in the settings nav */+ internal?: boolean;+ }+);+type SettingsProps = {- pages: Array<- {- title: string;- slug: string;- section?: string;- show?: boolean | (() => boolean);- } & ({ content: ReactNode } | { href: string })- >;+ pages: Array<SettingsPage>;activeSlug?: string;fullHeight?: boolean;+ /** Replaces a section's label; rendered even when the section has no pages */+ sectionHeaders?: Record<string, ReactNode>;};+const pageKey = (page: SettingsPage) => `${page.section ?? ""}:${page.slug}`;+export const PagedSettingsContainer = ({pages,activeSlug,fullHeight = false,+ sectionHeaders = {},}: SettingsProps) => {const router = useRouter();- const availablePages = pages.filter((page) => {- if ("show" in page) {- if (typeof page.show === "function") {- return page.show();- }- return page.show;- }- return true;- });+ const availablePages = pages.filter((page) =>+ typeof page.show === "function" ? page.show() : (page.show ?? true),+ );+ const contentPages = availablePages.filter((page) => "content" in page);const currentPage =- availablePages.find((page) => page.slug === activeSlug) ??- availablePages[0]; // Fallback to first page if not found+ contentPages.find((page) => page.slug === activeSlug) ?? contentPages[0];const onChange = (newSlug: string) => {- const pathSegments = router.asPath.split("/");+ const pathSegments = router.asPath.split("?")[0].split("/");if (pathSegments[pathSegments.length - 1] !== "settings")pathSegments.pop();if (newSlug !== "index") pathSegments.push(newSlug);router.push(pathSegments.join("/"));};+ const handleSelectPage = (key: string) => {+ const page = availablePages.find((p) => pageKey(p) === key);+ if (!page) return;+ if ("href" in page) router.push(page.href);+ else onChange(page.slug);+ };++ const groups = groupPagesBySection(availablePages);+ const headerOnlySections = Object.keys(sectionHeaders).filter(+ (section) => !groups.some((group) => group.section === section),+ );+return (<mainclassName={cn(@@ -68,28 +86,27 @@ export const PagedSettingsContainer = ({"min-h-0 flex-1 grid-rows-[auto_minmax(0,1fr)] md:grid-rows-1",)}>- <nav className="block md:hidden">+ <nav className="flex flex-col gap-2 md:hidden">+ {Object.entries(sectionHeaders).map(([section, header]) => (+ <div key={section}>{header}</div>+ ))}<Select- onValueChange={(slug) => {- const page = availablePages.find((p) => p.slug === slug);- if (page && "href" in page) router.push(page.href);- else onChange(slug);- }}- value={currentPage.slug}+ onValueChange={handleSelectPage}+ value={currentPage ? pageKey(currentPage) : undefined}><SelectTrigger><SelectValue placeholder="Select a page" /></SelectTrigger><SelectContent>- {groupPagesBySection(availablePages).map((group) => (+ {groups.map((group) => (<SelectGroup key={group.section ?? "default"}>{group.section ? (<SelectLabel>{group.section}</SelectLabel>) : null}{group.pages.map((page) => (- <SelectItem key={page.title} value={page.slug}>+ <SelectItem key={pageKey(page)} value={pageKey(page)}>{page.title}- {"href" in page && (+ {"href" in page && !page.internal && (<ArrowUpRight className="icon-base ml-1 inline" />)}</SelectItem>@@ -106,35 +123,47 @@ export const PagedSettingsContainer = ({)}x-chunk="dashboard-04-chunk-0">- {availablePages.map((page, index) => (- <Fragment key={page.title}>- {page.section &&- page.section !== availablePages[index - 1]?.section ? (- <span className="text-muted-foreground mt-4 flex h-8 items-center px-2 text-xs font-bold first:mt-0">- {page.section}- </span>- ) : null}- {"href" in page ? (- <Link- href={page.href}- className="hover:bg-muted hover:text-foreground flex h-8 flex-row items-center gap-2 rounded-sm px-2"- >- {page.title}- <ArrowUpRight className="icon-base inline" />- </Link>- ) : (- <span- onClick={() => onChange(page.slug)}- className={cn(- "hover:bg-muted hover:text-foreground flex h-8 cursor-pointer items-center rounded-sm px-2",- page.slug === currentPage.slug &&- "bg-muted text-primary font-bold",- )}- >- {page.title}- </span>+ {[+ ...groups,+ ...headerOnlySections.map((section) => ({ section, pages: [] })),+ ].map((group) => (+ <div+ key={group.section ?? "default"}+ className="grid gap-y-1 [&:not(:first-child)]:mt-4"+ >+ {group.section+ ? (sectionHeaders[group.section] ?? (+ <span className="text-foreground flex h-8 items-center px-2 text-xs font-bold">+ {group.section}+ </span>+ ))+ : null}+ {group.pages.map((page) =>+ "href" in page ? (+ <Link+ key={pageKey(page)}+ href={page.href}+ className="hover:bg-muted hover:text-foreground flex h-8 flex-row items-center gap-2 rounded-sm px-2"+ >+ {page.title}+ {!page.internal && (+ <ArrowUpRight className="icon-base inline" />+ )}+ </Link>+ ) : (+ <span+ key={pageKey(page)}+ onClick={() => onChange(page.slug)}+ className={cn(+ "hover:bg-muted hover:text-foreground flex h-8 cursor-pointer items-center rounded-sm px-2",+ page === currentPage && "bg-muted text-primary font-bold",+ )}+ >+ {page.title}+ </span>+ ),)}- </Fragment>+ </div>))}</nav><divdiff --git a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsxindex 0efe265f93..e6faefd5c0 100644--- a/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx+++ b/web/src/components/layouts/app-layout/variants/AuthenticatedLayout.tsx@@ -55,6 +55,7 @@ import useLocalStorage from "@/src/components/useLocalStorage";import { usePostHogClientCapture } from "@/src/features/posthog-analytics";import { useSession } from "next-auth/react";import { useQueryProjectOrOrganization } from "@/src/features/projects";+import { accountSettingsPath } from "@/src/features/settings/accountSettingsPath";import { useHasOrganizationAccess } from "@/src/features/rbac";import {PaymentBannerView,@@ -136,6 +137,7 @@ export function AuthenticatedLayout({// Account-level entry: use the raw flag (same as account settings tabs), not// project-scoped force-v3 suppression.const showV4Migration = useV4UpgradeUiFlag();+ const { organization: currentOrganization } = useQueryProjectOrOrganization();const regionMenuItems = getAvailableCloudRegionOptions(currentRegion).map((region) => ({@@ -191,8 +193,8 @@ export function AuthenticatedLayout({: []),{type: "link" as const,- name: "Account Settings",- href: "/account/settings",+ name: "Settings",+ href: accountSettingsPath(currentOrganization?.id),},...(showV4Migration? [diff --git a/web/src/components/layouts/app-shell-chrome.clienttest.tsx b/web/src/components/layouts/app-shell-chrome.clienttest.tsxindex 9f708530b6..16e621887a 100644--- a/web/src/components/layouts/app-shell-chrome.clienttest.tsx+++ b/web/src/components/layouts/app-shell-chrome.clienttest.tsx@@ -76,7 +76,7 @@ const sidebarArgs = {userMenuItems: [{type: "link" as const,- name: "Account Settings",+ name: "Settings",href: "/account/settings",},],diff --git a/web/src/components/nav/AppSidebar/AppSidebar.stories.tsx b/web/src/components/nav/AppSidebar/AppSidebar.stories.tsxindex 5973cf93c0..d0eb685386 100644--- a/web/src/components/nav/AppSidebar/AppSidebar.stories.tsx+++ b/web/src/components/nav/AppSidebar/AppSidebar.stories.tsx@@ -54,7 +54,7 @@ const meta = preview.meta({userMenuItems: [{type: "link",- name: "Account Settings",+ name: "Settings",href: "/account/settings",},{ type: "action", name: "Sign out", onClick: fn() },diff --git a/web/src/components/nav/topbar-account.tsx b/web/src/components/nav/topbar-account.tsxindex 859178ee1c..e62884a856 100644--- a/web/src/components/nav/topbar-account.tsx+++ b/web/src/components/nav/topbar-account.tsx@@ -16,6 +16,8 @@ import {import { ThemeToggle } from "@/src/features/theming/ThemeToggle";import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";import { cn } from "@/src/utils/tailwind";+import { useQueryProjectOrOrganization } from "@/src/features/projects";+import { accountSettingsPath } from "@/src/features/settings/accountSettingsPath";/*** Compact account affordance for the mobile top bar: the user's avatar opening@@ -30,6 +32,7 @@ export const TopbarAccount = ({className?: string;}) => {const showV4Migration = useV4UpgradeUiFlag();+ const { organization } = useQueryProjectOrOrganization();const name = user.name ?? "";const email = user.email ?? "";@@ -66,7 +69,7 @@ export const TopbarAccount = ({</DropdownMenuLabel><DropdownMenuSeparator /><DropdownMenuItem asChild>- <Link href="/account/settings">Account settings</Link>+ <Link href={accountSettingsPath(organization?.id)}>Settings</Link></DropdownMenuItem>{showV4Migration ? (<DropdownMenuItem asChild>diff --git a/web/src/features/account/AccountSettingsPage.tsx b/web/src/features/account/AccountSettingsPage.tsxindex 5b6c461847..06f180b9bc 100644--- a/web/src/features/account/AccountSettingsPage.tsx+++ b/web/src/features/account/AccountSettingsPage.tsx@@ -1,5 +1,4 @@/* eslint-disable @repo/no-abstracted-overlay-trigger */-import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";import Header from "@/src/components/layouts/header";import { Card } from "@/src/components/ui/card";import { Button } from "@/src/components/ui/button";@@ -28,12 +27,9 @@ import {import { useSession } from "next-auth/react";import { signOutCleanly } from "@/src/features/auth/lib/signOut";import { SettingsDangerZone } from "@/src/components/SettingsDangerZone";-import ContainerPage from "@/src/components/layouts/container-page";-import { useRouter } from "next/router";import { StringNoHTML } from "@langfuse/shared";import Link from "next/link";import { showSuccessToast, showErrorToast } from "@/src/features/notifications";-import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";import { classifyTrpcToastError } from "@/src/utils/trpcErrorClassification";@@ -302,17 +298,14 @@ type AccountSettingsPage = {export function useAccountSettingsPages(): AccountSettingsPage[] {const { data: session } = useSession();const userEmail = session?.user?.email ?? "";- const showV4Migration = useV4UpgradeUiFlag();- return getAccountSettingsPages({ userEmail, showV4Migration });+ return getAccountSettingsPages({ userEmail });}const getAccountSettingsPages = ({userEmail,- showV4Migration,}: {userEmail: string;- showV4Migration: boolean;}): AccountSettingsPage[] => [{title: "General",@@ -370,28 +363,4 @@ const getAccountSettingsPages = ({</div>),},- {- title: "v4 Migration",- slug: "v4-migration",- href: "/v4-migration",- show: showV4Migration,- },];--export default function AccountSettingsPage() {- const router = useRouter();- const pages = useAccountSettingsPages();-- return (- <ContainerPage- headerProps={{- title: "Account Settings",- }}- >- <PagedSettingsContainer- activeSlug={router.query.page as string | undefined}- pages={pages}- />- </ContainerPage>- );-}diff --git a/web/src/features/organizations/OrganizationSettingsPage.tsx b/web/src/features/organizations/OrganizationSettingsPage.tsxindex 5bc6ee3a4a..2a2b93badc 100644--- a/web/src/features/organizations/OrganizationSettingsPage.tsx+++ b/web/src/features/organizations/OrganizationSettingsPage.tsx@@ -1,4 +1,3 @@-import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";import Header from "@/src/components/layouts/header";import { Button } from "@/src/components/ui/button";import { ConnectedMembershipInvitesSettingsTable } from "@/src/features/rbac/components/MembershipInvitesSettingsTable/ConnectedMembershipInvitesSettingsTable";@@ -7,14 +6,10 @@ import { useHasOrganizationAccess } from "@/src/features/rbac";import { JSONView } from "@/src/components/ui/CodeJsonViewer";import RenameOrganization from "@/src/features/organizations/components/RenameOrganization";import { DeleteOrganizationDialogController } from "@/src/features/organizations/components/DeleteOrganizationDialogController";-import { useQueryOrganization } from "@/src/features/organizations/hooks";-import { useRouter } from "next/router";import { SettingsDangerZone } from "@/src/components/SettingsDangerZone";import { BillingSettings } from "@/src/ee/features/billing/components/BillingSettings";import { OrganizationUsageBreakdown } from "@/src/features/organization-usage";import { useHasEntitlement, usePlan } from "@/src/features/entitlements";-import ContainerPage from "@/src/components/layouts/container-page";-import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";import { SSOSettings } from "@/src/ee/features/sso-settings";import { type CloudConfigSchema, isCloudPlan } from "@langfuse/shared";import { useQueryProjectOrOrganization } from "@/src/features/projects";@@ -94,7 +89,7 @@ export function useOrganizationSettingsPages(): OrganizationSettingsPage[] {});}-export const getOrganizationSettingsPages = ({+const getOrganizationSettingsPages = ({organization,showBillingSettings,showUsageSettings,@@ -309,43 +304,6 @@ export const getOrganizationSettingsPages = ({},];-const OrganizationSettingsPage = () => {- const organization = useQueryOrganization();- const router = useRouter();- const { page } = router.query;- const pages = useOrganizationSettingsPages();-- if (!organization) {- return (- <ContainerPage- headerProps={{- title: "Organization Settings",- }}- >- <NoDataOrLoading isLoading />- </ContainerPage>- );- }-- return (- <ContainerPage- headerProps={{- title: "Organization Settings",- }}- extendRight={router.query.page === "ai-gateway-models"}- fullHeight={router.query.page === "ai-gateway-models"}- >- <PagedSettingsContainer- activeSlug={page as string | undefined}- pages={pages}- fullHeight={router.query.page === "ai-gateway-models"}- />- </ContainerPage>- );-};--export default OrganizationSettingsPage;-function OrganizationMembersSettings({ orgId }: { orgId: string }) {const [invitesPagination, setInvitesPagination] = useSessionStorage(`orgInvites_${orgId}_pagination`,diff --git a/web/src/features/settings/SettingsPage.clienttest.tsx b/web/src/features/settings/SettingsPage.clienttest.tsxnew file mode 100644index 0000000000..4b4c54985b--- /dev/null+++ b/web/src/features/settings/SettingsPage.clienttest.tsx@@ -0,0 +1,168 @@+import { fireEvent, render, screen } from "@testing-library/react";+import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";+import { buildSettingsPages } from "@/src/features/settings/SettingsPage";++const router = vi.hoisted(() => ({+ asPath: "/account/settings",+ push: vi.fn(),+}));++vi.mock("next/router", () => ({ useRouter: () => router }));++vi.mock("@/src/features/account", () => ({+ useAccountSettingsPages: () => [],+}));++vi.mock("@/src/features/organizations/OrganizationSettingsPage", () => ({+ useOrganizationSettingsPages: () => [],+}));++const accountPages = [+ { title: "General", slug: "index", content: "account general" },+];++const organizationPages = [+ {+ title: "General",+ slug: "index",+ section: "Organization",+ content: "org general",+ },+ {+ title: "Billing",+ slug: "billing",+ section: "Organization",+ content: "billing",+ },+ {+ title: "Projects",+ slug: "projects",+ section: "Organization",+ href: "/organization/org-1",+ },+ {+ title: "v4 Migration",+ slug: "v4-migration",+ section: "Organization",+ href: "/v4-migration",+ },+];++const summarize = (pages: ReturnType<typeof buildSettingsPages>) =>+ pages.map((page) => ({+ section: page.section,+ slug: page.slug,+ ...("href" in page+ ? { href: page.href, internal: page.internal ?? false }+ : { content: true }),+ }));++describe("buildSettingsPages", () => {+ it("links organization pages from the account route", () => {+ const pages = buildSettingsPages({+ scope: "account",+ organizationId: "org-1",+ accountPages,+ organizationPages,+ });++ expect(summarize(pages)).toEqual([+ { section: "Account Settings", slug: "index", content: true },+ {+ section: "Organization",+ slug: "index",+ href: "/organization/org-1/settings",+ internal: true,+ },+ {+ section: "Organization",+ slug: "billing",+ href: "/organization/org-1/settings/billing",+ internal: true,+ },+ {+ section: "Organization",+ slug: "projects",+ href: "/organization/org-1",+ internal: false,+ },+ {+ section: "Organization",+ slug: "v4-migration",+ href: "/v4-migration",+ internal: false,+ },+ ]);+ });++ it("links account pages from the organization route, keeping the org", () => {+ const pages = buildSettingsPages({+ scope: "organization",+ organizationId: "org-1",+ accountPages,+ organizationPages,+ });++ expect(summarize(pages)).toEqual([+ {+ section: "Account Settings",+ slug: "index",+ href: "/account/settings?organizationId=org-1",+ internal: true,+ },+ { section: "Organization", slug: "index", content: true },+ { section: "Organization", slug: "billing", content: true },+ {+ section: "Organization",+ slug: "projects",+ href: "/organization/org-1",+ internal: false,+ },+ {+ section: "Organization",+ slug: "v4-migration",+ href: "/v4-migration",+ internal: false,+ },+ ]);+ });++ it("keeps converted links visible in the nav", () => {+ render(+ <PagedSettingsContainer+ pages={buildSettingsPages({+ scope: "account",+ organizationId: "org-1",+ accountPages,+ organizationPages,+ })}+ />,+ );++ expect(screen.getAllByRole("link", { name: "General" })).toHaveLength(1);+ expect(screen.getByRole("link", { name: "Billing" })).toHaveAttribute(+ "href",+ "/organization/org-1/settings/billing",+ );+ });++ it("drops table query params when switching pages", () => {+ router.asPath = "/organization/org-1/settings/members?search=alice";+ render(+ <PagedSettingsContainer+ pages={buildSettingsPages({+ scope: "organization",+ organizationId: "org-1",+ accountPages,+ organizationPages,+ })}+ />,+ );++ fireEvent.click(screen.getByText("Billing"));++ expect(router.push).toHaveBeenCalledWith(+ "/organization/org-1/settings/billing",+ );+ });+});diff --git a/web/src/features/settings/SettingsPage.tsx b/web/src/features/settings/SettingsPage.tsxnew file mode 100644index 0000000000..4f3b14bc1d--- /dev/null+++ b/web/src/features/settings/SettingsPage.tsx@@ -0,0 +1,150 @@+import { type ComponentProps } from "react";+import { useRouter } from "next/router";+import { useSession } from "next-auth/react";+import { PagedSettingsContainer } from "@/src/components/PagedSettingsContainer";+import ContainerPage from "@/src/components/layouts/container-page";+import { NoDataOrLoading } from "@/src/components/NoDataOrLoading";+import { OrganizationDropdownMenu } from "@/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu";+import { DropdownIndicator } from "@/src/components/design-system/DropdownIndicator/DropdownIndicator";+import { useAccountSettingsPages } from "@/src/features/account";+import { useQueryOrganization } from "@/src/features/organizations";+import { useOrganizationSettingsPages } from "@/src/features/organizations/OrganizationSettingsPage";+import { accountSettingsPath } from "@/src/features/settings/accountSettingsPath";++type SettingsScope = "account" | "organization";++type SettingsPageProps = { scope: SettingsScope };++type SettingsPageEntry = ComponentProps<+ typeof PagedSettingsContainer+>["pages"][number];++const ACCOUNT_SECTION = "Account Settings";+const ORGANIZATION_SECTION = "Organization";++export function SettingsPage({ scope }: SettingsPageProps) {+ const router = useRouter();+ const organization = useQueryOrganization();+ const accountPages = useAccountSettingsPages();+ const organizationPages = useOrganizationSettingsPages();++ const pages = buildSettingsPages({+ scope,+ organizationId: organization?.id,+ accountPages,+ organizationPages,+ });++ const activeSlug =+ typeof router.query.page === "string" ? router.query.page : undefined;+ const fullHeight =+ scope === "organization" && activeSlug === "ai-gateway-models";++ if (scope === "organization" && !organization) {+ return (+ <ContainerPage headerProps={{ title: "Settings" }}>+ <NoDataOrLoading isLoading />+ </ContainerPage>+ );+ }++ return (+ <ContainerPage+ headerProps={{ title: "Settings" }}+ extendRight={fullHeight}+ fullHeight={fullHeight}+ >+ <PagedSettingsContainer+ activeSlug={activeSlug}+ pages={pages}+ fullHeight={fullHeight}+ sectionHeaders={{+ [ORGANIZATION_SECTION]: <OrganizationSectionHeader />,+ }}+ />+ </ContainerPage>+ );+}++/** Labels the org section; offers an org picker only when no org is in context */+function OrganizationSectionHeader() {+ const session = useSession();+ const organization = useQueryOrganization();+ const organizations = session.data?.user?.organizations;++ return (+ <div className="flex flex-col gap-1">+ <span className="text-foreground flex h-8 items-center px-2 text-xs font-bold">+ Org Settings+ </span>+ {organization ? null : (+ <OrganizationDropdownMenu+ {...(organizations+ ? { state: "loaded", organizations }+ : { state: "loading" })}+ canCreateOrganizations={!!session.data?.user?.canCreateOrganizations}+ getOrgPath={accountSettingsPath}+ >+ {({ getTriggerProps }) => (+ <button+ type="button"+ className="border-border bg-background text-foreground hover:bg-muted flex h-8 w-full items-center justify-between gap-1 rounded-md border px-2 text-sm whitespace-nowrap"+ {...getTriggerProps()}+ >+ <span>Select organization</span>+ <DropdownIndicator size="sm" nudge />+ </button>+ )}+ </OrganizationDropdownMenu>+ )}+ </div>+ );+}++const organizationSettingsPath = (organizationId: string, slug: string) =>+ `/organization/${organizationId}/settings${slug === "index" ? "" : `/${slug}`}`;++/**+ * Merges account and organization settings into one nav. Pages owned by the+ * other route become internal links, so each route only renders its own+ * content while the nav looks the same on both.+ */+export function buildSettingsPages({+ scope,+ organizationId,+ accountPages,+ organizationPages,+}: {+ scope: SettingsScope;+ organizationId: string | undefined;+ accountPages: SettingsPageEntry[];+ organizationPages: SettingsPageEntry[];+}): SettingsPageEntry[] {+ const account = accountPages.map((page): SettingsPageEntry => {+ const base = { ...page, section: ACCOUNT_SECTION };+ if (scope === "account" || !("content" in page)) return base;+ return {+ title: page.title,+ slug: page.slug,+ section: ACCOUNT_SECTION,+ show: page.show,+ href: accountSettingsPath(organizationId),+ internal: true,+ };+ });++ const organization = organizationPages.map((page): SettingsPageEntry => {+ if (scope === "organization" || !("content" in page) || !organizationId)+ return page;+ return {+ title: page.title,+ slug: page.slug,+ section: page.section,+ show: page.show,+ href: organizationSettingsPath(organizationId, page.slug),+ internal: true,+ };+ });++ return [...account, ...organization];+}diff --git a/web/src/features/settings/accountSettingsPath.ts b/web/src/features/settings/accountSettingsPath.tsnew file mode 100644index 0000000000..365048c95b--- /dev/null+++ b/web/src/features/settings/accountSettingsPath.ts@@ -0,0 +1,8 @@+/**+ * The settings page opened from the profile menu. Passing the current+ * organization keeps its settings in the same nav.+ */+export const accountSettingsPath = (organizationId?: string) =>+ organizationId+ ? `/account/settings?organizationId=${encodeURIComponent(organizationId)}`+ : "/account/settings";diff --git a/web/src/features/settings/index.ts b/web/src/features/settings/index.tsnew file mode 100644index 0000000000..6aa1093899--- /dev/null+++ b/web/src/features/settings/index.ts@@ -0,0 +1 @@+export { SettingsPage } from "@/src/features/settings/SettingsPage";diff --git a/web/src/pages/account/settings/index.tsx b/web/src/pages/account/settings/index.tsxindex cf3fdbd07d..d4cd701e97 100644--- a/web/src/pages/account/settings/index.tsx+++ b/web/src/pages/account/settings/index.tsx@@ -1,4 +1,5 @@-export {- default,- useAccountSettingsPages,-} from "@/src/features/account/AccountSettingsPage";+import { SettingsPage } from "@/src/features/settings";++export default function AccountSettingsRoute() {+ return <SettingsPage scope="account" />;+}diff --git a/web/src/pages/organization/[organizationId]/settings/[page].tsx b/web/src/pages/organization/[organizationId]/settings/[page].tsxindex d49160d62e..664d81798f 100644--- a/web/src/pages/organization/[organizationId]/settings/[page].tsx+++ b/web/src/pages/organization/[organizationId]/settings/[page].tsx@@ -1 +1,5 @@-export { default } from "@/src/features/organizations/OrganizationSettingsPage";+import { SettingsPage } from "@/src/features/settings";++export default function OrganizationSettingsRoute() {+ return <SettingsPage scope="organization" />;+}diff --git a/web/src/pages/organization/[organizationId]/settings/index.tsx b/web/src/pages/organization/[organizationId]/settings/index.tsxindex 10fed7a5da..664d81798f 100644--- a/web/src/pages/organization/[organizationId]/settings/index.tsx+++ b/web/src/pages/organization/[organizationId]/settings/index.tsx@@ -1,5 +1,5 @@-export {- default,- useOrganizationSettingsPages,- getOrganizationSettingsPages,-} from "@/src/features/organizations/OrganizationSettingsPage";+import { SettingsPage } from "@/src/features/settings";++export default function OrganizationSettingsRoute() {+ return <SettingsPage scope="organization" />;+}