feat(navigation): standardise multi-page mode menus in the header#1645
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| "use client"; | ||
| import { FileText, GitCompareArrows, ListChecks, Network, Search, type LucideIcon } from "lucide-react"; | ||
| import { ModeNav, type ModeNavItem } from "@/components/mode-nav/mode-nav"; | ||
| import { appModeDefinition, type AppModeId } from "@/lib/app-modes"; | ||
| import { modeSecondaryNavigationEntries, modeSecondaryNavigationHref } from "@/lib/mode-secondary-navigation"; | ||
| const iconByItemId: Record<string, LucideIcon> = { | ||
| search: Search, | ||
| diagnoses: FileText, | ||
| compare: GitCompareArrows, | ||
| builder: ListChecks, | ||
| map: Network, | ||
| }; | ||
| /** | ||
| * Adapts the canonical route registry to the universal header-integrated mode | ||
| * navigation. Keeping this mapping in one component prevents the page shell, | ||
| * Specifiers, and Formulation from drifting onto different labels or URLs. | ||
| */ | ||
| export function RegistryModeNav({ | ||
| modeId, | ||
| activeId, | ||
| searchParamString = "", | ||
| }: { | ||
| modeId: AppModeId; | ||
| activeId: string; | ||
| searchParamString?: string; | ||
| }) { | ||
| const currentSearchParams = new URLSearchParams(searchParamString); | ||
| const items = modeSecondaryNavigationEntries(modeId).flatMap<ModeNavItem>((entry) => { | ||
| if (!entry.href) return []; | ||
| return [ | ||
| { | ||
| id: entry.id, | ||
| label: entry.label, | ||
| href: modeSecondaryNavigationHref({ | ||
| modeId, | ||
| itemId: entry.id, | ||
| href: entry.href, | ||
| currentSearchParams, | ||
| }), | ||
| icon: iconByItemId[entry.id] ?? FileText, | ||
| }, | ||
| ]; | ||
| }); | ||
| return <ModeNav items={items} label={`${appModeDefinition(modeId).label} pages`} activeId={activeId} />; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,13 @@ | ||
| "use client"; | ||
| import { useEffect, useState } from "react"; | ||
| import { isDocumentViewerOwnedRoute } from "@/components/clinical-dashboard/mobile-composer-reserve"; | ||
| import { RegistryModeNav } from "@/components/mode-nav/registry-mode-nav"; | ||
| import { SecondaryNavigation, type SecondaryNavigationSectionItem } from "@/components/secondary-navigation"; | ||
| import type { AppModeId } from "@/lib/app-modes"; | ||
| import { isInformationPage } from "@/lib/information-pages"; | ||
| import { activeModeSecondaryNavigationId, isModeSecondaryNavigationRoute } from "@/lib/mode-secondary-navigation"; | ||
| export type InformationPageSectionDefinition = { | ||
| id: string; | ||
| @@ -152,15 +144,19 @@ export function informationPageSectionDefinitions(pathname: string): readonly In | ||
| if ( | ||
| pathname.startsWith("/specifiers/") && | ||
| !["/specifiers/builder", "/specifiers/compare", "/specifiers/map"].includes(pathname) | ||
| ) { | ||
| return specifierSections; | ||
| } | ||
| if ( | ||
| pathname.startsWith("/formulation/") && | ||
| !["/formulation/builder", "/formulation/compare", "/formulation/map"].includes(pathname) | ||
| ) { | ||
| return formulationSections; | ||
| } | ||
| if (pathname.startsWith("/differentials/presentations/")) return differentialPresentationSections; | ||
| if (pathname.endsWith("/differentials") && pathname.startsWith("/dsm/diagnoses/")) { | ||
| return dsmDifferentialSections; | ||
| } | ||
| if (pathname.startsWith("/dsm/diagnoses/")) return dsmDiagnosisSections; | ||
| if (pathname.startsWith("/documents/") && pathname !== "/documents/search") return documentSections; | ||
| return []; | ||
| @@ -248,57 +244,28 @@ export function PageSecondaryNavigation({ | ||
| modeId, | ||
| pathname, | ||
| hasSubmittedSearch, | ||
| /** | ||
| * Bridged query string from GlobalStandaloneSearchShellBody. Must not call | ||
| * useSearchParams here — that reintroduces a nested Suspense boundary under | ||
| * the standalone shell body (search-chrome invariant 17). | ||
| */ | ||
| searchParamString = "", | ||
| /** | ||
| * Only reaches the "On this page" bar. The mode bar is the header-integrated | ||
| * `ModeNav`, which portals into the collapsing header and owns its own | ||
| * placement, so no positioning prop is accepted for it. | ||
| */ | ||
| sticky = true, | ||
| }: { | ||
| modeId: AppModeId; | ||
| pathname: string; | ||
| hasSubmittedSearch: boolean; | ||
| searchParamString?: string; | ||
| sticky?: boolean; | ||
| }) { | ||
| const informationDefinitions = informationPageSectionDefinitions(pathname); | ||
| const locallyOwnedInformationNavigation = hasLocalInformationPageNavigation(pathname); | ||
| const activeId = activeModeSecondaryNavigationId(modeId, pathname); | ||
| // Therapy Compass owns both its workflow bindings and its dynamic detail | ||
| // sections inside TcProvider; rendering the shell registry as well would | ||
| @@ -309,13 +276,5 @@ export function PageSecondaryNavigation({ | ||
| return <AvailableInformationPageNavigation definitions={informationDefinitions} sticky={sticky} />; | ||
| } | ||
| if (!isModeSecondaryNavigationRoute({ modeId, pathname, hasSubmittedSearch })) return null; | ||
| return <RegistryModeNav modeId={modeId} activeId={activeId} searchParamString={searchParamString} />; | ||
devin-ai-integration[bot] marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Pass the current query string to
RegistryModeNav.This call uses the adapter default of
"". A Formulation workflow URL withmechanism,a,b, ortemplateloses that state when a user selects another mode-navigation item.Thread the encoded route query string through
FormulationSubnavand its callers. Add a navigation test that starts with selected mechanisms and a template.🤖 Prompt for AI Agents