Skip to content

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

feat(studio): tighten Integrations layout (#49088)

Danny White65a5e593ca4d
diff --git a/apps/studio/components/interfaces/Integrations/VercelGithub/IntegrationPanels.tsx b/apps/studio/components/interfaces/Integrations/VercelGithub/IntegrationPanels.tsx
index 63c447fd0dd..79adf607456 100644
--- a/apps/studio/components/interfaces/Integrations/VercelGithub/IntegrationPanels.tsx
+++ b/apps/studio/components/interfaces/Integrations/VercelGithub/IntegrationPanels.tsx
@@ -291,7 +291,7 @@ export const EmptyIntegrationConnection = forwardRef<
},
ref
) => {
- const label = children ?? 'Add new project connection'
+ const label = children ?? 'Add connection'
return (
<div
diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.test.ts b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.test.ts
index ab1d4ef9dd2..5e184b8399e 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.test.ts
+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.test.ts
@@ -4,6 +4,7 @@ import {
getConnectionsAttention,
getConnectionsAttentionCopy,
getConnectionStatusUi,
+ getConnectionTitle,
type PrivateLinkConnectionStatus,
} from './AWSPrivateLink.utils'
@@ -26,6 +27,30 @@ describe('getConnectionStatusUi', () => {
})
})
+describe('getConnectionTitle', () => {
+ it('uses the customer nickname when present', () => {
+ expect(
+ getConnectionTitle({
+ account_name: 'Production VPC',
+ aws_account_id: '123456789012',
+ })
+ ).toBe('Production VPC')
+ })
+
+ it('falls back to the AWS account ID for an unnamed connection', () => {
+ expect(getConnectionTitle({ aws_account_id: '123456789012' })).toBe('123456789012')
+ })
+
+ it('falls back to the AWS account ID for a blank nickname', () => {
+ expect(
+ getConnectionTitle({
+ account_name: ' ',
+ aws_account_id: '123456789012',
+ })
+ ).toBe('123456789012')
+ })
+})
+
describe('getConnectionsAttentionCopy', () => {
it('returns null when nothing needs attention', () => {
expect(getConnectionsAttentionCopy({ waitingCount: 0, expiredCount: 0 })).toBeNull()
diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.ts b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.ts
index abb1c170f9e..8820e95f287 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.ts
+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLink.utils.ts
@@ -46,6 +46,14 @@ export function getConnectionStatusUi(status?: PrivateLinkConnectionStatus): Con
return CONNECTION_STATUS_UI[status] ?? UNKNOWN_STATUS_UI
}
+export function getConnectionTitle(
+ account: Pick<AWSAccount, 'account_name' | 'aws_account_id'>
+): string {
+ const nickname = account.account_name?.trim()
+ if (nickname) return nickname
+ return account.aws_account_id
+}
+
export type ConnectionsAttention = {
waitingCount: number
expiredCount: number
diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx
index 225ad2ca666..0894c39c797 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx
@@ -1,106 +1,37 @@
-import { Edit, MoreVertical, Trash } from 'lucide-react'
-import {
- Badge,
- Button,
- CardContent,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from 'ui'
+import { Badge } from 'ui'
-import { getConnectionStatusUi } from './AWSPrivateLink.utils'
+import { getConnectionStatusUi, getConnectionTitle } from './AWSPrivateLink.utils'
+import { ResourceItem } from '@/components/ui/Resource/ResourceItem'
+import type { AWSAccount } from '@/data/aws-accounts/aws-accounts-query'
import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'
-interface AWSPrivateLinkAccountItemProps {
- aws_account_id: string
- account_name?: string
- database_type?: 'PRIMARY' | 'READ_REPLICA'
- database_identifier?: string
- resource_access_manager_resource_config_id?: string
- resource_access_manager_resource_config_arn?: string
- resource_access_manager_share_arn?: string
- status:
- | 'CREATING'
- | 'READY'
- | 'ASSOCIATION_REQUEST_EXPIRED'
- | 'ASSOCIATION_ACCEPTED'
- | 'CREATION_FAILED'
- | 'DELETING'
- shared_at: string | null
- onEdit: () => void
- onDelete: () => void
-}
-
export const AWSPrivateLinkAccountItem = ({
- aws_account_id,
- account_name,
- database_type,
- database_identifier,
- resource_access_manager_resource_config_id,
- resource_access_manager_resource_config_arn,
- resource_access_manager_share_arn,
- status,
- onEdit,
- onDelete,
-}: AWSPrivateLinkAccountItemProps) => {
- const databaseTarget =
+ account,
+ onView,
+}: {
+ account: AWSAccount
+ onView: () => void
+}) => {
+ const { account_name, aws_account_id, database_identifier, database_type, status } = account
+ const title = getConnectionTitle({ account_name, aws_account_id })
+ const statusUi = getConnectionStatusUi(status)
+ const replicaId = database_identifier ? formatDatabaseID(database_identifier) : undefined
+ const showDatabase = database_type === 'READ_REPLICA' || title === aws_account_id
+ const databaseLabel =
database_type === 'READ_REPLICA'
- ? `Read replica (ID: ${database_identifier ? formatDatabaseID(database_identifier) : 'Unknown identifier'})`
+ ? `Read replica${replicaId ? ` (ID: ${replicaId})` : ''}`
: 'Primary database'
- const statusUi = getConnectionStatusUi(status)
return (
- <CardContent className="flex items-center justify-between text-sm gap-4">
- <div className="flex-1">
- {account_name && <div className="font-medium text-foreground">{account_name}</div>}
- <div className="text-xs text-foreground-lighter">Database: {databaseTarget}</div>
- <div className="text-xs text-foreground-lighter">Destination account: {aws_account_id}</div>
- {resource_access_manager_resource_config_id && (
- <div className="flex items-center gap-x-1 text-xs text-foreground-lighter">
- <span>Resource configuration:</span>
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="font-mono">{resource_access_manager_resource_config_id}</span>
- </TooltipTrigger>
- {(resource_access_manager_resource_config_arn ||
- resource_access_manager_share_arn) && (
- <TooltipContent side="bottom" className="max-w-xs break-all">
- {resource_access_manager_resource_config_arn && (
- <p>Resource config ARN: {resource_access_manager_resource_config_arn}</p>
- )}
- {resource_access_manager_share_arn && (
- <p>Resource share ARN: {resource_access_manager_share_arn}</p>
- )}
- </TooltipContent>
- )}
- </Tooltip>
- </div>
- )}
+ <ResourceItem
+ onClick={onView}
+ className="border-b! last:border-b-0!"
+ meta={<Badge variant={statusUi.badgeVariant}>{statusUi.badge}</Badge>}
+ >
+ <div className="min-w-0">
+ <div className="font-medium text-foreground truncate">{title}</div>
+ {showDatabase && <p className="text-xs text-foreground-lighter">{databaseLabel}</p>}
</div>
-
- <Badge variant={statusUi.badgeVariant}>{statusUi.badge}</Badge>
-
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="text" className="px-1" icon={<MoreVertical />} />
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end" className="w-40">
- <DropdownMenuItem onClick={onEdit} className="gap-x-2">
- <Edit size={14} />
- <span>View connection</span>
- </DropdownMenuItem>
- <DropdownMenuSeparator />
- <DropdownMenuItem onClick={onDelete} className="gap-x-2">
- <Trash size={14} />
- <span>Delete connection</span>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </CardContent>
+ </ResourceItem>
)
}
diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx
index 76bc92d7188..3688e994d54 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx
@@ -1,3 +1,4 @@
+import { Plus } from 'lucide-react'
import { useState } from 'react'
import { toast } from 'sonner'
import {
@@ -67,11 +68,6 @@ export const AWSPrivateLinkSection = () => {
setShowForm(true)
}
- const onDeleteAccount = (account: AWSAccount) => {
- setSelectedAccount(account)
- setShowDeleteModal(true)
- }
-
const onConfirmDelete = () => {
if (selectedAccount && project) {
deleteAccount({
@@ -96,12 +92,12 @@ export const AWSPrivateLinkSection = () => {
<>
<PageSection>
<PageSectionMeta>
- <div className="flex flex-1 items-start gap-6">
+ <div className="flex flex-1 items-start gap-5">
<IntegrationSectionIcon title="aws" />
<PageSectionSummary>
<PageSectionTitle>AWS PrivateLink</PageSectionTitle>
<PageSectionDescription>
- Connect to this project from your AWS VPC without using the public internet.
+ Private connectivity from a connected AWS VPC, without the public internet.
</PageSectionDescription>
</PageSectionSummary>
</div>
@@ -110,7 +106,7 @@ export const AWSPrivateLinkSection = () => {
<div className="space-y-6">
{promptPlanUpgrade && (
<UpgradeToPro
- layout="vertical"
+ layout="responsive"
primaryText="Available on Team and Enterprise plans"
secondaryText="Upgrade to add a PrivateLink connection."
buttonText="Upgrade to Team"
@@ -120,7 +116,7 @@ export const AWSPrivateLinkSection = () => {
<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">Connections</h3>
- <Button variant="default" onClick={onAddAccount}>
+ <Button variant="default" icon={<Plus />} onClick={onAddAccount}>
Add connection
</Button>
</div>
@@ -130,9 +126,8 @@ export const AWSPrivateLinkSection = () => {
{accounts?.map((account) => (
<AWSPrivateLinkAccountItem
key={`${account.aws_account_id}-${account.database_identifier ?? 'primary'}`}
- {...account}
- onEdit={() => onEditAccount(account)}
- onDelete={() => onDeleteAccount(account)}
+ account={account}
+ onView={() => onEditAccount(account)}
/>
))}
</ResourceList>
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
index d56634f0111..6de70c98b15 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx
@@ -388,6 +388,13 @@ export const GitHubIntegrationConnectionForm = ({
isDeletingConnection ||
isLoadingRepositoryOptions
+ let repositoryDescription = 'Select the repository to connect to your project'
+ if (connection) {
+ repositoryDescription = 'Change the connected repository'
+ } else if (gitHubAuthorization === null) {
+ repositoryDescription = 'Connect GitHub to link a repository to this project'
+ }
+
return (
<>
<Form {...githubSettingsForm}>
@@ -402,11 +409,7 @@ export const GitHubIntegrationConnectionForm = ({
name="repositoryId"
label="GitHub repository"
layout="flex-row-reverse"
- description={
- connection
- ? 'Change the connected repository'
- : 'Select the repository to connect to your project'
- }
+ description={repositoryDescription}
disabled={
(!connection && !canCreateGitHubConnection) ||
(connection && !canUpdateGitHubConnection)
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx
index c1149f96f0c..4e2b8112d44 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubRepositoryField.tsx
@@ -139,7 +139,7 @@ export const GitHubRepositoryField = <TFormValues extends FieldValues>({
<Button
id={name}
variant="default"
- size="small"
+ size="tiny"
type="button"
disabled={disabled}
onClick={() => {
diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
index 00ea1c883eb..2c927fea1ee 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GithubSection.tsx
@@ -1,8 +1,11 @@
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,
@@ -17,6 +20,7 @@ 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'
@@ -98,8 +102,8 @@ export const GitHubSection = ({ isProjectScoped }: { isProjectScoped: boolean })
})
const description = isProjectScoped
- ? 'Connect this Supabase project to a GitHub repository. Supabase applies database changes when you merge into your production branch. If branching is enabled, each pull request gets its own preview database.'
- : 'Connect GitHub repositories to Supabase projects in this organization. The Supabase GitHub app watches file, branch, and pull request activity in each connected repository.'
+ ? '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) => {
@@ -119,7 +123,7 @@ export const GitHubSection = ({ isProjectScoped }: { isProjectScoped: boolean })
return (
<PageSection>
<PageSectionMeta>
- <div className="flex flex-1 items-start gap-6">
+ <div className="flex flex-1 items-start gap-5">
<IntegrationSectionIcon title="github" />
<PageSectionSummary>
<PageSectionTitle>GitHub</PageSectionTitle>
@@ -137,25 +141,34 @@ export const GitHubSection = ({ isProjectScoped }: { isProjectScoped: boolean })
) : (
<div className="space-y-6">
<div className="flex flex-col gap-y-2">
- <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>
+ {(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 && (
@@ -177,3 +190,38 @@ export const GitHubSection = ({ isProjectScoped }: { isProjectScoped: boolean })
</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>
+ )
+}
diff --git a/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx b/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx
index 80405ab50b3..a4c68e74162 100644
--- a/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx
+++ b/apps/studio/components/interfaces/Settings/Integrations/IntegrationsSettings.tsx
@@ -35,10 +35,18 @@ const INTEGRATION_ICONS: Record<
</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
+ className={className}
+ viewBox="0 0 24 24"
+ fill="currentColor"
+ overflow="visible"
+ aria-hidden
+ >
+ <g transform="translate(12 12) scale(0.11) translate(-152 -91)">
+ <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" />
+ </g>
</svg>
),
}
diff --git a/apps/studio/components/ui/UpgradeToPro.tsx b/apps/studio/components/ui/UpgradeToPro.tsx
index 4c8ddac9616..38933863553 100644
--- a/apps/studio/components/ui/UpgradeToPro.tsx
+++ b/apps/studio/components/ui/UpgradeToPro.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react'
import { cn } from 'ui'
-import { Admonition } from 'ui-patterns/Admonition'
+import { Admonition, type AdmonitionLayout } from 'ui-patterns/Admonition'
import { DocsButton } from './DocsButton'
import { UpgradePlanButton } from './UpgradePlanButton'
@@ -19,7 +19,7 @@ interface UpgradeToProProps {
source?: string
disabled?: boolean
fullWidth?: boolean
- layout?: 'vertical' | 'horizontal'
+ layout?: AdmonitionLayout
variant?: 'default' | 'primary'
className?: string
docsUrl?: string