mirror of
https://github.com/supabase/supabase.git
synced 2026-09-09 03:19:36 +08:00
## What kind of change does this PR introduce? UI ## What is the current behavior? GitHub’s empty state and Integrations icon spacing do not match the PrivateLink list. Add connection has no plus. PrivateLink rows use a kebab instead of click-to-view. ## What is the new behavior? GitHub empty state matches the connections list. **Connect GitHub** is tiny and asks you to connect before choosing a repo. Section icons align. **Add connection** has a plus. PrivateLink rows are clickable; delete stays in the sheet. | Before | After | | --- | --- | | <img width="1456" height="1508" alt="CleanShot 2026-08-14 at 12 48 48@2x" src="https://github.com/user-attachments/assets/27485e35-c24f-478e-8328-aad03ebb1dfb" /> | <img width="1468" height="1494" alt="CleanShot 2026-08-14 at 14 22 19@2x" src="https://github.com/user-attachments/assets/056e3b48-4542-4be5-9b21-4b5abd726e8e" /> | ## Additional context Stacked on #49087. No Vercel card work in this PR. See #49030 for the end state, as it may already include fixes you might propose. ## To test - **Project Settings → Integrations.** Check GitHub, Vercel, and PrivateLink icon alignment. - GitHub not connected: description should say **Connect GitHub to link a repository to this project.** Button should be tiny. - If GitHub has no repo (org page), the empty state should ask you to add a connection. - PrivateLink **Add connection** should show a plus. Click a connection row to view it. No kebab. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * AWS PrivateLink connections now display clearer titles, status, replica details, and database visibility. * GitHub organization integrations now provide improved empty states and clearer connection actions. * Added plus icons to connection buttons. * **Improvements** * Updated GitHub guidance based on authorization and repository selection status. * Standardized connection labels and refined integration page layouts. * Improved AWS integration icon presentation and responsive upgrade prompts. * **Bug Fixes** * Simplified default connection button wording across integrations. * Improved AWS account title fallback behavior when a nickname is unavailable. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
228 lines
8.1 KiB
TypeScript
228 lines
8.1 KiB
TypeScript
import { PermissionAction } from '@supabase/shared-types/out/constants'
|
|
import { useParams } from 'common'
|
|
import { Plus } from 'lucide-react'
|
|
import { useRouter } from 'next/router'
|
|
import { useCallback, useMemo } from 'react'
|
|
import { toast } from 'sonner'
|
|
import { Button, Card, CardContent } from 'ui'
|
|
import { FormLayout } from 'ui-patterns/form/Layout/FormLayout'
|
|
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 { ButtonTooltip } from '@/components/ui/ButtonTooltip'
|
|
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('GitHub connection deleted')
|
|
},
|
|
})
|
|
|
|
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 description = isProjectScoped
|
|
? 'Preview branches and production deploys from a connected GitHub repository.'
|
|
: 'Preview branches and production deploys from connected GitHub repositories.'
|
|
|
|
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-5">
|
|
<IntegrationSectionIcon title="github" />
|
|
<PageSectionSummary>
|
|
<PageSectionTitle>GitHub</PageSectionTitle>
|
|
<PageSectionDescription>{description}</PageSectionDescription>
|
|
</PageSectionSummary>
|
|
</div>
|
|
</PageSectionMeta>
|
|
<PageSectionContent>
|
|
{isLoadingPermissions ? (
|
|
<GenericSkeletonLoader />
|
|
) : !canReadGitHubConnection ? (
|
|
<NoPermission resourceText="view GitHub connections" />
|
|
) : isProjectScoped ? (
|
|
<GitHubIntegrationConnectionForm connection={existingConnection} />
|
|
) : (
|
|
<div className="space-y-6">
|
|
<div className="flex flex-col gap-y-2">
|
|
{(connections?.length ?? 0) > 0 ? (
|
|
<>
|
|
<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}
|
|
icon={<Plus />}
|
|
>
|
|
Add connection
|
|
</EmptyIntegrationConnection>
|
|
</>
|
|
) : (
|
|
<GitHubOrgEmptyState
|
|
disabled={!canCreateGitHubConnection}
|
|
onClick={onAddGitHubConnection}
|
|
/>
|
|
)}
|
|
</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>
|
|
)
|
|
}
|
|
|
|
function GitHubOrgEmptyState({ disabled, onClick }: { disabled: boolean; onClick: () => void }) {
|
|
return (
|
|
<Card>
|
|
<CardContent>
|
|
<FormLayout
|
|
layout="flex-row-reverse"
|
|
label="GitHub repository"
|
|
description="Add a connection to link a repository to a project"
|
|
>
|
|
{disabled ? (
|
|
<ButtonTooltip
|
|
icon={<Plus />}
|
|
variant="default"
|
|
size="tiny"
|
|
disabled
|
|
tooltip={{
|
|
content: {
|
|
side: 'bottom',
|
|
text: 'Additional permissions required to add connection',
|
|
},
|
|
}}
|
|
>
|
|
Add connection
|
|
</ButtonTooltip>
|
|
) : (
|
|
<Button icon={<Plus />} variant="default" size="tiny" type="button" onClick={onClick}>
|
|
Add connection
|
|
</Button>
|
|
)}
|
|
</FormLayout>
|
|
</CardContent>
|
|
</Card>
|
|
)
|
|
}
|