mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 18:05:11 +03:00
## What kind of change does this PR introduce? Bug fix. Resolves [FE-4192](https://linear.app/supabase/issue/FE-4192/org-and-project-selectors-sometimes-dont-register-selections). ## What is the current behavior? Navigation actions sometimes nest links inside command or dropdown menu items. Closing the menu during selection can prevent the nested link navigation from registering. ## What is the new behavior? - Adds a documented Studio CommandItemLink composition that wraps command items with their navigation link. - Migrates all Studio command-item links, including organisation, project, function, database, branch, and integration actions. - Uses the dropdown menu asChild composition for both infrastructure-diagram Manage replica actions. - Preserves native link behaviour and leaves disabled command items non-navigable. ## To test - [ ] [Organisation and project selectors](https://studio-staging-git-dnywh-fe-4192-selector-links-supabase.vercel.app/dashboard/org): open the organisation selector and try an organisation, All Organizations, and New organization. Open a project, then use the project selector to switch projects and open New project. Confirm every action navigates on the first click. - [ ] [Branch selector](https://studio-staging-git-dnywh-fe-4192-selector-links-supabase.vercel.app/dashboard/project/_): in a project with branching enabled, open the branch selector. Switch branches and select Manage branches. Confirm both navigate on the first click. - [ ] [Database selector](https://studio-staging-git-dnywh-fe-4192-selector-links-supabase.vercel.app/dashboard/project/_/observability/query-performance): open the Source selector. Switch between the primary database and a read replica if available, then select Create a new read replica. Confirm selections apply and the footer action navigates on the first click. - [ ] [Function selector](https://studio-staging-git-dnywh-fe-4192-selector-links-supabase.vercel.app/dashboard/project/_/auth/hooks): select Add a new hook, choose a hook, select Postgres, then open the Postgres function selector and select New function. Confirm it navigates on the first click. - [ ] [Infrastructure diagram](https://studio-staging-git-dnywh-fe-4192-selector-links-supabase.vercel.app/dashboard/project/_/settings/infrastructure): for a project with a read replica, select Manage replica from both diagram variants. Confirm the replica settings open on the first click. - [ ] On any navigational row above, modifier-click and confirm native link behaviour is preserved. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Added consistent link navigation across organization, project, branch, function, replica, and integration menus. * Added project-specific destinations to organization and project selectors. * Preserved disabled-item behavior while improving accessible command-menu link semantics. * **Bug Fixes** * Improved navigation and menu-closing behavior for command items and dropdown actions. * **Tests** * Added coverage for link destinations, accessibility roles, disabled states, and route preservation. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
186 lines
5.5 KiB
TypeScript
186 lines
5.5 KiB
TypeScript
import { ListTree, MessageCircle, Plus } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import {
|
|
Button,
|
|
cn,
|
|
Command,
|
|
CommandEmpty,
|
|
CommandGroup,
|
|
CommandInput,
|
|
CommandItem,
|
|
CommandList,
|
|
CommandSeparator,
|
|
ScrollArea,
|
|
} from 'ui'
|
|
|
|
import { BranchLink } from './BranchLink'
|
|
import { CommandItemLink } from '@/components/ui/CommandItemLink'
|
|
import type { Branch } from '@/data/branches/branches-query'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
|
|
const BRANCHING_GITHUB_DISCUSSION_LINK = 'https://github.com/orgs/supabase/discussions/18937'
|
|
|
|
export interface BranchDropdownCommandContentProps {
|
|
embedded: boolean
|
|
className?: string
|
|
branchList: Branch[]
|
|
selectedBranch: Branch | undefined
|
|
branchesCount: number
|
|
isBranchingEnabled: boolean
|
|
projectRef: string | undefined
|
|
onClose: () => void
|
|
onCreateBranch: () => void
|
|
}
|
|
|
|
export function BranchDropdownCommandContent({
|
|
embedded,
|
|
className,
|
|
branchList,
|
|
selectedBranch,
|
|
branchesCount,
|
|
isBranchingEnabled,
|
|
projectRef,
|
|
onClose,
|
|
onCreateBranch,
|
|
}: BranchDropdownCommandContentProps) {
|
|
const track = useTrack()
|
|
|
|
if (embedded) {
|
|
return (
|
|
<Command className={cn(className, 'flex flex-col flex-1 min-h-0 overflow-hidden')}>
|
|
<div className="grid grid-cols-2 gap-2 shrink-0 p-2 border-b">
|
|
<Button
|
|
variant="text"
|
|
size="small"
|
|
asChild
|
|
block
|
|
icon={<ListTree size={14} strokeWidth={1.5} />}
|
|
>
|
|
<Link
|
|
href={`/project/${projectRef}/branches`}
|
|
className="text-xs text-foreground-light hover:text-foreground"
|
|
onClick={onClose}
|
|
>
|
|
Manage branches
|
|
</Link>
|
|
</Button>
|
|
<Button
|
|
variant="text"
|
|
size="small"
|
|
asChild
|
|
block
|
|
icon={<MessageCircle size={14} strokeWidth={1.5} />}
|
|
>
|
|
<a
|
|
target="_blank"
|
|
rel="noreferrer noopener"
|
|
href={BRANCHING_GITHUB_DISCUSSION_LINK}
|
|
onClick={onClose}
|
|
className="text-xs text-foreground-light hover:text-foreground"
|
|
>
|
|
Branching feedback
|
|
</a>
|
|
</Button>
|
|
<Button
|
|
variant="default"
|
|
size="small"
|
|
block
|
|
className="col-span-full text-xs text-foreground-light hover:text-foreground"
|
|
onClick={() => {
|
|
track('branch_selector_create_clicked')
|
|
onClose()
|
|
onCreateBranch()
|
|
}}
|
|
icon={<Plus size={14} strokeWidth={1.5} />}
|
|
>
|
|
Create branch
|
|
</Button>
|
|
</div>
|
|
{isBranchingEnabled && (
|
|
<CommandInput placeholder="Find branch..." wrapperClassName="shrink-0 border-b" />
|
|
)}
|
|
<CommandList className="flex flex-col flex-1 p-1 min-h-0 overflow-y-auto max-h-none!">
|
|
{isBranchingEnabled && <CommandEmpty>No branches found</CommandEmpty>}
|
|
<CommandGroup className="min-h-0">
|
|
{branchList.map((branch) => (
|
|
<BranchLink
|
|
key={branch.id}
|
|
branch={branch}
|
|
isSelected={branch.id === selectedBranch?.id || branchesCount === 0}
|
|
onClose={onClose}
|
|
/>
|
|
))}
|
|
</CommandGroup>
|
|
</CommandList>
|
|
</Command>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<Command className={className}>
|
|
{isBranchingEnabled && <CommandInput placeholder="Find branch..." />}
|
|
<CommandList>
|
|
{isBranchingEnabled && <CommandEmpty>No branches found</CommandEmpty>}
|
|
<CommandGroup>
|
|
<ScrollArea className="max-h-[210px] overflow-y-auto">
|
|
{branchList.map((branch) => (
|
|
<BranchLink
|
|
key={branch.id}
|
|
branch={branch}
|
|
isSelected={branch.id === selectedBranch?.id || branchesCount === 0}
|
|
onClose={onClose}
|
|
/>
|
|
))}
|
|
</ScrollArea>
|
|
</CommandGroup>
|
|
|
|
<CommandSeparator />
|
|
|
|
<CommandGroup>
|
|
<CommandItem
|
|
className="cursor-pointer w-full"
|
|
onSelect={() => {
|
|
track('branch_selector_create_clicked')
|
|
onClose()
|
|
onCreateBranch()
|
|
}}
|
|
>
|
|
<div className="w-full flex items-center gap-2">
|
|
<Plus size={14} strokeWidth={1.5} />
|
|
<p>Create branch</p>
|
|
</div>
|
|
</CommandItem>
|
|
<CommandItemLink
|
|
href={`/project/${projectRef}/branches`}
|
|
className="cursor-pointer w-full gap-2"
|
|
onSelect={() => {
|
|
track('branch_selector_manage_clicked')
|
|
onClose()
|
|
}}
|
|
>
|
|
<ListTree size={14} strokeWidth={1.5} />
|
|
<p>Manage branches</p>
|
|
</CommandItemLink>
|
|
</CommandGroup>
|
|
|
|
<CommandSeparator />
|
|
|
|
<CommandGroup>
|
|
<CommandItemLink
|
|
href={BRANCHING_GITHUB_DISCUSSION_LINK}
|
|
linkProps={{ target: '_blank', rel: 'noreferrer noopener' }}
|
|
className="cursor-pointer w-full gap-2"
|
|
onSelect={onClose}
|
|
>
|
|
<MessageCircle size={14} strokeWidth={1} className="mt-0.5" />
|
|
<div>
|
|
<p>Branching feedback</p>
|
|
<p className="text-lighter">Join GitHub Discussion</p>
|
|
</div>
|
|
</CommandItemLink>
|
|
</CommandGroup>
|
|
</CommandList>
|
|
</Command>
|
|
)
|
|
}
|