Files
Danny White 476d4a5851 refactor(ui): drop redundant Button variant="default" props (#50161)
## What kind of change does this PR introduce?

Mechanical cleanup on top of the Button default-variant change (#50160).

## What is the current behavior?

Many callsites still pass `variant="default"` even though that is now
the component default.

## What is the new behavior?

Removes redundant static `variant="default"` from legacy `Button` and
`ButtonTooltip` callsites. Keeps explicit defaults where they document
the API:

- `button-default.tsx` and `button-sizes.tsx` demos
- `DocsButton`, which pins neutral styling at the wrapper boundary

## To test

Studio:

- [Auth → Rate
Limits](https://studio-staging-2s957kwc4-supabase.vercel.app/dashboard/project/_/auth/rate-limits):
dirty the form so Cancel appears; Cancel stays neutral, Save stays green
- [Project Settings → API
Keys](https://studio-staging-2s957kwc4-supabase.vercel.app/dashboard/project/_/settings/api-keys):
`DocsButton` in the header actions stays neutral

Design system:

- [Design system →
Button](https://design-system-git-dnywh-dc924ac1-supabase.vercel.app/design-system/docs/components/button):
`button-default` / `button-sizes` still show explicit default styling;
Primary (green) is restricted to the Primary section (and `asChild`)

WWW:

- [www → Brand
assets](https://zone-www-dot-com-git-dnywh-dc924ac1-supabase.vercel.app/brand-assets):
Download logo kit / Download button kit stay neutral
2026-09-11 17:05:26 +10:00

213 lines
7.6 KiB
TypeScript

import { EllipsisVertical, Pencil, Plus, Trash2 } from 'lucide-react'
import {
Badge,
Button,
Card,
CardContent,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
Skeleton,
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
Tooltip,
TooltipContent,
TooltipTrigger,
} from 'ui'
import type { JitUserRule } from './JitDbAccess.types'
import { getJitStatusDisplay } from './JitDbAccess.utils'
interface JitDbAccessRulesTableProps {
users: JitUserRule[]
isLoading?: boolean
canUpdate: boolean
disableActions?: boolean
allProjectMembersHaveRules?: boolean
onAddRule: () => void
onEditRule: (user: JitUserRule) => void
onDeleteRule: (user: JitUserRule) => void
}
export function JitDbAccessRulesTable({
users,
isLoading = false,
canUpdate,
disableActions = false,
allProjectMembersHaveRules = false,
onAddRule,
onEditRule,
onDeleteRule,
}: JitDbAccessRulesTableProps) {
const addDisabled = disableActions || !canUpdate || allProjectMembersHaveRules
const addRuleTooltip = !canUpdate
? 'Additional permissions required'
: allProjectMembersHaveRules
? 'All project members already have temporary access rules'
: undefined
if (isLoading) {
return (
<Card>
<CardContent className="space-y-4 p-4">
<div className="flex items-center justify-between">
<div className="space-y-2">
<Skeleton className="h-4 w-32" />
<Skeleton className="h-4 w-64" />
</div>
<Skeleton className="h-9 w-24" />
</div>
<Skeleton className="h-32 w-full" />
</CardContent>
</Card>
)
}
return (
<Card>
<CardContent className="space-y-4 p-0">
<div className="flex items-center justify-between px-4 pb-2 pt-6">
<div>
<h3 className="text-sm text-foreground">Temporary access rules</h3>
<p className="text-sm text-foreground-light">
Manage member access, allowed roles, and expiry settings.
</p>
</div>
<Tooltip>
<TooltipTrigger asChild>
<span className="inline-flex">
<Button icon={<Plus />} onClick={onAddRule} disabled={addDisabled}>
Add rule
</Button>
</span>
</TooltipTrigger>
{addRuleTooltip && <TooltipContent side="bottom">{addRuleTooltip}</TooltipContent>}
</Tooltip>
</div>
<Table className="border-t">
<TableHeader>
<TableRow>
<TableHead>Member</TableHead>
<TableHead>Roles</TableHead>
<TableHead>Status</TableHead>
<TableHead className="w-1">
<span className="sr-only">Actions</span>
</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{users.length === 0 ? (
<TableRow className="[&>td]:hover:bg-inherit">
<TableCell colSpan={4}>
<p className="text-sm text-foreground">No rules yet</p>
<p className="text-sm text-foreground-lighter">
Add your first temporary access rule above
</p>
</TableCell>
</TableRow>
) : (
users.map((user) => {
const statusDisplay = getJitStatusDisplay(user.status)
const enabledGrants = user.grants.filter((grant) => grant.enabled)
const rowIsInteractive = canUpdate && !disableActions
return (
<TableRow
key={user.id}
className={rowIsInteractive ? 'relative focus-inset cursor-pointer' : undefined}
onClick={
rowIsInteractive
? (event) => {
if ((event.target as HTMLElement).closest('button')) return
onEditRule(user)
}
: undefined
}
onKeyDown={
rowIsInteractive
? (event) => {
if ((event.target as HTMLElement).closest('button')) return
if (event.key === 'Enter' || event.key === ' ') {
event.preventDefault()
onEditRule(user)
}
}
: undefined
}
tabIndex={rowIsInteractive ? 0 : undefined}
>
<TableCell className="text-sm">
{user.name && <p>{user.name}</p>}
<p className="text-foreground-lighter">{user.email}</p>
</TableCell>
<TableCell className="text-sm text-foreground-light">
{enabledGrants.length} role{enabledGrants.length === 1 ? '' : 's'}
</TableCell>
<TableCell className="text-sm text-foreground-light">
{statusDisplay.badges.length > 0 ? (
<span className="flex flex-wrap gap-1.5">
{statusDisplay.badges.map((badge) => (
<Badge key={badge.label} variant={badge.variant}>
{badge.label}
</Badge>
))}
</span>
) : null}
</TableCell>
<TableCell className="text-right">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button
icon={<EllipsisVertical />}
aria-label="More actions"
size="tiny"
className="w-7 hit-area-2"
disabled={!canUpdate || disableActions}
/>
</DropdownMenuTrigger>
<DropdownMenuContent align="end" side="bottom" className="w-40">
<DropdownMenuItem
className="gap-x-2"
onClick={(event) => {
event.stopPropagation()
onEditRule(user)
}}
disabled={!canUpdate || disableActions}
>
<Pencil size={14} className="text-foreground-lighter" />
Edit
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem
className="gap-x-2"
onClick={(event) => {
event.stopPropagation()
onDeleteRule(user)
}}
disabled={!canUpdate || disableActions}
>
<Trash2 size={14} className="text-foreground-lighter" />
Delete
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</TableCell>
</TableRow>
)
})
)}
</TableBody>
</Table>
</CardContent>
</Card>
)
}