mirror of
https://github.com/supabase/supabase.git
synced 2026-06-01 18:34:37 +08: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 -->
235 lines
8.3 KiB
TypeScript
235 lines
8.3 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { IS_PLATFORM } from 'common'
|
|
import { ChevronDown } from 'lucide-react'
|
|
import { Dispatch, SetStateAction, useState } from 'react'
|
|
import { useForm } from 'react-hook-form'
|
|
import {
|
|
Button,
|
|
Form,
|
|
FormControl,
|
|
FormDescription,
|
|
FormField,
|
|
FormItem,
|
|
FormLabel,
|
|
InputGroup,
|
|
InputGroupAddon,
|
|
InputGroupButton,
|
|
InputGroupInput,
|
|
Popover,
|
|
PopoverContent,
|
|
PopoverTrigger,
|
|
Switch,
|
|
} from 'ui'
|
|
import * as z from 'zod'
|
|
|
|
import { RealtimeConfig } from './useRealtimeMessages'
|
|
import { DocsButton } from '@/components/ui/DocsButton'
|
|
import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'
|
|
import { getTemporaryAPIKey } from '@/data/api-keys/temp-api-keys-query'
|
|
import { DOCS_URL } from '@/lib/constants'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
|
|
|
|
type ControlledOpenProps =
|
|
| { open: boolean; onOpenChange: (open: boolean) => void }
|
|
| { open?: undefined; onOpenChange?: undefined }
|
|
|
|
type ChooseChannelPopoverProps = {
|
|
config: RealtimeConfig
|
|
onChangeConfig: Dispatch<SetStateAction<RealtimeConfig>>
|
|
} & ControlledOpenProps
|
|
|
|
const FormSchema = z.object({ channel: z.string(), isPrivate: z.boolean() })
|
|
|
|
export const ChooseChannelPopover = ({
|
|
config,
|
|
onChangeConfig,
|
|
open: controlledOpen,
|
|
onOpenChange,
|
|
}: ChooseChannelPopoverProps) => {
|
|
const [internalOpen, setInternalOpen] = useState(false)
|
|
const isControlled = controlledOpen !== undefined
|
|
const open = isControlled ? controlledOpen : internalOpen
|
|
|
|
const setOpen = (v: boolean) => {
|
|
if (isControlled) {
|
|
onOpenChange?.(v)
|
|
} else {
|
|
setInternalOpen(v)
|
|
}
|
|
}
|
|
const track = useTrack()
|
|
|
|
const form = useForm<z.infer<typeof FormSchema>>({
|
|
mode: 'onBlur',
|
|
reValidateMode: 'onBlur',
|
|
resolver: zodResolver(FormSchema),
|
|
defaultValues: { channel: '', isPrivate: false },
|
|
})
|
|
|
|
const onOpen = (v: boolean) => {
|
|
// when opening, copy the outside config into the intermediate one
|
|
if (v === true) {
|
|
form.setValue('channel', config.channelName)
|
|
}
|
|
setOpen(v)
|
|
}
|
|
|
|
const onSubmit = async () => {
|
|
setOpen(false)
|
|
track('realtime_inspector_listen_channel_clicked')
|
|
|
|
let token = config.token
|
|
|
|
// [Joshen] Refresh if starting to listen + using temp API key, since it has a low refresh rate
|
|
if (token.startsWith('sb_temp') || !IS_PLATFORM) {
|
|
const data = await getTemporaryAPIKey({ projectRef: config.projectRef, expiry: 3600 })
|
|
token = data.api_key
|
|
}
|
|
onChangeConfig({
|
|
...config,
|
|
token,
|
|
channelName: form.getValues('channel'),
|
|
isChannelPrivate: form.getValues('isPrivate'),
|
|
enabled: true,
|
|
})
|
|
}
|
|
|
|
const channelPopoverTrigger = (
|
|
<PopoverTrigger asChild>
|
|
<Button className="rounded-r-none" type="default" size="tiny" iconRight={<ChevronDown />}>
|
|
<p
|
|
className="max-w-[120px] truncate"
|
|
title={config.channelName.length > 0 ? config.channelName : ''}
|
|
>
|
|
{config.channelName.length > 0 ? `Channel: ${config.channelName}` : 'Join a channel'}
|
|
</p>
|
|
</Button>
|
|
</PopoverTrigger>
|
|
)
|
|
|
|
return (
|
|
<Popover open={open} onOpenChange={onOpen}>
|
|
{!open && config.channelName.length === 0 ? (
|
|
<ShortcutTooltip shortcutId={SHORTCUT_IDS.INSPECTOR_JOIN_CHANNEL} side="bottom">
|
|
{channelPopoverTrigger}
|
|
</ShortcutTooltip>
|
|
) : (
|
|
channelPopoverTrigger
|
|
)}
|
|
<PopoverContent className="p-0 w-[320px]" align="start">
|
|
<div className="p-4 flex flex-col text-sm">
|
|
{config.channelName.length === 0 ? (
|
|
<>
|
|
<Form {...form}>
|
|
<form
|
|
id="realtime-channel"
|
|
onSubmit={form.handleSubmit(() => onSubmit())}
|
|
className="flex flex-col gap-y-4"
|
|
>
|
|
<FormField
|
|
name="channel"
|
|
control={form.control}
|
|
render={({ field }) => (
|
|
<FormItem className="flex flex-col gap-y-2">
|
|
<div className="flex flex-col gap-y-1">
|
|
<label className="text-foreground text-xs">Name of channel</label>
|
|
<InputGroup>
|
|
<FormControl>
|
|
<InputGroupInput
|
|
{...field}
|
|
autoComplete="off"
|
|
className="rounded-r-none text-xs px-2.5 py-1 h-auto"
|
|
placeholder="Enter a channel name"
|
|
/>
|
|
</FormControl>
|
|
<InputGroupAddon align="inline-end">
|
|
<InputGroupButton
|
|
type="primary"
|
|
disabled={form.getValues().channel.length === 0}
|
|
onClick={() => onSubmit()}
|
|
>
|
|
Listen to channel
|
|
</InputGroupButton>
|
|
</InputGroupAddon>
|
|
</InputGroup>
|
|
</div>
|
|
<FormDescription className="text-xs text-foreground-lighter">
|
|
The channel you initialize with the Supabase Realtime client. Learn more
|
|
in{' '}
|
|
<a
|
|
target="_blank"
|
|
rel="noreferrer"
|
|
className="underline hover:text-foreground transition"
|
|
href={`${DOCS_URL}/guides/realtime/concepts#channels`}
|
|
>
|
|
our docs
|
|
</a>
|
|
</FormDescription>
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
<FormField
|
|
key="isPrivate"
|
|
control={form.control}
|
|
name="isPrivate"
|
|
render={({ field }) => (
|
|
<FormItem className="">
|
|
<div className="flex flex-row items-center gap-x-2">
|
|
<FormControl>
|
|
<Switch
|
|
checked={field.value}
|
|
onCheckedChange={field.onChange}
|
|
disabled={field.disabled}
|
|
/>
|
|
</FormControl>
|
|
<FormLabel className="text-xs">Is channel private?</FormLabel>
|
|
</div>
|
|
<FormDescription className="text-xs text-foreground-lighter mt-2">
|
|
If the channel is marked as private, it will use RLS policies to filter
|
|
messages.
|
|
</FormDescription>
|
|
</FormItem>
|
|
)}
|
|
/>
|
|
|
|
<DocsButton
|
|
abbrev={false}
|
|
className="w-min"
|
|
href={`${DOCS_URL}/guides/realtime/authorization`}
|
|
/>
|
|
</form>
|
|
</Form>
|
|
</>
|
|
) : (
|
|
<div className="space-y-2">
|
|
<div className="flex items-center gap-x-2">
|
|
<p className="text-foreground text-xs">
|
|
Currently joined{' '}
|
|
<span className={config.isChannelPrivate ? 'text-brand' : 'text-warning'}>
|
|
{config.isChannelPrivate ? 'private' : 'public'}
|
|
</span>{' '}
|
|
channel:
|
|
</p>
|
|
<p className="text-xs border border-scale-600 py-0.5 px-1 rounded-md bg-surface-200">
|
|
{config.channelName}
|
|
</p>
|
|
</div>
|
|
<p className="text-xs text-foreground-lighter mt-2">
|
|
If you leave this channel, all of the messages populated on this page will disappear
|
|
</p>
|
|
<Button
|
|
type="default"
|
|
onClick={() => onChangeConfig({ ...config, channelName: '', enabled: false })}
|
|
>
|
|
Leave channel
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</PopoverContent>
|
|
</Popover>
|
|
)
|
|
}
|