mirror of
https://github.com/supabase/supabase.git
synced 2026-09-29 14:32:16 +08: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 -->
199 lines
6.4 KiB
TypeScript
199 lines
6.4 KiB
TypeScript
import { useParams } from 'common'
|
|
import { Box, Plus } from 'lucide-react'
|
|
import Link from 'next/link'
|
|
import { useRouter } from 'next/router'
|
|
import type { ComponentProps } from 'react'
|
|
import { useState } from 'react'
|
|
import { Button, CommandGroup } from 'ui'
|
|
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
|
|
|
|
import { AppLayoutDropdownTriggerButton } from './AppLayoutDropdown'
|
|
import { sanitizeRoute } from './ProjectDropdown.utils'
|
|
import { ProjectRowLink } from './ProjectRowLink'
|
|
import { useEmbeddedCloseHandler } from './useEmbeddedCloseHandler'
|
|
import { CommandItemLink } from '@/components/ui/CommandItemLink'
|
|
import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
|
|
import PartnerIcon from '@/components/ui/PartnerIcon'
|
|
import { getManagedByFromOrganizationPartner } from '@/data/organizations/managed-by-utils'
|
|
import type { OrgProject } from '@/data/projects/org-projects-infinite-query'
|
|
import { useProjectDetailQuery } from '@/data/projects/project-detail-query'
|
|
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
|
|
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { IS_PLATFORM } from '@/lib/constants'
|
|
import type { ManagedBy } from '@/lib/constants/infrastructure'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
|
|
// --- Sub-components ---
|
|
|
|
interface ProjectDropdownNewProjectActionsProps {
|
|
organizationSlug: string | undefined
|
|
embedded: boolean
|
|
onClose: () => void
|
|
}
|
|
|
|
function ProjectDropdownNewProjectActions({
|
|
organizationSlug,
|
|
embedded,
|
|
onClose,
|
|
}: ProjectDropdownNewProjectActionsProps) {
|
|
const href = `/new/${organizationSlug}`
|
|
|
|
if (embedded) {
|
|
return (
|
|
<Button
|
|
variant="default"
|
|
block
|
|
size="small"
|
|
asChild
|
|
icon={<Plus size={14} strokeWidth={1.5} />}
|
|
>
|
|
<Link
|
|
href={href}
|
|
onClick={onClose}
|
|
className="text-xs text-foreground-light hover:text-foreground"
|
|
>
|
|
New project
|
|
</Link>
|
|
</Button>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<CommandGroup>
|
|
<CommandItemLink href={href} className="cursor-pointer w-full gap-2" onSelect={onClose}>
|
|
<Plus size={14} strokeWidth={1.5} />
|
|
<p>New project</p>
|
|
</CommandItemLink>
|
|
</CommandGroup>
|
|
)
|
|
}
|
|
|
|
const ProjectDropdownNonPlatformView = ({ projectName }: { projectName: string }) => {
|
|
return <div className="text-sm px-3 py-1">{projectName}</div>
|
|
}
|
|
|
|
interface ProjectDropdownPlatformViewProps {
|
|
projectRef: string | undefined
|
|
projectName: string
|
|
projectManagedBy?: ManagedBy
|
|
selectorProps: Omit<
|
|
ComponentProps<typeof OrganizationProjectSelector>,
|
|
'renderTrigger' | 'embedded'
|
|
>
|
|
}
|
|
|
|
function ProjectDropdownPlatformView({
|
|
projectRef,
|
|
projectName,
|
|
projectManagedBy,
|
|
selectorProps,
|
|
}: ProjectDropdownPlatformViewProps) {
|
|
return (
|
|
<div className="flex items-center shrink-0">
|
|
<Link href={`/project/${projectRef}`} className="flex items-center gap-2 shrink-0 text-sm">
|
|
<Box size={14} strokeWidth={1.5} className="text-foreground-lighter" />
|
|
<span title={projectName} className="text-foreground max-w-32 lg:max-w-64 truncate">
|
|
{projectName}
|
|
</span>
|
|
{projectManagedBy && <PartnerIcon organization={{ managed_by: projectManagedBy }} />}
|
|
</Link>
|
|
|
|
<OrganizationProjectSelector
|
|
{...selectorProps}
|
|
renderTrigger={() => (
|
|
<AppLayoutDropdownTriggerButton
|
|
className="shrink-0"
|
|
aria-label="Show organization projects"
|
|
/>
|
|
)}
|
|
/>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
// --- Main component ---
|
|
|
|
interface ProjectDropdownProps {
|
|
embedded?: boolean
|
|
className?: string
|
|
onClose?: () => void
|
|
}
|
|
|
|
export const ProjectDropdown = ({
|
|
embedded = false,
|
|
className,
|
|
onClose,
|
|
}: ProjectDropdownProps = {}) => {
|
|
const router = useRouter()
|
|
const { ref } = useParams()
|
|
const { data: project, isPending: isLoadingProject } = useSelectedProjectQuery()
|
|
const { data: selectedOrganization } = useSelectedOrganizationQuery()
|
|
|
|
const isBranch = project?.parentRef !== project?.ref
|
|
const { data: parentProject, isPending: isLoadingParentProject } = useProjectDetailQuery(
|
|
{ ref: project?.parent_project_ref },
|
|
{ enabled: isBranch }
|
|
)
|
|
const selectedProject = parentProject ?? project
|
|
|
|
const projectCreationEnabled = useIsFeatureEnabled('projects:create')
|
|
const track = useTrack()
|
|
|
|
const [open, setOpen] = useState(false)
|
|
const close = useEmbeddedCloseHandler(embedded, onClose, setOpen)
|
|
const selectedProjectManagedBy = selectedProject?.integration_source
|
|
? getManagedByFromOrganizationPartner(undefined, selectedProject.integration_source)
|
|
: selectedOrganization?.billing_partner
|
|
? selectedOrganization.managed_by
|
|
: undefined
|
|
|
|
if (isLoadingProject || (isBranch && isLoadingParentProject) || !selectedProject) {
|
|
if (!embedded) return <ShimmeringLoader className="p-2 md:mr-2 md:w-[90px]" />
|
|
}
|
|
|
|
const handleSetOpen = embedded
|
|
? (_value: boolean) => onClose?.()
|
|
: (next: boolean) => {
|
|
if (next) track('header_project_dropdown_opened')
|
|
setOpen(next)
|
|
}
|
|
|
|
const selectorProps = {
|
|
open,
|
|
setOpen: handleSetOpen,
|
|
selectedRef: ref,
|
|
getItemHref: (project: { ref: string }) => {
|
|
const sanitizedRoute = sanitizeRoute(router.route, router.query)
|
|
return sanitizedRoute?.replace('[ref]', project.ref) ?? `/project/${project.ref}`
|
|
},
|
|
renderRow: (project: Pick<OrgProject, 'ref' | 'name' | 'status' | 'integration_source'>) => (
|
|
<ProjectRowLink project={project} selectedRef={ref} />
|
|
),
|
|
renderActions: (_setOpen: (value: boolean) => void, options?: { embedded?: boolean }) =>
|
|
projectCreationEnabled ? (
|
|
<ProjectDropdownNewProjectActions
|
|
organizationSlug={selectedOrganization?.slug}
|
|
embedded={options?.embedded ?? false}
|
|
onClose={close}
|
|
/>
|
|
) : null,
|
|
}
|
|
|
|
if (embedded)
|
|
return (
|
|
<OrganizationProjectSelector {...selectorProps} embedded className={className} fetchOnMount />
|
|
)
|
|
|
|
return IS_PLATFORM ? (
|
|
<ProjectDropdownPlatformView
|
|
projectRef={project?.ref}
|
|
projectName={selectedProject?.name ?? ''}
|
|
projectManagedBy={selectedProjectManagedBy}
|
|
selectorProps={selectorProps}
|
|
/>
|
|
) : (
|
|
<ProjectDropdownNonPlatformView projectName={selectedProject?.name ?? ''} />
|
|
)
|
|
}
|