mirror of
https://github.com/supabase/supabase.git
synced 2026-10-08 02:45:07 +03:00
## 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
256 lines
8.0 KiB
TypeScript
256 lines
8.0 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import dayjs from 'dayjs'
|
|
import { ExternalLink } from 'lucide-react'
|
|
import { useState } from 'react'
|
|
import { useForm, type SubmitHandler } from 'react-hook-form'
|
|
import { toast } from 'sonner'
|
|
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 { z } from 'zod'
|
|
|
|
import {
|
|
CLASSIC_TOKEN_WARNING,
|
|
CUSTOM_EXPIRY_VALUE,
|
|
EXPIRES_AT_OPTIONS,
|
|
} from '../AccessToken.constants'
|
|
import { getExpirationDate, getMaxCustomExpiryDate } from '../AccessToken.utils'
|
|
import { DatePicker } from '@/components/ui/DatePicker'
|
|
import {
|
|
useAccessTokenCreateMutation,
|
|
type NewAccessToken,
|
|
} from '@/data/access-tokens/access-tokens-create-mutation'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
|
|
const formId = 'new-access-token-form'
|
|
|
|
const TokenSchema = z.object({
|
|
tokenName: z.string().min(1, 'Please enter a name for the token'),
|
|
expiresAt: z.string().min(1, 'Please select an expiry'),
|
|
})
|
|
|
|
export interface NewAccessTokenDialogProps {
|
|
open: boolean
|
|
tokenScope?: 'V0' | undefined
|
|
onOpenChange: (open: boolean) => void
|
|
onCreateToken: (token: NewAccessToken) => void
|
|
}
|
|
|
|
export const NewTokenDialog = ({
|
|
open,
|
|
tokenScope,
|
|
onOpenChange,
|
|
onCreateToken,
|
|
}: NewAccessTokenDialogProps) => {
|
|
const [customExpiryDate, setCustomExpiryDate] = useState<{ date: string } | undefined>(undefined)
|
|
const [isCustomExpiry, setIsCustomExpiry] = useState(false)
|
|
|
|
const form = useForm<z.infer<typeof TokenSchema>>({
|
|
resolver: zodResolver(TokenSchema),
|
|
defaultValues: { tokenName: '', expiresAt: EXPIRES_AT_OPTIONS['month'].value },
|
|
mode: 'onChange',
|
|
})
|
|
const track = useTrack()
|
|
const { mutate: createAccessToken, isPending } = useAccessTokenCreateMutation()
|
|
|
|
const onSubmit: SubmitHandler<z.infer<typeof TokenSchema>> = async (values) => {
|
|
let expiresAt: string | undefined
|
|
|
|
if (isCustomExpiry && customExpiryDate) {
|
|
expiresAt = customExpiryDate.date
|
|
} else {
|
|
expiresAt = getExpirationDate(values.expiresAt)
|
|
}
|
|
|
|
createAccessToken(
|
|
{ name: values.tokenName, scope: tokenScope, expires_at: expiresAt },
|
|
{
|
|
onSuccess: (data) => {
|
|
track('access_token_created', {
|
|
tokenType: 'classic',
|
|
expiryPreset: values.expiresAt,
|
|
})
|
|
toast.success('Access token created successfully')
|
|
onCreateToken(data)
|
|
handleClose()
|
|
},
|
|
}
|
|
)
|
|
}
|
|
|
|
const handleClose = () => {
|
|
form.reset()
|
|
setCustomExpiryDate(undefined)
|
|
setIsCustomExpiry(false)
|
|
onOpenChange(false)
|
|
}
|
|
|
|
const handleExpiryChange = (value: string) => {
|
|
if (value === CUSTOM_EXPIRY_VALUE) {
|
|
setIsCustomExpiry(true)
|
|
// Set a default custom date (today at 23:59:59)
|
|
const defaultCustomDate = {
|
|
date: dayjs().endOf('day').toISOString(),
|
|
}
|
|
setCustomExpiryDate(defaultCustomDate)
|
|
form.setValue('expiresAt', value)
|
|
} else {
|
|
setIsCustomExpiry(false)
|
|
setCustomExpiryDate(undefined)
|
|
form.setValue('expiresAt', value)
|
|
}
|
|
}
|
|
|
|
const handleCustomDateChange = (value: { date: string }) => {
|
|
setCustomExpiryDate(value)
|
|
}
|
|
|
|
return (
|
|
<Dialog
|
|
open={open}
|
|
onOpenChange={(open) => {
|
|
if (!open) {
|
|
form.reset()
|
|
setCustomExpiryDate(undefined)
|
|
setIsCustomExpiry(false)
|
|
}
|
|
onOpenChange(open)
|
|
}}
|
|
>
|
|
<DialogContent>
|
|
<DialogHeader>
|
|
<DialogTitle>
|
|
{tokenScope === 'V0' ? 'Generate token for experimental API' : 'Generate New Token'}
|
|
</DialogTitle>
|
|
</DialogHeader>
|
|
<DialogSectionSeparator />
|
|
{tokenScope === 'V0' ? (
|
|
<Admonition
|
|
type="warning"
|
|
className="rounded-none border-t-0 border-x-0"
|
|
title="The experimental API provides additional endpoints which allows you to manage your organizations and projects."
|
|
description={
|
|
<>
|
|
<p>
|
|
These include deleting organizations and projects which cannot be undone. As such,
|
|
be very careful when using this API.
|
|
</p>
|
|
<div className="mt-4">
|
|
<Button asChild icon={<ExternalLink />}>
|
|
<a href="https://api.supabase.com/api/v0" target="_blank" rel="noreferrer">
|
|
Experimental API documentation
|
|
</a>
|
|
</Button>
|
|
</div>
|
|
</>
|
|
}
|
|
/>
|
|
) : (
|
|
<Admonition
|
|
type="warning"
|
|
className="rounded-none border-t-0 border-x-0"
|
|
title={CLASSIC_TOKEN_WARNING.title}
|
|
description={CLASSIC_TOKEN_WARNING.description}
|
|
/>
|
|
)}
|
|
<DialogSection className="flex flex-col gap-4">
|
|
<Form {...form}>
|
|
<form
|
|
id={formId}
|
|
className="flex flex-col gap-4"
|
|
onSubmit={form.handleSubmit(onSubmit)}
|
|
>
|
|
<FormField
|
|
key="tokenName"
|
|
name="tokenName"
|
|
control={form.control}
|
|
render={({ field }) => (
|
|
<FormItemLayout label="Name">
|
|
<FormControl>
|
|
<Input {...field} placeholder="Provide a name for your token" />
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
<FormField
|
|
key="expiresAt"
|
|
name="expiresAt"
|
|
control={form.control}
|
|
render={({ field }) => (
|
|
<FormItemLayout label="Expires in">
|
|
<div className="flex gap-2">
|
|
<Select value={field.value} onValueChange={handleExpiryChange}>
|
|
<FormControl className="grow">
|
|
<SelectTrigger>
|
|
<SelectValue placeholder="Expires at" />
|
|
</SelectTrigger>
|
|
</FormControl>
|
|
<SelectContent>
|
|
{Object.values(EXPIRES_AT_OPTIONS).map(
|
|
(option: { value: string; label: string }) => (
|
|
<SelectItem key={option.value} value={option.value}>
|
|
{option.label}
|
|
</SelectItem>
|
|
)
|
|
)}
|
|
</SelectContent>
|
|
</Select>
|
|
{isCustomExpiry && (
|
|
<DatePicker
|
|
selectsRange={false}
|
|
triggerButtonSize="small"
|
|
contentSide="top"
|
|
to={customExpiryDate?.date}
|
|
minDate={new Date()}
|
|
maxDate={getMaxCustomExpiryDate().toDate()}
|
|
onChange={(date) => {
|
|
if (date.to) handleCustomDateChange({ date: date.to })
|
|
}}
|
|
/>
|
|
)}
|
|
</div>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
</form>
|
|
</Form>
|
|
</DialogSection>
|
|
<DialogFooter>
|
|
<Button
|
|
disabled={isPending}
|
|
onClick={() => {
|
|
form.reset()
|
|
setCustomExpiryDate(undefined)
|
|
setIsCustomExpiry(false)
|
|
onOpenChange(false)
|
|
}}
|
|
>
|
|
Cancel
|
|
</Button>
|
|
<Button variant="primary" form={formId} type="submit" loading={isPending}>
|
|
Generate token
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|