mirror of
https://github.com/supabase/supabase.git
synced 2026-06-28 19:39:19 -04:00
77ecfd5997
## What kind of change does this PR introduce? UI bug fix. Resolves FE-3617. ## What is the current behavior? On `/org/[slug]/integrations`, the Vercel section renders full-width and the page uses a mixed layout: GitHub still uses the old Scaffold two-column pattern while `VercelSection` was migrated to `PageSection` without a page container in #46868. ## What is the new behavior? - Migrates `/org/[slug]/integrations` to `PageHeader` + `PageContainer size="small"` + `PageSection`, matching project settings integrations - Puts the Vercel "Install Vercel Integration" CTA in the same dashed card pattern as "Add new project connection" (org + project) - Consolidates GitHub into a shared `GitHubSection` with `isProjectScoped`, mirroring `VercelSection` | Before | After | | --- | --- | | <img width="1728" height="997" alt="Integrations Peels Org Supabase-BEB84402-99AA-4EF2-8B8F-3CAE98FEA33D" src="https://github.com/user-attachments/assets/f52741d5-9c31-4707-a10f-c613e0b80bf4" /> | <img width="1728" height="997" alt="Integrations Freebie Supabase-975CF6FD-135B-4E84-AD0B-B47CD8F2AC73" src="https://github.com/user-attachments/assets/1d665601-a38e-4e6b-b205-fde99efa2237" /> | ## To test - [x] `/org/{slug}/integrations`: GitHub and Vercel sections contained, vertically stacked - [x] Vercel connection tree connectors render correctly when integration is installed - [x] `/project/{ref}/settings/integrations`: no regression - [x] Org keyboard shortcut for add connection still works --------- Co-authored-by: Cursor <cursoragent@cursor.com>
182 lines
6.9 KiB
TypeScript
182 lines
6.9 KiB
TypeScript
import { PermissionAction } from '@supabase/shared-types/out/constants'
|
|
import { useParams } from 'common'
|
|
import { useRouter } from 'next/router'
|
|
import { useCallback, useMemo } from 'react'
|
|
import { toast } from 'sonner'
|
|
import {
|
|
PageSection,
|
|
PageSectionContent,
|
|
PageSectionDescription,
|
|
PageSectionMeta,
|
|
PageSectionSummary,
|
|
PageSectionTitle,
|
|
} from 'ui-patterns/PageSection'
|
|
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
|
|
|
|
import { IntegrationSectionIcon } from '../IntegrationsSettings'
|
|
import { GitHubIntegrationConnectionForm } from './GitHubIntegrationConnectionForm'
|
|
import { IntegrationConnectionItem } from '@/components/interfaces/Integrations/VercelGithub/IntegrationConnection'
|
|
import { EmptyIntegrationConnection } from '@/components/interfaces/Integrations/VercelGithub/IntegrationPanels'
|
|
import { InlineLink } from '@/components/ui/InlineLink'
|
|
import NoPermission from '@/components/ui/NoPermission'
|
|
import { useGitHubAuthorizationQuery } from '@/data/integrations/github-authorization-query'
|
|
import { useGitHubConnectionDeleteMutation } from '@/data/integrations/github-connection-delete-mutation'
|
|
import {
|
|
useGitHubConnectionsQuery,
|
|
type GitHubConnection,
|
|
} from '@/data/integrations/github-connections-query'
|
|
import type { IntegrationProjectConnection } from '@/data/integrations/integrations.types'
|
|
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
|
|
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
|
|
import {
|
|
GITHUB_INTEGRATION_INSTALLATION_URL,
|
|
GITHUB_INTEGRATION_REVOKE_AUTHORIZATION_URL,
|
|
} from '@/lib/github'
|
|
import { SHORTCUT_IDS } from '@/state/shortcuts/registry'
|
|
import { useShortcut } from '@/state/shortcuts/useShortcut'
|
|
|
|
const toIntegrationProjectConnection = (
|
|
connection: GitHubConnection
|
|
): IntegrationProjectConnection => ({
|
|
id: String(connection.id),
|
|
added_by: {
|
|
id: String(connection.user?.id),
|
|
primary_email: connection.user?.primary_email ?? '',
|
|
username: connection.user?.username ?? '',
|
|
},
|
|
foreign_project_id: String(connection.repository.id),
|
|
supabase_project_ref: connection.project.ref,
|
|
organization_integration_id: 'unused',
|
|
inserted_at: connection.inserted_at,
|
|
updated_at: connection.updated_at,
|
|
metadata: {
|
|
name: connection.repository.name,
|
|
} as IntegrationProjectConnection['metadata'],
|
|
})
|
|
|
|
export const GitHubSection = ({ isProjectScoped }: { isProjectScoped: boolean }) => {
|
|
const router = useRouter()
|
|
const { ref: projectRef } = useParams()
|
|
const { data: org } = useSelectedOrganizationQuery()
|
|
|
|
const { can: canReadGitHubConnection, isLoading: isLoadingPermissions } =
|
|
useAsyncCheckPermissions(PermissionAction.READ, 'integrations.github_connections')
|
|
const { can: canCreateGitHubConnection } = useAsyncCheckPermissions(
|
|
PermissionAction.CREATE,
|
|
'integrations.github_connections'
|
|
)
|
|
const { can: canUpdateGitHubConnection } = useAsyncCheckPermissions(
|
|
PermissionAction.UPDATE,
|
|
'integrations.github_connections'
|
|
)
|
|
|
|
const { data: gitHubAuthorization } = useGitHubAuthorizationQuery({
|
|
enabled: !isProjectScoped,
|
|
})
|
|
const { data: connections } = useGitHubConnectionsQuery(
|
|
{ organizationId: org?.id },
|
|
{ enabled: isProjectScoped ? !!projectRef && !!org?.id : !!org?.id }
|
|
)
|
|
|
|
const { mutate: deleteGitHubConnection } = useGitHubConnectionDeleteMutation({
|
|
onSuccess: () => {
|
|
toast.success('Successfully deleted GitHub connection')
|
|
},
|
|
})
|
|
|
|
const existingConnection = useMemo(
|
|
() => connections?.find((c) => c.project.ref === projectRef),
|
|
[connections, projectRef]
|
|
)
|
|
|
|
const onAddGitHubConnection = useCallback(() => {
|
|
router.push('/project/_/settings/integrations')
|
|
}, [router])
|
|
|
|
useShortcut(SHORTCUT_IDS.ORG_INTEGRATIONS_ADD_CONNECTION, onAddGitHubConnection, {
|
|
enabled: !isProjectScoped && canCreateGitHubConnection,
|
|
})
|
|
|
|
const onDeleteGitHubConnection = useCallback(
|
|
async (connection: IntegrationProjectConnection) => {
|
|
if (!org?.id) {
|
|
toast.error('Organization not found')
|
|
return
|
|
}
|
|
|
|
deleteGitHubConnection({
|
|
connectionId: connection.id,
|
|
organizationId: org.id,
|
|
})
|
|
},
|
|
[deleteGitHubConnection, org?.id]
|
|
)
|
|
|
|
return (
|
|
<PageSection>
|
|
<PageSectionMeta>
|
|
<div className="flex flex-1 items-start gap-6">
|
|
<IntegrationSectionIcon title="github" />
|
|
<PageSectionSummary>
|
|
<PageSectionTitle>
|
|
{isProjectScoped ? 'GitHub Integration' : 'GitHub Connections'}
|
|
</PageSectionTitle>
|
|
<PageSectionDescription>
|
|
{isProjectScoped
|
|
? 'Connect any of your GitHub repositories to a project. Supabase applies database changes when you merge into your production branch. If branching is enabled, each pull request gets its own preview database.'
|
|
: 'Connect any of your GitHub repositories to a project. The GitHub app watches file, branch, and pull request activity in your repository.'}
|
|
</PageSectionDescription>
|
|
</PageSectionSummary>
|
|
</div>
|
|
</PageSectionMeta>
|
|
<PageSectionContent>
|
|
{isLoadingPermissions ? (
|
|
<GenericSkeletonLoader />
|
|
) : !canReadGitHubConnection ? (
|
|
<NoPermission resourceText="view this organization's GitHub connections" />
|
|
) : isProjectScoped ? (
|
|
<GitHubIntegrationConnectionForm connection={existingConnection} />
|
|
) : (
|
|
<div className="space-y-6">
|
|
<div>
|
|
<ul className="flex flex-col gap-y-2">
|
|
{connections?.map((connection) => (
|
|
<IntegrationConnectionItem
|
|
key={connection.id}
|
|
disabled={!canUpdateGitHubConnection}
|
|
connection={toIntegrationProjectConnection(connection)}
|
|
type="GitHub"
|
|
onDeleteConnection={onDeleteGitHubConnection}
|
|
/>
|
|
))}
|
|
</ul>
|
|
|
|
<EmptyIntegrationConnection
|
|
onClick={onAddGitHubConnection}
|
|
showNode={false}
|
|
disabled={!canCreateGitHubConnection}
|
|
>
|
|
Add new project connection
|
|
</EmptyIntegrationConnection>
|
|
</div>
|
|
|
|
{gitHubAuthorization && (
|
|
<p className="text-sm text-foreground-light">
|
|
You are authorized with the Supabase GitHub App. You can configure your{' '}
|
|
<InlineLink href={GITHUB_INTEGRATION_INSTALLATION_URL}>
|
|
GitHub App installations and repository access
|
|
</InlineLink>
|
|
, or{' '}
|
|
<InlineLink href={GITHUB_INTEGRATION_REVOKE_AUTHORIZATION_URL}>
|
|
revoke your authorization
|
|
</InlineLink>
|
|
.
|
|
</p>
|
|
)}
|
|
</div>
|
|
)}
|
|
</PageSectionContent>
|
|
</PageSection>
|
|
)
|
|
}
|