Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore: Reorganize the Files buckets code (#51350)

Ivan Vasilov9d1661dec154
diff --git a/.agents/skills/react-hook-form/SKILL.md b/.agents/skills/react-hook-form/SKILL.md
index 064fd1fd454..ae333a4fd5f 100644
--- a/.agents/skills/react-hook-form/SKILL.md
+++ b/.agents/skills/react-hook-form/SKILL.md
@@ -170,7 +170,7 @@ buttons.
must read one of them in the owner, or the next refetch will discard array
edits. (Good examples:
`components/interfaces/Settings/Database/ConnectionLogging.tsx`,
- `components/interfaces/Storage/EditBucketModal.tsx`.)
+ `components/interfaces/Storage/FilesBuckets/EditBucketModal.tsx`.)
- **After a successful mutation, re-baseline the form** in `onSuccess` so the
saved state becomes the new baseline (`isDirty` returns to false, Cancel now
reverts to the saved values). Prefer what the server actually persisted: if the
diff --git a/apps/studio/.github/eslint-rule-baselines.json b/apps/studio/.github/eslint-rule-baselines.json
index 4fdc6d40801..48863a87939 100644
--- a/apps/studio/.github/eslint-rule-baselines.json
+++ b/apps/studio/.github/eslint-rule-baselines.json
@@ -422,7 +422,7 @@
"components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/index.tsx": 1,
"components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/useAnalyticsBucketAssociatedEntities.tsx": 4,
"components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx": 1,
- "components/interfaces/Storage/CreateBucketModal.tsx": 1,
+ "components/interfaces/Storage/FilesBuckets/CreateBucketModal.tsx": 1,
"components/interfaces/Storage/ImportForeignSchemaDialog.tsx": 1,
"components/interfaces/Storage/Storage.utils.ts": 4,
"components/interfaces/Storage/StorageBucketsError.tsx": 1,
@@ -921,8 +921,8 @@
"components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/NamespaceWithTables/TableRowComponent.tsx": 3,
"components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/NamespaceWithTables/index.tsx": 1,
"components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx": 4,
- "components/interfaces/Storage/CreateBucketModal.tsx": 3,
- "components/interfaces/Storage/EditBucketModal.tsx": 3,
+ "components/interfaces/Storage/FilesBuckets/CreateBucketModal.tsx": 3,
+ "components/interfaces/Storage/FilesBuckets/EditBucketModal.tsx": 3,
"components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx": 2,
"components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx": 1,
"components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx": 2,
diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsx
index 93e3e0240fe..dcd6c0e09f9 100644
--- a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsx
+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsx
@@ -15,8 +15,8 @@ import { Admonition } from 'ui-patterns/Admonition'
import { Input } from 'ui-patterns/DataInputs/Input'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import { CreateBucketModal } from '../CreateBucketModal'
import { EmptyBucketState } from '../EmptyBucketState'
+import { CreateBucketModal } from '../FilesBuckets/CreateBucketModal'
import { CreateBucketButton } from '../NewBucketButton'
import { STORAGE_BUCKET_SORT } from '../Storage.constants'
import { useStoragePreference } from '../StorageExplorer/useStoragePreference'
diff --git a/apps/studio/components/interfaces/Storage/CreateBucketModal.utils.ts b/apps/studio/components/interfaces/Storage/CreateBucketModal.utils.ts
deleted file mode 100644
index 2f10e8ced95..00000000000
--- a/apps/studio/components/interfaces/Storage/CreateBucketModal.utils.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// [Joshen] These are referenced from the storage API directly here
-// https://github.com/supabase/storage/blob/69e4a40799a9d10be0a63a37cbb46d7d9bea0e17/src/storage/limits.ts#L59
-
-// only allow s3 safe characters and characters which require special handling for now
-// the slash restriction come from bucket naming rules
-// and the rest of the validation rules are based on S3 object key validation.
-// https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
-// https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html
-export const validBucketNameRegex = /^(\w|!|-|\.|\*|'|\(|\)| |&|\$|@|=|;|:|\+|,|\?)*$/
-export const inverseValidBucketNameRegex = /[^A-Za-z0-9_!\-.*'() &$@=;:+,?]/
-
-// only allow s3 safe characters and characters which require special handling for now
-// https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
-export const validObjectKeyRegex = /^(\w|\/|!|-|\.|\*|'|\(|\)| |&|\$|@|=|;|:|\+|,|\?)*$/
-export const inverseValidObjectKeyRegex = /[^A-Za-z0-9_\/!\-.*'() &$@=;:+,?]/
diff --git a/apps/studio/components/interfaces/Storage/BucketVersioningFields.schema.test.ts b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.schema.test.ts
similarity index 100%
rename from apps/studio/components/interfaces/Storage/BucketVersioningFields.schema.test.ts
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.schema.test.ts
diff --git a/apps/studio/components/interfaces/Storage/BucketVersioningFields.schema.ts b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.schema.ts
similarity index 94%
rename from apps/studio/components/interfaces/Storage/BucketVersioningFields.schema.ts
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.schema.ts
index 9812a81cfc1..3d90f1dff63 100644
--- a/apps/studio/components/interfaces/Storage/BucketVersioningFields.schema.ts
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.schema.ts
@@ -1,6 +1,6 @@
import { z } from 'zod'
-import type { ExpirationMode } from './StorageVersioning.constants'
+import type { ExpirationMode } from '@/components/interfaces/Storage/StorageVersioning.constants'
/** Empty drops the condition from the policy, which is distinct from zero. */
const versioningNumberField = z.union([z.literal(''), z.coerce.number().int()])
diff --git a/apps/studio/components/interfaces/Storage/BucketVersioningFields.test.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.test.tsx
similarity index 98%
rename from apps/studio/components/interfaces/Storage/BucketVersioningFields.test.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.test.tsx
index b863797eb3a..d424531f1c3 100644
--- a/apps/studio/components/interfaces/Storage/BucketVersioningFields.test.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.test.tsx
@@ -12,7 +12,7 @@ import {
superRefineBucketVersioning,
type BucketVersioningFormValues,
} from './BucketVersioningFields.schema'
-import type { BucketVersioningState } from './StorageVersioning.constants'
+import type { BucketVersioningState } from '@/components/interfaces/Storage/StorageVersioning.constants'
import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock } from '@/tests/lib/msw'
diff --git a/apps/studio/components/interfaces/Storage/BucketVersioningFields.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.tsx
similarity index 98%
rename from apps/studio/components/interfaces/Storage/BucketVersioningFields.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.tsx
index d3f01ef04bf..751544e0bc5 100644
--- a/apps/studio/components/interfaces/Storage/BucketVersioningFields.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.tsx
@@ -11,7 +11,10 @@ import {
toNullableNumber,
} from './BucketVersioningFields.utils'
import { LifecyclePolicySection } from './LifecyclePolicySection'
-import type { BucketVersioningState, ExpirationMode } from './StorageVersioning.constants'
+import type {
+ BucketVersioningState,
+ ExpirationMode,
+} from '@/components/interfaces/Storage/StorageVersioning.constants'
import { FormSectionCollapse } from '@/components/ui/FormSectionCollapse'
interface BucketVersioningFieldsProps {
diff --git a/apps/studio/components/interfaces/Storage/BucketVersioningFields.utils.test.ts b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.utils.test.ts
similarity index 100%
rename from apps/studio/components/interfaces/Storage/BucketVersioningFields.utils.test.ts
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.utils.test.ts
diff --git a/apps/studio/components/interfaces/Storage/BucketVersioningFields.utils.ts b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.utils.ts
similarity index 94%
rename from apps/studio/components/interfaces/Storage/BucketVersioningFields.utils.ts
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.utils.ts
index 90f579fadcc..508b4aa5be2 100644
--- a/apps/studio/components/interfaces/Storage/BucketVersioningFields.utils.ts
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/BucketVersioningFields.utils.ts
@@ -1,4 +1,4 @@
-import type { BucketVersioningState } from './StorageVersioning.constants'
+import type { BucketVersioningState } from '@/components/interfaces/Storage/StorageVersioning.constants'
export type RetentionTightening = 'none' | 'days' | 'versions' | 'both'
diff --git a/apps/studio/components/interfaces/Storage/ExpirationModeToggle.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/ExpirationModeToggle.tsx
similarity index 91%
rename from apps/studio/components/interfaces/Storage/ExpirationModeToggle.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/ExpirationModeToggle.tsx
index 72a2123adfe..922725242d8 100644
--- a/apps/studio/components/interfaces/Storage/ExpirationModeToggle.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/ExpirationModeToggle.tsx
@@ -1,6 +1,6 @@
import { RadioGroupStacked, RadioGroupStackedItem } from 'ui'
-import type { ExpirationMode } from './StorageVersioning.constants'
+import type { ExpirationMode } from '@/components/interfaces/Storage/StorageVersioning.constants'
interface ExpirationModeToggleProps {
mode: ExpirationMode
diff --git a/apps/studio/components/interfaces/Storage/LifecyclePolicySection.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/LifecyclePolicySection.tsx
similarity index 98%
rename from apps/studio/components/interfaces/Storage/LifecyclePolicySection.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/LifecyclePolicySection.tsx
index cf6e4da5035..b5b8019a4c8 100644
--- a/apps/studio/components/interfaces/Storage/LifecyclePolicySection.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/BucketVersioningFields/LifecyclePolicySection.tsx
@@ -16,7 +16,7 @@ import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import type { BucketVersioningFormValues } from './BucketVersioningFields.schema'
import { ExpirationModeToggle } from './ExpirationModeToggle'
-import type { ExpirationMode } from './StorageVersioning.constants'
+import type { ExpirationMode } from '@/components/interfaces/Storage/StorageVersioning.constants'
import { AlertError } from '@/components/ui/AlertError'
import { FormSectionCollapse } from '@/components/ui/FormSectionCollapse'
diff --git a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.tsx
similarity index 89%
rename from apps/studio/components/interfaces/Storage/CreateBucketModal.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.tsx
index fd16c6897fc..e4bdb7cf974 100644
--- a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/CreateBucketModal.tsx
@@ -26,57 +26,21 @@ import {
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
-import z from 'zod'
-import { inverseValidBucketNameRegex, validBucketNameRegex } from './CreateBucketModal.utils'
-import { convertFromBytes, convertToBytes } from './StorageSettings/StorageSettings.utils'
+import { BucketFormSchema, type BucketFormValues } from './FilesBucket.schema'
import { StorageSizeUnits } from '@/components/interfaces/Storage/StorageSettings/StorageSettings.constants'
+import {
+ convertFromBytes,
+ convertToBytes,
+} from '@/components/interfaces/Storage/StorageSettings/StorageSettings.utils'
import { InlineLink } from '@/components/ui/InlineLink'
import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'
import { useBucketCreateMutation } from '@/data/storage/bucket-create-mutation'
import { IS_PLATFORM } from '@/lib/constants'
import { useTrack } from '@/lib/telemetry/track'
-const FormSchema = 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(''),
- })
- .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',
- })
- }
- })
-
const formId = 'create-storage-bucket-form'
-export type CreateBucketForm = z.infer<typeof FormSchema>
-
interface CreateBucketModalProps {
open: boolean
onOpenChange: (value: boolean) => void
@@ -97,8 +61,8 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalProps
onError: () => {},
})
- const form = useForm<CreateBucketForm>({
- resolver: zodResolver(FormSchema),
+ const form = useForm<BucketFormValues>({
+ resolver: zodResolver(BucketFormSchema),
defaultValues: {
name: '',
public: false,
@@ -111,7 +75,7 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalProps
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) => {
+ const onSubmit: SubmitHandler<BucketFormValues> = async (values) => {
if (!ref) return console.error('Project ref is required')
// [Joshen] Should shift this into superRefine in the form schema
diff --git a/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/DeleteBucketModal.tsx
similarity index 97%
rename from apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/DeleteBucketModal.tsx
index 4be62e31def..7d2acf649f1 100644
--- a/apps/studio/components/interfaces/Storage/DeleteBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/DeleteBucketModal.tsx
@@ -2,7 +2,7 @@ import { useParams } from 'common'
import { useRouter } from 'next/router'
import { toast } from 'sonner'
-import { extractBucketNameFromDefinition } from './Storage.utils'
+import { extractBucketNameFromDefinition } from '@/components/interfaces/Storage/Storage.utils'
import { TextConfirmModal } from '@/components/ui/TextConfirmModalWrapper'
import { useDatabasePoliciesQuery } from '@/data/database-policies/database-policies-query'
import { useDatabasePolicyDeleteMutation } from '@/data/database-policies/database-policy-delete-mutation'
diff --git a/apps/studio/components/interfaces/Storage/EditBucketModal.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/EditBucketModal.tsx
similarity index 96%
rename from apps/studio/components/interfaces/Storage/EditBucketModal.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/EditBucketModal.tsx
index 1a62501d678..c9c3f817158 100644
--- a/apps/studio/components/interfaces/Storage/EditBucketModal.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/EditBucketModal.tsx
@@ -26,8 +26,8 @@ import {
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
-import { z } from 'zod'
+import { EditBucketFormSchema, type BucketFormValues } from './FilesBucket.schema'
import { StorageSizeUnits } from '@/components/interfaces/Storage/StorageSettings/StorageSettings.constants'
import {
convertFromBytes,
@@ -45,17 +45,6 @@ export interface EditBucketModalProps {
onClose: () => void
}
-const BucketSchema = z.object({
- name: z.string(),
- 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(''),
-})
-
const formId = 'edit-storage-bucket-form'
export const EditBucketModal = ({ visible, bucket, onClose }: EditBucketModalProps) => {
@@ -113,8 +102,8 @@ export const EditBucketModal = ({ visible, bucket, onClose }: EditBucketModalPro
allowed_mime_types: (bucket?.allowed_mime_types ?? []).join(', '),
}
- const form = useForm<z.infer<typeof BucketSchema>>({
- resolver: zodResolver(BucketSchema),
+ const form = useForm<BucketFormValues>({
+ resolver: zodResolver(EditBucketFormSchema),
defaultValues,
values: defaultValues,
mode: 'onSubmit',
@@ -136,7 +125,7 @@ export const EditBucketModal = ({ visible, bucket, onClose }: EditBucketModalPro
onClose()
}
- const onSubmit: SubmitHandler<z.infer<typeof BucketSchema>> = async (values) => {
+ const onSubmit: SubmitHandler<BucketFormValues> = async (values) => {
if (bucket === undefined) return console.error('Bucket is required')
if (ref === undefined) return console.error('Project ref is required')
diff --git a/apps/studio/components/interfaces/Storage/EmptyBucketModal.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/EmptyBucketModal.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Storage/EmptyBucketModal.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/EmptyBucketModal.tsx
diff --git a/apps/studio/components/interfaces/Storage/FilesBuckets/FilesBucket.schema.ts b/apps/studio/components/interfaces/Storage/FilesBuckets/FilesBucket.schema.ts
new file mode 100644
index 00000000000..1126efb4e0b
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/FilesBucket.schema.ts
@@ -0,0 +1,45 @@
+import { z } from 'zod'
+
+import {
+ inverseValidBucketNameRegex,
+ validBucketNameRegex,
+} from '@/components/interfaces/Storage/Storage.utils'
+
+const BucketFormObjectSchema = 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(''),
+})
+
+export const EditBucketFormSchema = BucketFormObjectSchema.extend({
+ name: z.string(),
+})
+
+export const BucketFormSchema = BucketFormObjectSchema.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',
+ })
+ }
+})
+
+export type BucketFormValues = z.infer<typeof BucketFormSchema>
diff --git a/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/PublicBucketWarning.tsx
similarity index 100%
rename from apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx
rename to apps/studio/components/interfaces/Storage/FilesBuckets/PublicBucketWarning.tsx
diff --git a/apps/studio/components/interfaces/Storage/FilesBuckets/index.tsx b/apps/studio/components/interfaces/Storage/FilesBuckets/index.tsx
index 47581b71093..4121162da80 100644
--- a/apps/studio/components/interfaces/Storage/FilesBuckets/index.tsx
+++ b/apps/studio/components/interfaces/Storage/FilesBuckets/index.tsx
@@ -18,12 +18,12 @@ import { PageContainer } from 'ui-patterns/PageContainer'
import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import { CreateBucketModal } from '../CreateBucketModal'
import { EmptyBucketState } from '../EmptyBucketState'
import { CreateBucketButton } from '../NewBucketButton'
import { STORAGE_BUCKET_SORT } from '../Storage.constants'
import { useStoragePreference } from '../StorageExplorer/useStoragePreference'
import { BucketsTable } from './BucketsTable'
+import { CreateBucketModal } from './CreateBucketModal'
import { useFilesBucketsShortcuts } from './useFilesBucketsShortcuts'
import { AlertError } from '@/components/ui/AlertError'
import { InlineLink } from '@/components/ui/InlineLink'
diff --git a/apps/studio/components/interfaces/Storage/Storage.utils.ts b/apps/studio/components/interfaces/Storage/Storage.utils.ts
index 0ba74d57c70..33c62a05824 100644
--- a/apps/studio/components/interfaces/Storage/Storage.utils.ts
+++ b/apps/studio/components/interfaces/Storage/Storage.utils.ts
@@ -262,3 +262,19 @@ export const getDecryptedParameters = async ({
...paramsWithDecryptedValues,
}
}
+
+// [Joshen] These are referenced from the storage API directly here
+// https://github.com/supabase/storage/blob/69e4a40799a9d10be0a63a37cbb46d7d9bea0e17/src/storage/limits.ts#L59
+
+// only allow s3 safe characters and characters which require special handling for now
+// the slash restriction come from bucket naming rules
+// and the rest of the validation rules are based on S3 object key validation.
+// https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
+// https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html
+export const validBucketNameRegex = /^(\w|!|-|\.|\*|'|\(|\)| |&|\$|@|=|;|:|\+|,|\?)*$/
+export const inverseValidBucketNameRegex = /[^A-Za-z0-9_!\-.*'() &$@=;:+,?]/
+
+// only allow s3 safe characters and characters which require special handling for now
+// https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
+export const validObjectKeyRegex = /^(\w|\/|!|-|\.|\*|'|\(|\)| |&|\$|@|=|;|:|\+|,|\?)*$/
+export const inverseValidObjectKeyRegex = /[^A-Za-z0-9_\/!\-.*'() &$@=;:+,?]/
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
index 98991c1125b..92db153f72c 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
@@ -1,9 +1,9 @@
import { toast } from 'sonner'
import { copyToClipboard } from 'ui'
-import { inverseValidObjectKeyRegex, validObjectKeyRegex } from '../CreateBucketModal.utils'
import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES } from '../Storage.constants'
import { StorageItem, StorageItemMetadata } from '../Storage.types'
+import { inverseValidObjectKeyRegex, validObjectKeyRegex } from '../Storage.utils'
import type { StorageObject } from '@/data/storage/bucket-objects-list-mutation'
import { BASE_PATH } from '@/lib/constants'
import type { StorageExplorerState } from '@/state/storage-explorer'
diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx
index ddb0ff64927..80a016e717f 100644
--- a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx
+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx
@@ -27,7 +27,7 @@ import { Admonition } from 'ui-patterns/Admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import z from 'zod'
-import { inverseValidBucketNameRegex } from '../CreateBucketModal.utils'
+import { inverseValidBucketNameRegex } from '../Storage.utils'
import { useS3VectorsWrapperInstance } from './useS3VectorsWrapperInstance'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
diff --git a/apps/studio/components/interfaces/Storage/__tests__/CreateBucketModal.test.tsx b/apps/studio/components/interfaces/Storage/__tests__/CreateBucketModal.test.tsx
index f7de92004a0..2905e779fd5 100644
--- a/apps/studio/components/interfaces/Storage/__tests__/CreateBucketModal.test.tsx
+++ b/apps/studio/components/interfaces/Storage/__tests__/CreateBucketModal.test.tsx
@@ -2,7 +2,7 @@ import { fireEvent, screen, waitFor } from '@testing-library/dom'
import userEvent from '@testing-library/user-event'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { CreateBucketModal } from '../CreateBucketModal'
+import { CreateBucketModal } from '../FilesBuckets/CreateBucketModal'
import { ProjectContextProvider } from '@/components/layouts/ProjectLayout/ProjectContext'
import { customRender } from '@/tests/lib/custom-render'
import { addAPIMock } from '@/tests/lib/msw'
diff --git a/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx b/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx
index bfb0e7201cf..c6c30b3c03b 100644
--- a/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx
+++ b/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx
@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'
import { useState } from 'react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { DeleteBucketModal } from '../DeleteBucketModal'
+import { DeleteBucketModal } from '../FilesBuckets/DeleteBucketModal'
import { ProjectContextProvider } from '@/components/layouts/ProjectLayout/ProjectContext'
import { Bucket } from '@/data/storage/buckets-query'
import { customRender } from '@/tests/lib/custom-render'
diff --git a/apps/studio/components/interfaces/Storage/__tests__/EditBucketModal.test.tsx b/apps/studio/components/interfaces/Storage/__tests__/EditBucketModal.test.tsx
index e04f7bbccdf..afdee45b9d1 100644
--- a/apps/studio/components/interfaces/Storage/__tests__/EditBucketModal.test.tsx
+++ b/apps/studio/components/interfaces/Storage/__tests__/EditBucketModal.test.tsx
@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'
import { useState } from 'react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { EditBucketModal } from '../EditBucketModal'
+import { EditBucketModal } from '../FilesBuckets/EditBucketModal'
import { ProjectContextProvider } from '@/components/layouts/ProjectLayout/ProjectContext'
import { Bucket } from '@/data/storage/buckets-query'
import { render } from '@/tests/helpers'
diff --git a/apps/studio/components/interfaces/Storage/__tests__/EmptyBucketModal.test.tsx b/apps/studio/components/interfaces/Storage/__tests__/EmptyBucketModal.test.tsx
index e82a4c8ef72..d62fda2859b 100644
--- a/apps/studio/components/interfaces/Storage/__tests__/EmptyBucketModal.test.tsx
+++ b/apps/studio/components/interfaces/Storage/__tests__/EmptyBucketModal.test.tsx
@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'
import { useState } from 'react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { EmptyBucketModal } from '../EmptyBucketModal'
+import { EmptyBucketModal } from '../FilesBuckets/EmptyBucketModal'
import { ProjectContextProvider } from '@/components/layouts/ProjectLayout/ProjectContext'
import { Bucket } from '@/data/storage/buckets-query'
import { render } from '@/tests/helpers'
diff --git a/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx b/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx
index 3028a520c86..7b1ad863a03 100644
--- a/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx
+++ b/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx
@@ -25,11 +25,11 @@ import {
import { PageBreadcrumbs, PageBreadcrumbsActions } from 'ui-patterns/PageBreadcrumbs'
import { PageContainer } from 'ui-patterns/PageContainer'
-import { DeleteBucketModal } from '@/components/interfaces/Storage/DeleteBucketModal'
-import { EditBucketModal } from '@/components/interfaces/Storage/EditBucketModal'
-import { EmptyBucketModal } from '@/components/interfaces/Storage/EmptyBucketModal'
+import { DeleteBucketModal } from '@/components/interfaces/Storage/FilesBuckets/DeleteBucketModal'
+import { EditBucketModal } from '@/components/interfaces/Storage/FilesBuckets/EditBucketModal'
+import { EmptyBucketModal } from '@/components/interfaces/Storage/FilesBuckets/EmptyBucketModal'
+import { PublicBucketWarning } from '@/components/interfaces/Storage/FilesBuckets/PublicBucketWarning'
import { useSelectedBucket } from '@/components/interfaces/Storage/FilesBuckets/useSelectedBucket'
-import { PublicBucketWarning } from '@/components/interfaces/Storage/PublicBucketWarning'
import { PUBLIC_BUCKET_TOOLTIP } from '@/components/interfaces/Storage/Storage.constants'
import StorageBucketsError from '@/components/interfaces/Storage/StorageBucketsError'
import { StorageExplorer } from '@/components/interfaces/Storage/StorageExplorer/StorageExplorer'