mirror of
https://github.com/supabase/supabase.git
synced 2026-10-14 13:49:09 +03:00
## Problem Primary colour serves readable text and selected controls, but those uses need different shades. Light mode needs darker text, while dark mode needs a deeper button fill. Fixed brand green on interactive chrome also prevents a custom primary hue from carrying through the interface. Some slider tracks and selected text are hard to read. ## Solution - Keep `--primary` for accessible text and small selected indicators. Use `--primary-solid` for button fills, which need a deeper shade in dark mode. - Add `--primary-bright` for focus rings, selected control chrome, chart accents, and other interactive highlights. It follows `--primary-hue`; `brand-*` stays fixed for Supabase identity. - Make slider troughs clearer and text selection translucent with theme foreground text. - Document the split in the design-system colour guide. | Before | After | | --- | --- | | <img width="980" height="244" alt="Before: light mode primary controls" src="https://github.com/user-attachments/assets/dfae325d-0dfe-4231-8bcd-3f89c4b9d793" /> | <img width="982" height="204" alt="After: light mode primary controls" src="https://github.com/user-attachments/assets/5fdcb531-a6e3-4549-8a13-9d9a5ebe6e20" /> | | <img width="610" height="120" alt="Before: slider track" src="https://github.com/user-attachments/assets/04f768e0-51e8-4d06-9b97-c52f4a34f122" /> | <img width="622" height="126" alt="After: slider track" src="https://github.com/user-attachments/assets/95127f4e-13dc-4f0f-b63c-cf5d70a28b42" /> | | <img width="652" height="512" alt="Before: dark mode controls" src="https://github.com/user-attachments/assets/3f88de66-90cc-40ee-8cf1-b5f4eb87b09a" /> | <img width="658" height="498" alt="After: dark mode controls" src="https://github.com/user-attachments/assets/906bec30-6ca1-4614-9fb3-6cf5e5feec22" /> | ## Review instructions 1. Compare light and dark mode in the [colour usage guide](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/color-usage#primary-and-brand-colors). Check primary ink, primary-solid, primary-bright, and fixed brand swatches. 2. In Studio, open the ‘new table’ sheet in [Table Editor](https://studio-staging-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/dashboard/project/_/editor). Tab through the new table sheet's fields and toggles. Check the focus rings, selected controls, and the sheet's edges in both themes. You do not need to save a table. 3. Select text in Studio in both themes, including a link or primary-coloured label. The selection and text should remain legible. 4. Check the [Field](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/field) Price Range slider: the unused track should remain visible in both themes. The selected field card border should follow primary-bright. 5. Check the [Button](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/button) and [Radio Group](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/radio-group) previews. In dark mode, `primary` button fill should be deeper than primary [text](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/color-usage#text); selected radios should remain readable.
334 lines
13 KiB
TypeScript
334 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-primary-bright'
|
|
}`}
|
|
/>
|
|
)}
|
|
<circle
|
|
r={4}
|
|
className={`cursor-pointer ${
|
|
hasNoDatabases
|
|
? 'fill-background-surface-300 stroke-border-stronger'
|
|
: hasPrimary
|
|
? 'fill-primary-bright 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
|
|
onClick={() => {
|
|
setCenter([14, 7])
|
|
setZoom(1.5)
|
|
}}
|
|
>
|
|
Close
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
export default MapView
|