Files
Gildas Garcia 96d43099bb chore: refactor Button API so that it can be used a standard button (#46880)
## Problem

Our `<Button>` component breaks the default `button` contract by
redefining the `type` prop to set its variant (`primary`, `default`,
etc) instead of the button type (`submit`, `button`, etc).
This is confusing and forces to write more code when using it with
shadcn components that expect/inject the standard button props.

## Solution

- rename the `type` prop to `variant`
- rename the `htmlType` prop to `type`
- propagate the changes where necessary
- format code

## How to test

As this is just prop renaming, if it builds it's ok

---------

Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com>
2026-06-16 23:59:58 +02:00

334 lines
11 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useParams } from 'common'
import { Eye, EyeOff, Trash } from 'lucide-react'
import { useState } from 'react'
import { SubmitHandler, useFieldArray, useForm } from 'react-hook-form'
import { toast } from 'sonner'
import {
Button,
Card,
CardContent,
CardFooter,
CardHeader,
CardTitle,
cn,
ExpandingTextArea,
Form,
FormControl,
FormField,
Tooltip,
TooltipContent,
TooltipTrigger,
} from 'ui'
import { Input } from 'ui-patterns/DataInputs/Input'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import z from 'zod'
import { DuplicateSecretWarningModal } from './DuplicateSecretWarningModal'
import { useSecretsCreateMutation } from '@/data/secrets/secrets-create-mutation'
import { useSecretsQuery } from '@/data/secrets/secrets-query'
type SecretPair = {
name: string
value: string
}
const FormSchema = z.object({
secrets: z.array(
z.object({
name: z
.string()
.min(1, 'Please provide a name for your secret')
.refine((value) => !value.match(/^(SUPABASE_).*/), {
message: 'Name must not start with the SUPABASE_ prefix',
}),
value: z.string().min(1, 'Please provide a value for your secret'),
})
),
})
const defaultValues = {
secrets: [{ name: '', value: '' }],
}
const removeWrappingQuotes = (str: string): string => {
if ((str.startsWith('"') && str.endsWith('"')) || (str.startsWith("'") && str.endsWith("'"))) {
return str.slice(1, -1)
}
return str
}
export const AddNewSecretForm = () => {
const { ref: projectRef } = useParams()
const [visibleSecrets, setVisibleSecrets] = useState<Set<string>>(new Set())
const [duplicateSecretName, setDuplicateSecretName] = useState<string>('')
const [pendingSecrets, setPendingSecrets] = useState<z.infer<typeof FormSchema> | null>(null)
const form = useForm({
resolver: zodResolver(FormSchema),
defaultValues,
})
const { fields, append, remove } = useFieldArray({
control: form.control,
name: 'secrets',
})
const { data: existingSecrets } = useSecretsQuery({
projectRef: projectRef,
})
function handlePaste(e: ClipboardEvent) {
e.preventDefault()
const text = e.clipboardData?.getData('text')
if (!text) return
// If text doesn't contain '=' and is being pasted into a specific field, handle as single value
if (!text.includes('=')) {
const inputName = (e.target as HTMLInputElement).name
if (inputName?.includes('secrets')) {
const [_, indexStr, field] = inputName.match(/secrets\.(\d+)\.(\w+)/) || []
if (indexStr && field) {
const index = parseInt(indexStr)
form.setValue(
`secrets.${index}.${field}` as `secrets.${number}.name` | `secrets.${number}.value`,
text.trim()
)
return
}
}
}
const pairs: Array<SecretPair> = []
try {
const jsonData = JSON.parse(text)
Object.entries(jsonData).forEach(([key, value]) => {
pairs.push({ name: key, value: String(value) })
})
} catch {
// Try KEY=VALUE format (multiple lines)
const lines = text.split(/\n/)
lines.forEach((line) => {
const [key, ...valueParts] = line.split('=')
if (key && valueParts.length) {
const valueStr = valueParts.join('=').trim()
pairs.push({
name: key.trim(),
value: removeWrappingQuotes(valueStr),
})
}
})
}
if (pairs.length) {
const currentSecrets = form.getValues('secrets')
// Filter out any empty pairs before combining
const nonEmptySecrets = currentSecrets.filter((secret) => secret.name || secret.value)
form.setValue('secrets', [...nonEmptySecrets, ...pairs])
}
}
const { mutate: createSecret, isPending: isCreating } = useSecretsCreateMutation({
onSuccess: (_, variables) => {
toast.success(`Successfully created new secret "${variables.secrets[0].name}"`)
// RHF recommends using setTimeout/useEffect to reset the form
setTimeout(() => {
form.reset()
setVisibleSecrets(new Set())
}, 0)
},
})
const onSubmit: SubmitHandler<z.infer<typeof FormSchema>> = async (data) => {
// Check for duplicate secret names
const existingSecretNames = existingSecrets?.map((secret) => secret.name) || []
const duplicateSecret = data.secrets.find((secret) => existingSecretNames.includes(secret.name))
if (duplicateSecret) {
setDuplicateSecretName(duplicateSecret.name)
setPendingSecrets(data)
return
}
createSecret({ projectRef, secrets: data.secrets })
}
const handleConfirmDuplicate = () => {
if (pendingSecrets) {
createSecret({ projectRef, secrets: pendingSecrets.secrets })
setDuplicateSecretName('')
setPendingSecrets(null)
}
}
const handleCancelDuplicate = () => {
setDuplicateSecretName('')
setPendingSecrets(null)
}
const handleToggleSecretVisibility = (fieldId: string) => {
setVisibleSecrets((prev) => {
const visibleSet = new Set(prev)
if (visibleSet.has(fieldId)) {
visibleSet.delete(fieldId)
} else {
visibleSet.add(fieldId)
}
return visibleSet
})
}
const handleRemoveSecret = (fieldId: string, index: number) => {
if (fields.length > 1) {
setVisibleSecrets((prev) => {
const visibleSet = new Set(prev)
visibleSet.delete(fieldId)
return visibleSet
})
remove(index)
} else {
form.reset(defaultValues)
setVisibleSecrets(new Set())
}
}
const handleAddAnotherSecret = () => {
append({ name: '', value: '' })
}
const isSecretVisible = (fieldId: string) => visibleSecrets.has(fieldId)
return (
<>
<Form {...form}>
<form className="w-full" onSubmit={form.handleSubmit(onSubmit)}>
<Card>
<CardHeader>
<CardTitle>Add or replace secrets</CardTitle>
</CardHeader>
<CardContent>
{fields.map((fieldItem, index) => (
<div
key={fieldItem.id}
className={cn(
'flex flex-col gap-4 last:mb-0 mb-4',
index > 0 &&
'border-t border-default pt-4 -mx-(--card-padding-x) px-(--card-padding-x)'
)}
>
<FormField
control={form.control}
name={`secrets.${index}.name`}
render={({ field }) => (
<FormItemLayout
label="Name"
layout="flex-row-reverse"
description="A unique name for your secret."
>
<div className="flex w-full items-center gap-2">
<FormControl className="flex-1">
<Input
{...field}
className="w-full font-mono"
containerClassName="w-full"
placeholder="e.g. CLIENT_KEY"
data-1p-ignore
data-lpignore="true"
data-form-type="other"
data-bwignore
onPaste={(e) => handlePaste(e.nativeEvent)}
/>
</FormControl>
<Button
variant="default"
className="w-[34px] h-[34px] shrink-0 p-0"
aria-label="Remove secret"
icon={<Trash size={12} />}
disabled={fields.length <= 1}
onClick={() => handleRemoveSecret(fieldItem.id, index)}
/>
</div>
</FormItemLayout>
)}
/>
<FormField
control={form.control}
name={`secrets.${index}.value`}
render={({ field }) => (
<FormItemLayout
label="Value"
layout="flex-row-reverse"
description="Supports multi-line values such as PEM keys, JSON, or functions."
>
<FormControl>
<div className="relative w-full">
<ExpandingTextArea
{...field}
data-1p-ignore
data-lpignore="true"
data-form-type="other"
data-bwignore
className="font-mono max-h-[320px] pr-10"
style={
{
WebkitTextSecurity: isSecretVisible(fieldItem.id)
? undefined
: 'disc',
} as React.CSSProperties
}
/>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="text"
className="absolute right-3 top-2 px-1"
aria-label={
isSecretVisible(fieldItem.id)
? 'Hide secret value'
: 'Show secret value'
}
icon={isSecretVisible(fieldItem.id) ? <EyeOff /> : <Eye />}
onClick={() => handleToggleSecretVisibility(fieldItem.id)}
/>
</TooltipTrigger>
<TooltipContent side="bottom">
{isSecretVisible(fieldItem.id) ? 'Hide value' : 'Show value'}
</TooltipContent>
</Tooltip>
</div>
</FormControl>
</FormItemLayout>
)}
/>
</div>
))}
</CardContent>
<CardFooter className="justify-between space-x-2">
<p className="text-sm text-foreground-muted">
Insert or update multiple secrets at once by pasting key-value pairs
</p>
<div className="flex items-center space-x-2">
<Button variant="default" onClick={handleAddAnotherSecret}>
Add another
</Button>
<Button variant="primary" type="submit" disabled={isCreating} loading={isCreating}>
{isCreating ? 'Saving...' : fields.length > 1 ? 'Bulk save' : 'Save'}
</Button>
</div>
</CardFooter>
</Card>
</form>
</Form>
<DuplicateSecretWarningModal
visible={!!duplicateSecretName}
onCancel={handleCancelDuplicate}
onConfirm={handleConfirmDuplicate}
isCreating={isCreating}
secretName={duplicateSecretName}
/>
</>
)
}