mirror of
https://github.com/supabase/supabase.git
synced 2026-09-22 13:37:53 +08:00
476d4a5851
## 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
242 lines
7.8 KiB
TypeScript
242 lines
7.8 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { useForm, useWatch } from 'react-hook-form'
|
|
import {
|
|
Button,
|
|
Dialog,
|
|
DialogContent,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogSection,
|
|
DialogSectionSeparator,
|
|
DialogTitle,
|
|
Form,
|
|
FormControl,
|
|
FormField,
|
|
Input,
|
|
Select,
|
|
SelectContent,
|
|
SelectItem,
|
|
SelectTrigger,
|
|
SelectValue,
|
|
} from 'ui'
|
|
import { Admonition } from 'ui-patterns/Admonition'
|
|
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
|
|
import * as z from 'zod'
|
|
|
|
import {
|
|
COMPUTE_INSTANCE_DEPLOYABLE_RUNTIMES,
|
|
COMPUTE_INSTANCE_SIZES,
|
|
COMPUTE_REGION,
|
|
} from './Compute.constants'
|
|
import type { ComputeInstanceAccess } from './Compute.types'
|
|
import { formatSize, generateComputeInstanceName } from './Compute.utils'
|
|
import { ComputeInstanceSnippetTabs } from './ComputeInstanceSnippetTabs'
|
|
import { RuntimeBadge } from './RuntimeBadge'
|
|
|
|
const FORM_ID = 'deploy-instance-form'
|
|
|
|
const DeployComputeInstanceFormSchema = z.object({
|
|
name: z
|
|
.string()
|
|
.trim()
|
|
.min(1, 'Name is required')
|
|
.regex(/^[a-z0-9-]+$/, 'Lowercase letters, numbers, and hyphens only'),
|
|
runtime: z.enum(COMPUTE_INSTANCE_DEPLOYABLE_RUNTIMES),
|
|
size: z.enum(COMPUTE_INSTANCE_SIZES),
|
|
access: z.enum(['private', 'public']),
|
|
instances: z
|
|
.union([z.literal(''), z.coerce.number().int().gte(1).lte(10)])
|
|
.refine((value) => value !== '', 'Instances is required'),
|
|
})
|
|
|
|
type DeployComputeInstanceFormValues = z.infer<typeof DeployComputeInstanceFormSchema>
|
|
|
|
const DEFAULT_VALUES: DeployComputeInstanceFormValues = {
|
|
name: '',
|
|
runtime: 'deno',
|
|
size: COMPUTE_INSTANCE_SIZES[0],
|
|
access: 'private',
|
|
instances: 1,
|
|
}
|
|
|
|
const ACCESS_OPTIONS: { value: ComputeInstanceAccess; label: string }[] = [
|
|
{ value: 'private', label: 'Private' },
|
|
{ value: 'public', label: 'Public' },
|
|
]
|
|
|
|
interface DeployComputeInstanceDialogProps {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
}
|
|
|
|
export const DeployComputeInstanceDialog = ({
|
|
open,
|
|
onOpenChange,
|
|
}: DeployComputeInstanceDialogProps) => {
|
|
const form = useForm<DeployComputeInstanceFormValues>({
|
|
mode: 'onBlur',
|
|
resolver: zodResolver(DeployComputeInstanceFormSchema),
|
|
defaultValues: { ...DEFAULT_VALUES, name: generateComputeInstanceName() },
|
|
})
|
|
|
|
const [name, runtime, size, access, instances] = useWatch({
|
|
control: form.control,
|
|
name: ['name', 'runtime', 'size', 'access', 'instances'],
|
|
})
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent size="large">
|
|
<DialogHeader>
|
|
<DialogTitle>Deploy</DialogTitle>
|
|
</DialogHeader>
|
|
|
|
<DialogSectionSeparator />
|
|
|
|
<Admonition
|
|
type="note"
|
|
title="This dashboard is read-only during the Private Alpha"
|
|
description={`Configure an instance below, then deploy it locally. Compute instances only deploy to ${COMPUTE_REGION} during alpha.`}
|
|
className="border-x-0 border-y-0 rounded-none"
|
|
/>
|
|
|
|
<DialogSectionSeparator />
|
|
|
|
<DialogSection>
|
|
<Form {...form}>
|
|
<form id={FORM_ID} className="flex flex-col gap-y-4">
|
|
<FormField
|
|
control={form.control}
|
|
name="name"
|
|
render={({ field }) => (
|
|
<FormItemLayout label="Name">
|
|
<FormControl>
|
|
<Input {...field} placeholder="my-instance" />
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
|
|
<FormField
|
|
control={form.control}
|
|
name="runtime"
|
|
render={({ field }) => (
|
|
<FormItemLayout label="Runtime">
|
|
<Select value={field.value} onValueChange={field.onChange}>
|
|
<FormControl>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
</FormControl>
|
|
<SelectContent>
|
|
{COMPUTE_INSTANCE_DEPLOYABLE_RUNTIMES.map((value) => (
|
|
<SelectItem key={value} value={value}>
|
|
<RuntimeBadge runtime={value} />
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
|
|
<FormField
|
|
control={form.control}
|
|
name="size"
|
|
render={({ field }) => (
|
|
<FormItemLayout
|
|
label="Size"
|
|
description="Fixed at deploy time and cannot be changed later"
|
|
>
|
|
<Select value={field.value} onValueChange={field.onChange}>
|
|
<FormControl>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
</FormControl>
|
|
<SelectContent>
|
|
{COMPUTE_INSTANCE_SIZES.map((value) => (
|
|
<SelectItem key={value} value={value}>
|
|
{formatSize(value)}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
|
|
<FormField
|
|
control={form.control}
|
|
name="access"
|
|
render={({ field }) => (
|
|
<FormItemLayout
|
|
label="Access"
|
|
description="Public instances accept requests with a publishable key"
|
|
>
|
|
<Select value={field.value} onValueChange={field.onChange}>
|
|
<FormControl>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
</FormControl>
|
|
<SelectContent>
|
|
{ACCESS_OPTIONS.map((option) => (
|
|
<SelectItem key={option.value} value={option.value}>
|
|
{option.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
|
|
<FormField
|
|
control={form.control}
|
|
name="instances"
|
|
render={({ field }) => (
|
|
<FormItemLayout label="Instances" description="1 to 10">
|
|
<FormControl>
|
|
<Input
|
|
{...field}
|
|
type="number"
|
|
min={1}
|
|
max={10}
|
|
onChange={(e) =>
|
|
field.onChange(
|
|
Number.isNaN(e.target.valueAsNumber) ? '' : e.target.valueAsNumber
|
|
)
|
|
}
|
|
/>
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
</form>
|
|
</Form>
|
|
</DialogSection>
|
|
|
|
<DialogSectionSeparator />
|
|
|
|
<DialogSection>
|
|
<ComputeInstanceSnippetTabs
|
|
input={{
|
|
name: name ?? '',
|
|
runtime: runtime ?? DEFAULT_VALUES.runtime,
|
|
size: size ?? DEFAULT_VALUES.size,
|
|
access: access ?? DEFAULT_VALUES.access,
|
|
instances: typeof instances === 'number' ? instances : DEFAULT_VALUES.instances,
|
|
}}
|
|
tabs={['ai', 'cli', 'config']}
|
|
/>
|
|
</DialogSection>
|
|
|
|
<DialogFooter>
|
|
<Button onClick={() => onOpenChange(false)}>Cancel</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|