Files
supabase/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx
T
Claude 3a0530d2d7 Add AND/OR expiration toggle, move deleted-versions toggle into header, update terminology
Task A: Add ExpirationMode (and/or) toggle between retention-days and
max-versions fields in bucket settings. 'and' = single S3 lifecycle policy
(both conditions must be met), 'or' = two independent rules (either triggers).
Wired into form schema, create/edit bucket modals, and mock store.

Task B: Move 'Show deleted versions' toggle from breadcrumb bar into the
file explorer table header, right of the search input. Switch is on the left
of the label text.

Task C: Add noncurrent version rows beneath each deleted object in TrashList.
Nested rows have left indentation with a CornerDownRight icon and lighter
background. Added DeletedObjectVersion interface and mock data to
protection-mocks.ts. Updated all user-facing terminology from 'files' to
'versions' across Trash, TrashList, TrashSelectionBar, DeletedFilesList,
DeletedFilesHeaderSelection, DeletedFilePreviewPane, and bucket page tabs.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TiUEvmC84bRsteqsWXHY2p
2026-08-07 11:03:16 +00:00

463 lines
17 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useParams } from 'common'
import { useMemo, useState } from 'react'
import { SubmitHandler, useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
import {
Button,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
Form,
FormControl,
FormField,
FormMessage,
Input,
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
Switch,
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import z from 'zod'
import { StorageSizeUnits } from '@/components/interfaces/Storage/StorageSettings/StorageSettings.constants'
import { InlineLink } from '@/components/ui/InlineLink'
import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'
import { useBucketCreateMutation } from '@/data/storage/bucket-create-mutation'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { IS_PLATFORM } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
import { BucketDataProtectionFields } from './BucketDataProtectionFields'
import {
bucketProtectionFormFields,
superRefineBucketProtection,
} from './BucketDataProtectionFields.schema'
import { inverseValidBucketNameRegex, validBucketNameRegex } from './CreateBucketModal.utils'
import {
getVersioningPlanLimits,
setMockBucketProtection,
useIsStorageProtectionEnabled,
type VersioningPlanLimits,
} from './StorageProtection.constants'
import { convertFromBytes, convertToBytes } from './StorageSettings/StorageSettings.utils'
const buildFormSchema = (planLimits: VersioningPlanLimits | null) =>
z
.object({
name: z
.string()
.trim()
.min(1, 'Please provide a name for your bucket')
.max(100, 'Bucket name should be below 100 characters')
.refine(
(value) => !value.endsWith(' '),
'The name of the bucket cannot end with a whitespace'
)
.refine(
(value) => value !== 'public',
'"public" is a reserved name. Please choose another name'
),
public: z.boolean().default(false),
has_file_size_limit: z.boolean().default(false),
formatted_size_limit: z.coerce
.number()
.min(0, 'File size upload limit has to be at least 0')
.optional(),
allowed_mime_types: z.string().trim().default(''),
...bucketProtectionFormFields,
})
.superRefine((data, ctx) => {
if (!validBucketNameRegex.test(data.name)) {
const [match] = data.name.match(inverseValidBucketNameRegex) ?? []
ctx.addIssue({
path: ['name'],
code: z.ZodIssueCode.custom,
message: !!match
? `Bucket name cannot contain the "${match}" character`
: 'Bucket name contains an invalid special character',
})
}
superRefineBucketProtection(data, ctx, planLimits)
})
const formId = 'create-storage-bucket-form'
export type CreateBucketForm = z.infer<ReturnType<typeof buildFormSchema>>
interface CreateBucketModalProps {
open: boolean
onOpenChange: (value: boolean) => void
}
export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalProps) => {
const { ref } = useParams()
const [selectedUnit, setSelectedUnit] = useState<string>(StorageSizeUnits.MB)
const [hasAllowedMimeTypes, setHasAllowedMimeTypes] = useState(false)
const showProtection = useIsStorageProtectionEnabled()
const { data: organization } = useSelectedOrganizationQuery()
const planLimits = getVersioningPlanLimits(organization?.plan.id)
const { data } = useProjectStorageConfigQuery({ projectRef: ref }, { enabled: IS_PLATFORM })
const { value, unit } = convertFromBytes(data?.fileSizeLimit ?? 0)
const formattedGlobalUploadLimit = `${value} ${unit}`
const track = useTrack()
const { mutateAsync: createBucket, isPending: isCreatingBucket } = useBucketCreateMutation({
// [Joshen] Silencing the error here as it's being handled in onSubmit
onError: () => {},
})
// Depends on the org's plan, which loads asynchronously — rebuild the
// schema (and its versioning min/max validation) once it resolves.
const formSchema = useMemo(() => buildFormSchema(planLimits), [planLimits])
const form = useForm<CreateBucketForm>({
resolver: zodResolver(formSchema),
defaultValues: {
name: '',
public: false,
has_file_size_limit: false,
formatted_size_limit: undefined,
allowed_mime_types: '',
enable_versioning: false,
version_expiry_days: '',
max_noncurrent_versions: '',
expiration_mode: 'and',
},
})
const { formatted_size_limit: formattedSizeLimitError } = form.formState.errors
const isPublicBucket = useWatch({ control: form.control, name: 'public' })
const hasFileSizeLimit = useWatch({ control: form.control, name: 'has_file_size_limit' })
const onSubmit: SubmitHandler<CreateBucketForm> = async (values) => {
if (!ref) return console.error('Project ref is required')
// [Joshen] Should shift this into superRefine in the form schema
try {
const fileSizeLimit =
values.has_file_size_limit && values.formatted_size_limit !== undefined
? convertToBytes(values.formatted_size_limit, selectedUnit as StorageSizeUnits)
: undefined
const allowedMimeTypes =
hasAllowedMimeTypes && values.allowed_mime_types.length > 0
? values.allowed_mime_types.split(',').map((x) => x.trim())
: undefined
if (!!fileSizeLimit && !!data?.fileSizeLimit && fileSizeLimit > data.fileSizeLimit) {
return form.setError('formatted_size_limit', {
type: 'manual',
message: 'exceed_global_limit',
})
}
await createBucket({
projectRef: ref,
id: values.name,
type: 'STANDARD',
isPublic: values.public,
file_size_limit: fileSizeLimit,
allowed_mime_types: allowedMimeTypes,
})
track('storage_bucket_created', { bucketType: 'STANDARD' })
// [Prototype] Object versioning has no platform API yet — persist it to
// the in-memory mock store so the buckets list reflects it right away.
setMockBucketProtection(values.name, {
versioning: values.enable_versioning ? 'enabled' : 'disabled',
versionExpiryDays:
values.enable_versioning && typeof values.version_expiry_days === 'number'
? values.version_expiry_days
: null,
maxNoncurrentVersions:
values.enable_versioning && typeof values.max_noncurrent_versions === 'number'
? values.max_noncurrent_versions
: null,
expirationMode: values.expiration_mode,
})
toast.success(`Successfully created bucket ${values.name}`)
form.reset()
setSelectedUnit(StorageSizeUnits.MB)
onOpenChange(false)
} catch (error: any) {
// Handle specific error cases for inline display
const errorMessage = error.message?.toLowerCase() || ''
if (
errorMessage.includes('mime type') &&
(errorMessage.includes('is not supported') || errorMessage.includes('not supported'))
) {
// Set form error for the MIME types field
form.setError('allowed_mime_types', {
type: 'manual',
message: 'Invalid MIME type format. Please check your input.',
})
} else {
// For other errors, show a toast as fallback
toast.error(`Failed to create bucket: ${error.message}`)
}
}
}
const handleClose = () => {
form.reset()
setSelectedUnit(StorageSizeUnits.MB)
onOpenChange(false)
}
return (
<Dialog
open={open}
onOpenChange={(open) => {
if (!open) {
handleClose()
}
}}
>
<DialogContent aria-describedby={undefined}>
<DialogHeader>
<DialogTitle>Create file bucket</DialogTitle>
</DialogHeader>
<DialogSectionSeparator />
<Form {...form}>
<form id={formId} onSubmit={form.handleSubmit(onSubmit)}>
<DialogSection className="flex flex-col gap-y-2">
<FormField
key="name"
name="name"
control={form.control}
render={({ field }) => (
<FormItemLayout
name="name"
label="Bucket name"
labelOptional="Cannot be changed after creation"
>
<FormControl>
<Input
id="name"
data-1p-ignore
data-lpignore="true"
data-form-type="other"
data-bwignore
{...field}
placeholder="Enter bucket name"
/>
</FormControl>
</FormItemLayout>
)}
/>
</DialogSection>
<DialogSectionSeparator />
<DialogSection className="space-y-3">
<FormField
key="public"
name="public"
control={form.control}
render={({ field }) => (
<FormItemLayout
hideMessage
name="public"
label="Public bucket"
description="Allow anyone to read objects without authorization"
layout="flex"
>
<FormControl>
<Switch
id="public"
size="large"
checked={field.value}
onCheckedChange={field.onChange}
/>
</FormControl>
</FormItemLayout>
)}
/>
{isPublicBucket && (
<Admonition
type="warning"
title="Public buckets are not protected"
description="Users can read objects in public buckets without any authorization. Row level security (RLS) policies are still required for other operations such as object uploads and deletes."
/>
)}
</DialogSection>
<DialogSectionSeparator />
<DialogSection className="space-y-2">
<FormField
key="has_file_size_limit"
name="has_file_size_limit"
control={form.control}
render={({ field }) => (
<FormItemLayout
name="has_file_size_limit"
label="Restrict file size"
description="Prevent uploading of files larger than a specified limit"
layout="flex"
>
<FormControl>
<Switch
id="has_file_size_limit"
size="large"
checked={field.value}
onCheckedChange={field.onChange}
/>
</FormControl>
</FormItemLayout>
)}
/>
{hasFileSizeLimit && (
<div>
<FormField
key="formatted_size_limit"
name="formatted_size_limit"
control={form.control}
render={({ field }) => (
<FormItemLayout
hideMessage
name="formatted_size_limit"
label="File size limit"
>
<div className="grid grid-cols-12 gap-x-2">
<div className="col-span-8">
<FormControl>
<Input
id="formatted_size_limit"
aria-label="File size limit"
type="number"
min={0}
placeholder="0"
{...field}
/>
</FormControl>
</div>
<div className="col-span-4">
<Select value={selectedUnit} onValueChange={setSelectedUnit}>
<SelectTrigger aria-label="File size limit unit" size="small">
<SelectValue>{selectedUnit}</SelectValue>
</SelectTrigger>
<SelectContent>
{Object.values(StorageSizeUnits).map((unit: string) => (
<SelectItem key={unit} value={unit} className="text-xs">
{unit}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
</div>
</FormItemLayout>
)}
/>
{formattedSizeLimitError?.message === 'exceed_global_limit' && (
<FormMessage className="mt-2">
Exceeds global limit of {formattedGlobalUploadLimit}. Increase limit in{' '}
<InlineLink
className="text-destructive decoration-destructive-500 hover:decoration-destructive"
href={`/project/${ref}/storage/settings`}
onClick={() => onOpenChange(false)}
>
Storage Settings
</InlineLink>{' '}
first.
</FormMessage>
)}
{IS_PLATFORM && (
<p className="text-sm text-foreground-lighter mt-2">
This project has a{' '}
<InlineLink
className="text-foreground-light hover:text-foreground"
href={`/project/${ref}/storage/settings`}
onClick={() => onOpenChange(false)}
>
global file size limit
</InlineLink>{' '}
of {formattedGlobalUploadLimit}.
</p>
)}
</div>
)}
</DialogSection>
<DialogSectionSeparator />
<DialogSection className="space-y-2">
<FormItemLayout
name="has_allowed_mime_types"
label="Restrict MIME types"
description="Allow only certain types of files to be uploaded"
layout="flex"
>
<FormControl>
<Switch
id="has_allowed_mime_types"
size="large"
checked={hasAllowedMimeTypes}
onCheckedChange={setHasAllowedMimeTypes}
/>
</FormControl>
</FormItemLayout>
{hasAllowedMimeTypes && (
<FormField
key="allowed_mime_types"
name="allowed_mime_types"
control={form.control}
render={({ field }) => (
<FormItemLayout
name="allowed_mime_types"
label="Allowed MIME types"
labelOptional="Comma separated values"
description="Wildcards are allowed, e.g. image/*."
>
<FormControl>
<Input
id="allowed_mime_types"
{...field}
placeholder="e.g image/jpeg, image/png, audio/mpeg, video/mp4, etc"
/>
</FormControl>
</FormItemLayout>
)}
/>
)}
</DialogSection>
{showProtection && <BucketDataProtectionFields isPublicBucket={isPublicBucket} />}
</form>
</Form>
<DialogFooter>
<Button variant="default" disabled={isCreatingBucket} onClick={() => onOpenChange(false)}>
Cancel
</Button>
<Button
form={formId}
type="submit"
loading={isCreatingBucket}
disabled={isCreatingBucket}
>
Create
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)
}