mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 03:15:06 +03:00
Bring the Vercel project connect layout up to date with other connect screens. Follows up from https://github.com/supabase/supabase/pull/47550 which is required. | Before | After | | --- | --- | | <img width="2368" height="1680" alt="image" src="https://github.com/user-attachments/assets/f5c0b8ef-8fb5-4176-b0cf-98e33958dcc8" /> | <img width="848" height="808" alt="image" src="https://github.com/user-attachments/assets/e64c289f-0b73-4605-ad38-4552d3d6f934" /> | <img width="883" height="733" alt="image" src="https://github.com/user-attachments/assets/7ccd9b72-de6a-4c21-ac8e-abe773bb8116" /> ## Testing - Open the deploy preview or staging URL for `/dashboard/integrations/vercel/acme-production/marketplace/choose-project` with callback params from a real Vercel Marketplace install redirect (see _Vercel_ subheading below). ### Vercel - Run through the [install flow](https://github.com/supabase/supabase/pull/47550) on a real project until you get to the project connection screen, copy the url and paste into staging preview <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit * **New Features** * Introduced interstitial-style Vercel integration experiences for both install and choose-project flows, with improved page titles and clearer environment-variable guidance (including tooltip details). * **Bug Fixes** * Improved Vercel integration matching by configuration id and strengthened loading/error handling with more specific “not found” messaging. * **Refactor** * Enhanced the Vercel/GitHub project chooser with a dedicated interstitial mode. * Updated partner logo rendering to support optional styling customization. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Alaister Young <alaister@users.noreply.github.com>
162 lines
5.3 KiB
TypeScript
162 lines
5.3 KiB
TypeScript
import { keyBy } from 'lodash'
|
|
import { useCallback, useMemo } from 'react'
|
|
import { toast } from 'sonner'
|
|
import { SidePanel } from 'ui'
|
|
|
|
import { ENV_VAR_RAW_KEYS } from '@/components/interfaces/Integrations/Vercel/Integrations-Vercel.constants'
|
|
import {
|
|
ForeignProject,
|
|
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'
|
|
import { useIntegrationVercelConnectionsCreateMutation } from '@/data/integrations/integrations-vercel-connections-create-mutation'
|
|
import { useVercelProjectsQuery } from '@/data/integrations/integrations-vercel-projects-query'
|
|
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { BASE_PATH } from '@/lib/constants'
|
|
import { EMPTY_ARR } from '@/lib/void'
|
|
import { useSidePanelsStateSnapshot } from '@/state/side-panels'
|
|
|
|
const VERCEL_ICON = (
|
|
<svg xmlns="http://www.w3.org/2000/svg" fill="white" viewBox="0 0 512 512" className="w-6">
|
|
<path fillRule="evenodd" d="M256,48,496,464H16Z" />
|
|
</svg>
|
|
)
|
|
|
|
export const SidePanelVercelProjectLinker = () => {
|
|
const { data: selectedProject } = useSelectedProjectQuery()
|
|
const { data: selectedOrganization } = useSelectedOrganizationQuery()
|
|
const sidePanelStateSnapshot = useSidePanelsStateSnapshot()
|
|
const organizationIntegrationId = sidePanelStateSnapshot.vercelConnectionsIntegrationId
|
|
|
|
const { data: integrationData } = useOrgIntegrationsQuery({
|
|
orgSlug: selectedOrganization?.slug,
|
|
})
|
|
const vercelIntegrations = integrationData?.filter(
|
|
(integration) => integration.integration.name === 'Vercel'
|
|
) // vercel
|
|
|
|
/**
|
|
* Find the right integration
|
|
*
|
|
* we use the snapshot.organizationIntegrationId which should be set whenever this sidepanel is opened
|
|
*/
|
|
const selectedIntegration = vercelIntegrations?.find((x) => x.id === organizationIntegrationId)
|
|
|
|
const { data: vercelProjectsData } = useVercelProjectsQuery(
|
|
{
|
|
organization_integration_id: organizationIntegrationId,
|
|
},
|
|
{ enabled: organizationIntegrationId !== undefined }
|
|
)
|
|
|
|
const vercelProjects = useMemo(() => vercelProjectsData ?? EMPTY_ARR, [vercelProjectsData])
|
|
const vercelProjectsById = useMemo(() => keyBy(vercelProjects, 'id'), [vercelProjects])
|
|
|
|
const getForeignProjectIcon = useCallback(
|
|
(_project: ForeignProject) => {
|
|
const project = vercelProjectsById[_project.id]
|
|
|
|
return !project?.framework ? (
|
|
vercelIcon
|
|
) : (
|
|
<img
|
|
src={`${BASE_PATH}/img/icons/frameworks/${project.framework}.svg`}
|
|
width={21}
|
|
height={21}
|
|
alt={`icon`}
|
|
/>
|
|
)
|
|
},
|
|
[vercelProjectsById]
|
|
)
|
|
|
|
const { mutate: createConnections, isPending: isCreatingConnection } =
|
|
useIntegrationVercelConnectionsCreateMutation({
|
|
async onSuccess({ env_sync_error: envSyncError }) {
|
|
if (envSyncError) {
|
|
toast.error(
|
|
`Failed to sync environment variables: ${envSyncError.message}. Please try re-syncing manually from settings.`
|
|
)
|
|
}
|
|
|
|
sidePanelStateSnapshot.setVercelConnectionsOpen(false)
|
|
},
|
|
})
|
|
|
|
const onCreateConnections = useCallback(
|
|
(vars: any) => {
|
|
createConnections({
|
|
...vars,
|
|
connection: {
|
|
...vars.connection,
|
|
metadata: {
|
|
...vars.connection.metadata,
|
|
supabaseConfig: {
|
|
projectEnvVars: {
|
|
write: true,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
})
|
|
},
|
|
[createConnections]
|
|
)
|
|
|
|
return (
|
|
<SidePanel
|
|
hideFooter
|
|
size="large"
|
|
header="Add new Vercel project connection"
|
|
visible={sidePanelStateSnapshot.vercelConnectionsOpen}
|
|
onCancel={() => sidePanelStateSnapshot.setVercelConnectionsOpen(false)}
|
|
>
|
|
<div className="py-6 flex flex-col gap-6 bg-studio h-full">
|
|
<SidePanel.Content>
|
|
<Markdown
|
|
content={`
|
|
### Choose repository to connect to
|
|
|
|
Check the details below before proceeding
|
|
`}
|
|
/>
|
|
</SidePanel.Content>
|
|
<SidePanel.Content className="flex flex-col gap-2">
|
|
<ProjectLinker
|
|
slug={selectedOrganization?.slug}
|
|
defaultSupabaseProject={selectedProject}
|
|
organizationIntegrationId={selectedIntegration?.id}
|
|
foreignProjects={vercelProjects}
|
|
onCreateConnections={onCreateConnections}
|
|
installedConnections={selectedIntegration?.connections}
|
|
isLoading={isCreatingConnection}
|
|
integrationIcon={VERCEL_ICON}
|
|
getForeignProjectIcon={getForeignProjectIcon}
|
|
choosePrompt="Choose Vercel Project"
|
|
mode="Vercel"
|
|
/>
|
|
<Markdown
|
|
content={`
|
|
The following environment variables will be added:
|
|
|
|
${ENV_VAR_RAW_KEYS.map((x) => {
|
|
return `\n - \`${x}\``
|
|
})}
|
|
`}
|
|
/>
|
|
</SidePanel.Content>
|
|
<SidePanel.Content>
|
|
<ul>
|
|
<li className="border px-10">
|
|
{/* <IntegrationConnectionOption connection={githubIntegrations[0]} /> */}
|
|
</li>
|
|
</ul>
|
|
</SidePanel.Content>
|
|
</div>
|
|
</SidePanel>
|
|
)
|
|
}
|