-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Add settings and usage breadcrumbs #5929
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9ff6bd8
feat(web): add settings and usage breadcrumbs
juliusmarminge 4dc25fe
refactor(web): compose workspace breadcrumbs from reusable items
juliusmarminge 4d32c0d
fix(web): keep usage breadcrumb items as spans
juliusmarminge 4fb10d0
fix(web): use semantic breadcrumbs in settings
juliusmarminge 23a8c47
fix(web): improve project settings breadcrumbs
juliusmarminge 6e42fda
fix(web): correct chat breadcrumb flex classes
juliusmarminge d21a4e2
refactor(web): simplify project menu callback
juliusmarminge 911a02c
Delete apps/web/src/components/WorkspaceBreadcrumb.test.tsx
juliusmarminge 59221e3
Delete apps/web/src/components/settings/SettingsBreadcrumb.test.tsx
juliusmarminge File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import type { ReactNode } from "react"; | ||
|
|
||
| import { cn } from "../lib/utils"; | ||
|
|
||
| interface WorkspaceBreadcrumbProps { | ||
| readonly ariaLabel: string; | ||
| readonly children: ReactNode; | ||
| readonly className?: string; | ||
| } | ||
|
|
||
| export function WorkspaceBreadcrumb({ ariaLabel, children, className }: WorkspaceBreadcrumbProps) { | ||
| return ( | ||
| <nav aria-label={ariaLabel} className={cn("min-w-0", className)}> | ||
| {/* Keep the flexible container draggable in Electron. Interactive | ||
| descendants are excluded by the shared .drag-region CSS rules. */} | ||
| <ol className="m-0 flex min-w-0 list-none items-center gap-2 p-0 text-sm sm:gap-3"> | ||
| {children} | ||
| </ol> | ||
| </nav> | ||
| ); | ||
| } | ||
|
|
||
| interface WorkspaceBreadcrumbItemProps { | ||
| readonly children: ReactNode; | ||
| readonly className?: string; | ||
| readonly current?: boolean; | ||
| } | ||
|
|
||
| export function WorkspaceBreadcrumbItem({ | ||
| children, | ||
| className, | ||
| current = false, | ||
| }: WorkspaceBreadcrumbItemProps) { | ||
| return ( | ||
| <li | ||
| aria-current={current ? "page" : undefined} | ||
| className={cn( | ||
| "flex min-w-0 items-center font-medium", | ||
| current ? "text-foreground" : "shrink-0 text-muted-foreground", | ||
| className, | ||
| )} | ||
| > | ||
| {children} | ||
| </li> | ||
| ); | ||
| } | ||
|
|
||
| export function WorkspaceBreadcrumbSeparator() { | ||
| return ( | ||
| <li aria-hidden="true" className="flex shrink-0 items-center text-icon-muted"> | ||
| / | ||
| </li> | ||
| ); | ||
| } | ||
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,34 @@ | ||
| import { | ||
| WorkspaceBreadcrumb, | ||
| WorkspaceBreadcrumbItem, | ||
| WorkspaceBreadcrumbSeparator, | ||
| } from "../WorkspaceBreadcrumb"; | ||
| import { SETTINGS_SECTION_LABELS } from "./settingsSearch"; | ||
|
|
||
| const SETTINGS_BREADCRUMB_LABELS: Readonly<Record<string, string>> = { | ||
| ...SETTINGS_SECTION_LABELS, | ||
| "/settings/diagnostics": "Diagnostics", | ||
| }; | ||
|
|
||
| function settingsBreadcrumbLabel(pathname: string): string | null { | ||
| const normalizedPathname = pathname.replace(/\/+$/, "") || "/"; | ||
| return SETTINGS_BREADCRUMB_LABELS[normalizedPathname] ?? null; | ||
| } | ||
|
|
||
| export function SettingsBreadcrumb({ pathname }: { pathname: string }) { | ||
| const sectionLabel = settingsBreadcrumbLabel(pathname); | ||
|
|
||
| return ( | ||
| <WorkspaceBreadcrumb ariaLabel="Settings breadcrumb"> | ||
| {sectionLabel ? ( | ||
| <> | ||
| <WorkspaceBreadcrumbItem>Settings</WorkspaceBreadcrumbItem> | ||
| <WorkspaceBreadcrumbSeparator /> | ||
| </> | ||
| ) : null} | ||
| <WorkspaceBreadcrumbItem current className="truncate"> | ||
| {sectionLabel ?? "Settings"} | ||
| </WorkspaceBreadcrumbItem> | ||
| </WorkspaceBreadcrumb> | ||
| ); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.