mirror of
https://github.com/supabase/supabase.git
synced 2026-10-07 10:25:06 +03:00
## What kind of change does this PR introduce? Bug fix. ## What is the current behavior? Vercel install and project-link failures use transient toasts. ## What is the new behavior? Failures remain visible below the relevant action and clear when the user retries or changes a selection. The Vercel mutation hooks expose errors without choosing their presentation. Interstitial callers render them inline, while existing non-interstitial callers explicitly retain their toasts. | Before | After | | --- | --- | | <img width="1024" height="759" alt="Install Vercel Integration Supabase" src="https://github.com/user-attachments/assets/6348cdd2-220a-4ad8-89f9-7fc51de36a3c" /> | <img width="1024" height="759" alt="Install Vercel Integration Supabase" src="https://github.com/user-attachments/assets/ecc50c4e-daab-4f6d-bf86-7282e2aff92c" /> | ## To test 1. Switch to `dnywh/inline-vercel-errors` (this branch). 2. Open `apps/studio/pages/integrations/vercel/install.tsx`. 3. Find the `actionError` assignment immediately below `useVercelIntegrationCreateMutation` and replace the whole assignment with: ```tsx const actionError = 'Creating Vercel integration failed: Test error' ``` 4. With local Studio running and while signed in, open `http://localhost:8082/integrations/vercel/install?code=test&configurationId=test&source=marketplace` 5. Confirm the error remains visible below **Install integration**. No Vercel installation or real authorisation code is required. 6. Revert the temporary edit. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Bug Fixes * Improved error handling across Vercel project connection and installation flows. * Validation, duplicate-connection, and connection failures now appear inline in the relevant setup steps. * Errors clear automatically when the selected project or organization changes. * Notifications remain available in supported flows, including new project creation and side-panel setup. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
164 lines
5.6 KiB
TypeScript
164 lines
5.6 KiB
TypeScript
import { keyBy } from 'lodash'
|
|
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 { 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'
|
|
import type { ResponseError } from '@/types'
|
|
|
|
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)
|
|
},
|
|
onError(error: ResponseError) {
|
|
toast.error(`Failed to create connection: ${error.message}`)
|
|
},
|
|
})
|
|
|
|
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>
|
|
)
|
|
}
|