mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 18:05:11 +03:00
## Summary
I migrated every `useSendEventMutation` call site in `apps/studio` to
`useTrack`, deleted the legacy hook, and added a lint guardrail so it
can't return. `useTrack` is the type-safe replacement: it auto-injects
`groups: { project, organization }` from the selected project/org and
types `action` + `properties` against `TelemetryEvent`. Existing call
sites built groups manually and were not type-checked at the action
level. The migration covers 81 files (60 trivial swaps, 9 org-only, 3
pre-auth, 5 bespoke, 4 test mocks).
## Changes
- Migrated trivial call sites across `pages/project/[ref]`,
`components/interfaces/*` (Reports, Storage, Realtime/Inspector,
SQLEditor, Functions, EdgeFunctions, Integrations, ProjectAPIDocs,
Branching/BranchManagement, TableGridEditor, Connect, Docs, Auth,
Support, Home, ProjectHome, App), `components/layouts/*`, and
`components/ui/*`.
- Migrated org-only sites (`Organization/Documents/*`,
`Organization/BillingSettings/Subscription/*`,
`Organization/SecuritySettings.tsx`,
`Account/Preferences/DashboardSettingsToggles.tsx`) by dropping the
manual `groups: { organization: ... }` and letting `useTrack`
auto-inject. Verified `useSelectedProjectQuery` is disabled on org
routes (gates on URL `[ref]`).
- Migrated pre-auth sites (`SignInForm.tsx`, `sign-in-mfa.tsx`,
`profile.tsx`) where neither project nor org is resolved.
- Bespoke handling:
- `execute-sql-mutation.ts` and `table-row-create-mutation.ts`: pass `{
project: projectRef }` via `groupOverrides` since the mutation can
target a non-selected project ref.
- `useStudioCommandMenuTelemetry.ts`: kept a direct `sendTelemetryEvent`
call because studio groups must override pre-built event groups
(opposite of `useTrack`'s override direction).
- `AIAssistantOption.tsx`: passes sentinel-aware `groupOverrides` so
`NO_PROJECT_MARKER`/`NO_ORG_MARKER` continue to suppress group emission.
- `SidePanelEditor.utils.tsx`: utility functions `createTable` and
`updateTable` now take a `track: Track` parameter (threaded from
`SidePanelEditor.tsx`); dropped the `organizationSlug` arg since groups
are no longer assembled manually.
- Branch-event attribution: preserved `parentProjectRef` overrides on
`branch_updated`, `branch_merge_completed`, `branch_merge_failed`,
`branch_merge_submitted`, `branch_delete_button_clicked`,
`branch_review_with_assistant_clicked`, and
`branch_*_merge_request_button_clicked`. Original code grouped these
under the parent (production) project, not the branch ref;
auto-injection would have shifted them onto the branch.
- Switched 4 test mocks from `@/data/telemetry/send-event-mutation` to
`@/lib/telemetry/track`. Removed obsolete tests around manual groups and
`try/catch` on telemetry rejection.
- Deleted `apps/studio/data/telemetry/send-event-mutation.ts`. The
deleted module is its own guardrail: any reintroduction of the import
fails at TypeScript module resolution before lint runs.
## Testing
Tested on preview deploy:
- [x] SQL editor `CREATE TABLE` fires `table_created` with method
`sql_editor` and `groups.project` set to the mutation's `projectRef`.
- [x] Table editor creates a table from the side panel; `table_created`
fires from `SidePanelEditor.utils` via threaded `track`.
- [x] Help button (`/project/[ref]/...`) fires `help_button_clicked`
with auto-injected project + org groups.
- [x] Sign-in form fires `sign_in` with empty groups (pre-auth,
expected).
- [x] Org documents page (`/org/[slug]/documents`) fires
`document_view_button_clicked` with org group only, no stale project
ref.
- [x] Command menu (`Cmd+K`) inside a project still fires
`command_menu_opened` with studio's project/org overriding any
event-supplied groups.
- [x] Support form "Ask the Assistant" without selected org fires
`ai_assistant_in_support_form_clicked` with no project/org groups
(sentinels suppress).
- [x] On a branch, "Update branch" / "Merge branch" / "Close merge
request" events fire with `groups.project` set to the parent project
ref, not the branch ref.
Local checks:
- [x] 22/22 tests pass across the 4 updated test files
(`SidePanelEditor.utils.createTable`, `EdgeFunctionRenderer`,
`LayoutSidebar`, `PlanUpdateSidePanel`).
- [x] `rg useSendEventMutation apps/studio` returns 0 hits.
## Linear
- fixes GROWTH-860
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Chores**
* Standardized telemetry across the Studio to a unified tracking system;
events now send simplified payloads with less contextual/grouping data.
* No user-facing flows changed; UI behavior, permissions, and
interactions remain the same.
* **Tests**
* Updated telemetry mocks and tests to align with the new tracking
approach.
<!-- review_stack_entry_start -->
[](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/46140?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)
<!-- review_stack_entry_end -->
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
418 lines
15 KiB
TypeScript
418 lines
15 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { useParams } from 'common'
|
|
import { useState } from 'react'
|
|
import { SubmitHandler, useForm } 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 { inverseValidBucketNameRegex, validBucketNameRegex } from './CreateBucketModal.utils'
|
|
import { convertFromBytes, convertToBytes } from './StorageSettings/StorageSettings.utils'
|
|
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 { 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
|
|
}
|
|
|
|
export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalProps) => {
|
|
const { ref } = useParams()
|
|
const [selectedUnit, setSelectedUnit] = useState<string>(StorageSizeUnits.MB)
|
|
const [hasAllowedMimeTypes, setHasAllowedMimeTypes] = useState(false)
|
|
|
|
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: () => {},
|
|
})
|
|
|
|
const form = useForm<CreateBucketForm>({
|
|
resolver: zodResolver(FormSchema),
|
|
defaultValues: {
|
|
name: '',
|
|
public: false,
|
|
has_file_size_limit: false,
|
|
formatted_size_limit: undefined,
|
|
allowed_mime_types: '',
|
|
},
|
|
})
|
|
const { formatted_size_limit: formattedSizeLimitError } = form.formState.errors
|
|
const isPublicBucket = form.watch('public')
|
|
const hasFileSizeLimit = form.watch('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' })
|
|
|
|
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>
|
|
</form>
|
|
</Form>
|
|
|
|
<DialogFooter>
|
|
<Button type="default" disabled={isCreatingBucket} onClick={() => onOpenChange(false)}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
form={formId}
|
|
htmlType="submit"
|
|
loading={isCreatingBucket}
|
|
disabled={isCreatingBucket}
|
|
>
|
|
Create
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|