Files
supabase/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/AddRestrictionModal.tsx
T
Danny White 1131e3e2ce fix(ui): default Button variant to default instead of primary (#50160)
## What kind of change does this PR introduce?

Bug fix / design-system alignment for the legacy `Button` from `ui`.

## What is the current behavior?

Omitting `variant` on the legacy `Button` falls back to brand-green
`primary`. That makes accidental greens easy, and it is hard to spot the
real main action on busy pages.

## What is the new behavior?

- Legacy `Button` now defaults to neutral `default`
- Intentional primary CTAs (create, save, submit, marketing CTAs, and
matching `ButtonTooltip` usages) now set `variant="primary"` so their
appearance is unchanged
- Neutral actions that previously relied on the old fallback (cancel,
close, back, dashboard nav, and similar) become grey/white
- Design-system docs updated; regression tests cover the new default

`Button_Shadcn_` is unchanged. It already uses its own CVA default.

This is PR 1 of 2 in a stack. PR 2 drops now-redundant
`variant="default"` props.

## To test

Studio (http://localhost:8082):

- `/sign-in`: Sign in stays green
- Open a project → Database → Tables: New table stays green
- Auth → Users → Invite: Invite user stays green; Cancel / dismiss
controls stay neutral
- Project Settings → General: edit a field so Cancel and Save appear.
Cancel is neutral, Save is green

Design system (http://localhost:3003):

- Components → Button: default demo is neutral; primary demo is green;
featured preview is the default variant

Marketing (optional):

- www header: Start your project stays green; logged-in Dashboard is
neutral

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Style**
- Buttons now default to a neutral style, while primary actions across
Studio, documentation, marketing pages, forms, dialogs, and error states
use prominent primary styling.
- Updated button examples and previews clarify the distinction between
default and primary variants.
  - Event registration now includes a directional arrow icon.

- **Tests**
- Added coverage confirming default button styling and explicit primary
styling behave as expected.
- Updated related test fixtures to use primary styling where
appropriate.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2026-09-10 11:23:17 +10:00

287 lines
10 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useParams } from 'common'
import { HelpCircle } from 'lucide-react'
import { useEffect } from 'react'
import { useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
import {
Button,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
Form,
FormControl,
FormField,
Input,
Tooltip,
TooltipContent,
TooltipTrigger,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import * as z from 'zod'
import { checkIfPrivate, getAddressEndRange, normalize } from './NetworkRestrictions.utils'
import InformationBox from '@/components/ui/InformationBox'
import { useNetworkRestrictionsQuery } from '@/data/network-restrictions/network-restrictions-query'
import { useNetworkRestrictionsApplyMutation } from '@/data/network-restrictions/network-retrictions-apply-mutation'
import { DOCS_URL } from '@/lib/constants'
const IPV4_MAX_CIDR_BLOCK_SIZE = 32
const IPV6_MAX_CIDR_BLOCK_SIZE = 128
interface AddRestrictionModalProps {
type?: 'IPv4' | 'IPv6'
hasOverachingRestriction: boolean
onClose: () => void
}
const AddRestrictionModal = ({
type,
hasOverachingRestriction,
onClose,
}: AddRestrictionModalProps) => {
const formId = 'add-restriction-form'
const { ref } = useParams()
const { data } = useNetworkRestrictionsQuery({ projectRef: ref }, { enabled: type !== undefined })
const ipv4Restrictions = data?.config?.dbAllowedCidrs ?? []
// @ts-ignore [Joshen] API typing issue
const ipv6Restrictions = data?.config?.dbAllowedCidrsV6 ?? []
const restrictedIps = ipv4Restrictions.concat(ipv6Restrictions)
const { mutate: applyNetworkRestrictions, isPending: isApplying } =
useNetworkRestrictionsApplyMutation({
onSuccess: () => {
toast.success('Successfully added restriction')
onClose()
},
})
const cidrBlockSizeValidationMessage = `Size has to be between 0 to ${
type === 'IPv4' ? IPV4_MAX_CIDR_BLOCK_SIZE : IPV6_MAX_CIDR_BLOCK_SIZE
}`
const formSchema = z.object({
cidrBlockSize: z
.union([
z.literal(''),
z.coerce
.number()
.min(0, cidrBlockSizeValidationMessage)
.max(
type === 'IPv4' ? IPV4_MAX_CIDR_BLOCK_SIZE : IPV6_MAX_CIDR_BLOCK_SIZE,
cidrBlockSizeValidationMessage
),
])
.refine((value) => value !== '', 'Size is required'),
ipAddress: z
.string()
.min(1, `Please enter a valid IP address`)
.ip({
version: type === 'IPv4' ? 'v4' : 'v6',
message: `Please enter a valid ${type} address`,
})
.refine((val) => !checkIfPrivate(type, val), 'Private IP addresses are not supported'),
})
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
ipAddress: '',
cidrBlockSize: type === 'IPv4' ? IPV4_MAX_CIDR_BLOCK_SIZE : IPV6_MAX_CIDR_BLOCK_SIZE,
},
})
const { reset, formState } = form
const { errors } = formState
useEffect(() => {
reset({
ipAddress: '',
cidrBlockSize: type === 'IPv4' ? IPV4_MAX_CIDR_BLOCK_SIZE : IPV6_MAX_CIDR_BLOCK_SIZE,
})
}, [type, reset])
const onSubmit = async (values: any) => {
if (!ref) return console.error('Project ref is required')
const address = `${values.ipAddress}/${values.cidrBlockSize}`
const normalizedAddress = normalize(address)
const alreadyExists =
restrictedIps.includes(address) || restrictedIps.includes(normalizedAddress)
if (alreadyExists) {
return toast(`The address ${address} is already restricted`)
}
// Need to replace over arching restriction (allow all / disallow all)
if (hasOverachingRestriction) {
const dbAllowedCidrs = type === 'IPv4' ? [normalizedAddress] : []
const dbAllowedCidrsV6 = type === 'IPv6' ? [normalizedAddress] : []
applyNetworkRestrictions({ projectRef: ref, dbAllowedCidrs, dbAllowedCidrsV6 })
} else {
const dbAllowedCidrs =
type === 'IPv4' ? [...ipv4Restrictions, normalizedAddress] : ipv4Restrictions
const dbAllowedCidrsV6 =
type === 'IPv6' ? [...ipv6Restrictions, normalizedAddress] : ipv6Restrictions
applyNetworkRestrictions({ projectRef: ref, dbAllowedCidrs, dbAllowedCidrsV6 })
}
}
const [cidrBlockSize, ipAddress] = useWatch({
name: ['cidrBlockSize', 'ipAddress'],
control: form.control,
})
const availableAddresses =
type === 'IPv4'
? Math.pow(2, IPV4_MAX_CIDR_BLOCK_SIZE - (cidrBlockSize ?? 0))
: Math.pow(2, IPV6_MAX_CIDR_BLOCK_SIZE - (cidrBlockSize ?? 0))
const addressRange =
type !== undefined ? getAddressEndRange(type, `${ipAddress}/${cidrBlockSize}`) : undefined
const isValidCIDR =
errors.cidrBlockSize == null && errors.ipAddress == null && addressRange != null
const normalizedAddress = isValidCIDR
? normalize(`${ipAddress}/${cidrBlockSize}`)
: `${ipAddress}/${cidrBlockSize}`
return (
<Dialog open={type !== undefined} onOpenChange={onClose}>
<DialogContent size="medium">
<DialogHeader>
<DialogTitle>{`Add a new ${type} restriction`}</DialogTitle>
</DialogHeader>
<DialogSectionSeparator />
<Form {...form}>
<DialogSection className="space-y-4">
<p className="text-sm text-foreground-light">
This will add an IP address range to a list of allowed ranges that can access your
database.
</p>
<InformationBox
title="Note: Restrictions only apply to direct connections to your database and connection pooler"
description="They do not currently apply to APIs offered over HTTPS, such as PostgREST, Storage, or Authentication."
urlLabel="Learn more"
url={`${DOCS_URL}/guides/platform/network-restrictions#limitations`}
/>
<form
id={formId}
onSubmit={form.handleSubmit(onSubmit)}
noValidate
className="flex space-x-4"
>
<div className="w-[55%]">
<FormField
control={form.control}
name="ipAddress"
render={({ field }) => (
<FormItemLayout layout="vertical" label={`${type} address`}>
<FormControl>
<Input {...field} placeholder={type === 'IPv4' ? '0.0.0.0' : '::0'} />
</FormControl>
</FormItemLayout>
)}
/>
</div>
<div className="grow">
<FormField
control={form.control}
name="cidrBlockSize"
render={({ field }) => (
<FormItemLayout
layout="vertical"
label={
<div className="flex items-center space-x-2">
<p>CIDR Block Size</p>
<Tooltip>
<TooltipTrigger>
<HelpCircle size="14" strokeWidth={2} />
</TooltipTrigger>
<TooltipContent side="bottom" className="w-80">
Classless inter-domain routing (CIDR) notation is the notation used to
identify networks and hosts in the networks. The block size tells us
how many bits we need to take for the network prefix, and is a value
between 0 to{' '}
{type === 'IPv4'
? IPV4_MAX_CIDR_BLOCK_SIZE
: IPV6_MAX_CIDR_BLOCK_SIZE}
.
</TooltipContent>
</Tooltip>
</div>
}
>
<FormControl>
<Input
{...field}
type="number"
min={0}
max={
type === 'IPv4' ? IPV4_MAX_CIDR_BLOCK_SIZE : IPV6_MAX_CIDR_BLOCK_SIZE
}
placeholder={
type === 'IPv4'
? IPV4_MAX_CIDR_BLOCK_SIZE.toString()
: IPV6_MAX_CIDR_BLOCK_SIZE.toString()
}
/>
</FormControl>
</FormItemLayout>
)}
/>
</div>
</form>
</DialogSection>
<DialogSectionSeparator />
{isValidCIDR ? (
<DialogSection className="space-y-1">
<p className="text-sm">
The address range <code className="text-code-inline">{normalizedAddress}</code> will
be restricted
</p>
<p className="text-sm text-foreground-light">
Selected address space:{' '}
<code className="text-code-inline">{addressRange.start}</code> to{' '}
<code className="text-code-inline">{addressRange.end}</code>{' '}
</p>
<p className="text-sm text-foreground-light">
Number of addresses: {availableAddresses}
</p>
</DialogSection>
) : (
<DialogSection>
<div className="h-[68px] flex items-center">
<p className="text-sm text-foreground-light">
A summary of your restriction will be shown here after entering a valid IP address
and CIDR block size. IP addresses will also be normalized.
</p>
</div>
</DialogSection>
)}
<DialogFooter>
<Button variant="default" disabled={isApplying} onClick={() => onClose()}>
Cancel
</Button>
<Button
variant="primary"
form={formId}
type="submit"
loading={isApplying}
disabled={isApplying}
>
Save restriction
</Button>
</DialogFooter>
</Form>
</DialogContent>
</Dialog>
)
}
export default AddRestrictionModal