Skip to content

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

Joshen/fe 3983 no way to create a new project in vercel integration when (#48230)

Joshen Lim7f42765070f7
diff --git a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx
index a256f0dd418..8ea17f52cf8 100644
--- a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx
+++ b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinker.tsx
@@ -1,81 +1,19 @@
-import { Check, ChevronDown, Plus, PlusIcon } from 'lucide-react'
-import Link from 'next/link'
-import { useRouter } from 'next/router'
-import { HTMLAttributes, ReactNode, useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
import { toast } from 'sonner'
-import {
- Badge,
- Button,
- cn,
- Command,
- CommandEmpty,
- CommandGroup,
- CommandInput,
- CommandItem,
- CommandList,
- CommandSeparator,
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from 'ui'
-import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
-import ShimmerLine from '@/components/ui/ShimmerLine'
import {
- IntegrationConnectionsCreateVariables,
- IntegrationProjectConnection,
-} from '@/data/integrations/integrations.types'
+ ActionButtons,
+ ForeignProjectSelector,
+ Panel,
+ SupabaseProjectSelector,
+} from './ProjectLinkerComponents'
+import { Project, ProjectLinkerProps } from './VercelGithub.types'
+import ShimmerLine from '@/components/ui/ShimmerLine'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
-import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { BASE_PATH } from '@/lib/constants'
-import { openInstallGitHubIntegrationWindow } from '@/lib/github'
import { EMPTY_ARR } from '@/lib/void'
-interface Project {
- name: string
- ref: string
-}
-
-export interface ForeignProject {
- id: string
- name: string
- installation_id?: number
-}
-
-const Panel = ({ children, className, ...props }: HTMLAttributes<HTMLDivElement>) => {
- return (
- <div
- className={cn(
- 'flex-1 min-w-0 flex flex-col grow gap-6 px-5 mx-auto w-full justify-center items-center',
- className
- )}
- {...props}
- >
- {children}
- </div>
- )
-}
-
-interface ProjectLinkerProps {
- slug?: string
- organizationIntegrationId?: string
- foreignProjects: ForeignProject[]
- onCreateConnections: (variables: IntegrationConnectionsCreateVariables) => void
- installedConnections?: IntegrationProjectConnection[]
- isLoading?: boolean
- integrationIcon: ReactNode
- getForeignProjectIcon?: (project: ForeignProject) => ReactNode
- choosePrompt?: string
- onSkip?: () => void
- loadingForeignProjects?: boolean
- showNoEntitiesState?: boolean
- defaultSupabaseProject?: Project
- defaultForeignProjectId?: string
- mode: 'Vercel' | 'GitHub'
- variant?: 'default' | 'interstitial'
-}
-
export const ProjectLinker = ({
slug,
organizationIntegrationId,
@@ -94,9 +32,6 @@ export const ProjectLinker = ({
mode,
variant = 'default',
}: ProjectLinkerProps) => {
- const router = useRouter()
- const projectCreationEnabled = useIsFeatureEnabled('projects:create')
-
const [openProjectsDropdown, setOpenProjectsDropdown] = useState(false)
const [openForeignProjectsComboBox, setOpenForeignProjectsComboBox] = useState(false)
const [foreignProjectId, setForeignProjectId] = useState<string | undefined>(
@@ -110,16 +45,6 @@ export const ProjectLinker = ({
})
const numProjects = orgProjects?.pages[0].pagination.count ?? 0
- useEffect(() => {
- if (defaultSupabaseProject !== undefined && selectedSupabaseProject === undefined)
- setSelectedSupabaseProject(defaultSupabaseProject)
- }, [defaultSupabaseProject, selectedSupabaseProject])
-
- useEffect(() => {
- if (defaultForeignProjectId !== undefined && foreignProjectId === undefined)
- setForeignProjectId(defaultForeignProjectId)
- }, [defaultForeignProjectId, foreignProjectId])
-
// create a flat array of foreign project ids. ie, ["prj_MlkO6AiLG5ofS9ojKrkS3PhhlY3f", ..]
const flatInstalledConnectionsIds = new Set(installedConnections.map((x) => x.foreign_project_id))
@@ -171,199 +96,15 @@ export const ProjectLinker = ({
!selectedSupabaseProject ||
!selectedForeignProject
- const supabaseProjectSelector = (
- <OrganizationProjectSelector
- sameWidthAsTrigger
- open={openProjectsDropdown}
- setOpen={setOpenProjectsDropdown}
- slug={slug}
- selectedRef={selectedSupabaseProject?.ref}
- onSelect={(project) => {
- setSelectedSupabaseProject(project)
- setOpenProjectsDropdown(false)
- }}
- renderRow={(project) => {
- return (
- <div className={cn('w-full flex items-center justify-between')}>
- <div className="flex items-center gap-x-2">
- {variant === 'default' && (
- <div className="bg-white shadow-sm border rounded-sm p-1 w-6 h-6 flex justify-center items-center">
- <img src={`${BASE_PATH}/img/supabase-logo.svg`} alt="Supabase" className="w-4" />
- </div>
- )}
- <p>{project.name}</p>
- {project.status === 'INACTIVE' && <Badge>Paused</Badge>}
- {project.status === 'GOING_DOWN' && <Badge>Pausing</Badge>}
- </div>
- {project.ref === selectedSupabaseProject?.ref && <Check size={16} />}
- </div>
- )
- }}
- renderTrigger={() => {
- return (
- <Button
- variant="default"
- block
- disabled={defaultSupabaseProject !== undefined || loadingSupabaseProjects}
- loading={loadingSupabaseProjects}
- className="justify-between h-[34px]"
- iconRight={
- defaultSupabaseProject === undefined ? (
- <span className="grow flex justify-end">
- <ChevronDown />
- </span>
- ) : null
- }
- >
- <div className="flex items-center gap-x-2">
- {variant === 'default' && (
- <div className="bg-white shadow-sm border rounded-sm p-1 w-6 h-6 flex justify-center items-center">
- <img src={`${BASE_PATH}/img/supabase-logo.svg`} alt="Supabase" className="w-4" />
- </div>
- )}
- <span className="truncate">
- {selectedSupabaseProject ? selectedSupabaseProject.name : 'Choose Supabase project'}
- </span>
- </div>
- </Button>
- )
- }}
- renderActions={() => {
- return (
- projectCreationEnabled && (
- <CommandGroup>
- <CommandItem
- className="cursor-pointer w-full"
- onSelect={() => {
- setOpenProjectsDropdown(false)
- router.push(`/new/${selectedOrganization?.slug}`)
- }}
- onClick={() => setOpenProjectsDropdown(false)}
- >
- <Link
- href={`/new/${selectedOrganization?.slug}`}
- onClick={() => {
- setOpenProjectsDropdown(false)
- }}
- className="w-full flex items-center gap-2"
- >
- <Plus size={14} strokeWidth={1.5} />
- <p>Create a new project</p>
- </Link>
- </CommandItem>
- </CommandGroup>
- )
- )
- }}
- />
- )
-
- const foreignProjectSelector = (
- <Popover open={openForeignProjectsComboBox} onOpenChange={setOpenForeignProjectsComboBox}>
- <PopoverTrigger asChild>
- <Button
- variant="default"
- block
- disabled={loadingForeignProjects}
- loading={loadingForeignProjects}
- className={cn(
- variant === 'interstitial' ? 'h-[34px] justify-between' : 'justify-start h-[34px]'
- )}
- icon={
- variant === 'default' ? (
- <div>
- {selectedForeignProject
- ? (getForeignProjectIcon?.(selectedForeignProject) ?? integrationIcon)
- : integrationIcon}
- </div>
- ) : undefined
- }
- iconRight={
- <span className="grow flex justify-end">
- <ChevronDown />
- </span>
- }
- >
- <span className="truncate">
- {(selectedForeignProject && selectedForeignProject.name) ?? choosePrompt}
- </span>
- </Button>
- </PopoverTrigger>
- <PopoverContent className="p-0" side="bottom" align="center" sameWidthAsTrigger>
- <Command>
- <CommandInput placeholder="Search for a project" />
- <CommandList className="max-h-[170px]!">
- <CommandEmpty>No results found.</CommandEmpty>
- <CommandGroup>
- {foreignProjects.map((project, i) => {
- return (
- <CommandItem
- key={project.id}
- value={`${project.name.replaceAll('"', '')}-${i}`}
- className="flex gap-2 items-center"
- onSelect={() => {
- if (project.id) setForeignProjectId(project.id)
- setOpenForeignProjectsComboBox(false)
- }}
- >
- <div>{getForeignProjectIcon?.(project) ?? integrationIcon}</div>
- <span className="truncate" title={project.name}>
- {project.name}
- </span>
- </CommandItem>
- )
- })}
- {foreignProjects.length === 0 && <CommandEmpty>No results found.</CommandEmpty>}
- </CommandGroup>
- {mode === 'GitHub' && (
- <>
- <CommandSeparator />
- <CommandGroup>
- <CommandItem
- className="flex gap-2 items-center cursor-pointer"
- onSelect={() => openInstallGitHubIntegrationWindow('install')}
- >
- <PlusIcon size={16} />
- Add GitHub Repositories
- </CommandItem>
- </CommandGroup>
- </>
- )}
- </CommandList>
- </Command>
- </PopoverContent>
- </Popover>
- )
+ useEffect(() => {
+ if (defaultSupabaseProject !== undefined && selectedSupabaseProject === undefined)
+ setSelectedSupabaseProject(defaultSupabaseProject)
+ }, [defaultSupabaseProject, selectedSupabaseProject])
- const actionButtons = (
- <div
- className={cn('flex w-full gap-2', variant === 'interstitial' ? 'flex-col' : 'justify-end')}
- >
- <Button
- size={variant === 'interstitial' ? undefined : 'medium'}
- variant={variant === 'interstitial' ? 'primary' : 'default'}
- block={variant === 'interstitial'}
- className={variant === 'default' ? 'self-end' : undefined}
- onClick={onCreateConnections}
- loading={isLoading}
- disabled={connectDisabled}
- >
- Connect project
- </Button>
- {onSkip !== undefined && (
- <Button
- size={variant === 'interstitial' ? undefined : 'medium'}
- variant={variant === 'interstitial' ? 'text' : 'default'}
- block={variant === 'interstitial'}
- onClick={() => {
- onSkip()
- }}
- >
- Skip
- </Button>
- )}
- </div>
- )
+ useEffect(() => {
+ if (defaultForeignProjectId !== undefined && foreignProjectId === undefined)
+ setForeignProjectId(defaultForeignProjectId)
+ }, [defaultForeignProjectId, foreignProjectId])
if (variant === 'interstitial') {
return (
@@ -384,19 +125,50 @@ export const ProjectLinker = ({
<p className="text-xs font-medium uppercase tracking-wider text-foreground-light">
Supabase project
</p>
- {supabaseProjectSelector}
+ <SupabaseProjectSelector
+ open={openProjectsDropdown}
+ variant={variant}
+ slug={slug}
+ defaultSupabaseProject={defaultSupabaseProject}
+ selectedSupabaseProject={selectedSupabaseProject}
+ loadingSupabaseProjects={loadingSupabaseProjects}
+ setOpen={setOpenProjectsDropdown}
+ setSelectedSupabaseProject={setSelectedSupabaseProject}
+ />
</section>
<section className="space-y-2" aria-label="Vercel project">
<p className="text-xs font-medium uppercase tracking-wider text-foreground-light">
Vercel project
</p>
- {foreignProjectSelector}
+ <ForeignProjectSelector
+ open={openForeignProjectsComboBox}
+ mode={mode}
+ variant={variant}
+ choosePrompt={choosePrompt}
+ selectedForeignProject={selectedForeignProject}
+ loadingForeignProjects={loadingForeignProjects}
+ foreignProjects={foreignProjects}
+ integrationIcon={integrationIcon}
+ setForeignProjectId={setForeignProjectId}
+ onOpenChange={setOpenForeignProjectsComboBox}
+ getForeignProjectIcon={getForeignProjectIcon}
+ />
</section>
</>
)}
- {actionButtons}
+ <ActionButtons
+ slug={slug}
+ mode={mode}
+ variant={variant}
+ showCreateProject={showNoEntitiesState && noSupabaseProjects}
+ connectDisabled={connectDisabled}
+ foreignProjectId={foreignProjectId}
+ isLoading={isLoading}
+ onCreateConnections={onCreateConnections}
+ onSkip={onSkip}
+ />
</div>
)
}
@@ -431,7 +203,16 @@ export const ProjectLinker = ({
<img src={`${BASE_PATH}/img/supabase-logo.svg`} alt="Supabase" className="w-6" />
</div>
- {supabaseProjectSelector}
+ <SupabaseProjectSelector
+ open={openProjectsDropdown}
+ variant={variant}
+ slug={slug}
+ defaultSupabaseProject={defaultSupabaseProject}
+ selectedSupabaseProject={selectedSupabaseProject}
+ loadingSupabaseProjects={loadingSupabaseProjects}
+ setOpen={setOpenProjectsDropdown}
+ setSelectedSupabaseProject={setSelectedSupabaseProject}
+ />
</Panel>
<div className="border border-foreground-lighter h-px w-8 border-dashed self-end mb-4" />
@@ -441,13 +222,37 @@ export const ProjectLinker = ({
{integrationIcon}
</div>
- {foreignProjectSelector}
+ <ForeignProjectSelector
+ open={openForeignProjectsComboBox}
+ mode={mode}
+ variant={variant}
+ choosePrompt={choosePrompt}
+ selectedForeignProject={selectedForeignProject}
+ loadingForeignProjects={loadingForeignProjects}
+ foreignProjects={foreignProjects}
+ integrationIcon={integrationIcon}
+ setForeignProjectId={setForeignProjectId}
+ onOpenChange={setOpenForeignProjectsComboBox}
+ getForeignProjectIcon={getForeignProjectIcon}
+ />
</Panel>
</div>
)}
</div>
- <div className="flex w-full justify-end gap-2 p-4 bg-surface-75">{actionButtons}</div>
+ <div className="flex w-full justify-end gap-2 p-4 bg-surface-75">
+ <ActionButtons
+ slug={slug}
+ mode={mode}
+ variant={variant}
+ showCreateProject={showNoEntitiesState && noSupabaseProjects}
+ connectDisabled={connectDisabled}
+ foreignProjectId={foreignProjectId}
+ isLoading={isLoading}
+ onCreateConnections={onCreateConnections}
+ onSkip={onSkip}
+ />
+ </div>
</div>
)
}
diff --git a/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx
new file mode 100644
index 00000000000..dcdf496453f
--- /dev/null
+++ b/apps/studio/components/interfaces/Integrations/VercelGithub/ProjectLinkerComponents.tsx
@@ -0,0 +1,325 @@
+import { useParams } from 'common'
+import { Check, ChevronDown, Plus, PlusIcon } from 'lucide-react'
+import Link from 'next/link'
+import { useRouter } from 'next/router'
+import { HTMLAttributes } from 'react'
+import {
+ Badge,
+ Button,
+ cn,
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+ CommandSeparator,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from 'ui'
+
+import { Project, type ForeignProject, type ProjectLinkerProps } from './VercelGithub.types'
+import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
+import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
+import { BASE_PATH } from '@/lib/constants'
+import { openInstallGitHubIntegrationWindow } from '@/lib/github'
+
+export const Panel = ({ children, className, ...props }: HTMLAttributes<HTMLDivElement>) => {
+ return (
+ <div
+ className={cn(
+ 'flex-1 min-w-0 flex flex-col grow gap-6 px-5 mx-auto w-full justify-center items-center',
+ className
+ )}
+ {...props}
+ >
+ {children}
+ </div>
+ )
+}
+
+export const ForeignProjectSelector = ({
+ open,
+ mode,
+ variant,
+ choosePrompt,
+ selectedForeignProject,
+ loadingForeignProjects,
+ foreignProjects,
+ integrationIcon,
+ onOpenChange,
+ setForeignProjectId,
+ getForeignProjectIcon,
+}: {
+ open: boolean
+ selectedForeignProject?: ForeignProject
+ setForeignProjectId: (id: string) => void
+ onOpenChange: (val: boolean) => void
+} & Pick<
+ ProjectLinkerProps,
+ | 'mode'
+ | 'variant'
+ | 'choosePrompt'
+ | 'loadingForeignProjects'
+ | 'foreignProjects'
+ | 'getForeignProjectIcon'
+ | 'integrationIcon'
+>) => {
+ return (
+ <Popover open={open} onOpenChange={onOpenChange}>
+ <PopoverTrigger asChild>
+ <Button
+ variant="default"
+ block
+ disabled={loadingForeignProjects}
+ loading={loadingForeignProjects}
+ className={cn(
+ variant === 'interstitial' ? 'h-[34px] justify-between' : 'justify-start h-[34px]'
+ )}
+ icon={
+ variant === 'default' ? (
+ <div>
+ {selectedForeignProject
+ ? (getForeignProjectIcon?.(selectedForeignProject) ?? integrationIcon)
+ : integrationIcon}
+ </div>
+ ) : undefined
+ }
+ iconRight={
+ <span className="grow flex justify-end">
+ <ChevronDown />
+ </span>
+ }
+ >
+ <span className="truncate">
+ {(selectedForeignProject && selectedForeignProject.name) ?? choosePrompt}
+ </span>
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="center" sameWidthAsTrigger>
+ <Command>
+ <CommandInput placeholder="Search for a project" />
+ <CommandList className="max-h-[170px]!">
+ <CommandEmpty>No results found.</CommandEmpty>
+ <CommandGroup>
+ {foreignProjects.map((project, i) => {
+ return (
+ <CommandItem
+ key={project.id}
+ value={`${project.name.replaceAll('"', '')}-${i}`}
+ className="flex gap-2 items-center"
+ onSelect={() => {
+ if (project.id) setForeignProjectId(project.id)
+ onOpenChange(false)
+ }}
+ >
+ <div>{getForeignProjectIcon?.(project) ?? integrationIcon}</div>
+ <span className="truncate" title={project.name}>
+ {project.name}
+ </span>
+ </CommandItem>
+ )
+ })}
+ {foreignProjects.length === 0 && <CommandEmpty>No results found.</CommandEmpty>}
+ </CommandGroup>
+ {mode === 'GitHub' && (
+ <>
+ <CommandSeparator />
+ <CommandGroup>
+ <CommandItem
+ className="flex gap-2 items-center cursor-pointer"
+ onSelect={() => openInstallGitHubIntegrationWindow('install')}
+ >
+ <PlusIcon size={16} />
+ Add GitHub Repositories
+ </CommandItem>
+ </CommandGroup>
+ </>
+ )}
+ </CommandList>
+ </Command>
+ </PopoverContent>
+ </Popover>
+ )
+}
+
+export const SupabaseProjectSelector = ({
+ open,
+ variant,
+ slug,
+ defaultSupabaseProject,
+ selectedSupabaseProject,
+ loadingSupabaseProjects,
+ setOpen,
+ setSelectedSupabaseProject,
+}: {
+ open: boolean
+ selectedSupabaseProject?: Project
+ loadingSupabaseProjects: boolean
+ setOpen: (val: boolean) => void
+ setSelectedSupabaseProject: (project: Project) => void
+} & Pick<ProjectLinkerProps, 'slug' | 'variant' | 'defaultSupabaseProject'>) => {
+ const router = useRouter()
+ const { data: selectedOrganization } = useSelectedOrganizationQuery()
+ const projectCreationEnabled = useIsFeatureEnabled('projects:create')
+
+ return (
+ <OrganizationProjectSelector
+ sameWidthAsTrigger
+ open={open}
+ setOpen={setOpen}
+ slug={slug}
+ selectedRef={selectedSupabaseProject?.ref}
+ onSelect={(project) => {
+ setSelectedSupabaseProject(project)
+ setOpen(false)
+ }}
+ renderRow={(project) => {
+ return (
+ <div className={cn('w-full flex items-center justify-between')}>
+ <div className="flex items-center gap-x-2">
+ {variant === 'default' && (
+ <div className="bg-white shadow-sm border rounded-sm p-1 w-6 h-6 flex justify-center items-center">
+ <img src={`${BASE_PATH}/img/supabase-logo.svg`} alt="Supabase" className="w-4" />
+ </div>
+ )}
+ <p>{project.name}</p>
+ {project.status === 'INACTIVE' && <Badge>Paused</Badge>}
+ {project.status === 'GOING_DOWN' && <Badge>Pausing</Badge>}
+ </div>
+ {project.ref === selectedSupabaseProject?.ref && <Check size={16} />}
+ </div>
+ )
+ }}
+ renderTrigger={() => {
+ return (
+ <Button
+ variant="default"
+ block
+ disabled={defaultSupabaseProject !== undefined || loadingSupabaseProjects}
+ loading={loadingSupabaseProjects}
+ className="justify-between h-[34px]"
+ iconRight={
+ defaultSupabaseProject === undefined ? (
+ <span className="grow flex justify-end">
+ <ChevronDown />
+ </span>
+ ) : null
+ }
+ >
+ <div className="flex items-center gap-x-2">
+ {variant === 'default' && (
+ <div className="bg-white shadow-sm border rounded-sm p-1 w-6 h-6 flex justify-center items-center">
+ <img src={`${BASE_PATH}/img/supabase-logo.svg`} alt="Supabase" className="w-4" />
+ </div>
+ )}
+ <span className="truncate">
+ {selectedSupabaseProject ? selectedSupabaseProject.name : 'Choose Supabase project'}
+ </span>
+ </div>
+ </Button>
+ )
+ }}
+ renderActions={() => {
+ return (
+ projectCreationEnabled && (
+ <CommandGroup>
+ <CommandItem
+ className="cursor-pointer w-full"
+ onSelect={() => {
+ setOpen(false)
+ router.push(`/new/${selectedOrganization?.slug}`)
+ }}
+ onClick={() => setOpen(false)}
+ >
+ <Link
+ href={`/new/${selectedOrganization?.slug}`}
+ className="w-full flex items-center gap-2"
+ onClick={() => setOpen(false)}
+ >
+ <Plus size={14} strokeWidth={1.5} />
+ <p>Create a new project</p>
+ </Link>
+ </CommandItem>
+ </CommandGroup>
+ )
+ )
+ }}
+ />
+ )
+}
+
+export const ActionButtons = ({
+ slug,
+ mode,
+ variant,
+ showCreateProject,
+ connectDisabled,
+ isLoading,
+ foreignProjectId,
+ onCreateConnections,
+ onSkip,
+}: {
+ showCreateProject: boolean
+ connectDisabled: boolean
+ foreignProjectId: string | undefined
+ onCreateConnections: () => void
+} & Pick<ProjectLinkerProps, 'slug' | 'variant' | 'mode' | 'onSkip' | 'isLoading'>) => {
+ const { next, externalId, currentProjectId } = useParams()
+ const organizationSlug = slug
+ const vercelProjectId = foreignProjectId ?? currentProjectId
+ // Deploy-button create is only for the install interstitial; settings side panels use /new.
+ const newProjectURL =
+ mode === 'Vercel' && variant === 'interstitial' && organizationSlug
+ ? `/integrations/vercel/${organizationSlug}/deploy-button/new-project?${new URLSearchParams({
+ ...(next ? { next } : {}),
+ ...(vercelProjectId ? { currentProjectId: vercelProjectId } : {}),
+ ...(externalId ? { externalId } : {}),
+ })}`
+ : `/new/${organizationSlug}`
+
+ return (
+ <div
+ className={cn('flex w-full gap-2', variant === 'interstitial' ? 'flex-col' : 'justify-end')}
+ >
+ {showCreateProject ? (
+ <Button
+ asChild
+ size={variant === 'interstitial' ? undefined : 'medium'}
+ variant={variant === 'interstitial' ? 'primary' : 'default'}
+ block={variant === 'interstitial'}
+ className={variant === 'default' ? 'self-end' : undefined}
+ loading={isLoading}
+ >
+ <Link href={newProjectURL}>Create project</Link>
+ </Button>
+ ) : (
+ <Button
+ size={variant === 'interstitial' ? undefined : 'medium'}
+ variant={variant === 'interstitial' ? 'primary' : 'default'}
+ block={variant === 'interstitial'}
+ className={variant === 'default' ? 'self-end' : undefined}
+ onClick={onCreateConnections}
+ loading={isLoading}
+ disabled={connectDisabled}
+ >
+ Connect project
+ </Button>
+ )}
+ {onSkip !== undefined && (
+ <Button
+ size={variant === 'interstitial' ? undefined : 'medium'}
+ variant={variant === 'interstitial' ? 'text' : 'default'}
+ block={variant === 'interstitial'}
+ onClick={() => {
+ onSkip()
+ }}
+ >
+ Skip
+ </Button>
+ )}
+ </div>
+ )
+}
diff --git a/apps/studio/components/interfaces/Integrations/VercelGithub/VercelGithub.types.ts b/apps/studio/components/interfaces/Integrations/VercelGithub/VercelGithub.types.ts
new file mode 100644
index 00000000000..aa745b4d43b
--- /dev/null
+++ b/apps/studio/components/interfaces/Integrations/VercelGithub/VercelGithub.types.ts
@@ -0,0 +1,36 @@
+import { ReactNode } from 'react'
+
+import {
+ type IntegrationConnectionsCreateVariables,
+ type IntegrationProjectConnection,
+} from '@/data/integrations/integrations.types'
+
+export interface Project {
+ name: string
+ ref: string
+}
+
+export interface ForeignProject {
+ id: string
+ name: string
+ installation_id?: number
+}
+
+export interface ProjectLinkerProps {
+ slug?: string
+ organizationIntegrationId?: string
+ foreignProjects: ForeignProject[]
+ onCreateConnections: (variables: IntegrationConnectionsCreateVariables) => void
+ installedConnections?: IntegrationProjectConnection[]
+ isLoading?: boolean
+ integrationIcon: ReactNode
+ getForeignProjectIcon?: (project: ForeignProject) => ReactNode
+ choosePrompt?: string
+ onSkip?: () => void
+ loadingForeignProjects?: boolean
+ showNoEntitiesState?: boolean
+ defaultSupabaseProject?: Project
+ defaultForeignProjectId?: string
+ mode: 'Vercel' | 'GitHub'
+ variant?: 'default' | 'interstitial'
+}
diff --git a/apps/studio/components/interfaces/Organization/IntegrationSettings/SidePanelVercelProjectLinker.tsx b/apps/studio/components/interfaces/Organization/IntegrationSettings/SidePanelVercelProjectLinker.tsx
index 9a5d547a858..774ee1f63d7 100644
--- a/apps/studio/components/interfaces/Organization/IntegrationSettings/SidePanelVercelProjectLinker.tsx
+++ b/apps/studio/components/interfaces/Organization/IntegrationSettings/SidePanelVercelProjectLinker.tsx
@@ -3,11 +3,9 @@ import { useCallback, useMemo } from 'react'
import { toast } from 'sonner'
import { SidePanel } from 'ui'
+import { type ForeignProject } from '../../Integrations/VercelGithub/VercelGithub.types'
import { ENV_VAR_RAW_KEYS } from '@/components/interfaces/Integrations/Vercel/Integrations-Vercel.constants'
-import {
- ForeignProject,
- ProjectLinker,
-} from '@/components/interfaces/Integrations/VercelGithub/ProjectLinker'
+import { ProjectLinker } from '@/components/interfaces/Integrations/VercelGithub/ProjectLinker'
import { Markdown } from '@/components/interfaces/Markdown'
import { vercelIcon } from '@/components/to-be-cleaned/ListIcons'
import { useOrgIntegrationsQuery } from '@/data/integrations/integrations-query-org-only'
diff --git a/apps/studio/lib/integrations/vercel-install.utils.ts b/apps/studio/lib/integrations/vercel-install.utils.ts
index cdc30c48cd3..837ffda50dc 100644
--- a/apps/studio/lib/integrations/vercel-install.utils.ts
+++ b/apps/studio/lib/integrations/vercel-install.utils.ts
@@ -59,9 +59,12 @@ export function buildVercelInstallRouteQuery({
})
case 'marketplace':
case 'external':
+ // Keep Deploy Button ids when present so choose-project → create can seed + link.
return removeUndefinedValues({
organizationSlug,
configurationId,
+ currentProjectId,
+ externalId,
next,
})
default:
diff --git a/apps/studio/pages/integrations/vercel/[slug]/marketplace/choose-project.tsx b/apps/studio/pages/integrations/vercel/[slug]/marketplace/choose-project.tsx
index 239ec8e56e9..be6674e039f 100644
--- a/apps/studio/pages/integrations/vercel/[slug]/marketplace/choose-project.tsx
+++ b/apps/studio/pages/integrations/vercel/[slug]/marketplace/choose-project.tsx
@@ -17,10 +17,8 @@ import {
VercelIntegrationInterstitialErrorState,
VercelIntegrationLogo,
} from '@/components/interfaces/Integrations/Vercel/VercelIntegrationInterstitial'
-import {
- ProjectLinker,
- type ForeignProject,
-} from '@/components/interfaces/Integrations/VercelGithub/ProjectLinker'
+import { ProjectLinker } from '@/components/interfaces/Integrations/VercelGithub/ProjectLinker'
+import type { ForeignProject } from '@/components/interfaces/Integrations/VercelGithub/VercelGithub.types'
import { InterstitialAccountRow, InterstitialLayout } from '@/components/layouts/InterstitialLayout'
import { vercelIcon } from '@/components/to-be-cleaned/ListIcons'
import { useOrgIntegrationsQuery } from '@/data/integrations/integrations-query-org-only'
@@ -42,7 +40,7 @@ const PAGE_TITLE = buildStudioPageTitle({
})
const VercelChooseProjectPage: NextPageWithLayout = () => {
- const { slug, configurationId, next } = useParams()
+ const { slug, configurationId, next, currentProjectId } = useParams()
const { username, primaryEmail, avatarUrl } = useProfileNameAndPicture()
const displayName = primaryEmail ?? username ?? ''
@@ -200,6 +198,7 @@ const VercelChooseProjectPage: NextPageWithLayout = () => {
integrationIcon={VERCEL_INTEGRATION_ICON}
getForeignProjectIcon={getForeignProjectIcon}
choosePrompt="Choose Vercel project"
+ defaultForeignProjectId={currentProjectId}
onSkip={() => {
if (next && isVercelUrl(next)) {
window.location.href = next
diff --git a/apps/studio/tests/pages/integrations/vercel/install.utils.test.ts b/apps/studio/tests/pages/integrations/vercel/install.utils.test.ts
index 3c88df74c09..b8109105f60 100644
--- a/apps/studio/tests/pages/integrations/vercel/install.utils.test.ts
+++ b/apps/studio/tests/pages/integrations/vercel/install.utils.test.ts
@@ -45,7 +45,7 @@ describe('buildVercelInstallRouteQuery', () => {
})
})
- test('only keeps marketplace destination params', () => {
+ test('keeps marketplace params and passes through deploy-button ids when present', () => {
expect(
buildVercelInstallRouteQuery({
source: 'marketplace',
@@ -58,6 +58,8 @@ describe('buildVercelInstallRouteQuery', () => {
).toStrictEqual({
organizationSlug: 'acme',
configurationId: 'configuration-id',
+ currentProjectId: 'vercel-project',
+ externalId: 'github-repo',
next: 'https://vercel.com/callback',
})
})