Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

adjust project settings integrations layout (#46868)

Saxon Fletchere92f13f11a87
diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx
index a503bcd1713..540879a0d1a 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx
@@ -2,16 +2,18 @@ import { useState } from 'react'
import { toast } from 'sonner'
import { Button, Card, CardContent, cn } from 'ui'
import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
+import {
+ PageSection,
+ PageSectionContent,
+ PageSectionDescription,
+ PageSectionMeta,
+ PageSectionSummary,
+ PageSectionTitle,
+} from 'ui-patterns/PageSection'
-import { IntegrationImageHandler } from '../IntegrationsSettings'
+import { IntegrationSectionIcon } from '../IntegrationsSettings'
import { AWSPrivateLinkAccountItem } from './AWSPrivateLinkAccountItem'
import { AWSPrivateLinkForm } from './AWSPrivateLinkForm'
-import {
- ScaffoldContainer,
- ScaffoldSection,
- ScaffoldSectionContent,
- ScaffoldSectionDetail,
-} from '@/components/layouts/Scaffold'
import { ResourceList } from '@/components/ui/Resource/ResourceList'
import { UpgradeToPro } from '@/components/ui/UpgradeToPro'
import { useAWSAccountDeleteMutation } from '@/data/aws-accounts/aws-account-delete-mutation'
@@ -63,64 +65,60 @@ export const AWSPrivateLinkSection = () => {
return (
<>
- <ScaffoldContainer>
- <ScaffoldSection className="py-12">
- <ScaffoldSectionDetail title="AWS PrivateLink">
- <p>Connect to your Supabase project from your AWS VPC using AWS PrivateLink.</p>
- <IntegrationImageHandler title="aws" />
- </ScaffoldSectionDetail>
- <ScaffoldSectionContent>
- <div className="space-y-6">
- <div className="space-y-4">
- <div className="space-y-1">
- <h3 className="text-sm font-medium text-foreground">
- How does the AWS PrivateLink integration work?
- </h3>
- <p className="text-sm text-foreground-light">
- Connecting to AWS PrivateLink allows you to create a private connection between
- your AWS VPC and your Supabase project.
- </p>
- </div>
- {promptPlanUpgrade && (
- <UpgradeToPro
- layout="vertical"
- primaryText="Only available on Team or Enterprise Plan and above"
- secondaryText="Connect your AWS VPC privately to your Supabase project using AWS PrivateLink."
- buttonText="Upgrade to Team"
- source="aws-privatelink-integration"
- />
- )}
- </div>
- <div className={cn(promptPlanUpgrade && 'opacity-25 pointer-events-none')}>
- <div className="flex items-center justify-between mb-3">
- <h3 className="text-sm font-medium text-foreground">AWS Accounts</h3>
- <Button type="default" onClick={onAddAccount}>
- Add account
- </Button>
- </div>
- {(accounts?.length ?? 0) > 0 ? (
- <ResourceList>
- {accounts?.map((account) => (
- <AWSPrivateLinkAccountItem
- key={account.aws_account_id}
- {...account}
- onEdit={() => onEditAccount(account)}
- onDelete={() => onDeleteAccount(account)}
- />
- ))}
- </ResourceList>
- ) : (
- <Card>
- <CardContent>
- <p className="text-foreground-lighter text-sm">No accounts connected</p>
- </CardContent>
- </Card>
- )}
+ <PageSection>
+ <PageSectionMeta>
+ <div className="flex flex-1 items-start gap-6">
+ <IntegrationSectionIcon title="aws" />
+ <PageSectionSummary>
+ <PageSectionTitle>AWS PrivateLink</PageSectionTitle>
+ <PageSectionDescription>
+ Connect to your Supabase project from your AWS VPC using AWS PrivateLink. Create a
+ private connection between your AWS VPC and your Supabase project without traffic
+ traversing the public internet.
+ </PageSectionDescription>
+ </PageSectionSummary>
+ </div>
+ </PageSectionMeta>
+ <PageSectionContent>
+ <div className="space-y-6">
+ {promptPlanUpgrade && (
+ <UpgradeToPro
+ layout="vertical"
+ primaryText="Only available on Team or Enterprise Plan and above"
+ secondaryText="Connect your AWS VPC privately to your Supabase project using AWS PrivateLink."
+ buttonText="Upgrade to Team"
+ source="aws-privatelink-integration"
+ />
+ )}
+ <div className={cn(promptPlanUpgrade && 'opacity-25 pointer-events-none')}>
+ <div className="flex items-center justify-between mb-3">
+ <h3 className="text-sm font-medium text-foreground">AWS Accounts</h3>
+ <Button type="default" onClick={onAddAccount}>
+ Add account
+ </Button>
</div>
+ {(accounts?.length ?? 0) > 0 ? (
+ <ResourceList>
+ {accounts?.map((account) => (
+ <AWSPrivateLinkAccountItem
+ key={account.aws_account_id}
+ {...account}
+ onEdit={() => onEditAccount(account)}
+ onDelete={() => onDeleteAccount(account)}
+ />
+ ))}
+ </ResourceList>
+ ) : (
+ <Card>
+ <CardContent>
+ <p className="text-foreground-lighter text-sm">No accounts connected</p>
+ </CardContent>
+ </Card>
+ )}
</div>
- </ScaffoldSectionContent>
- </ScaffoldSection>
- </ScaffoldContainer>
+ </div>
+ </PageSectionContent>
+ </PageSection>
<AWSPrivateLinkForm account={selectedAccount} open={showForm} onOpenChange={setShowForm} />
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
index 34240d1f58b..44ad75a9c30 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
@@ -1,16 +1,18 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { useMemo } from 'react'
+import {
+ PageSection,
+ PageSectionContent,
+ PageSectionDescription,
+ PageSectionMeta,
+ PageSectionSummary,
+ PageSectionTitle,
+} from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import { IntegrationImageHandler } from '../IntegrationsSettings'
+import { IntegrationSectionIcon } from '../IntegrationsSettings'
import { GitHubIntegrationConnectionForm } from './GitHubIntegrationConnectionForm'
-import {
- ScaffoldContainer,
- ScaffoldSection,
- ScaffoldSectionContent,
- ScaffoldSectionDetail,
-} from '@/components/layouts/Scaffold'
import NoPermission from '@/components/ui/NoPermission'
import { useGitHubConnectionsQuery } from '@/data/integrations/github-connections-query'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
@@ -33,39 +35,30 @@ export const GitHubSection = () => {
[connections, projectRef]
)
- const GitHubTitle = `GitHub Integration`
-
return (
- <ScaffoldContainer>
- <ScaffoldSection className="py-12">
- <ScaffoldSectionDetail title={GitHubTitle}>
- <p>Connect any of your GitHub repositories to a project.</p>
- <IntegrationImageHandler title="github" />
- </ScaffoldSectionDetail>
- <ScaffoldSectionContent>
- {isLoadingPermissions ? (
- <GenericSkeletonLoader />
- ) : !canReadGitHubConnection ? (
- <NoPermission resourceText="view this organization's GitHub connections" />
- ) : (
- <div className="space-y-6">
- <div className="space-y-1">
- <h3 className="text-sm font-medium text-foreground">
- How does the GitHub integration work?
- </h3>
- <p className="text-sm text-foreground-light">
- Connect to GitHub to apply changes to your database when you merge into your
- production branch. If branching is enabled, each pull request gets its own preview
- database.
- </p>
- </div>
- <div>
- <GitHubIntegrationConnectionForm connection={existingConnection} />
- </div>
- </div>
- )}
- </ScaffoldSectionContent>
- </ScaffoldSection>
- </ScaffoldContainer>
+ <PageSection>
+ <PageSectionMeta>
+ <div className="flex flex-1 items-start gap-6">
+ <IntegrationSectionIcon title="github" />
+ <PageSectionSummary>
+ <PageSectionTitle>GitHub Integration</PageSectionTitle>
+ <PageSectionDescription>
+ 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.
+ </PageSectionDescription>
+ </PageSectionSummary>
+ </div>
+ </PageSectionMeta>
+ <PageSectionContent>
+ {isLoadingPermissions ? (
+ <GenericSkeletonLoader />
+ ) : !canReadGitHubConnection ? (
+ <NoPermission resourceText="view this organization's GitHub connections" />
+ ) : (
+ <GitHubIntegrationConnectionForm connection={existingConnection} />
+ )}
+ </PageSectionContent>
+ </PageSection>
)
}
diff --git a/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx b/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx
index fb58bd8ffd2..5a0822d5b16 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx
@@ -1,10 +1,10 @@
+import { Card } from 'ui'
import { Admonition } from 'ui-patterns'
import { AWSPrivateLinkSection } from './AWSPrivateLink/AWSPrivateLinkSection'
import { GitHubSection } from './GithubIntegration/GithubSection'
import { VercelSection } from './VercelIntegration/VercelSection'
import { SidePanelVercelProjectLinker } from '@/components/interfaces/Organization/IntegrationSettings/SidePanelVercelProjectLinker'
-import { ScaffoldContainer, ScaffoldDivider } from '@/components/layouts/Scaffold'
import { InlineLink } from '@/components/ui/InlineLink'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
@@ -13,13 +13,46 @@ import { BASE_PATH } from '@/lib/constants'
export const IntegrationImageHandler = ({ title }: { title: 'vercel' | 'github' | 'aws' }) => {
return (
<img
- className="border rounded-lg shadow-sm w-full sm:w-48 mt-6 border-body"
+ className="border rounded-lg shadow-sm w-full sm:w-48 border-body"
src={`${BASE_PATH}/img/integrations/covers/${title}-cover.png`}
alt={`${title} cover`}
/>
)
}
+const INTEGRATION_ICONS: Record<
+ 'vercel' | 'github' | 'aws',
+ (className: string) => React.ReactNode
+> = {
+ github: (className) => (
+ <svg className={className} viewBox="0 0 32.58 31.77" fill="currentColor" aria-hidden>
+ <path d="M16.29,0a16.29,16.29,0,0,0-5.15,31.75c.82.15,1.11-.36,1.11-.79s0-1.41,0-2.77C7.7,29.18,6.74,26,6.74,26a4.36,4.36,0,0,0-1.81-2.39c-1.47-1,.12-1,.12-1a3.43,3.43,0,0,1,2.49,1.68,3.48,3.48,0,0,0,4.74,1.36,3.46,3.46,0,0,1,1-2.18c-3.62-.41-7.42-1.81-7.42-8a6.3,6.3,0,0,1,1.67-4.37,5.94,5.94,0,0,1,.16-4.31s1.37-.44,4.48,1.67a15.41,15.41,0,0,1,8.16,0c3.11-2.11,4.47-1.67,4.47-1.67A5.91,5.91,0,0,1,25,11.07a6.3,6.3,0,0,1,1.67,4.37c0,6.26-3.81,7.63-7.44,8a3.85,3.85,0,0,1,1.11,3c0,2.18,0,3.94,0,4.47s.29.94,1.12.78A16.29,16.29,0,0,0,16.29,0Z" />
+ </svg>
+ ),
+ vercel: (className) => (
+ <svg className={className} viewBox="0 0 512 512" fill="currentColor" aria-hidden>
+ <path fillRule="evenodd" d="M256,48,496,464H16Z" />
+ </svg>
+ ),
+ aws: (className) => (
+ <svg className={className} viewBox="0 0 304 182" fill="currentColor" aria-hidden>
+ <path d="M86.4 66.4c0 3.7.4 6.7 1.1 8.9.8 2.2 1.8 4.6 3.2 7.2.5.8.7 1.6.7 2.3 0 1-.6 2-1.9 3L83.2 92c-.9.6-1.8.9-2.6.9-1 0-2-.5-3-1.4-1.4-1.5-2.6-3.1-3.6-4.7-1-1.7-2-3.6-3.1-5.9Q59.2 94.7 41.5 94.7c-8.4 0-15.1-2.4-20-7.2s-7.4-11.2-7.4-19.2c0-8.5 3-15.4 9.1-20.6s14.2-7.8 24.5-7.8c3.4 0 6.9.3 10.6.8s7.5 1.3 11.5 2.2v-7.3c0-7.6-1.6-12.9-4.7-16-3.2-3.1-8.6-4.6-16.3-4.6-3.5 0-7.1.4-10.8 1.3s-7.3 2-10.8 3.4c-1.6.7-2.8 1.1-3.5 1.3s-1.2.3-1.6.3c-1.4 0-2.1-1-2.1-3.1v-4.9c0-1.6.2-2.8.7-3.5s1.4-1.4 2.8-2.1Q28.75 5 36.1 3.2C41 1.9 46.2 1.3 51.7 1.3c11.9 0 20.6 2.7 26.2 8.1 5.5 5.4 8.3 13.6 8.3 24.6v32.4zM45.8 81.6c3.3 0 6.7-.6 10.3-1.8s6.8-3.4 9.5-6.4c1.6-1.9 2.8-4 3.4-6.4s1-5.3 1-8.7v-4.2c-2.9-.7-6-1.3-9.2-1.7s-6.3-.6-9.4-.6c-6.7 0-11.6 1.3-14.9 4s-4.9 6.5-4.9 11.5c0 4.7 1.2 8.2 3.7 10.6 2.4 2.5 5.9 3.7 10.5 3.7m80.3 10.8c-1.8 0-3-.3-3.8-1-.8-.6-1.5-2-2.1-3.9L96.7 10.2c-.6-2-.9-3.3-.9-4 0-1.6.8-2.5 2.4-2.5h9.8c1.9 0 3.2.3 3.9 1 .8.6 1.4 2 2 3.9l16.8 66.2 15.6-66.2c.5-2 1.1-3.3 1.9-3.9s2.2-1 4-1h8c1.9 0 3.2.3 4 1 .8.6 1.5 2 1.9 3.9l15.8 67 17.3-67c.6-2 1.3-3.3 2-3.9.8-.6 2.1-1 3.9-1h9.3c1.6 0 2.5.8 2.5 2.5 0 .5-.1 1-.2 1.6s-.3 1.4-.7 2.5l-24.1 77.3q-.9 3-2.1 3.9c-.8.6-2.1 1-3.8 1h-8.6c-1.9 0-3.2-.3-4-1s-1.5-2-1.9-4L156 23l-15.4 64.4c-.5 2-1.1 3.3-1.9 4s-2.2 1-4 1zm128.5 2.7c-5.2 0-10.4-.6-15.4-1.8s-8.9-2.5-11.5-4c-1.6-.9-2.7-1.9-3.1-2.8s-.6-1.9-.6-2.8v-5.1c0-2.1.8-3.1 2.3-3.1q.9 0 1.8.3c.6.2 1.5.6 2.5 1 3.4 1.5 7.1 2.7 11 3.5 4 .8 7.9 1.2 11.9 1.2 6.3 0 11.2-1.1 14.6-3.3s5.2-5.4 5.2-9.5c0-2.8-.9-5.1-2.7-7s-5.2-3.6-10.1-5.2L246 52c-7.3-2.3-12.7-5.7-16-10.2-3.3-4.4-5-9.3-5-14.5q0-6.3 2.7-11.1c1.8-3.2 4.2-6 7.2-8.2 3-2.3 6.4-4 10.4-5.2s8.2-1.7 12.6-1.7c2.2 0 4.5.1 6.7.4 2.3.3 4.4.7 6.5 1.1 2 .5 3.9 1 5.7 1.6q2.7.9 4.2 1.8c1.4.8 2.4 1.6 3 2.5q.9 1.2.9 3.3v4.7c0 2.1-.8 3.2-2.3 3.2-.8 0-2.1-.4-3.8-1.2q-8.55-3.9-19.2-3.9c-5.7 0-10.2.9-13.3 2.8s-4.7 4.8-4.7 8.9c0 2.8 1 5.2 3 7.1s5.7 3.8 11 5.5l14.2 4.5c7.2 2.3 12.4 5.5 15.5 9.6s4.6 8.8 4.6 14c0 4.3-.9 8.2-2.6 11.6-1.8 3.4-4.2 6.4-7.3 8.8-3.1 2.5-6.8 4.3-11.1 5.6-4.5 1.4-9.2 2.1-14.3 2.1" />
+ <path d="M273.5 143.7c-32.9 24.3-80.7 37.2-121.8 37.2-57.6 0-109.5-21.3-148.7-56.7-3.1-2.8-.3-6.6 3.4-4.4 42.4 24.6 94.7 39.5 148.8 39.5 36.5 0 76.6-7.6 113.5-23.2 5.5-2.5 10.2 3.6 4.8 7.6" />
+ <path d="M287.2 128.1c-4.2-5.4-27.8-2.6-38.5-1.3-3.2.4-3.7-2.4-.8-4.5 18.8-13.2 49.7-9.4 53.3-5 3.6 4.5-1 35.4-18.6 50.2-2.7 2.3-5.3 1.1-4.1-1.9 4-9.9 12.9-32.2 8.7-37.5" />
+ </svg>
+ ),
+}
+
+export const IntegrationSectionIcon = ({ title }: { title: 'vercel' | 'github' | 'aws' }) => {
+ return (
+ <div className="shrink-0 text-foreground-light">
+ <Card className="flex h-14 w-14 shrink-0 items-center justify-center p-0">
+ {INTEGRATION_ICONS[title]('h-5 w-5')}
+ </Card>
+ </div>
+ )
+}
+
export const IntegrationSettings = () => {
const { data: project } = useSelectedProjectQuery()
const isBranch = project?.parent_project_ref !== undefined
@@ -33,37 +66,29 @@ export const IntegrationSettings = () => {
return (
<>
{isBranch && (
- <ScaffoldContainer>
- <Admonition
- type="default"
- className="mt-6"
- title="You are currently on a preview branch of your project"
- >
- To adjust your project's integration settings, you may return to your{' '}
- <InlineLink href={`/project/${project.parent_project_ref}/settings/integrations`}>
- main branch
- </InlineLink>
- .
- </Admonition>
- </ScaffoldContainer>
+ <Admonition
+ type="default"
+ className="mb-6"
+ title="You are currently on a preview branch of your project"
+ >
+ To adjust your project's integration settings, you may return to your{' '}
+ <InlineLink href={`/project/${project.parent_project_ref}/settings/integrations`}>
+ main branch
+ </InlineLink>
+ .
+ </Admonition>
)}
<GitHubSection />
{showVercelIntegration && (
<>
- <ScaffoldDivider />
<VercelSection isProjectScoped={true} />
<SidePanelVercelProjectLinker />
</>
)}
- {showAWSPrivateLink && (
- <>
- <ScaffoldDivider />
- <AWSPrivateLinkSection />
- </>
- )}
+ {showAWSPrivateLink && <AWSPrivateLinkSection />}
</>
)
}
diff --git a/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
index 90a7ed02f35..3309a748d35 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelSection.tsx
@@ -4,9 +4,17 @@ import Link from 'next/link'
import { useCallback, useMemo } from 'react'
import { toast } from 'sonner'
import { Button, cn } from 'ui'
+import {
+ PageSection,
+ PageSectionContent,
+ PageSectionDescription,
+ PageSectionMeta,
+ PageSectionSummary,
+ PageSectionTitle,
+} from 'ui-patterns/PageSection'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
-import { IntegrationImageHandler } from '../IntegrationsSettings'
+import { IntegrationSectionIcon } from '../IntegrationsSettings'
import VercelIntegrationConnectionForm from './VercelIntegrationConnectionForm'
import { IntegrationConnectionItem } from '@/components/interfaces/Integrations/VercelGithub/IntegrationConnection'
import {
@@ -14,12 +22,6 @@ import {
IntegrationConnectionHeader,
IntegrationInstallation,
} from '@/components/interfaces/Integrations/VercelGithub/IntegrationPanels'
-import {
- ScaffoldContainer,
- ScaffoldSection,
- ScaffoldSectionContent,
- ScaffoldSectionDetail,
-} from '@/components/layouts/Scaffold'
import { InlineLink } from '@/components/ui/InlineLink'
import NoPermission from '@/components/ui/NoPermission'
import { useOrgIntegrationsQuery } from '@/data/integrations/integrations-query-org-only'
@@ -119,8 +121,6 @@ export const VercelSection = ({ isProjectScoped }: { isProjectScoped: boolean })
[deleteVercelConnection, org?.slug]
)
- const VercelTitle = `Vercel Integration`
-
const integrationUrl =
process.env.NEXT_PUBLIC_ENVIRONMENT === 'prod'
? 'https://vercel.com/integrations/supabase'
@@ -141,116 +141,113 @@ export const VercelSection = ({ isProjectScoped }: { isProjectScoped: boolean })
)} `
return (
- <ScaffoldContainer>
- <ScaffoldSection className="py-12">
- <ScaffoldSectionDetail title={VercelTitle}>
- <p>Connect your Vercel teams to your Supabase organization.</p>
- <IntegrationImageHandler title="vercel" />
- </ScaffoldSectionDetail>
- <ScaffoldSectionContent>
- {isLoadingPermissions ? (
- <GenericSkeletonLoader />
- ) : !canReadVercelConnection ? (
- <NoPermission resourceText="view this organization's Vercel connections" />
- ) : (
- <div className="space-y-6">
- <div className="space-y-1">
- <h3 className="text-sm font-medium text-foreground">
- How does the Vercel integration work?
- </h3>
- <p className="text-sm text-foreground-light">
- Supabase will keep your environment variables up to date in each of the projects
- you assign to a Supabase project. You can also link multiple Vercel projects to
- the same Supabase project.
- </p>
- </div>
- <div>
- {vercelIntegration ? (
- <div key={vercelIntegration.id}>
- <IntegrationInstallation title={'Vercel'} integration={vercelIntegration} />
- {connections.length > 0 ? (
- <>
- <IntegrationConnectionHeader
- title={ConnectionHeaderTitle}
- markdown={`Repository connections for Vercel`}
- />
- <ul className="flex flex-col">
- {connections.map((connection) => (
- <div
- key={connection.id}
- className={cn(
- isProjectScoped && 'relative flex flex-col -gap-[1px] [&>li]:pb-0'
- )}
- >
- <IntegrationConnectionItem
- connection={connection}
- disabled={isBranch || !canUpdateVercelConnection}
- type={'Vercel' as IntegrationName}
- onDeleteConnection={onDeleteVercelConnection}
- className={cn(isProjectScoped && 'rounded-b-none! mb-0!')}
- />
- {isProjectScoped ? (
- <div className="relative pl-8 ml-6 border-l border-muted pb-6">
- <div className="border-b border-l border-r rounded-b-lg">
- <VercelIntegrationConnectionForm
- connection={connection}
- integration={vercelIntegration}
- disabled={isBranch || !canUpdateVercelConnection}
- />
- </div>
- </div>
- ) : null}
- </div>
- ))}
- </ul>
- </>
- ) : (
+ <PageSection>
+ <PageSectionMeta>
+ <div className="flex flex-1 items-start gap-6">
+ <IntegrationSectionIcon title="vercel" />
+ <PageSectionSummary>
+ <PageSectionTitle>Vercel Integration</PageSectionTitle>
+ <PageSectionDescription>
+ Connect your Vercel teams to your Supabase organization. Supabase keeps environment
+ variables up to date in each assigned project. You can also link multiple Vercel
+ projects to the same Supabase project.
+ </PageSectionDescription>
+ </PageSectionSummary>
+ </div>
+ </PageSectionMeta>
+ <PageSectionContent>
+ {isLoadingPermissions ? (
+ <GenericSkeletonLoader />
+ ) : !canReadVercelConnection ? (
+ <NoPermission resourceText="view this organization's Vercel connections" />
+ ) : (
+ <div className="space-y-6">
+ <div>
+ {vercelIntegration ? (
+ <div key={vercelIntegration.id}>
+ <IntegrationInstallation title={'Vercel'} integration={vercelIntegration} />
+ {connections.length > 0 ? (
+ <>
<IntegrationConnectionHeader
title={ConnectionHeaderTitle}
- className="pb-0"
markdown={`Repository connections for Vercel`}
/>
+ <ul className="flex flex-col">
+ {connections.map((connection) => (
+ <div
+ key={connection.id}
+ className={cn(
+ isProjectScoped && 'relative flex flex-col -gap-[1px] [&>li]:pb-0'
+ )}
+ >
+ <IntegrationConnectionItem
+ connection={connection}
+ disabled={isBranch || !canUpdateVercelConnection}
+ type={'Vercel' as IntegrationName}
+ onDeleteConnection={onDeleteVercelConnection}
+ className={cn(isProjectScoped && 'rounded-b-none! mb-0!')}
+ />
+ {isProjectScoped ? (
+ <div className="relative pl-8 ml-6 border-l border-muted pb-6">
+ <div className="border-b border-l border-r rounded-b-lg">
+ <VercelIntegrationConnectionForm
+ connection={connection}
+ integration={vercelIntegration}
+ disabled={isBranch || !canUpdateVercelConnection}
+ />
+ </div>
+ </div>
+ ) : null}
+ </div>
+ ))}
+ </ul>
+ </>
+ ) : (
+ <IntegrationConnectionHeader
+ title={ConnectionHeaderTitle}
+ className="pb-0"
+ markdown={`Repository connections for Vercel`}
+ />
+ )}
+ <EmptyIntegrationConnection
+ disabled={isBranch || !canCreateVercelConnection}
+ onClick={() => onAddVercelConnection(vercelIntegration.id)}
+ >
+ Add new project connection
+ </EmptyIntegrationConnection>
+ </div>
+ ) : (
+ <div>
+ <Button
+ icon={<ExternalLink />}
+ asChild={!isBranch}
+ type="default"
+ disabled={isBranch}
+ >
+ {isBranch ? (
+ <p>Install Vercel Integration</p>
+ ) : (
+ <Link href={integrationUrl} target="_blank" rel="noreferrer">
+ Install Vercel Integration
+ </Link>
)}
- <EmptyIntegrationConnection
- disabled={isBranch || !canCreateVercelConnection}
- onClick={() => onAddVercelConnection(vercelIntegration.id)}
- >
- Add new project connection
- </EmptyIntegrationConnection>
- </div>
- ) : (
- <div>
- <Button
- icon={<ExternalLink />}
- asChild={!isBranch}
- type="default"
- disabled={isBranch}
- >
- {isBranch ? (
- <p>Install Vercel Integration</p>
- ) : (
- <Link href={integrationUrl} target="_blank" rel="noreferrer">
- Install Vercel Integration
- </Link>
- )}
- </Button>
- </div>
- )}
- </div>
- {vercelProjectCount > 0 && vercelIntegration !== undefined && (
- <p className="text-sm text-foreground-light">
- Your Vercel connection can access {vercelProjectCount} Vercel projects. To change
- which projects Supabase may use, open your organization’s{' '}
- <InlineLink href={getIntegrationConfigurationUrl(vercelIntegration)}>
- Vercel integration settings
- </InlineLink>
- .
- </p>
+ </Button>
+ </div>
)}
</div>
- )}
- </ScaffoldSectionContent>
- </ScaffoldSection>
- </ScaffoldContainer>
+ {vercelProjectCount > 0 && vercelIntegration !== undefined && (
+ <p className="text-sm text-foreground-light">
+ Your Vercel connection can access {vercelProjectCount} Vercel projects. To change
+ which projects Supabase may use, open your organization’s{' '}
+ <InlineLink href={getIntegrationConfigurationUrl(vercelIntegration)}>
+ Vercel integration settings
+ </InlineLink>
+ .
+ </p>
+ )}
+ </div>
+ )}
+ </PageSectionContent>
+ </PageSection>
)
}
diff --git a/apps/studio/pages/project/[ref]/settings/integrations.tsx b/apps/studio/pages/project/[ref]/settings/integrations.tsx
index 1e0654c2f8b..5d02828a690 100644
--- a/apps/studio/pages/project/[ref]/settings/integrations.tsx
+++ b/apps/studio/pages/project/[ref]/settings/integrations.tsx
@@ -1,24 +1,31 @@
+import { PageContainer } from 'ui-patterns/PageContainer'
+import {
+ PageHeader,
+ PageHeaderDescription,
+ PageHeaderMeta,
+ PageHeaderSummary,
+ PageHeaderTitle,
+} from 'ui-patterns/PageHeader'
+
import { IntegrationSettings } from '@/components/interfaces/Settings/Integrations/IntegrationsSettings'
import { DefaultLayout } from '@/components/layouts/DefaultLayout'
import SettingsLayout from '@/components/layouts/ProjectSettingsLayout/SettingsLayout'
-import {
- ScaffoldContainer,
- ScaffoldDivider,
- ScaffoldHeader,
- ScaffoldTitle,
-} from '@/components/layouts/Scaffold'
import type { NextPageWithLayout } from '@/types'
const ProjectSettingsIntegrations: NextPageWithLayout = () => {
return (
<>
- <ScaffoldContainer>
- <ScaffoldHeader>
- <ScaffoldTitle>Integrations</ScaffoldTitle>
- </ScaffoldHeader>
- </ScaffoldContainer>
- <ScaffoldDivider />
- <IntegrationSettings />
+ <PageHeader size="small">
+ <PageHeaderMeta>
+ <PageHeaderSummary>
+ <PageHeaderTitle>Integrations</PageHeaderTitle>
+ <PageHeaderDescription>Connect external services to your project</PageHeaderDescription>
+ </PageHeaderSummary>
+ </PageHeaderMeta>
+ </PageHeader>
+ <PageContainer size="small">
+ <IntegrationSettings />
+ </PageContainer>
</>
)
}