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

335 lines
13 KiB
TypeScript

import { useParams } from 'common'
import dayjs from 'dayjs'
import { partition, uniqBy } from 'lodash'
import { MoreVertical } from 'lucide-react'
import Link from 'next/link'
import { parseAsBoolean, useQueryState } from 'nuqs'
import { useEffect, useState } from 'react'
import {
ComposableMap,
Geographies,
Geography,
Line,
Marker,
ZoomableGroup,
} from 'react-simple-maps'
import {
Badge,
Button,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
ScrollArea,
} from 'ui'
import { TimestampInfo } from 'ui-patterns/TimestampInfo'
import { AVAILABLE_REPLICA_REGIONS } from './InstanceConfiguration.constants'
import GeographyData from './MapData.json'
import { getReadReplicaPath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/ReadReplicas/ReadReplicas.constants'
import { RegionFlag } from '@/components/ui/RegionFlag'
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'
const MapView = () => {
const { ref } = useParams()
const dbSelectorState = useDatabaseSelectorStateSnapshot()
const { projectHomepageShowInstanceSize } = useIsFeatureEnabled([
'project_homepage:show_instance_size',
])
const [mount, setMount] = useState(false)
const [zoom, setZoom] = useState<number>(1.5)
const [center, setCenter] = useState<[number, number]>([14, 7])
const [tooltip, setTooltip] = useState<{
x: number
y: number
region: { key: string; country?: string; name?: string; region?: string }
}>()
const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
const { data } = useReadReplicasQuery({ projectRef: ref })
const databases = data ?? []
const [[primary], replicas] = partition(databases, (db) => db.identifier === ref)
const primaryCoordinates = AVAILABLE_REPLICA_REGIONS.find((region) =>
primary.region.includes(region.region)
)?.coordinates ?? [0, 0]
const uniqueRegionsByReplicas = uniqBy(replicas, (r) => {
return AVAILABLE_REPLICA_REGIONS.find((region) => r.region.includes(region.region))?.key
})
const selectedRegionKey =
AVAILABLE_REPLICA_REGIONS.find((region) => region.coordinates === center)?.region ?? ''
const showRegionDetails = zoom === 2.0 && selectedRegionKey !== undefined
const selectedRegion = AVAILABLE_REPLICA_REGIONS.find(
(region) => region.region === selectedRegionKey
)
const databasesInSelectedRegion = databases
.filter((database) => database.region.includes(selectedRegionKey))
.sort((a, b) => (a.inserted_at > b.inserted_at ? 1 : 0))
.sort((database) => (database.identifier === ref ? -1 : 0))
useEffect(() => {
setTimeout(() => setMount(true), 100)
}, [])
return (
<div className="bg-studio h-[500px] relative">
<ComposableMap projectionConfig={{ scale: 155 }} className="w-full h-full">
<ZoomableGroup
className={mount ? 'transition-all duration-300' : ''}
center={center}
zoom={zoom}
minZoom={1.5}
maxZoom={2.0}
filterZoomEvent={({ constructor: { name } }) =>
!['MouseEvent', 'WheelEvent'].includes(name)
}
>
<Geographies geography={GeographyData}>
{({ geographies }) =>
geographies.map((geo) => (
<Geography
key={geo.rsmKey}
geography={geo}
strokeWidth={0.3}
pointerEvents="none"
className="fill-gray-800 stroke-gray-900 dark:fill-gray-300 dark:stroke-gray-200"
/>
))
}
</Geographies>
{uniqueRegionsByReplicas.map((database) => {
const coordinates = AVAILABLE_REPLICA_REGIONS.find((region) =>
database.region.includes(region.region)
)?.coordinates
if (coordinates !== primaryCoordinates) {
return (
<Line
key={`line-${database.identifier}-${primary.identifier}`}
from={coordinates}
to={primaryCoordinates}
stroke="white"
strokeWidth={1}
strokeLinecap="round"
strokeOpacity={0.2}
strokeDasharray={'3, 3'}
className="map-path"
/>
)
} else {
return null
}
})}
{AVAILABLE_REPLICA_REGIONS.map((region) => {
const dbs =
databases.filter((database) => database.region.includes(region.region)) ?? []
const coordinates = AVAILABLE_REPLICA_REGIONS.find(
(r) => r.region === region.region
)?.coordinates
const hasNoDatabases = dbs.length === 0
const hasPrimary = dbs.some((database) => database.identifier === ref)
const replicas = dbs.filter((database) => database.identifier !== ref) ?? []
return (
<Marker
key={region.key}
coordinates={coordinates}
onMouseEnter={() => {
setTooltip({
x: coordinates![0],
y: coordinates![1],
region: {
key: region.key,
country: region.name,
region: region.region,
name: hasNoDatabases
? undefined
: hasPrimary
? `Primary Database${
replicas.length > 0
? ` + ${replicas.length} replica${replicas.length > 1 ? 's' : ''} `
: ''
}`
: `${replicas.length} Read Replica${
replicas.length > 1 ? 's' : ''
} deployed`,
},
})
}}
onMouseLeave={() => setTooltip(undefined)}
onClick={() => {
if (coordinates) {
setCenter(coordinates)
setZoom(2.0)
}
}}
>
{selectedRegionKey === region.region && (
<circle
r={4}
className={`animate-ping ${
hasNoDatabases ? 'fill-border-stronger' : 'fill-brand'
}`}
/>
)}
<circle
r={4}
className={`cursor-pointer ${
hasNoDatabases
? 'fill-background-surface-300 stroke-border-stronger'
: hasPrimary
? 'fill-brand stroke-brand-500'
: 'fill-brand-500 stroke-brand-400'
}`}
/>
</Marker>
)
})}
{tooltip !== undefined && zoom === 1.5 && (
<Marker coordinates={[tooltip.x - 47, tooltip.y - 5]}>
<foreignObject width={220} height={66.25}>
<div className="bg-studio/50 rounded-sm border">
<div className="px-3 py-2 flex flex-col">
<div className="flex items-center gap-x-2">
<RegionFlag className="w-4" region={tooltip.region.region ?? ''} />
<p className="text-[10px]">{tooltip.region.country}</p>
</div>
<p
className={`text-[10px] ${
tooltip.region.name === undefined ? 'text-foreground-light' : ''
}`}
>
{tooltip.region.name ?? 'No databases deployed'}
</p>
</div>
</div>
</foreignObject>
</Marker>
)}
</ZoomableGroup>
</ComposableMap>
{showRegionDetails && selectedRegion && (
<div className="absolute bottom-4 right-4 flex flex-col bg-studio/50 backdrop-blur-xs border rounded-sm w-[400px]">
<div className="flex items-center justify-between py-4 px-4 border-b">
<div>
<p className="text-xs text-foreground-light">
{databasesInSelectedRegion.length} database
{databasesInSelectedRegion.length > 1 ? 's' : ''} deployed in
</p>
<p className="text-sm">{selectedRegion.name}</p>
</div>
<RegionFlag className="w-10" region={selectedRegion.region} />
</div>
{databasesInSelectedRegion.length > 0 && (
<ScrollArea style={{ height: databasesInSelectedRegion.length > 2 ? '180px' : 'auto' }}>
<ul className={`flex flex-col divide-y`}>
{databasesInSelectedRegion.map((database) => {
const created = dayjs(database.inserted_at).format('DD MMM YYYY')
return (
<li
key={database.identifier}
className="text-sm px-4 py-2 flex items-center justify-between"
>
<div className="flex flex-col gap-y-1">
<p className="flex items-center gap-x-2">
{database.identifier === ref
? 'Primary Database'
: `Read Replica ${
database.identifier.length > 0 &&
`(ID: ${formatDatabaseID(database.identifier)})`
}`}
{database.status === REPLICA_STATUS.ACTIVE_HEALTHY ? (
<Badge variant="success">Healthy</Badge>
) : database.status === REPLICA_STATUS.COMING_UP ? (
<Badge>Coming up</Badge>
) : database.status === REPLICA_STATUS.RESTARTING ? (
<Badge>Restarting</Badge>
) : database.status === REPLICA_STATUS.RESIZING ? (
<Badge>Resizing</Badge>
) : (
<Badge variant="warning">Unhealthy</Badge>
)}
</p>
<div>
<p className="text-xs text-foreground-light">
AWS{projectHomepageShowInstanceSize ? `${database.size}` : ''}
</p>
{database.identifier !== ref && (
<p className="text-xs text-foreground-light">
Created on:{' '}
<TimestampInfo label={created} utcTimestamp={database.inserted_at} />
</p>
)}
</div>
</div>
{database.identifier !== ref && (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="text" icon={<MoreVertical />} className="px-1" />
</DropdownMenuTrigger>
<DropdownMenuContent className="w-40" side="bottom" align="end">
<DropdownMenuItem
className="gap-x-2"
disabled={database.status !== REPLICA_STATUS.ACTIVE_HEALTHY}
onClick={() => {
setShowConnect(true)
dbSelectorState.setSelectedDatabaseId(database.identifier)
}}
>
View connection string
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem className="gap-x-2" asChild>
<Link href={getReadReplicaPath(ref, database.identifier)}>
Manage replica
</Link>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
)}
</li>
)
})}
</ul>
</ScrollArea>
)}
<div
className={`flex items-center justify-end gap-x-2 px-4 py-2 ${
databasesInSelectedRegion.length > 0 ? 'border-t' : ''
}`}
>
<Button
variant="default"
onClick={() => {
setCenter([14, 7])
setZoom(1.5)
}}
>
Close
</Button>
</div>
</div>
)}
</div>
)
}
export default MapView