Skip to content

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

Chore/connect sheet/button (#42367)

Saxon Fletcher0e60c5f3417f
diff --git a/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx b/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx
index a24b3e33bb4..34cd4f491f0 100644
--- a/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx
+++ b/apps/studio/components/interfaces/App/CommandMenu/CommandMenu.tsx
@@ -1,6 +1,5 @@
import { IS_PLATFORM } from 'common'
import { useBranchCommands } from 'components/interfaces/BranchManagement/Branch.Commands'
-import { useConnectCommands } from 'components/interfaces/Connect/Connect.Commands'
import {
useQueryTableCommands,
useSnippetCommands,
@@ -12,13 +11,15 @@ import { useChangelogCommand } from 'ui-patterns/CommandMenu/prepackaged/Changel
import { useDocsAiCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsAi'
import { useDocsSearchCommands } from 'ui-patterns/CommandMenu/prepackaged/DocsSearch'
import { useThemeSwitcherCommands } from 'ui-patterns/CommandMenu/prepackaged/ThemeSwitcher'
+
import { useApiKeysCommands } from './ApiKeys'
import { useApiUrlCommand } from './ApiUrl'
-import { useProjectSwitchCommand, useConfigureOrganizationCommand } from './OrgProjectSwitcher'
-import { useSupportCommands } from './Support'
-import { orderCommandSectionsByPriority } from './ordering'
import { useContextSearchCommands } from './ContextSearchCommands'
import { useCreateCommands } from './CreateCommands'
+import { useConfigureOrganizationCommand, useProjectSwitchCommand } from './OrgProjectSwitcher'
+import { useSupportCommands } from './Support'
+import { orderCommandSectionsByPriority } from './ordering'
+import { useConnectCommands } from '@/components/interfaces/ConnectButton/Connect.Commands'
export default function StudioCommandMenu() {
useApiKeysCommands()
diff --git a/apps/studio/components/interfaces/Connect/Connect.tsx b/apps/studio/components/interfaces/Connect/Connect.tsx
index 0221bbf7f09..92a592fe15e 100644
--- a/apps/studio/components/interfaces/Connect/Connect.tsx
+++ b/apps/studio/components/interfaces/Connect/Connect.tsx
@@ -1,21 +1,19 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { IS_PLATFORM, useParams } from 'common'
-import { ExternalLink, Plug } from 'lucide-react'
-import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
-import { useEffect, useMemo, useState } from 'react'
-
import { ApiKeysTabContent } from 'components/interfaces/Connect/ApiKeysTabContent'
import { DatabaseConnectionString } from 'components/interfaces/Connect/DatabaseConnectionString'
import { McpTabContent } from 'components/interfaces/Connect/McpTabContent'
-import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import Panel from 'components/ui/Panel'
import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-import { BASE_PATH, PROJECT_STATUS } from 'lib/constants'
+import { BASE_PATH } from 'lib/constants'
+import { ExternalLink } from 'lucide-react'
+import Link from 'next/link'
import { useRouter } from 'next/router'
+import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
+import { useEffect, useMemo, useState } from 'react'
import {
Button,
DIALOG_PADDING_X,
@@ -26,24 +24,21 @@ import {
DialogHeader,
DialogSectionSeparator,
DialogTitle,
- DialogTrigger,
TabsContent_Shadcn_,
TabsList_Shadcn_,
TabsTrigger_Shadcn_,
Tabs_Shadcn_,
cn,
} from 'ui'
+
import { CONNECTION_TYPES, ConnectionType, FRAMEWORKS, MOBILES, ORMS } from './Connect.constants'
import { getContentFilePath, inferConnectTabFromParentKey } from './Connect.utils'
import { ConnectDropdown } from './ConnectDropdown'
import { ConnectTabContent } from './ConnectTabContent'
-import Link from 'next/link'
export const Connect = () => {
const router = useRouter()
const { ref: projectRef } = useParams()
- const { data: selectedProject } = useSelectedProjectQuery()
- const isActiveHealthy = selectedProject?.status === PROJECT_STATUS.ACTIVE_HEALTHY
const {
projectConnectionShowAppFrameworks: showAppFrameworks,
@@ -68,11 +63,6 @@ export const Connect = () => {
return true
})
- const [showConnect, setShowConnect] = useQueryState(
- 'showConnect',
- parseAsBoolean.withDefault(false)
- )
-
// helper to get the connection type object
function getConnectionObjectForTab(tab: string | null) {
switch (tab) {
@@ -87,6 +77,7 @@ export const Connect = () => {
}
}
+ const [open, setOpen] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
const [tab, setTab] = useQueryState('connectTab', parseAsString.withDefault('direct'))
const [queryFramework, setQueryFramework] = useQueryState('framework', parseAsString)
const [queryUsing, setQueryUsing] = useQueryState('using', parseAsString)
@@ -106,7 +97,7 @@ export const Connect = () => {
?.children.find((child) => child.key === selectedChild)?.children[0]?.key || ''
)
- const { data: settings } = useProjectSettingsV2Query({ projectRef }, { enabled: showConnect })
+ const { data: settings } = useProjectSettingsV2Query({ projectRef }, { enabled: open })
const { can: canReadAPIKeys } = useAsyncCheckPermissions(
PermissionAction.READ,
'service_api_keys'
@@ -258,18 +249,16 @@ export const Connect = () => {
setQueryMethod(null)
}
- const handleDialogChange = (open: boolean) => {
- if (!open) {
- setShowConnect(null)
+ const handleDialogChange = (dialogOpen: boolean) => {
+ if (!dialogOpen) {
setTab(null)
resetQueryStates()
- } else {
- setShowConnect(open)
}
+ setOpen(dialogOpen)
}
useEffect(() => {
- if (!showConnect) return
+ if (!open) return
const noConnectTabInUrl = typeof router.query.connectTab === 'undefined'
const hasQuery = queryFramework || queryUsing || queryWith
const inferred = inferConnectTabFromParentKey(queryFramework)
@@ -280,10 +269,10 @@ export const Connect = () => {
if (inferred === 'mobiles') setConnectionObject(MOBILES)
if (inferred === 'orms') setConnectionObject(ORMS)
}
- }, [showConnect, router.query.connectTab, queryFramework, queryUsing, queryWith, setTab])
+ }, [open, router.query.connectTab, queryFramework, queryUsing, queryWith, setTab])
useEffect(() => {
- if (!showConnect) return
+ if (!open) return
const newConnectionObject = getConnectionObjectForTab(tab)
setConnectionObject(newConnectionObject)
@@ -312,7 +301,7 @@ export const Connect = () => {
if (grandchild?.key !== queryWith) setQueryWith(grandchild?.key ?? null)
}
}, [
- showConnect,
+ open,
tab,
queryFramework,
setQueryFramework,
@@ -322,32 +311,8 @@ export const Connect = () => {
setQueryWith,
])
- if (!isActiveHealthy) {
- return (
- <ButtonTooltip
- disabled
- type="default"
- className="rounded-full"
- icon={<Plug className="rotate-90" />}
- tooltip={{
- content: {
- side: 'bottom',
- text: 'Project is currently not active and cannot be connected',
- },
- }}
- >
- Connect
- </ButtonTooltip>
- )
- }
-
return (
- <Dialog open={showConnect} onOpenChange={handleDialogChange}>
- <DialogTrigger asChild>
- <Button type="default" className="rounded-full" icon={<Plug className="rotate-90" />}>
- <span>Connect</span>
- </Button>
- </DialogTrigger>
+ <Dialog open={open} onOpenChange={handleDialogChange}>
<DialogContent className={cn('sm:max-w-5xl p-0 rounded-lg')} centered={false}>
<DialogHeader className={cn('text-left', DIALOG_PADDING_X)}>
<DialogTitle>
diff --git a/apps/studio/components/interfaces/Connect/content/astro/supabasejs/content.tsx b/apps/studio/components/interfaces/Connect/content/astro/supabasejs/content.tsx
index fe4ac30f1e3..46d9a2ac22f 100644
--- a/apps/studio/components/interfaces/Connect/content/astro/supabasejs/content.tsx
+++ b/apps/studio/components/interfaces/Connect/content/astro/supabasejs/content.tsx
@@ -1,10 +1,9 @@
import type { ContentFileProps } from 'components/interfaces/Connect/Connect.types'
-
import {
- ConnectTabs,
- ConnectTabTriggers,
- ConnectTabTrigger,
ConnectTabContent,
+ ConnectTabTrigger,
+ ConnectTabTriggers,
+ ConnectTabs,
} from 'components/interfaces/Connect/ConnectTabs'
import { SimpleCodeBlock } from 'ui'
diff --git a/apps/studio/components/interfaces/Connect/Connect.Commands.tsx b/apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx
similarity index 67%
rename from apps/studio/components/interfaces/Connect/Connect.Commands.tsx
rename to apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx
index 6a370317080..a981710097c 100644
--- a/apps/studio/components/interfaces/Connect/Connect.Commands.tsx
+++ b/apps/studio/components/interfaces/ConnectButton/Connect.Commands.tsx
@@ -1,18 +1,20 @@
-import { Plug } from 'lucide-react'
-import { useRouter } from 'next/router'
+import { COMMAND_MENU_SECTIONS } from 'components/interfaces/App/CommandMenu/CommandMenu.utils'
+import { orderCommandSectionsByPriority } from 'components/interfaces/App/CommandMenu/ordering'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from 'lib/constants'
+import { Plug } from 'lucide-react'
+import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
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'
export function useConnectCommands() {
- const router = useRouter()
const setIsOpen = useSetCommandMenuOpen()
const { data: selectedProject } = useSelectedProjectQuery()
const isActiveHealthy = selectedProject?.status === PROJECT_STATUS.ACTIVE_HEALTHY
+ const [_, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
+ const [__, setConnectTab] = useQueryState('connectTab', parseAsString)
+
useRegisterCommands(
COMMAND_MENU_SECTIONS.ACTIONS,
[
@@ -20,15 +22,7 @@ export function useConnectCommands() {
id: 'connect-to-project',
name: 'Connect to your project',
action: () => {
- // Open the Connect dialog by setting the showConnect query param
- router.push(
- {
- pathname: router.pathname,
- query: { ...router.query, showConnect: 'true' },
- },
- undefined,
- { shallow: true }
- )
+ setShowConnect(true)
setIsOpen(false)
},
icon: () => <Plug className="rotate-90" />,
@@ -37,15 +31,8 @@ export function useConnectCommands() {
id: 'connect-mcp',
name: 'Connect via MCP',
action: () => {
- // Open the Connect dialog with MCP tab
- router.push(
- {
- pathname: router.pathname,
- query: { ...router.query, showConnect: 'true', connectTab: 'mcp' },
- },
- undefined,
- { shallow: true }
- )
+ setShowConnect(true)
+ setConnectTab('mcp')
setIsOpen(false)
},
icon: () => <Plug className="rotate-90" />,
diff --git a/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsx b/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsx
new file mode 100644
index 00000000000..61a111e4c06
--- /dev/null
+++ b/apps/studio/components/interfaces/ConnectButton/ConnectButton.tsx
@@ -0,0 +1,39 @@
+import { ButtonTooltip } from 'components/ui/ButtonTooltip'
+import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
+import { Plug } from 'lucide-react'
+import { parseAsBoolean, useQueryState } from 'nuqs'
+import { ComponentProps } from 'react'
+import { Button } from 'ui'
+
+import { PROJECT_STATUS } from '@/lib/constants'
+
+interface ConnectButtonProps {
+ buttonType?: ComponentProps<typeof Button>['type']
+}
+
+export const ConnectButton = ({ buttonType = 'default' }: ConnectButtonProps) => {
+ const { data: selectedProject } = useSelectedProjectQuery()
+ const isActiveHealthy = selectedProject?.status === PROJECT_STATUS.ACTIVE_HEALTHY
+
+ const [_, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
+
+ return (
+ <ButtonTooltip
+ type={buttonType}
+ disabled={!isActiveHealthy}
+ className="rounded-full"
+ icon={<Plug className="rotate-90" />}
+ onClick={() => setShowConnect(true)}
+ tooltip={{
+ content: {
+ side: 'bottom',
+ text: !isActiveHealthy
+ ? 'Project is currently not active and cannot be connected'
+ : undefined,
+ },
+ }}
+ >
+ <span>Connect</span>
+ </ButtonTooltip>
+ )
+}
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
new file mode 100644
index 00000000000..737be71a55d
--- /dev/null
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
@@ -0,0 +1,37 @@
+import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
+import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle, cn } from 'ui'
+
+export const ConnectSheet = () => {
+ const [showConnect, setShowConnect] = useQueryState(
+ 'showConnect',
+ parseAsBoolean.withDefault(false)
+ )
+ const [connectTab, setConnectTab] = useQueryState('connectTab', parseAsString)
+
+ const handleOpenChange = (sheetOpen: boolean) => {
+ if (!sheetOpen) {
+ setConnectTab(null)
+ }
+ setShowConnect(sheetOpen)
+ }
+
+ return (
+ <Sheet open={showConnect} onOpenChange={handleOpenChange}>
+ <SheetContent size="lg" className="flex flex-col gap-0 p-0 space-y-0" tabIndex={undefined}>
+ <SheetHeader className={cn('text-left border-b shrink-0 py-6 px-8')}>
+ <div className="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
+ <div>
+ <SheetTitle>Connect to your project</SheetTitle>
+ <SheetDescription>Choose how you want to use Supabase</SheetDescription>
+ </div>
+ </div>
+ </SheetHeader>
+
+ <div className="flex flex-1 flex-col overflow-y-auto">
+ {/* Configuration Section */}
+ <div className="space-y-6 border-b p-8 shrink-0"></div>
+ </div>
+ </SheetContent>
+ </Sheet>
+ )
+}
diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/index.tsx b/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/index.tsx
index fce6f953b9c..6a91cff53ad 100644
--- a/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/index.tsx
+++ b/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/index.tsx
@@ -1,18 +1,18 @@
import { useQueryClient } from '@tanstack/react-query'
+import { useParams } from 'common'
import { useTheme } from 'next-themes'
import { useEffect, useMemo } from 'react'
import ReactFlow, { Background, ReactFlowProvider, useReactFlow } from 'reactflow'
+import { getStatusName } from '../Pipeline.utils'
+import { PrimaryDatabaseNode, ReadReplicaNode, ReplicationNode } from './Nodes'
+import { getDagreGraphLayout } from './ReplicationDiagram.utils'
import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'
import { useReplicationDestinationsQuery } from '@/data/replication/destinations-query'
import { replicationKeys } from '@/data/replication/keys'
import { ReplicationPipelineStatusResponse } from '@/data/replication/pipeline-status-query'
import { useReplicationPipelinesQuery } from '@/data/replication/pipelines-query'
import { timeout } from '@/lib/helpers'
-import { useParams } from 'common'
-import { getStatusName } from '../Pipeline.utils'
-import { PrimaryDatabaseNode, ReadReplicaNode, ReplicationNode } from './Nodes'
-import { getDagreGraphLayout } from './ReplicationDiagram.utils'
export const ReplicationDiagram = () => {
return (
diff --git a/apps/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx b/apps/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx
index b793e13256c..f014e3ec747 100644
--- a/apps/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx
+++ b/apps/studio/components/interfaces/Home/NewProjectPanel/APIKeys.tsx
@@ -1,10 +1,6 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'
-import { Loader } from 'lucide-react'
-
import { useParams } from 'common'
-import { Connect } from 'components/interfaces/Connect/Connect'
-import { ConnectionIcon } from 'components/interfaces/Connect/ConnectionIcon'
import { AlertError } from 'components/ui/AlertError'
import { InlineLink } from 'components/ui/InlineLink'
import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
@@ -12,11 +8,15 @@ import { useLegacyAPIKeysStatusQuery } from 'data/api-keys/legacy-api-keys-statu
import { useJwtSecretUpdatingStatusQuery } from 'data/config/jwt-secret-updating-status-query'
import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
+import { Loader } from 'lucide-react'
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from 'ui'
import { Admonition, GenericSkeletonLoader } from 'ui-patterns'
import { Input } from 'ui-patterns/DataInputs/Input'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import { ConnectionIcon } from '@/components/interfaces/Connect/ConnectionIcon'
+import { ConnectButton } from '@/components/interfaces/ConnectButton/ConnectButton'
+
export const APIKeys = () => {
const { ref: projectRef } = useParams()
const { can: canReadAPIKeys } = useAsyncCheckPermissions(PermissionAction.SECRETS_READ, '*')
@@ -208,7 +208,7 @@ export const APIKeys = () => {
Connect to your project from a variety of frameworks, ORMs, an MCP server, or even
directly via connection string.
</p>
- <Connect />
+ <ConnectButton />
</div>
</CardContent>
</>
diff --git a/apps/studio/components/interfaces/HomeNew/GettingStarted/Connect.test.ts b/apps/studio/components/interfaces/HomeNew/GettingStarted/Connect.test.ts
deleted file mode 100644
index 9e6a4b54599..00000000000
--- a/apps/studio/components/interfaces/HomeNew/GettingStarted/Connect.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import {
- getContentFilePath,
- inferConnectTabFromParentKey,
-} from 'components/interfaces/Connect/Connect.utils'
-import { FRAMEWORKS } from 'components/interfaces/Connect/Connect.constants'
-
-describe('Connect.utils helpers', () => {
- it('inferConnectTabFromParentKey returns frameworks for nextjs', () => {
- expect(inferConnectTabFromParentKey('nextjs')).toBe('frameworks')
- })
-
- it('inferConnectTabFromParentKey returns null for unknown', () => {
- expect(inferConnectTabFromParentKey('unknown-x')).toBeNull()
- })
-
- it('inferConnectTabFromParentKey returns mobiles for exporeactnative', () => {
- expect(inferConnectTabFromParentKey('exporeactnative')).toBe('mobiles')
- })
-
- it('inferConnectTabFromParentKey returns orms for prisma', () => {
- expect(inferConnectTabFromParentKey('prisma')).toBe('orms')
- })
-
- it('inferConnectTabFromParentKey returns null for null parentKey', () => {
- expect(inferConnectTabFromParentKey(null)).toBeNull()
- })
-
- describe('getContentFilePath', () => {
- it('returns parent/child/grandchild when all exist', () => {
- const path = getContentFilePath({
- connectionObject: FRAMEWORKS,
- selectedParent: 'nextjs',
- selectedChild: 'app',
- selectedGrandchild: 'supabasejs',
- })
- expect(path).toBe('nextjs/app/supabasejs')
- })
-
- it('returns parent/child when grandchild does not exist', () => {
- const path = getContentFilePath({
- connectionObject: FRAMEWORKS,
- selectedParent: 'remix',
- selectedChild: 'supabasejs',
- selectedGrandchild: 'does-not-exist',
- })
- expect(path).toBe('remix/supabasejs')
- })
-
- it('returns parent when child does not exist', () => {
- const path = getContentFilePath({
- connectionObject: FRAMEWORKS,
- selectedParent: 'nextjs',
- selectedChild: 'unknown-child',
- selectedGrandchild: 'any',
- })
- expect(path).toBe('nextjs')
- })
-
- it('returns empty string when parent does not exist', () => {
- const path = getContentFilePath({
- connectionObject: FRAMEWORKS,
- selectedParent: 'unknown-parent',
- selectedChild: 'any',
- selectedGrandchild: 'any',
- })
- expect(path).toBe('')
- })
- })
-})
diff --git a/apps/studio/components/interfaces/HomeNew/GettingStarted/FrameworkSelector.tsx b/apps/studio/components/interfaces/HomeNew/GettingStarted/FrameworkSelector.tsx
deleted file mode 100644
index 3f98835e868..00000000000
--- a/apps/studio/components/interfaces/HomeNew/GettingStarted/FrameworkSelector.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ConnectionType } from 'components/interfaces/Connect/Connect.constants'
-import { ConnectionIcon } from 'components/interfaces/Connect/ConnectionIcon'
-import { Box, Check, ChevronDown } from 'lucide-react'
-import { useState } from 'react'
-import {
- Button,
- CommandEmpty_Shadcn_,
- CommandGroup_Shadcn_,
- CommandInput_Shadcn_,
- CommandItem_Shadcn_,
- CommandList_Shadcn_,
- Command_Shadcn_,
- PopoverContent_Shadcn_,
- PopoverTrigger_Shadcn_,
- Popover_Shadcn_,
- cn,
-} from 'ui'
-
-interface FrameworkSelectorProps {
- value: string
- onChange: (value: string) => void
- items: ConnectionType[]
- className?: string
-}
-
-export const FrameworkSelector = ({
- value,
- onChange,
- items,
- className,
-}: FrameworkSelectorProps) => {
- const [open, setOpen] = useState(false)
-
- const selectedItem = items.find((item) => item.key === value)
-
- function handleSelect(key: string) {
- onChange(key)
- setOpen(false)
- }
-
- return (
- <Popover_Shadcn_ open={open} onOpenChange={setOpen} modal={false}>
- <div className={cn('flex', className)}>
- <PopoverTrigger_Shadcn_ asChild>
- <Button
- size="tiny"
- type="default"
- className="gap-0"
- iconRight={<ChevronDown strokeWidth={1.5} />}
- >
- <div className="flex items-center gap-2">
- {selectedItem?.icon ? <ConnectionIcon icon={selectedItem.icon} /> : <Box size={12} />}
- {selectedItem?.label}
- </div>
- </Button>
- </PopoverTrigger_Shadcn_>
- </div>
- <PopoverContent_Shadcn_
- className="p-0 max-w-48"
- side="bottom"
- align="start"
- onOpenAutoFocus={(e) => e.preventDefault()}
- >
- <Command_Shadcn_>
- <CommandInput_Shadcn_ placeholder="Search..." />
- <CommandList_Shadcn_>
- <CommandEmpty_Shadcn_>No results found.</CommandEmpty_Shadcn_>
- <CommandGroup_Shadcn_>
- {items.map((item) => (
- <CommandItem_Shadcn_
- key={item.key}
- value={item.key}
- onSelect={() => handleSelect(item.key)}
- className="flex gap-2 items-center"
- >
- {item.icon ? <ConnectionIcon icon={item.icon} /> : <Box size={12} />}
- {item.label}
- <Check
- size={15}
- className={cn('ml-auto', item.key === value ? 'opacity-100' : 'opacity-0')}
- />
- </CommandItem_Shadcn_>
- ))}
- </CommandGroup_Shadcn_>
- </CommandList_Shadcn_>
- </Command_Shadcn_>
- </PopoverContent_Shadcn_>
- </Popover_Shadcn_>
- )
-}
diff --git a/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStarted.utils.tsx b/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStarted.utils.tsx
index 0386d57c12a..113d1d54630 100644
--- a/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStarted.utils.tsx
+++ b/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStarted.utils.tsx
@@ -1,8 +1,7 @@
-import { BarChart3, Code, Database, GitBranch, Shield, Table, Upload, UserPlus } from 'lucide-react'
-
-import { FRAMEWORKS } from 'components/interfaces/Connect/Connect.constants'
import { DOCS_URL } from 'lib/constants'
+import { BarChart3, Code, Database, GitBranch, Shield, Table, Upload, UserPlus } from 'lucide-react'
import { AiIconAnimation, CodeBlock } from 'ui'
+
import type { GettingStartedAction, GettingStartedStep } from './GettingStarted.types'
import type { GettingStartedStatuses } from './useGettingStartedProgress'
@@ -136,7 +135,7 @@ export const getCodeWorkflowSteps = ({
title: 'Connect your application',
icon: <Code strokeWidth={1} className="text-foreground-muted" size={16} />,
description:
- 'Your project is ready; use the framework selector to preview starter code and launch the Connect flow with the client library you prefer.',
+ 'Your project is ready; open the Connect sheet to grab connection details and setup guidance.',
actions: connectActions,
},
{
@@ -309,7 +308,7 @@ export const getNoCodeWorkflowSteps = ({
title: 'Connect your application',
icon: <Code strokeWidth={1} className="text-foreground-muted" size={16} />,
description:
- 'Your project is ready; use the framework selector to preview starter code and launch the Connect flow to wire up your app.',
+ 'Your project is ready; open the Connect sheet to grab connection details and setup guidance.',
actions: connectActions,
},
{
@@ -377,5 +376,3 @@ export const getNoCodeWorkflowSteps = ({
},
]
}
-
-export const DEFAULT_FRAMEWORK_KEY = FRAMEWORKS[0]?.key ?? 'nextjs'
diff --git a/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx b/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx
index 62128342303..5eada2fc073 100644
--- a/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx
+++ b/apps/studio/components/interfaces/HomeNew/GettingStarted/GettingStartedSection.tsx
@@ -1,28 +1,22 @@
-import { Code, Table2 } from 'lucide-react'
-import { useRouter } from 'next/router'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-
import { IS_PLATFORM, useParams } from 'common'
-import { FRAMEWORKS } from 'components/interfaces/Connect/Connect.constants'
import { SIDEBAR_KEYS } from 'components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
import { BASE_PATH } from 'lib/constants'
import { useTrack } from 'lib/telemetry/track'
+import { Code, Table2 } from 'lucide-react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useAiAssistantStateSnapshot } from 'state/ai-assistant-state'
import { useSidebarManagerSnapshot } from 'state/sidebar-manager-state'
import { Button, Card, CardContent, ToggleGroup, ToggleGroupItem } from 'ui'
-import { FrameworkSelector } from './FrameworkSelector'
+
import { GettingStarted } from './GettingStarted'
import {
GettingStartedAction,
GettingStartedState,
GettingStartedStep,
} from './GettingStarted.types'
-import {
- DEFAULT_FRAMEWORK_KEY,
- getCodeWorkflowSteps,
- getNoCodeWorkflowSteps,
-} from './GettingStarted.utils'
+import { getCodeWorkflowSteps, getNoCodeWorkflowSteps } from './GettingStarted.utils'
import { useGettingStartedProgress } from './useGettingStartedProgress'
+import { ConnectButton } from '@/components/interfaces/ConnectButton/ConnectButton'
interface GettingStartedSectionProps {
value: GettingStartedState
@@ -30,13 +24,11 @@ interface GettingStartedSectionProps {
}
export function GettingStartedSection({ value, onChange }: GettingStartedSectionProps) {
- const router = useRouter()
const { ref } = useParams()
const track = useTrack()
const aiSnap = useAiAssistantStateSnapshot()
const { openSidebar } = useSidebarManagerSnapshot()
- const [selectedFramework, setSelectedFramework] = useState<string>(DEFAULT_FRAMEWORK_KEY)
const workflow: 'no-code' | 'code' | null = value === 'code' || value === 'no-code' ? value : null
const [previousWorkflow, setPreviousWorkflow] = useState<'no-code' | 'code' | null>(null)
@@ -50,68 +42,14 @@ export function GettingStartedSection({ value, onChange }: GettingStartedSection
[aiSnap, openSidebar]
)
- const connectPresetLinks = useMemo(() => {
- const basePath = router.asPath.split('?')[0]
- const parent = FRAMEWORKS.find((f) => f.key === selectedFramework)
- if (!parent) {
- return [
- {
- label: 'Connect',
- href: `${basePath}?showConnect=true&connectTab=frameworks`,
- },
- ]
- }
-
- let using: string | undefined
- let withKey: string | undefined
- if (parent.children && parent.children.length > 0) {
- // prefer App Router for Nextjs by default
- if (parent.key === 'nextjs') {
- const appChild = parent.children.find((c) => c.key === 'app') || parent.children[0]
- using = appChild?.key
- withKey = appChild?.children?.[0]?.key
- } else {
- using = parent.children[0]?.key
- withKey = parent.children[0]?.children?.[0]?.key
- }
- }
-
- const qs = new URLSearchParams({
- showConnect: 'true',
- connectTab: 'frameworks',
- framework: parent.key,
- })
- if (using) qs.set('using', using)
- if (withKey) qs.set('with', withKey)
-
+ const connectActions: GettingStartedAction[] = useMemo(() => {
return [
{
label: 'Connect',
- href: `${basePath}?${qs.toString()}`,
+ component: <ConnectButton buttonType="primary" />,
},
]
- }, [router.asPath, selectedFramework])
-
- const connectActions: GettingStartedAction[] = useMemo(() => {
- const selector: GettingStartedAction = {
- label: 'Framework selector',
- component: (
- <FrameworkSelector
- value={selectedFramework}
- onChange={setSelectedFramework}
- items={FRAMEWORKS}
- />
- ),
- }
-
- const linkActions: GettingStartedAction[] = connectPresetLinks.map((lnk) => ({
- label: 'Connect',
- href: lnk.href,
- variant: 'primary',
- }))
-
- return [selector, ...linkActions]
- }, [connectPresetLinks, selectedFramework])
+ }, [])
const codeSteps: GettingStartedStep[] = useMemo(
() =>
diff --git a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx
index 249f73e14e6..1279540e9e2 100644
--- a/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/LayoutHeader/LayoutHeader.tsx
@@ -1,11 +1,5 @@
-import { AnimatePresence, motion } from 'framer-motion'
-import { ChevronLeft } from 'lucide-react'
-import Link from 'next/link'
-import { ReactNode, useMemo } from 'react'
-
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
import { useIsBranching2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
-import { Connect } from 'components/interfaces/Connect/Connect'
import { LocalDropdown } from 'components/interfaces/LocalDropdown'
import { UserDropdown } from 'components/interfaces/UserDropdown'
import { AdvisorButton } from 'components/layouts/AppLayout/AdvisorButton'
@@ -16,20 +10,29 @@ import { OrganizationDropdown } from 'components/layouts/AppLayout/OrganizationD
import { ProjectDropdown } from 'components/layouts/AppLayout/ProjectDropdown'
import { getResourcesExceededLimitsOrg } from 'components/ui/OveragesBanner/OveragesBanner.utils'
import { useOrgUsageQuery } from 'data/usage/org-usage-query'
+import { AnimatePresence, motion } from 'framer-motion'
import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { IS_PLATFORM } from 'lib/constants'
+import { ChevronLeft } from 'lucide-react'
+import Link from 'next/link'
import { useRouter } from 'next/router'
+import { ReactNode, useMemo } from 'react'
import { useAppStateSnapshot } from 'state/app-state'
import { Badge, cn } from 'ui'
import { CommandMenuTriggerInput } from 'ui-patterns'
+
import { BreadcrumbsView } from './BreadcrumbsView'
import { FeedbackDropdown } from './FeedbackDropdown/FeedbackDropdown'
import { HelpPopover } from './HelpPopover'
import { HomeIcon } from './HomeIcon'
import { LocalVersionPopover } from './LocalVersionPopover'
import MergeRequestButton from './MergeRequestButton'
+import { Connect } from '@/components/interfaces/Connect/Connect'
+import { ConnectButton } from '@/components/interfaces/ConnectButton/ConnectButton'
+import { ConnectSheet } from '@/components/interfaces/ConnectSheet/ConnectSheet'
+import { usePHFlag } from '@/hooks/ui/useFlag'
const LayoutHeaderDivider = ({ className, ...props }: React.HTMLProps<HTMLSpanElement>) => (
<span className={cn('text-border-stronger pr-2', className)} {...props}>
@@ -64,13 +67,17 @@ export const LayoutHeader = ({
showProductMenu,
backToDashboardURL,
}: LayoutHeaderProps) => {
- const { ref: projectRef, slug } = useParams()
const router = useRouter()
+ const { ref: projectRef, slug } = useParams()
const { data: selectedProject } = useSelectedProjectQuery()
const { data: selectedOrganization } = useSelectedOrganizationQuery()
const { setMobileMenuOpen } = useAppStateSnapshot()
const gitlessBranching = useIsBranching2Enabled()
+ const connectSheetFlag = usePHFlag<string | boolean>('connectSheet')
+ const isFlagResolved = connectSheetFlag !== undefined
+ const isConnectSheetEnabled = connectSheetFlag === true || connectSheetFlag === 'variation'
+
const [commandMenuEnabled] = useLocalStorageQuery(LOCAL_STORAGE_KEYS.HOTKEY_COMMAND_MENU, true)
const isAccountPage = router.pathname.startsWith('/account')
@@ -198,7 +205,7 @@ export const LayoutHeader = ({
}}
>
{IS_PLATFORM && gitlessBranching && <MergeRequestButton />}
- <Connect />
+ <ConnectButton />
</motion.div>
)}
</AnimatePresence>
@@ -265,6 +272,8 @@ export const LayoutHeader = ({
</div>
</div>
</header>
+
+ {isFlagResolved ? isConnectSheetEnabled ? <ConnectSheet /> : <Connect /> : null}
</>
)
}
diff --git a/apps/studio/components/ui/FileExplorerAndEditor/index.tsx b/apps/studio/components/ui/FileExplorerAndEditor/index.tsx
index ba93da877cd..ac399cda6ce 100644
--- a/apps/studio/components/ui/FileExplorerAndEditor/index.tsx
+++ b/apps/studio/components/ui/FileExplorerAndEditor/index.tsx
@@ -1,25 +1,25 @@
+import { AIEditor } from 'components/ui/AIEditor'
import { AnimatePresence, motion } from 'framer-motion'
import { Edit, File, Plus, Trash } from 'lucide-react'
import { useEffect, useState } from 'react'
import { toast } from 'sonner'
-
-import { AIEditor } from 'components/ui/AIEditor'
import {
Button,
- cn,
- ContextMenu_Shadcn_,
ContextMenuContent_Shadcn_,
ContextMenuItem_Shadcn_,
ContextMenuSeparator_Shadcn_,
ContextMenuTrigger_Shadcn_,
- flattenTree,
+ ContextMenu_Shadcn_,
Tooltip,
TooltipContent,
TooltipTrigger,
TreeView,
TreeViewItem,
+ cn,
+ flattenTree,
} from 'ui'
-import { FileAction, TreeChildData, type FileData } from './FileExplorerAndEditor.types'
+
+import { FileAction, type FileData, TreeChildData } from './FileExplorerAndEditor.types'
import {
extractZipFile,
getFileAction,
diff --git a/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx b/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx
index 7c1111c2b78..f5be997d027 100644
--- a/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx
+++ b/packages/ui-patterns/src/McpUrlBuilder/components/ClientSelectDropdown.tsx
@@ -15,6 +15,7 @@ import {
Popover_Shadcn_,
cn,
} from 'ui'
+
import type { McpClient } from '../types'
import { ConnectionIcon } from './ConnectionIcon'
diff --git a/packages/ui/src/components/CodeBlock/CodeBlock.tsx b/packages/ui/src/components/CodeBlock/CodeBlock.tsx
index 4780f6bc44b..6d411ac5686 100644
--- a/packages/ui/src/components/CodeBlock/CodeBlock.tsx
+++ b/packages/ui/src/components/CodeBlock/CodeBlock.tsx
@@ -1,17 +1,11 @@
'use client'
+import curl from 'highlightjs-curl'
import { noop } from 'lodash'
import { Check, Copy } from 'lucide-react'
import { useTheme } from 'next-themes'
import { Children, ReactNode, useState } from 'react'
import { Light as SyntaxHighlighter, SyntaxHighlighterProps } from 'react-syntax-highlighter'
-
-import { copyToClipboard } from '../../lib/utils'
-import { cn } from '../../lib/utils/cn'
-import { Button } from '../Button/Button'
-import { monokaiCustomTheme } from './CodeBlock.utils'
-
-import curl from 'highlightjs-curl'
import bash from 'react-syntax-highlighter/dist/cjs/languages/hljs/bash'
import csharp from 'react-syntax-highlighter/dist/cjs/languages/hljs/csharp'
import dart from 'react-syntax-highlighter/dist/cjs/languages/hljs/dart'
@@ -30,6 +24,11 @@ import sql from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql'
import ts from 'react-syntax-highlighter/dist/cjs/languages/hljs/typescript'
import yaml from 'react-syntax-highlighter/dist/cjs/languages/hljs/yaml'
+import { copyToClipboard } from '../../lib/utils'
+import { cn } from '../../lib/utils/cn'
+import { Button } from '../Button/Button'
+import { monokaiCustomTheme } from './CodeBlock.utils'
+
export type CodeBlockLang =
| 'js'
| 'jsx'