Skip to content

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

Connect iteration (#43949)

Saxon Fletcher2ab9915d8c72
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx
index b90dbd1a84c..39ee7052dd7 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectConfigSection.tsx
@@ -80,7 +80,7 @@ export function ConnectConfigSection({
className="flex-1 rounded-lg text-left"
>
<div className="flex items-center gap-2">
- {option.icon && <ConnectionIcon icon={option.icon} />}
+ {option.icon && <ConnectionIcon supportsDarkMode icon={option.icon} />}
<span className="text-sm">{option.label}</span>
</div>
</RadioGroupStackedItem>
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
index f110ec843c2..790a38f21d4 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectSheet.tsx
@@ -2,6 +2,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
+import { useTrack } from 'lib/telemetry/track'
import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
import { useEffect, useMemo, useRef } from 'react'
import { cn, Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from 'ui'
@@ -10,11 +11,10 @@ import type { ConnectMode, ProjectKeys } from './Connect.types'
import { CONNECT_MODES } from './Connect.types'
import { ConnectConfigSection, ModeSelector } from './ConnectConfigSection'
import { ConnectStepsSection } from './ConnectStepsSection'
-import { useConnectState } from './useConnectState'
import { useAvailableConnectModes } from './useAvailableConnectModes'
+import { useConnectState } from './useConnectState'
import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
import { useAppStateSnapshot } from '@/state/app-state'
-import { useTrack } from 'lib/telemetry/track'
function isConnectMode(value: string): value is ConnectMode {
return CONNECT_MODES.some((mode) => mode === value)
diff --git a/apps/studio/components/interfaces/ConnectSheet/ConnectionIcon.tsx b/apps/studio/components/interfaces/ConnectSheet/ConnectionIcon.tsx
index b2de0e20795..9bb52a94a83 100644
--- a/apps/studio/components/interfaces/ConnectSheet/ConnectionIcon.tsx
+++ b/apps/studio/components/interfaces/ConnectSheet/ConnectionIcon.tsx
@@ -1,9 +1,7 @@
+import { BASE_PATH } from 'lib/constants'
import { useTheme } from 'next-themes'
import Image from 'next/image'
-import { BASE_PATH } from 'lib/constants'
-import { cn } from 'ui'
-
interface ConnectionIconProps {
icon: string
iconFolder?: string
@@ -37,12 +35,6 @@ export const ConnectionIcon = ({
}${imageExtension}.svg`
return (
- <Image
- className={cn('transition-all group-hover:scale-110', className)}
- src={iconImgSrc}
- alt={`${icon} logo`}
- width={size}
- height={size}
- />
+ <Image className={className} src={iconImgSrc} alt={`${icon} logo`} width={size} height={size} />
)
}
diff --git a/apps/studio/components/interfaces/ProjectHome/ConnectSection.config.tsx b/apps/studio/components/interfaces/ProjectHome/ConnectSection.config.tsx
index 6159be2284a..4b2e7196e69 100644
--- a/apps/studio/components/interfaces/ProjectHome/ConnectSection.config.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/ConnectSection.config.tsx
@@ -1,4 +1,4 @@
-import { Box, Cable, Database, Sparkles } from 'lucide-react'
+import { Box, Cable, Database, KeyRound, Sparkles } from 'lucide-react'
import type { ReactNode } from 'react'
import type { ConnectMode } from '../ConnectSheet/Connect.types'
@@ -6,35 +6,50 @@ import type { ConnectMode } from '../ConnectSheet/Connect.types'
export type ConnectSectionVariant = 'connect' | 'getting-started'
export type ConnectAction = {
- mode: ConnectMode
+ id: ConnectMode | 'api_keys'
heading: string
subheading: string
icon: ReactNode
+ mode?: ConnectMode
+ href?: string
+ requiresActiveProject?: boolean
}
export const CONNECT_ACTIONS: ConnectAction[] = [
{
+ id: 'framework',
mode: 'framework',
heading: 'Framework',
subheading: 'Use a client library',
icon: <Box size={16} strokeWidth={1.5} />,
},
{
+ id: 'direct',
mode: 'direct',
heading: 'Direct',
subheading: 'Connection string',
icon: <Database size={16} strokeWidth={1.5} />,
},
{
+ id: 'orm',
mode: 'orm',
heading: 'ORM',
subheading: 'Third-party library',
icon: <Cable size={16} strokeWidth={1.5} />,
},
{
+ id: 'mcp',
mode: 'mcp',
heading: 'MCP',
subheading: 'Connect your agent',
icon: <Sparkles size={16} strokeWidth={1.5} />,
},
+ {
+ id: 'api_keys',
+ heading: 'API Keys',
+ subheading: 'Manage project keys',
+ icon: <KeyRound size={16} strokeWidth={1.5} />,
+ href: '/project/[ref]/settings/api-keys',
+ requiresActiveProject: false,
+ },
]
diff --git a/apps/studio/components/interfaces/ProjectHome/ConnectSection.tsx b/apps/studio/components/interfaces/ProjectHome/ConnectSection.tsx
index 299153046e9..df723aa0094 100644
--- a/apps/studio/components/interfaces/ProjectHome/ConnectSection.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/ConnectSection.tsx
@@ -2,20 +2,22 @@ import { IS_PLATFORM } from 'common'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { BASE_PATH, PROJECT_STATUS } from 'lib/constants'
import { useTrack } from 'lib/telemetry/track'
+import { ChevronRight } from 'lucide-react'
+import { useRouter } from 'next/router'
import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs'
import { useEffect, useRef } from 'react'
import { Card, CardContent, cn } from 'ui'
-import type { ConnectMode } from '../ConnectSheet/Connect.types'
import { useAvailableConnectModes } from '../ConnectSheet/useAvailableConnectModes'
-import { useAppStateSnapshot } from '@/state/app-state'
import { CONNECT_ACTIONS, type ConnectSectionVariant } from './ConnectSection.config'
+import { useAppStateSnapshot } from '@/state/app-state'
interface ConnectSectionProps {
variant: ConnectSectionVariant
}
export const ConnectSection = ({ variant }: ConnectSectionProps) => {
+ const router = useRouter()
const { data: selectedProject } = useSelectedProjectQuery()
const { setConnectSheetSource } = useAppStateSnapshot()
const track = useTrack()
@@ -26,7 +28,7 @@ export const ConnectSection = ({ variant }: ConnectSectionProps) => {
const availableModeIds = useAvailableConnectModes()
const availableActions = CONNECT_ACTIONS.filter((action) =>
- availableModeIds.includes(action.mode)
+ action.mode ? availableModeIds.includes(action.mode) : true
)
const hasTrackedExposure = useRef(false)
@@ -38,11 +40,19 @@ export const ConnectSection = ({ variant }: ConnectSectionProps) => {
track('home_connect_section_exposed', { variant })
}, [variant, track])
- const handleConnectClick = (mode: ConnectMode) => {
- track('home_connect_action_clicked', { mode })
- setConnectTab(mode)
- setConnectSheetSource('connect_section')
- setShowConnect(true)
+ const handleActionClick = (action: (typeof CONNECT_ACTIONS)[number]) => {
+ track('home_connect_action_clicked', { mode: action.id })
+
+ if (action.mode) {
+ setConnectTab(action.mode)
+ setConnectSheetSource('connect_section')
+ setShowConnect(true)
+ return
+ }
+
+ if (action.href && selectedProject?.ref) {
+ router.push(action.href.replace('[ref]', selectedProject.ref))
+ }
}
return (
@@ -67,26 +77,35 @@ export const ConnectSection = ({ variant }: ConnectSectionProps) => {
</div>
<CardContent className="relative z-10 p-0">
- <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 divide-y md:divide-y-0 md:divide-x border-muted">
+ <div className="grid grid-cols-1 xl:grid-cols-5 divide-y xl:divide-y-0 xl:divide-x border-muted">
{availableActions.map((action) => (
<button
- key={action.mode}
+ key={action.id}
type="button"
- disabled={!isActiveHealthy}
- onClick={() => handleConnectClick(action.mode)}
+ disabled={
+ (action.requiresActiveProject ?? true) ? !isActiveHealthy : !selectedProject?.ref
+ }
+ onClick={() => handleActionClick(action)}
className={cn(
- 'group flex flex-col items-center justify-center gap-3 p-6 text-center transition-colors min-h-32',
+ 'group flex items-center gap-3 p-4 text-left transition-colors min-h-[72px] w-full',
'hover:bg-surface-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-brand',
- !isActiveHealthy && 'cursor-not-allowed opacity-50'
+ 'xl:min-h-32 xl:flex-col xl:justify-center xl:p-6 xl:text-center',
+ ((action.requiresActiveProject ?? true)
+ ? !isActiveHealthy
+ : !selectedProject?.ref) && 'cursor-not-allowed opacity-50'
)}
>
- <span className="text-foreground-light group-hover:text-foreground">
+ <span className="shrink-0 text-foreground-light group-hover:text-foreground">
{action.icon}
</span>
- <div className="flex flex-col gap-1">
+ <div className="flex min-w-0 flex-1 flex-col gap-1 xl:flex-initial">
<p className="text-sm">{action.heading}</p>
<p className="text-sm text-foreground-lighter">{action.subheading}</p>
</div>
+ <ChevronRight
+ size={16}
+ className="shrink-0 text-foreground-lighter group-hover:text-foreground xl:hidden"
+ />
</button>
))}
</div>
diff --git a/apps/studio/components/interfaces/ProjectHome/Home.tsx b/apps/studio/components/interfaces/ProjectHome/Home.tsx
index 3939521415b..6d84a1d0fc6 100644
--- a/apps/studio/components/interfaces/ProjectHome/Home.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/Home.tsx
@@ -21,7 +21,7 @@ import type { ConnectSectionVariant } from './ConnectSection.config'
import { CustomReportSection } from './CustomReportSection'
import { type GettingStartedState } from './GettingStarted/GettingStarted.types'
import { GettingStartedSection } from './GettingStarted/GettingStartedSection'
-import { DEFAULT_SECTION_ORDER, mergeSectionOrder, getSectionVisibility } from './Home.utils'
+import { DEFAULT_SECTION_ORDER, getSectionVisibility, mergeSectionOrder } from './Home.utils'
import { ProjectUsageSection as ProjectUsageSectionV2 } from './ProjectUsageSection'
export const ProjectHome = () => {
@@ -94,14 +94,14 @@ export const ProjectHome = () => {
<ScaffoldContainer size="large" className={cn(isPaused && 'h-full')}>
<ScaffoldSection
isFullWidth
- className={cn(isPaused ? 'h-full flex justify-center !p-0' : 'pt-16 pb-0')}
+ className={cn(isPaused ? 'h-full flex justify-center !p-0' : 'pb-0')}
>
<TopSection />
</ScaffoldSection>
</ScaffoldContainer>
{!isPaused && (
<ScaffoldContainer size="large">
- <ScaffoldSection isFullWidth className="gap-16 pb-32">
+ <ScaffoldSection isFullWidth className="gap-12 pb-32">
<DndContext sensors={sensors} onDragEnd={handleDragEnd}>
<SortableContext
items={sectionOrder.filter((id) => {
diff --git a/apps/studio/components/interfaces/ProjectHome/ProjectConnectionHoverCard.tsx b/apps/studio/components/interfaces/ProjectHome/ProjectConnectionHoverCard.tsx
deleted file mode 100644
index 82c8e4bdf8f..00000000000
--- a/apps/studio/components/interfaces/ProjectHome/ProjectConnectionHoverCard.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { Label } from '@ui/components/shadcn/ui/label'
-import { getConnectionStrings } from 'components/interfaces/Connect/DatabaseSettings.utils'
-import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
-import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'
-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
-import { pluckObjectFields } from 'lib/helpers'
-import { Plug } from 'lucide-react'
-import { parseAsBoolean, useQueryState } from 'nuqs'
-import { useMemo, useState, type ReactNode } from 'react'
-import { Button, HoverCard, HoverCardContent, HoverCardTrigger } from 'ui'
-import { ShimmeringLoader } from 'ui-patterns'
-import { Input } from 'ui-patterns/DataInputs/Input'
-
-import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
-
-const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user'] as const
-const EMPTY_CONNECTION_INFO = {
- db_user: '',
- db_host: '',
- db_port: '',
- db_name: '',
-}
-
-const DetailRow = ({ label, children }: { label: string; children: ReactNode }) => {
- return (
- <div className="flex flex-col gap-2">
- <Label>{label}</Label>
- {children}
- </div>
- )
-}
-
-interface ProjectConnectionHoverCardProps {
- projectRef?: string
-}
-
-export const ProjectConnectionHoverCard = ({ projectRef }: ProjectConnectionHoverCardProps) => {
- const [open, setOpen] = useState(false)
- const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
-
- const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissions(
- PermissionAction.READ,
- 'service_api_keys'
- )
-
- const { data: projectUrl, isPending: isLoadingApiUrl } = useProjectApiUrl({ projectRef })
-
- const { data: apiKeys, isLoading: isLoadingKeys } = useAPIKeysQuery(
- { projectRef },
- { enabled: open && canReadAPIKeys }
- )
- const { publishableKey } = canReadAPIKeys ? getKeys(apiKeys) : { publishableKey: null }
-
- const { data: databases, isLoading: isLoadingDatabases } = useReadReplicasQuery(
- { projectRef },
- { enabled: open && !!projectRef }
- )
- const primaryDatabase = databases?.find((db) => db.identifier === projectRef)
-
- const directConnectionString = useMemo(() => {
- if (
- !primaryDatabase?.db_host ||
- !primaryDatabase?.db_name ||
- !primaryDatabase?.db_user ||
- !primaryDatabase?.db_port
- ) {
- return ''
- }
- const connectionInfo = pluckObjectFields(primaryDatabase, [...DB_FIELDS])
- return getConnectionStrings({
- connectionInfo: { ...EMPTY_CONNECTION_INFO, ...connectionInfo },
- metadata: { projectRef },
- }).direct.uri
- }, [primaryDatabase, projectRef])
-
- return (
- <HoverCard openDelay={250} closeDelay={100} open={open} onOpenChange={setOpen}>
- <HoverCardTrigger asChild>
- <button onClick={() => setShowConnect(true)} className="flex items-center gap-4 mt-3 group">
- <div className=" transition w-8 h-8 rounded-md bg-surface-75 group-hover:bg-muted border flex items-center justify-center">
- <Plug strokeWidth={1.5} size={16} className="text-foreground-light rotate-90" />
- </div>
- {isLoadingApiUrl ? (
- <ShimmeringLoader className="w-32" />
- ) : (
- <span className="transition text-foreground-light group-hover:text-foreground underline decoration-dotted decoration-foreground-muted underline-offset-4 max-w-[320px] text-left">
- {projectUrl ?? 'Project URL unavailable'}
- </span>
- )}
- </button>
- </HoverCardTrigger>
- <HoverCardContent side="bottom" align="start" className="w-[420px] p-0">
- <div className="p-4 border-b space-y-4">
- <h3 className="heading-meta text-foreground-light">Data API</h3>
- <DetailRow label="Project URL">
- <Input
- copy
- readOnly
- className="font-mono text-xs"
- value={projectUrl ?? ''}
- placeholder="Project URL unavailable"
- />
- </DetailRow>
- <DetailRow label="Publishable Key">
- {isLoadingPermissions || isLoadingKeys ? (
- <div className="text-xs text-foreground-lighter">Loading publishable key...</div>
- ) : canReadAPIKeys ? (
- <Input
- copy
- readOnly
- className="font-mono text-xs"
- value={publishableKey?.api_key ?? ''}
- placeholder="Publishable key unavailable"
- />
- ) : (
- <div className="text-xs text-foreground-lighter">
- You don't have permission to view API keys.
- </div>
- )}
- </DetailRow>
- </div>
- <div className="p-4 space-y-4 border-b">
- <h3 className="heading-meta text-foreground-light"> Database </h3>
- <DetailRow label="Direct connection string">
- {isLoadingDatabases ? (
- <div className="text-xs text-foreground-lighter">Loading connection string...</div>
- ) : (
- <Input
- copy
- readOnly
- className="font-mono text-xs"
- value={directConnectionString}
- placeholder="Connection string unavailable"
- />
- )}
- </DetailRow>
- </div>
- <div className="p-4">
- <Button
- icon={<Plug className="rotate-90" />}
- type="default"
- size="medium"
- className="w-full"
- onClick={() => setShowConnect(true)}
- >
- Get connected
- </Button>
- </div>
- </HoverCardContent>
- </HoverCard>
- )
-}
diff --git a/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx b/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx
new file mode 100644
index 00000000000..447c694d431
--- /dev/null
+++ b/apps/studio/components/interfaces/ProjectHome/ProjectConnectionPopover.tsx
@@ -0,0 +1,226 @@
+import { PermissionAction } from '@supabase/shared-types/out/constants'
+import { getConnectionStrings } from 'components/interfaces/Connect/DatabaseSettings.utils'
+import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'
+import { useReadReplicasQuery } from 'data/read-replicas/replicas-query'
+import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
+import { pluckObjectFields } from 'lib/helpers'
+import { Check, ChevronDown, Copy, Database, KeyRound, Link2, Terminal } from 'lucide-react'
+import { parseAsBoolean, useQueryState } from 'nuqs'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import {
+ Button,
+ cn,
+ copyToClipboard,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from 'ui'
+import { ShimmeringLoader } from 'ui-patterns'
+
+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'
+
+const DB_FIELDS = ['db_host', 'db_name', 'db_port', 'db_user'] as const
+const EMPTY_CONNECTION_INFO = {
+ db_user: '',
+ db_host: '',
+ db_port: '',
+ db_name: '',
+}
+
+interface ProjectConnectionPopoverProps {
+ projectRef?: string
+}
+
+export const ProjectConnectionPopover = ({ projectRef }: ProjectConnectionPopoverProps) => {
+ const [open, setOpen] = useState(false)
+ const [copiedItem, setCopiedItem] = useState<string | null>(null)
+ const copiedTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+ const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))
+
+ const { isLoading: isLoadingPermissions, can: canReadAPIKeys } = useAsyncCheckPermissions(
+ PermissionAction.READ,
+ 'service_api_keys'
+ )
+
+ const { data: projectUrl, isPending: isLoadingApiUrl } = useProjectApiUrl({ projectRef })
+
+ const { data: apiKeys, isLoading: isLoadingKeys } = useAPIKeysQuery(
+ { projectRef },
+ { enabled: open && canReadAPIKeys }
+ )
+ const { publishableKey } = canReadAPIKeys ? getKeys(apiKeys) : { publishableKey: null }
+
+ const { data: databases, isLoading: isLoadingDatabases } = useReadReplicasQuery(
+ { projectRef },
+ { enabled: open && !!projectRef }
+ )
+ const primaryDatabase = databases?.find((db) => db.identifier === projectRef)
+
+ const directConnectionString = useMemo(() => {
+ if (
+ !primaryDatabase?.db_host ||
+ !primaryDatabase?.db_name ||
+ !primaryDatabase?.db_user ||
+ !primaryDatabase?.db_port
+ ) {
+ return ''
+ }
+ const connectionInfo = pluckObjectFields(primaryDatabase, [...DB_FIELDS])
+ return getConnectionStrings({
+ connectionInfo: { ...EMPTY_CONNECTION_INFO, ...connectionInfo },
+ metadata: { projectRef },
+ }).direct.uri
+ }, [primaryDatabase, projectRef])
+
+ const cliCommands = useMemo(
+ () =>
+ [
+ 'supabase login',
+ 'supabase init',
+ `supabase link --project-ref ${projectRef ?? 'PROJECT_REF_UNAVAILABLE'}`,
+ ].join('\n'),
+ [projectRef]
+ )
+
+ const menuItems = useMemo(
+ () => [
+ {
+ label: 'Project URL',
+ value: projectUrl ?? '',
+ displayValue: isLoadingApiUrl
+ ? 'Loading project URL...'
+ : (projectUrl ?? 'Project URL unavailable'),
+ disabled: isLoadingApiUrl || !projectUrl,
+ icon: Link2,
+ },
+ {
+ label: 'Publishable key',
+ value: publishableKey?.api_key ?? '',
+ displayValue:
+ isLoadingPermissions || isLoadingKeys
+ ? 'Loading publishable key...'
+ : canReadAPIKeys
+ ? (publishableKey?.api_key ?? 'Publishable key unavailable')
+ : "You don't have permission to view API keys.",
+ disabled:
+ isLoadingPermissions || isLoadingKeys || !canReadAPIKeys || !publishableKey?.api_key,
+ icon: KeyRound,
+ },
+ {
+ label: 'Direct connection string',
+ value: directConnectionString,
+ displayValue: isLoadingDatabases
+ ? 'Loading connection string...'
+ : directConnectionString || 'Connection string unavailable',
+ disabled: isLoadingDatabases || !directConnectionString,
+ icon: Database,
+ },
+ {
+ label: 'CLI setup commands',
+ value: cliCommands,
+ displayValue: cliCommands.replace(/\n/g, ' - '),
+ disabled: !projectRef,
+ icon: Terminal,
+ },
+ ],
+ [
+ canReadAPIKeys,
+ cliCommands,
+ directConnectionString,
+ isLoadingApiUrl,
+ isLoadingDatabases,
+ isLoadingKeys,
+ isLoadingPermissions,
+ projectRef,
+ projectUrl,
+ publishableKey?.api_key,
+ ]
+ )
+
+ useEffect(() => {
+ return () => {
+ if (copiedTimeoutRef.current) clearTimeout(copiedTimeoutRef.current)
+ }
+ }, [])
+
+ return (
+ <div className="mt-3 inline-flex max-w-full items-center gap-3 min-w-0">
+ {isLoadingApiUrl ? (
+ <ShimmeringLoader className="w-32 shrink-0" />
+ ) : (
+ <span className="min-w-0 max-w-[320px] truncate text-left text-foreground-light">
+ {projectUrl ?? 'Project URL unavailable'}
+ </span>
+ )}
+ <DropdownMenu open={open} onOpenChange={setOpen}>
+ <DropdownMenuTrigger asChild>
+ <Button
+ type="default"
+ size="tiny"
+ className="shrink-0"
+ iconRight={
+ <ChevronDown size={14} className={cn('transition-transform', open && 'rotate-180')} />
+ }
+ >
+ Copy
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent side="bottom" align="end" className="w-80 p-1">
+ {menuItems.map((item) => {
+ const Icon = item.icon
+
+ return (
+ <DropdownMenuItem
+ key={item.label}
+ className="group relative items-center gap-3 pr-10"
+ disabled={item.disabled}
+ onSelect={(event) => {
+ event.preventDefault()
+ if (item.disabled) return
+
+ copyToClipboard(item.value)
+ setCopiedItem(item.label)
+
+ if (copiedTimeoutRef.current) clearTimeout(copiedTimeoutRef.current)
+ copiedTimeoutRef.current = setTimeout(() => setCopiedItem(null), 1500)
+ }}
+ >
+ <Icon size={14} className="mt-0.5 shrink-0 text-foreground-light" />
+ <div className="min-w-0 flex-1">
+ <div className="text-sm text-foreground">{item.label}</div>
+ <div className="truncate text-sm text-foreground-lighter">
+ {item.displayValue}
+ </div>
+ </div>
+ <div
+ className={cn(
+ 'absolute right-2 top-1/2 -translate-y-1/2 text-foreground-lighter opacity-0 transition-opacity group-hover:opacity-100',
+ copiedItem === item.label && 'opacity-100 text-brand'
+ )}
+ >
+ {copiedItem === item.label ? <Check size={14} /> : <Copy size={14} />}
+ </div>
+ </DropdownMenuItem>
+ )
+ })}
+ <DropdownMenuSeparator />
+ <div className="p-1">
+ <Button
+ type="default"
+ size="tiny"
+ className="w-full"
+ onClick={() => {
+ setOpen(false)
+ setShowConnect(true)
+ }}
+ >
+ Get Connected
+ </Button>
+ </div>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ )
+}
diff --git a/apps/studio/components/interfaces/ProjectHome/TopSection.tsx b/apps/studio/components/interfaces/ProjectHome/TopSection.tsx
index 057945eeec9..5279bb72ef8 100644
--- a/apps/studio/components/interfaces/ProjectHome/TopSection.tsx
+++ b/apps/studio/components/interfaces/ProjectHome/TopSection.tsx
@@ -1,5 +1,5 @@
import { ActivityStats } from 'components/interfaces/ProjectHome/ActivityStats'
-import { ProjectConnectionHoverCard } from 'components/interfaces/ProjectHome/ProjectConnectionHoverCard'
+import { ProjectConnectionPopover } from 'components/interfaces/ProjectHome/ProjectConnectionPopover'
import { ProjectPausedState } from 'components/layouts/ProjectLayout/PausedState/ProjectPausedState'
import { ComputeBadgeWrapper } from 'components/ui/ComputeBadgeWrapper'
import { InlineLink } from 'components/ui/InlineLink'
@@ -81,7 +81,7 @@ export const TopSection = () => {
/>
</div>
</div>
- <ProjectConnectionHoverCard projectRef={project?.ref} />
+ <ProjectConnectionPopover projectRef={project?.ref} />
</div>
</div>
<div className="mt-8">
diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx
index a54930134f5..efee91c7fb8 100644
--- a/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx
+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/LayoutHeader.tsx
@@ -17,6 +17,7 @@ import { ProjectDropdown } from 'components/layouts/AppLayout/ProjectDropdown'
import { HelpButton } from 'components/ui/HelpPanel/HelpButton'
import { getResourcesExceededLimitsOrg } from 'components/ui/OveragesBanner/OveragesBanner.utils'
import { useOrgUsageQuery } from 'data/usage/org-usage-query'
+import dayjs from 'dayjs'
import { DevToolbarTrigger } from 'dev-tools'
import { AnimatePresence, motion } from 'framer-motion'
import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
@@ -59,7 +60,7 @@ const LayoutHeaderDivider = ({ className, ...props }: React.HTMLProps<HTMLSpanEl
interface LayoutHeaderProps {
customHeaderComponents?: ReactNode
- breadcrumbs?: any[]
+ breadcrumbs?: unknown[]
headerTitle?: string
backToDashboardURL?: string
}
@@ -98,6 +99,12 @@ export const LayoutHeader = ({
}
}, [orgUsage])
+ const isNewProject =
+ selectedProject?.inserted_at !== undefined &&
+ dayjs(selectedProject.inserted_at).isAfter(dayjs().subtract(5, 'day'))
+
+ const connectButtonType = isNewProject ? 'primary' : 'default'
+
// show org selection if we are on a project page or on a explicit org route
const showOrgSelection = slug || (selectedOrganization && projectRef)
@@ -216,7 +223,7 @@ export const LayoutHeader = ({
}}
>
{IS_PLATFORM && gitlessBranching && <MergeRequestButton />}
- <ConnectButton />
+ <ConnectButton buttonType={connectButtonType} />
</motion.div>
)}
</AnimatePresence>
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index 27a9600b424..0fe93070fcf 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -2035,9 +2035,9 @@ export interface HomeConnectActionClickedEvent {
action: 'home_connect_action_clicked'
properties: {
/**
- * The connect mode that was clicked
+ * The connect action/tile that was clicked
*/
- mode: 'framework' | 'direct' | 'orm' | 'mcp'
+ mode: 'framework' | 'direct' | 'orm' | 'mcp' | 'api_keys'
}
groups: TelemetryGroups
}