Skip to content

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

fix(studio): disambiguate query cancel telemetry and gate live-mode hotkey (#49137)

claude[bot]4e280d4498e5
diff --git a/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx b/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx
index 8f40dd2a165..829290f74a2 100644
--- a/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx
+++ b/apps/studio/components/interfaces/Observability/DatabaseConnections/ActivityRow.tsx
@@ -149,11 +149,12 @@ export const ActivityRow = ({
activity.state === 'idle in transaction (aborted)') &&
durationSeconds >= WARN_DURATION_IDLE_TXN))
- const onCancelQuery = async () => {
+ const onCancelQuery = async (origin: 'dropdown_menu' | 'terminate_dialog') => {
const isBlocking = (data ?? []).some((x) => x.blocked_by.includes(activity.pid))
track('query_cancel_button_clicked', {
activityState: activity.state,
isBlocking,
+ origin,
})
const toastId = toast.loading(`Cancelling query (ID: ${activity.pid})`)
@@ -445,7 +446,7 @@ export const ActivityRow = ({
disabled={
activity.state !== 'active' || superuserRoles?.includes(activity.role_name)
}
- onClick={onCancelQuery}
+ onClick={() => onCancelQuery('dropdown_menu')}
tooltip={{
content: {
side: 'left',
@@ -503,7 +504,10 @@ export const ActivityRow = ({
<AlertDialogCancel>Back</AlertDialogCancel>
<div className="flex items-center gap-x-2">
{activity.state === 'active' && (
- <AlertDialogAction variant="default" onClick={onCancelQuery}>
+ <AlertDialogAction
+ variant="default"
+ onClick={() => onCancelQuery('terminate_dialog')}
+ >
Cancel query
</AlertDialogAction>
)}
diff --git a/apps/studio/pages/project/[ref]/observability/connections.tsx b/apps/studio/pages/project/[ref]/observability/connections.tsx
index 10cc40a4caf..ad85042cac9 100644
--- a/apps/studio/pages/project/[ref]/observability/connections.tsx
+++ b/apps/studio/pages/project/[ref]/observability/connections.tsx
@@ -40,6 +40,7 @@ export const DatabaseConnections: NextPageWithLayout = () => {
const [now, setNow] = useState(() => dayjs.utc())
useShortcut(SHORTCUT_IDS.DATA_TABLE_TOGGLE_LIVE, handleToggleLive, {
+ enabled: isDatabaseConnectionsEnabled,
registerInCommandMenu: false,
})
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 7e97c3d26ef..9596095bcaa 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -1605,7 +1605,8 @@ export interface SessionTerminateSubmittedEvent {
}
/**
- * User clicked the Cancel query menu item for a database session in the Database Connections activity table.
+ * User clicked Cancel query for a database session in the Database Connections activity table,
+ * either from the row's dropdown menu or from the terminate session confirmation dialog.
*
* @group Events
* @source studio
@@ -1619,6 +1620,10 @@ export interface QueryCancelButtonClickedEvent {
* Whether the session whose query is being cancelled was itself blocking one or more other sessions.
*/
isBlocking: boolean
+ /**
+ * Which surface the cancel was triggered from.
+ */
+ origin: 'dropdown_menu' | 'terminate_dialog'
}
groups: TelemetryGroups
}