Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Disable vercel integration for vercel managed projects #30801

Merged
merged 1 commit into from
Dec 4, 2024
Merged

fix: Disable vercel integration for vercel managed projects #30801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/docs/content/guides/deployment/branching.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ With the Supabase branching integration, you can sync the Git branch used by the

<Admonition type="note" label="Vercel Branching support is in development.">

The Vercel Integration for Supabase branching is under development. To express your interest, [join the discussion on GitHub discussions](https://github.com/orgs/supabase/discussions/18938).
The Vercel Integration for Supabase branching is working only with Supabase managed projects. There is currently no support for Vercel Marketplace managed resources, however the support is planned in the future.

</Admonition>

Expand Down
16 changes: 15 additions & 1 deletion apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ import { useSelectedProject } from 'hooks/misc/useSelectedProject'
import { pluralize } from 'lib/helpers'
import { getIntegrationConfigurationUrl } from 'lib/integration-utils'
import { useSidePanelsStateSnapshot } from 'state/side-panels'
import { Button, cn } from 'ui'
import { Alert_Shadcn_, AlertTitle_Shadcn_, Button, cn } from 'ui'
import { IntegrationImageHandler } from '../IntegrationsSettings'
import VercelIntegrationConnectionForm from './VercelIntegrationConnectionForm'
import PartnerManagedResource from 'components/ui/PartnerManagedResource'
import PartnerIcon from 'components/ui/PartnerIcon'

const VercelSection = ({ isProjectScoped }: { isProjectScoped: boolean }) => {
const project = useSelectedProject()
Expand Down Expand Up @@ -164,6 +166,18 @@ You can change the scope of the access for Supabase by configuring
<ScaffoldSectionContent>
{!canReadVercelConnection ? (
<NoPermission resourceText="view this organization's Vercel connections" />
) : org?.managed_by === 'vercel-marketplace' ? (
<Alert_Shadcn_ className="flex flex-col items-center gap-y-2 border-0 rounded-none">
<PartnerIcon
organization={{ managed_by: 'vercel-marketplace' }}
showTooltip={false}
size="large"
/>

<AlertTitle_Shadcn_ className="text-sm">
Vercel Integration is not available for Vercel Marketplace managed projects.
</AlertTitle_Shadcn_>
</Alert_Shadcn_>
) : (
<>
<Markdown content={VercelContentSectionTop} />
Expand Down