mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 01:45:10 +03:00
## What kind of change does this PR introduce? Bug fix and design-system update. Resolves DEPR-316. Follow-up rename (`text-brand` → `text-primary`) is in a dedicated PR (https://github.com/supabase/supabase/pull/50564) stacked on this one. ## What is the current behavior? `text-brand` resolves to the canonical bright brand green in places that need readable text, which fails WCAG AA on light surfaces. A separate `text-brand-display` token adds another green for large type. ## What is the new behavior? - `text-brand` maps to accessible `--primary` (light mode darkened to meet ~4.5:1 AA) - `--hue` / `--primary-hue` aligned to 157.5 - `text-brand-display` removed; former display callsites use `text-brand` - Bright fills/borders stay on `brand-default` - Design-system colour and typography docs updated | Before | After | | --- | --- | | <img width="514" height="112" alt="CleanShot 2026-09-02 at 11 13 09@2x" src="https://github.com/user-attachments/assets/4e0138a9-a32d-4e4c-a426-90736706e1e7" /> | <img width="512" height="138" alt="CleanShot 2026-09-21 at 11 42 05@2x" src="https://github.com/user-attachments/assets/164cc5b1-a0c5-4e93-95f1-80016641a114" /> | | <img width="864" height="266" alt="CleanShot 2026-09-02 at 11 13 53@2x" src="https://github.com/user-attachments/assets/3c1ca53f-bf9e-431e-bc15-816b4a275b8e" /> | <img width="882" height="248" alt="CleanShot 2026-09-21 at 11 41 37@2x" src="https://github.com/user-attachments/assets/24828e7b-ed6b-44cb-b9dc-becc3398bdfc" /> | | <img width="782" height="692" alt="CleanShot 2026-09-02 at 11 16 30@2x" src="https://github.com/user-attachments/assets/fc871977-77bc-47fb-9e0e-9284e0ecd5cc" /> | <img width="730" height="690" alt="CleanShot 2026-09-21 at 11 42 52@2x" src="https://github.com/user-attachments/assets/bf479515-d5f9-471e-b82d-f097c0f4b56c" /> | | <img width="480" height="306" alt="CleanShot 2026-09-02 at 11 18 53@2x" src="https://github.com/user-attachments/assets/03f341f4-f02e-44f8-a2b2-8c31670d0427" /> | <img width="470" height="300" alt="CleanShot 2026-09-21 at 11 43 19@2x" src="https://github.com/user-attachments/assets/9df18217-d5e6-48b8-ba0b-579d2664b94b" /> | | <img width="960" height="300" alt="CleanShot 2026-09-02 at 11 32 04@2x" src="https://github.com/user-attachments/assets/6b1d9373-7a71-4247-81ff-26441604b09d" /> | <img width="980" height="306" alt="CleanShot 2026-09-21 at 11 44 13@2x" src="https://github.com/user-attachments/assets/41ad4784-02ec-4b29-b860-32af9fa79aa8" /> | | <img width="924" height="214" alt="CleanShot 2026-09-02 at 11 34 44@2x" src="https://github.com/user-attachments/assets/1de661fe-c7b6-499b-a94f-e4737436ec79" /> | <img width="752" height="162" alt="CleanShot 2026-09-21 at 11 44 56@2x" src="https://github.com/user-attachments/assets/1811890f-0660-4445-84e9-447720954fa1" /> | ## To test Test each callsite **in light mode** (dark mode is largely unchanged). ### WWW - [Homepage](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/): “Scale to millions” uses readable brand text (display token is gone) - [Careers](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/careers): small “Careers” eyebrow readable; green dividers stay bright `brand-default` - [Contact](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/contact-us): email / policy links use readable brand text - [Regions](https://zone-www-dot-com-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/regions): “Ask about early access to BYOC” readable ### Docs - [Docs homepage](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs): “DOCS” wordmark and resource links readable - [Database overview](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/guides/database/overview): nav / footer brand links readable - [JavaScript reference](https://docs-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/reference/javascript/introduction): active sidebar treatment readable ### Design system - [Typography](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/typography): documents `text-brand` only (no display) - [Colour usage](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/docs/color-usage): `text-brand` vs `bg-brand-default` - [Design-system homepage](https://design-system-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/): brand text examples across themes ### Studio - [Auth providers](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/auth/providers): enabled provider badge text readable; status dot stays bright - [Database policies](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/database/policies?new=true): template hover text more legible - [Database connections](https://studio-staging-git-dnywh-depr-316-brand-text-tokens-supabase.vercel.app/dashboard/project/_/observability/connections): “Live” status readable; animated dot stays bright green --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
244 lines
8.1 KiB
TypeScript
244 lines
8.1 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { ChevronUp, MoreVertical, Trash } from 'lucide-react'
|
|
import { useEffect, useState } from 'react'
|
|
import { useForm, type SubmitHandler } from 'react-hook-form'
|
|
import { toast } from 'sonner'
|
|
import {
|
|
Button,
|
|
cn,
|
|
Collapsible,
|
|
CollapsibleContent,
|
|
CollapsibleTrigger,
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuTrigger,
|
|
Form,
|
|
FormControl,
|
|
FormField,
|
|
Switch,
|
|
Tooltip,
|
|
TooltipContent,
|
|
TooltipTrigger,
|
|
} from 'ui'
|
|
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
|
|
import * as z from 'zod'
|
|
|
|
import { ROLE_PERMISSIONS } from './Roles.constants'
|
|
import { useDatabaseRoleUpdateMutation } from '@/data/database-roles/database-role-update-mutation'
|
|
import type { PgRole } from '@/data/database-roles/database-roles-query'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
|
|
interface RoleRowProps {
|
|
role: PgRole
|
|
disabled?: boolean
|
|
onSelectDelete: (role: string) => void
|
|
}
|
|
|
|
const permissionSchema = z.boolean().optional()
|
|
const formSchema = z.object(
|
|
Object.keys(ROLE_PERMISSIONS).reduce(
|
|
(acc, key) => ({
|
|
...acc,
|
|
[key]: permissionSchema,
|
|
}),
|
|
{} as Record<keyof typeof ROLE_PERMISSIONS, z.ZodBoolean>
|
|
)
|
|
)
|
|
|
|
export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps) => {
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const [isExpanded, setIsExpanded] = useState(false)
|
|
const { mutate: updateDatabaseRole, isPending: isUpdating } = useDatabaseRoleUpdateMutation()
|
|
const form = useForm<z.infer<typeof formSchema>>({
|
|
resolver: zodResolver(formSchema),
|
|
defaultValues: role,
|
|
})
|
|
|
|
const { reset, formState } = form
|
|
const { isDirty } = formState
|
|
|
|
useEffect(() => {
|
|
reset(role)
|
|
}, [role, reset])
|
|
|
|
const onSaveChanges: SubmitHandler<z.infer<typeof formSchema>> = async (values) => {
|
|
if (!project) return console.error('Project is required')
|
|
|
|
const changed = Object.fromEntries(
|
|
Object.entries(values).filter(([k, v]) => {
|
|
const key = k as keyof PgRole
|
|
return v !== role[key]
|
|
})
|
|
)
|
|
|
|
if (Object.keys(changed).length === 0) {
|
|
// No actual changes to persist; avoid sending an empty update payload
|
|
reset(role)
|
|
return
|
|
}
|
|
|
|
updateDatabaseRole(
|
|
{
|
|
projectRef: project.ref,
|
|
connectionString: project.connectionString,
|
|
id: role.id,
|
|
payload: changed,
|
|
},
|
|
{
|
|
onSuccess: () => {
|
|
toast.success(`Successfully updated role "${role.name}"`)
|
|
reset(values)
|
|
},
|
|
}
|
|
)
|
|
}
|
|
|
|
const formId = `role-update-form-${role.id}`
|
|
|
|
return (
|
|
<Collapsible
|
|
open={isExpanded}
|
|
className={cn(
|
|
'bg-surface-100',
|
|
'hover:bg-overlay-hover',
|
|
'data-open:bg-selection',
|
|
'border-default hover:border-strong',
|
|
'data-open:border-strong',
|
|
'data-open:pb-px col-span-12 mx-auto',
|
|
'-space-y-px overflow-hidden',
|
|
'border border-t-0 first:border-t first:mt-0! hover:border-t hover:-mt-px shadow-sm transition hover:z-50',
|
|
'first:rounded-tl first:rounded-tr',
|
|
'last:rounded-bl last:rounded-br'
|
|
)}
|
|
>
|
|
<div className={cn('flex items-center relative', !disabled && 'pr-(--card-padding-x)')}>
|
|
<CollapsibleTrigger asChild>
|
|
<button
|
|
id={`collapsible-trigger-${role.id}`}
|
|
type="button"
|
|
tabIndex={0}
|
|
className="group flex w-full items-center justify-between rounded-sm py-3 px-card text-foreground"
|
|
onClick={(event) => {
|
|
event.preventDefault()
|
|
event.stopPropagation()
|
|
setIsExpanded(!isExpanded)
|
|
}}
|
|
>
|
|
<div className="flex items-start space-x-3">
|
|
<ChevronUp
|
|
className="text-border-stronger transition data-open-parent:rotate-0 data-closed-parent:rotate-180"
|
|
strokeWidth={2}
|
|
width={14}
|
|
/>
|
|
<div className="space-x-2 flex items-center">
|
|
<p className="text-left text-sm">{role.name}</p>
|
|
<p className="text-left text-sm text-foreground-light">(ID: {role.id})</p>
|
|
</div>
|
|
</div>
|
|
<div className="flex items-center space-x-4">
|
|
{role.activeConnections > 0 && (
|
|
<div className="relative h-2 w-2">
|
|
<span className="flex h-2 w-2">
|
|
<span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-brand-default opacity-75"></span>
|
|
<span className="relative inline-flex h-2 w-2 rounded-full bg-brand-default opacity-75"></span>
|
|
</span>
|
|
</div>
|
|
)}
|
|
<p
|
|
className={cn(
|
|
`text-sm`,
|
|
role.activeConnections > 0 ? 'text-foreground' : 'text-foreground-light'
|
|
)}
|
|
>
|
|
{role.activeConnections} connections
|
|
</p>
|
|
</div>
|
|
</button>
|
|
</CollapsibleTrigger>
|
|
{!disabled && (
|
|
<DropdownMenu>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button
|
|
className="px-1"
|
|
icon={<MoreVertical />}
|
|
aria-label={`${role.name} actions`}
|
|
/>
|
|
</DropdownMenuTrigger>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="bottom">More options</TooltipContent>
|
|
</Tooltip>
|
|
<DropdownMenuContent side="bottom" align="end" className="w-[120px]">
|
|
<DropdownMenuItem
|
|
className="space-x-2"
|
|
onClick={(event) => {
|
|
event.stopPropagation()
|
|
onSelectDelete(role.id.toString())
|
|
}}
|
|
>
|
|
<Trash className="text-red-800" size="14" strokeWidth={2} />
|
|
<p>Delete</p>
|
|
</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
)}
|
|
</div>
|
|
<CollapsibleContent>
|
|
<Form {...form}>
|
|
<form
|
|
id={formId}
|
|
onSubmit={form.handleSubmit(onSaveChanges)}
|
|
className="group border-t border-default bg-surface-100 py-6 px-5 md:px-20 text-foreground"
|
|
>
|
|
<div className="py-4 space-y-[9px]">
|
|
{(Object.keys(ROLE_PERMISSIONS) as (keyof typeof ROLE_PERMISSIONS)[]).map(
|
|
(permission) => (
|
|
<FormField
|
|
key={permission}
|
|
control={form.control}
|
|
name={permission}
|
|
disabled={disabled || ROLE_PERMISSIONS[permission].disabled}
|
|
render={({ field }) => (
|
|
<FormItemLayout
|
|
id={`${role.id}-${permission}`}
|
|
layout="flex"
|
|
label={ROLE_PERMISSIONS[permission].description}
|
|
>
|
|
<FormControl>
|
|
<Switch
|
|
id={`${role.id}-${permission}`}
|
|
checked={field.value}
|
|
onCheckedChange={field.onChange}
|
|
disabled={disabled || ROLE_PERMISSIONS[permission].disabled}
|
|
/>
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
)
|
|
)}
|
|
</div>
|
|
{!disabled && (
|
|
<div className="py-4 flex items-center space-x-2 justify-end">
|
|
<Button disabled={!isDirty || isUpdating} onClick={() => reset()}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
variant="primary"
|
|
type="submit"
|
|
disabled={!isDirty || isUpdating}
|
|
loading={isUpdating}
|
|
>
|
|
Save
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</form>
|
|
</Form>
|
|
</CollapsibleContent>
|
|
</Collapsible>
|
|
)
|
|
}
|