Skip to content

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

chore(studio): use ShortcutBadge in Connect command (#46245)

Danny White7283459a02c7
diff --git a/apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx b/apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx
index 96949e35c35..c6a0082dbcd 100644
--- a/apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx
+++ b/apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx
@@ -1,27 +1,14 @@
import { Plug } from 'lucide-react'
import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
-import { Fragment } from 'react'
-import { KeyboardShortcut } from 'ui'
import type { ICommand } from 'ui-patterns/CommandMenu'
import { useRegisterCommands, useSetCommandMenuOpen } from 'ui-patterns/CommandMenu'
import { COMMAND_MENU_SECTIONS } from '@/components/interfaces/App/CommandMenu/CommandMenu.utils'
import { orderCommandSectionsByPriority } from '@/components/interfaces/App/CommandMenu/ordering'
+import { ShortcutBadge } from '@/components/ui/ShortcutBadge'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
-import { hotkeyToKeys } from '@/state/shortcuts/formatShortcut'
-import { SHORTCUT_DEFINITIONS, SHORTCUT_IDS } from '@/state/shortcuts/registry'
-
-const ConnectShortcutBadge = () => (
- <div className="flex items-center gap-1">
- {SHORTCUT_DEFINITIONS[SHORTCUT_IDS.CONNECT_OPEN_SHEET].sequence.map((step, index) => (
- <Fragment key={`${step}-${index}`}>
- {index > 0 && <span className="text-foreground-lighter text-[11px]">then</span>}
- <KeyboardShortcut keys={hotkeyToKeys(step)} />
- </Fragment>
- ))}
- </div>
-)
+import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
export function useConnectCommands() {
const setIsOpen = useSetCommandMenuOpen()
@@ -43,7 +30,7 @@ export function useConnectCommands() {
setIsOpen(false)
},
icon: () => <Plug className="rotate-90" />,
- badge: ConnectShortcutBadge,
+ badge: () => <ShortcutBadge shortcutId={SHORTCUT_IDS.CONNECT_OPEN_SHEET} />,
},
{
id: 'connect-mcp',
diff --git a/apps/studio/state/app-state.ts b/apps/studio/state/app-state.ts
index 27cea14b872..54d2016c782 100644
--- a/apps/studio/state/app-state.ts
+++ b/apps/studio/state/app-state.ts
@@ -1,4 +1,5 @@
import { LOCAL_STORAGE_KEYS as COMMON_LOCAL_STORAGE_KEYS } from 'common'
+import { type ConnectSheetSource } from 'common/telemetry-constants'
import { proxy, snapshot, useSnapshot } from 'valtio'
const getInitialState = () => {
@@ -70,8 +71,8 @@ export const appState = proxy({
appState.mobileMenuOpen = value
},
- connectSheetSource: 'header_button' as 'header_button' | 'connect_section' | 'keyboard_shortcut',
- setConnectSheetSource: (value: 'header_button' | 'connect_section' | 'keyboard_shortcut') => {
+ connectSheetSource: 'header_button' as ConnectSheetSource,
+ setConnectSheetSource: (value: ConnectSheetSource) => {
appState.connectSheetSource = value
},
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index da9e845d688..23fd8cebc16 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -1916,6 +1916,8 @@ export interface HomeConnectActionClickedEvent {
groups: TelemetryGroups
}
+export type ConnectSheetSource = 'header_button' | 'connect_section' | 'keyboard_shortcut'
+
/**
* User opened the ConnectSheet panel.
*
@@ -1929,7 +1931,7 @@ export interface ConnectSheetOpenedEvent {
/**
* Where the sheet was opened from
*/
- source: 'header_button' | 'connect_section' | 'keyboard_shortcut'
+ source: ConnectSheetSource
}
groups: TelemetryGroups
}