mirror of
https://github.com/supabase/supabase.git
synced 2026-09-09 19:42:46 +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 -->
184 lines
5.8 KiB
TypeScript
184 lines
5.8 KiB
TypeScript
import { useParams } from 'common'
|
|
import { uniqBy } from 'lodash'
|
|
import { Check, ChevronsUpDown, Plus } from 'lucide-react'
|
|
import { useState } from 'react'
|
|
import {
|
|
Alert,
|
|
AlertDescription,
|
|
AlertTitle,
|
|
Button,
|
|
Command,
|
|
CommandEmpty,
|
|
CommandGroup,
|
|
CommandInput,
|
|
CommandItem,
|
|
CommandList,
|
|
CommandSeparator,
|
|
Popover,
|
|
PopoverContent,
|
|
PopoverTrigger,
|
|
ScrollArea,
|
|
} from 'ui'
|
|
|
|
import { CommandItemLink } from '@/components/ui/CommandItemLink'
|
|
import {
|
|
DatabaseFunctionsData,
|
|
useDatabaseFunctionsQuery,
|
|
} from '@/data/database-functions/database-functions-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
|
|
type DatabaseFunction = DatabaseFunctionsData[number]
|
|
|
|
interface FunctionSelectorProps {
|
|
className?: string
|
|
size?: 'tiny' | 'small'
|
|
showError?: boolean
|
|
schema?: string
|
|
value: string
|
|
onChange: (value: string) => void
|
|
disabled?: boolean
|
|
stopScrollPropagation?: boolean
|
|
// used to filter the functions by a criteria
|
|
filterFunction?: (func: DatabaseFunction) => boolean
|
|
noResultsLabel?: React.ReactNode
|
|
}
|
|
|
|
const FunctionSelector = ({
|
|
className,
|
|
size = 'tiny',
|
|
showError = true,
|
|
disabled = false,
|
|
schema,
|
|
value,
|
|
onChange,
|
|
stopScrollPropagation = false,
|
|
filterFunction = () => true,
|
|
noResultsLabel = <span>No functions found in this schema.</span>,
|
|
}: FunctionSelectorProps) => {
|
|
const { ref } = useParams()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const [open, setOpen] = useState(false)
|
|
|
|
const {
|
|
data,
|
|
error,
|
|
isPending: isLoading,
|
|
isError,
|
|
isSuccess,
|
|
refetch,
|
|
} = useDatabaseFunctionsQuery({
|
|
projectRef: project?.ref,
|
|
connectionString: project?.connectionString,
|
|
})
|
|
|
|
const filteredFunctions = (data ?? [])
|
|
.filter((func) => schema && func.schema === schema)
|
|
.filter(filterFunction)
|
|
const functions = uniqBy(filteredFunctions, (func) => func.name)
|
|
|
|
return (
|
|
<div className={className}>
|
|
{isLoading && (
|
|
<Button variant="default" className="justify-start" block size={size} loading>
|
|
Loading functions...
|
|
</Button>
|
|
)}
|
|
|
|
{showError && isError && (
|
|
<Alert variant="warning" className="px-3! py-3!">
|
|
<AlertTitle className="text-xs text-amber-900">Failed to load functions</AlertTitle>
|
|
|
|
<AlertDescription className="text-xs mb-2">Error: {error.message}</AlertDescription>
|
|
|
|
<Button variant="default" size="tiny" onClick={() => refetch()}>
|
|
Reload functions
|
|
</Button>
|
|
</Alert>
|
|
)}
|
|
|
|
{isSuccess && (
|
|
<Popover open={open} onOpenChange={setOpen} modal={false}>
|
|
<PopoverTrigger asChild>
|
|
<Button
|
|
size={size}
|
|
disabled={!!disabled}
|
|
variant="default"
|
|
className={`w-full [&>span]:w-full ${size === 'small' ? 'py-1.5' : ''}`}
|
|
iconRight={
|
|
<ChevronsUpDown className="text-foreground-muted" strokeWidth={2} size={14} />
|
|
}
|
|
>
|
|
{value ? (
|
|
<div className="w-full flex gap-1">
|
|
<p className="text-foreground-lighter">function:</p>
|
|
<p className="text-foreground">{value}</p>
|
|
</div>
|
|
) : (
|
|
<div className="w-full flex gap-1">
|
|
<p className="text-foreground-lighter">Select a function</p>
|
|
</div>
|
|
)}
|
|
</Button>
|
|
</PopoverTrigger>
|
|
<PopoverContent className="p-0" side="bottom" align="start" sameWidthAsTrigger>
|
|
<Command>
|
|
<CommandInput placeholder="Search functions..." />
|
|
<CommandList
|
|
onWheel={stopScrollPropagation ? (event) => event.stopPropagation() : undefined}
|
|
>
|
|
<CommandEmpty>No functions found</CommandEmpty>
|
|
<CommandGroup>
|
|
<ScrollArea className={(functions || []).length > 7 ? 'h-[210px]' : ''}>
|
|
{!functions.length && (
|
|
<CommandItem
|
|
key="no-function-found"
|
|
disabled={true}
|
|
className="flex items-center justify-between space-x-2 w-full"
|
|
>
|
|
{noResultsLabel}
|
|
</CommandItem>
|
|
)}
|
|
{functions.map((func) => (
|
|
<CommandItem
|
|
key={func.id}
|
|
value={func.name.replaceAll('"', '')}
|
|
className="cursor-pointer flex items-center justify-between space-x-2 w-full"
|
|
onSelect={() => {
|
|
onChange(func.name)
|
|
setOpen(false)
|
|
}}
|
|
onClick={() => {
|
|
onChange(func.name)
|
|
setOpen(false)
|
|
}}
|
|
>
|
|
<span>{func.name}</span>
|
|
{value === func.name && (
|
|
<Check className="text-brand" size={14} strokeWidth={2} />
|
|
)}
|
|
</CommandItem>
|
|
))}
|
|
</ScrollArea>
|
|
</CommandGroup>
|
|
<CommandSeparator />
|
|
<CommandGroup>
|
|
<CommandItemLink
|
|
href={`/project/${ref}/database/functions`}
|
|
className="cursor-pointer w-full gap-2"
|
|
onSelect={() => setOpen(false)}
|
|
>
|
|
<Plus size={14} strokeWidth={1.5} />
|
|
<p>New function</p>
|
|
</CommandItemLink>
|
|
</CommandGroup>
|
|
</CommandList>
|
|
</Command>
|
|
</PopoverContent>
|
|
</Popover>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
export default FunctionSelector
|