Files
Danny White 29ad86558c fix(studio): make menu links reliable (#49584)
## 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 -->
2026-08-26 16:59:44 +08:00

162 lines
5.9 KiB
TypeScript

import { useBreakpoint, useParams } from 'common'
import { Boxes, ChevronsUpDown, Plus } from 'lucide-react'
import { useRouter } from 'next/router'
import { useState } from 'react'
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandList,
CommandSeparator,
Popover,
PopoverContent,
PopoverTrigger,
ScrollArea,
SidebarMenu,
SidebarMenuButton,
SidebarMenuItem,
} from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import { OrgSelectorSheet } from './OrgSelectorSheet'
import { OrgCommandItem } from '@/components/layouts/AppLayout/OrgCommandItem'
import { CommandItemLink } from '@/components/ui/CommandItemLink'
import { useOrganizationsQuery } from '@/data/organizations/organizations-query'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
export function OrgSelector() {
const router = useRouter()
const { slug: routeSlug } = useParams()
const { data: selectedOrganization } = useSelectedOrganizationQuery()
const { data: organizations, isPending: isLoadingOrganizations } = useOrganizationsQuery()
const organizationCreationEnabled = useIsFeatureEnabled('organizations:create')
const [open, setOpen] = useState(false)
const slug = selectedOrganization?.slug
const isPlatformOrg = selectedOrganization?.plan?.id === 'platform'
const selectedOrgInitial = selectedOrganization?.name?.trim().charAt(0).toUpperCase() || 'O'
const { data: projects } = useOrgProjectsInfiniteQuery(
{ slug, limit: 1 },
{ enabled: Boolean(slug) && !isPlatformOrg }
)
const numProjects = projects?.pages[0]?.pagination.count
const projectsLabel = isPlatformOrg
? 'Platform'
: typeof numProjects === 'number'
? `${numProjects} project${numProjects === 1 ? '' : 's'}`
: 'No projects'
const isMobile = useBreakpoint('md')
if (isLoadingOrganizations) return <ShimmeringLoader className="ml-1 w-[120px]" />
const triggerButton = (
<SidebarMenuButton
size="lg"
className="data-open:bg-sidebar-accent data-open:text-sidebar-accent-foreground gap-2 h-auto text-left group px-1.5 py-1 touch-manipulation"
onClick={isMobile ? () => setOpen(true) : undefined}
>
<span className="flex w-8 aspect-square shrink-0 items-center justify-center rounded-sm border bg-surface-100 text-xs font-medium text-foreground-lighter">
{selectedOrgInitial}
</span>
<div className="flex min-w-0 flex-1 flex-col text-left -mb-0.5">
<div className="truncate text-foreground font-medium leading-tight min-w-[100px] max-w-[250px]">
{selectedOrganization?.name ?? 'Select organization'}
</div>
{selectedOrganization && (
<div className="flex items-center gap-1 truncate text-foreground-light leading-tight text-xs">
<Boxes className="shrink-0 size-3" strokeWidth={1.5} />
<span>{projectsLabel}</span>
</div>
)}
</div>
<ChevronsUpDown
strokeWidth={1}
className="ml-auto text-foreground-light md:hidden md:group-hover:block w-4! h-4!"
/>
</SidebarMenuButton>
)
if (isMobile) {
return (
<>
<SidebarMenu className="shrink">
<SidebarMenuItem>
{isLoadingOrganizations ? <ShimmeringLoader className="p-2 w-[90px]" /> : triggerButton}
</SidebarMenuItem>
</SidebarMenu>
<OrgSelectorSheet
open={open}
onOpenChange={setOpen}
onClose={() => setOpen(false)}
selectedOrganization={selectedOrganization ?? null}
/>
</>
)
}
return (
<SidebarMenu>
<SidebarMenuItem>
<Popover open={open} onOpenChange={setOpen} modal={false}>
<PopoverTrigger asChild>{triggerButton}</PopoverTrigger>
<PopoverContent className="p-0" side="bottom" align="start">
<Command>
<CommandInput placeholder="Find organization..." />
<CommandList>
<CommandEmpty>No organizations found</CommandEmpty>
<CommandGroup>
<ScrollArea
className={(organizations || []).length > 7 ? 'h-full md:h-[210px]' : ''}
>
{organizations?.map((org) => (
<OrgCommandItem
key={org.slug}
org={org}
selectedSlug={slug}
routePathname={router.pathname}
hasRouteSlug={!!routeSlug}
onClose={() => setOpen(false)}
/>
))}
</ScrollArea>
</CommandGroup>
<CommandSeparator />
<CommandGroup>
<CommandItemLink
href="/organizations"
className="cursor-pointer w-full gap-2"
onSelect={() => setOpen(false)}
>
<p>All Organizations</p>
</CommandItemLink>
</CommandGroup>
{organizationCreationEnabled && (
<>
<CommandSeparator />
<CommandGroup>
<CommandItemLink
href="/new"
className="cursor-pointer w-full gap-2"
onSelect={() => setOpen(false)}
>
<Plus size={14} strokeWidth={1.5} />
<p>New organization</p>
</CommandItemLink>
</CommandGroup>
</>
)}
</CommandList>
</Command>
</PopoverContent>
</Popover>
</SidebarMenuItem>
</SidebarMenu>
)
}