mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 09:55:06 +03:00
I made the connected-project framework icons fall back when no shipped SVG exists for a framework. The three icon sites built `/img/icons/frameworks/<framework>.svg` straight from the integration's framework preset, which is an open-ended string. They only fell back when the value was empty, so any preset without an asset (`express`, `hono`, `fastapi`, `tanstack-start` and others) showed a broken image and logged a 404. **Changed:** - **Broken framework icons**: `getFrameworkIconUrl` returns the asset URL only for slugs in a set that mirrors `public/img/icons/frameworks/`. The integration connection row, the org project linker and the marketplace project picker now show their existing fallback icon for any other slug. A test keeps the set equal to the directory listing. - **Framework type**: I deleted the hand-kept `VercelFramework` union. It listed exactly the shipped icon slugs, while the API types the field as `string | null`, and that mismatch is what made the old empty-only check look safe. **Note:** I rejected an `onError` fallback because the browser still sends the 404 request. Adding logos for common presets is left for design. ## To test Tested on Vercel preview (staging): no real connection there uses these presets, so I rewrote the org integrations response in the browser to give one integration four connections. - [x] Open an org's Integrations page with connections whose framework has no shipped icon (`express`, `eve`, `tanstack-start-lovable`). Expect the fallback badge and no request under `/dashboard/img/icons/frameworks/` for those slugs. Observed: all three rows showed the badge and the network log had no request for their SVGs. - [x] Same page with a `nextjs` connection. Expect its framework logo. Observed: `nextjs.svg` loaded with a 200. - [x] Same page with the real, unmodified response (one connection with `framework: null`). Expect the badge, no frameworks requests, and no new console errors. Observed: as expected. ## Linear - fixes GROWTH-1309 <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Vercel integration and project views now display framework icons when available and fall back to the Vercel icon when no matching icon exists. * Framework metadata now supports values beyond a fixed list, while unsupported frameworks continue to use the fallback icon. * **Tests** * Added coverage for supported and unsupported framework icons, including base-path handling. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
160 lines
5.5 KiB
TypeScript
160 lines
5.5 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 { getFrameworkIconUrl } from '@/lib/integration-utils'
|
|
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]
|
|
const frameworkIconUrl = getFrameworkIconUrl(project?.framework)
|
|
|
|
return !frameworkIconUrl ? (
|
|
vercelIcon
|
|
) : (
|
|
<img src={frameworkIconUrl} 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>
|
|
)
|
|
}
|