Skip to content

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

chore(studio): clarify dedicated pooler compatibility (#43320)

Danny Whitea052dd740967
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx
index 332e9c7cc8d..f7c23432868 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx
@@ -1,9 +1,4 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { ExternalLink } from 'lucide-react'
-import { useTheme } from 'next-themes'
-import Image from 'next/image'
-import Link from 'next/link'
-
import { useFlag, useParams } from 'common'
import {
ScaffoldSection,
@@ -19,10 +14,15 @@ import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { BASE_PATH, DOCS_URL } from 'lib/constants'
import { MANAGED_BY } from 'lib/constants/infrastructure'
+import { ExternalLink } from 'lucide-react'
+import { useTheme } from 'next-themes'
+import Image from 'next/image'
+import Link from 'next/link'
import { useOrgSettingsPageStateSnapshot } from 'state/organization-settings'
-import { Alert, AlertTitle_Shadcn_, Alert_Shadcn_, Button } from 'ui'
+import { Alert, Alert_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
-import ProjectUpdateDisabledTooltip from '../ProjectUpdateDisabledTooltip'
+
+import { ProjectUpdateDisabledTooltip } from '../ProjectUpdateDisabledTooltip'
import SpendCapSidePanel from './SpendCapSidePanel'
export interface CostControlProps {}
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/ProjectUpdateDisabledTooltip.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/ProjectUpdateDisabledTooltip.tsx
index 4956a78098a..a02b3300730 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/ProjectUpdateDisabledTooltip.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/ProjectUpdateDisabledTooltip.tsx
@@ -7,29 +7,28 @@ export interface ProjectUpdateDisabledTooltipProps {
tooltip?: string
}
-const ProjectUpdateDisabledTooltip = ({
+export const ProjectUpdateDisabledTooltip = ({
projectUpdateDisabled,
projectNotActive = false,
children,
tooltip,
}: PropsWithChildren<ProjectUpdateDisabledTooltipProps>) => {
- const showTooltip = projectUpdateDisabled || projectNotActive
+ const tooltipMessage =
+ tooltip ||
+ (projectUpdateDisabled
+ ? 'Subscription changes are currently disabled. Our engineers are working on a fix.'
+ : projectNotActive
+ ? 'Unable to update subscription as project is currently not active'
+ : undefined)
return (
<Tooltip>
<TooltipTrigger asChild>{children}</TooltipTrigger>
- {showTooltip && (
- <TooltipContent side="bottom" className="w-72 text-center">
- {projectUpdateDisabled
- ? tooltip ||
- 'Subscription changes are currently disabled. Our engineers are working on a fix.'
- : projectNotActive
- ? 'Unable to update subscription as project is currently not active'
- : ''}
+ {tooltipMessage !== undefined && (
+ <TooltipContent side="bottom" className="w-64 text-center">
+ {tooltipMessage}
</TooltipContent>
)}
</Tooltip>
)
}
-
-export default ProjectUpdateDisabledTooltip
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx
index 2ab3378a058..d1d434d3aa8 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx
@@ -1,13 +1,13 @@
-import { useState } from 'react'
-import { toast } from 'sonner'
-
import { useFlag, useParams } from 'common'
import { CANCELLATION_REASONS } from 'components/interfaces/Billing/Billing.constants'
import { useSendDowngradeFeedbackMutation } from 'data/feedback/exit-survey-send'
import { getComputeSize, OrgProject } from 'data/projects/org-projects-infinite-query'
import { useOrgSubscriptionUpdateMutation } from 'data/subscriptions/org-subscription-update-mutation'
+import { useState } from 'react'
+import { toast } from 'sonner'
import { Alert, Button, cn, Input, Modal } from 'ui'
-import ProjectUpdateDisabledTooltip from '../ProjectUpdateDisabledTooltip'
+
+import { ProjectUpdateDisabledTooltip } from '../ProjectUpdateDisabledTooltip'
export interface ExitSurveyModalProps {
visible: boolean
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
index 8494343da25..f3f6b37074c 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/Subscription.tsx
@@ -1,6 +1,4 @@
import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/constants'
-import Link from 'next/link'
-
import { useFlag, useParams } from 'common'
import { SupportLink } from 'components/interfaces/Support/SupportLink'
import {
@@ -12,11 +10,13 @@ import AlertError from 'components/ui/AlertError'
import NoPermission from 'components/ui/NoPermission'
import { useOrgSubscriptionQuery } from 'data/subscriptions/org-subscription-query'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
+import Link from 'next/link'
import { useOrgSettingsPageStateSnapshot } from 'state/organization-settings'
import { Alert, Button } from 'ui'
import { Admonition } from 'ui-patterns'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
-import ProjectUpdateDisabledTooltip from '../ProjectUpdateDisabledTooltip'
+
+import { ProjectUpdateDisabledTooltip } from '../ProjectUpdateDisabledTooltip'
import { Restriction } from '../Restriction'
import { PlanUpdateSidePanel } from './PlanUpdateSidePanel'
diff --git a/apps/studio/components/interfaces/Settings/Addons/Addons.tsx b/apps/studio/components/interfaces/Settings/Addons/Addons.tsx
index 66bcbd2b07a..f672118ea3a 100644
--- a/apps/studio/components/interfaces/Settings/Addons/Addons.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/Addons.tsx
@@ -5,7 +5,7 @@ import {
subscriptionHasHipaaAddon,
} from 'components/interfaces/Billing/Subscription/Subscription.utils'
import { NoticeBar } from 'components/interfaces/DiskManagement/ui/NoticeBar'
-import ProjectUpdateDisabledTooltip from 'components/interfaces/Organization/BillingSettings/ProjectUpdateDisabledTooltip'
+import { ProjectUpdateDisabledTooltip } from 'components/interfaces/Organization/BillingSettings/ProjectUpdateDisabledTooltip'
import { SupportLink } from 'components/interfaces/Support/SupportLink'
import {
ScaffoldContainer,
@@ -27,6 +27,7 @@ import dayjs from 'dayjs'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import {
+ useIsAwsCloudProvider,
useIsOrioleDbInAws,
useIsProjectActive,
useSelectedProjectQuery,
@@ -52,6 +53,7 @@ export const Addons = () => {
const { resolvedTheme } = useTheme()
const { ref: projectRef } = useParams()
const { setPanel } = useAddonsPagePanel()
+ const isAws = useIsAwsCloudProvider()
const isProjectActive = useIsProjectActive()
const isOrioleDbInAws = useIsOrioleDbInAws()
@@ -184,7 +186,7 @@ export const Addons = () => {
</ScaffoldContainer>
)}
<ScaffoldContainer>
- <ScaffoldSection>
+ <ScaffoldSection className="!pb-12">
<ScaffoldSectionDetail>
<div className="space-y-6">
<p className="m-0">Compute Size</p>
@@ -358,7 +360,7 @@ export const Addons = () => {
<>
<ScaffoldDivider />
<ScaffoldContainer>
- <ScaffoldSection>
+ <ScaffoldSection className="!pb-12">
<ScaffoldSectionDetail>
<div className="space-y-6">
<p className="m-0">Dedicated IPv4 address</p>
@@ -409,13 +411,21 @@ export const Addons = () => {
<ProjectUpdateDisabledTooltip
projectUpdateDisabled={projectUpdateDisabled}
projectNotActive={!isProjectActive}
+ tooltip={
+ !isAws
+ ? 'Dedicated IPv4 address is only available for AWS projects'
+ : undefined
+ }
>
<Button
type="default"
className="mt-2 pointer-events-auto"
onClick={() => setPanel('ipv4')}
disabled={
- !isProjectActive || projectUpdateDisabled || !(canUpdateIPv4 || ipv4)
+ !isAws ||
+ !isProjectActive ||
+ projectUpdateDisabled ||
+ !(canUpdateIPv4 || ipv4)
}
>
{!!ipv4
@@ -434,7 +444,7 @@ export const Addons = () => {
<ScaffoldDivider />
<ScaffoldContainer>
- <ScaffoldSection>
+ <ScaffoldSection className="!pb-12">
<ScaffoldSectionDetail>
<div className="space-y-6">
<p className="m-0">Point in time recovery</p>
@@ -562,7 +572,7 @@ export const Addons = () => {
<>
<ScaffoldDivider />
<ScaffoldContainer>
- <ScaffoldSection>
+ <ScaffoldSection className="!pb-12">
<ScaffoldSectionDetail>
<div className="space-y-6">
<p className="m-0">Custom domain</p>
diff --git a/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx
index dbc8995cbbf..8541721f47e 100644
--- a/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx
@@ -1,9 +1,4 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { AlertCircle, ExternalLink } from 'lucide-react'
-import Link from 'next/link'
-import { useEffect, useState } from 'react'
-import { toast } from 'sonner'
-
import { useFlag, useParams } from 'common'
import { useProjectAddonRemoveMutation } from 'data/subscriptions/project-addon-remove-mutation'
import { useProjectAddonUpdateMutation } from 'data/subscriptions/project-addon-update-mutation'
@@ -14,18 +9,24 @@ import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { DOCS_URL } from 'lib/constants'
import { formatCurrency } from 'lib/helpers'
+import { AlertCircle } from 'lucide-react'
+import Link from 'next/link'
+import { useEffect, useState } from 'react'
+import { toast } from 'sonner'
import { useAddonsPagePanel } from 'state/addons-page'
import {
Alert,
+ Alert_Shadcn_,
AlertDescription_Shadcn_,
AlertTitle_Shadcn_,
- Alert_Shadcn_,
Button,
+ cn,
Radio,
SidePanel,
- cn,
} from 'ui'
+import { DocsButton } from '@/components/ui/DocsButton'
+
const CustomDomainSidePanel = () => {
const { ref: projectRef } = useParams()
const { data: organization } = useSelectedOrganizationQuery()
@@ -119,17 +120,9 @@ const CustomDomainSidePanel = () => {
: undefined
}
header={
- <div className="flex items-center justify-between">
+ <div className="flex w-full items-center justify-between">
<h4>Custom domains</h4>
- <Button asChild type="default" icon={<ExternalLink strokeWidth={1.5} />}>
- <Link
- href={`${DOCS_URL}/guides/platform/custom-domains`}
- target="_blank"
- rel="noreferrer"
- >
- About custom domains
- </Link>
- </Button>
+ <DocsButton href={`${DOCS_URL}/guides/platform/custom-domains`} />
</div>
}
>
diff --git a/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx
index 872f88ea008..a381a9c9326 100644
--- a/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/IPv4SidePanel.tsx
@@ -1,10 +1,6 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { ExternalLink } from 'lucide-react'
-import Link from 'next/link'
-import { useEffect, useState } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
+import { DocsButton } from 'components/ui/DocsButton'
import { InlineLink } from 'components/ui/InlineLink'
import { useProjectAddonRemoveMutation } from 'data/subscriptions/project-addon-remove-mutation'
import { useProjectAddonUpdateMutation } from 'data/subscriptions/project-addon-update-mutation'
@@ -16,8 +12,11 @@ import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization
import { useIsAwsCloudProvider } from 'hooks/misc/useSelectedProject'
import { DOCS_URL } from 'lib/constants'
import { formatCurrency } from 'lib/helpers'
+import Link from 'next/link'
+import { useEffect, useState } from 'react'
+import { toast } from 'sonner'
import { useAddonsPagePanel } from 'state/addons-page'
-import { Button, Radio, SidePanel, cn } from 'ui'
+import { Button, cn, RadioGroup_Shadcn_, RadioGroupLargeItem_Shadcn_, SidePanel } from 'ui'
import { Admonition } from 'ui-patterns'
const IPv4SidePanel = () => {
@@ -62,12 +61,41 @@ const IPv4SidePanel = () => {
const availableOptions =
(addons?.available_addons ?? []).find((addon) => addon.type === 'ipv4')?.variants ?? []
- const isFreePlan = organization?.plan?.id === 'free'
const { hasAccess: hasAccessToIPv4, isLoading: isLoadingEntitlement } =
useCheckEntitlements('ipv4')
const hasChanges = selectedOption !== (subscriptionIpV4Option?.variant.identifier ?? 'ipv4_none')
const selectedIPv4 = availableOptions.find((option) => option.identifier === selectedOption)
- const isPgBouncerEnabled = !isFreePlan
+
+ const ipv4Options = [
+ {
+ value: 'ipv4_none',
+ id: 'ipv4_none',
+ title: 'No IPv4 address',
+ description: 'Use shared pooler or IPv6 for database connections.',
+ priceContent: (
+ <>
+ <p className="text-foreground text-sm">$0</p>
+ <p className="text-foreground-light translate-y-[1px] text-sm">/ month</p>
+ </>
+ ),
+ priceRowClassName: 'mt-2',
+ },
+ ...availableOptions.map((option) => ({
+ value: option.identifier,
+ id: option.identifier,
+ title: 'Dedicated IPv4 address',
+ description: 'Allow database connections from IPv4 networks.',
+ priceContent: (
+ <>
+ <p className="text-sm" translate="no">
+ {formatCurrency(option.price)}
+ </p>
+ <p className="text-foreground-light translate-y-[0.5px]">/ month / database</p>
+ </>
+ ),
+ priceRowClassName: 'mt-3',
+ })),
+ ]
useEffect(() => {
if (visible) {
@@ -112,26 +140,22 @@ const IPv4SidePanel = () => {
: undefined
}
header={
- <div className="flex items-center justify-between">
+ <div className="flex w-full items-center justify-between">
<h4>Dedicated IPv4 address</h4>
- <Button asChild type="default" icon={<ExternalLink strokeWidth={1.5} />}>
- <Link
- href={`${DOCS_URL}/guides/platform/ipv4-address`}
- target="_blank"
- rel="noreferrer"
- >
- About dedicated IPv4 addresses
- </Link>
- </Button>
+ <DocsButton href={`${DOCS_URL}/guides/platform/ipv4-address`} />
</div>
}
>
<SidePanel.Content>
<div className="py-6 space-y-4">
<p className="text-sm">
- Direct connections to the database only work if your client is able to resolve IPv6
- addresses. Enabling the dedicated IPv4 add-on allows you to directly connect to your
- database via a IPv4 address.
+ Your project’s direct connection endpoint and dedicated pooler are IPv6-only by default.
+ Enable the dedicated IPv4 address add-on to connect from IPv4-only networks.
+ </p>
+
+ <p className="text-sm">
+ The shared pooler endpoint accepts IPv4 connections by default and does not require this
+ add-on.
</p>
{!isAws && (
@@ -141,84 +165,42 @@ const IPv4SidePanel = () => {
/>
)}
- {isPgBouncerEnabled ? (
- <Admonition
- type="default"
- title="The Dedicated Pooler does not support IPv4 addresses"
- description="If you are connecting to your database via the Dedicated Pooler, you may need this add-on if your network does not support communicating via IPv6. Alternatively, you may consider using our Shared Pooler."
- />
- ) : (
- <p className="text-sm">
- If you are connecting via the Shared connection pooler, you do not need this add-on as
- our pooler resolves to IPv4 addresses. You can check your connection info in your{' '}
- <InlineLink href={`/project/${projectRef}/database/settings#connection-pooler`}>
- project database settings
- </InlineLink>
- .
- </p>
- )}
-
- <div className={cn('!mt-8 pb-4', !hasAccessToIPv4 && 'opacity-75')}>
- <Radio.Group
- type="large-cards"
- size="tiny"
- id="ipv4"
- onChange={(event: any) => setSelectedOption(event.target.value)}
- >
- <Radio
+ {isAws && (
+ <div className={cn('!mt-8 pb-4', !hasAccessToIPv4 && 'opacity-75')}>
+ <RadioGroup_Shadcn_
name="ipv4"
- checked={selectedOption === 'ipv4_none'}
- className="col-span-4 !p-0"
- label="No IPv4"
- value="ipv4_none"
+ value={selectedOption}
+ onValueChange={setSelectedOption}
+ className="grid grid-cols-1 md:grid-cols-2 gap-4"
>
- <div className="w-full group">
- <div className="border-b border-default px-4 py-2 group-hover:border-control">
- <p className="text-sm">No IPv4 address</p>
- </div>
- <div className="px-4 py-2 flex flex-col justify-between">
- <p className="text-foreground-light">
- Use connection pooler or IPv6 for direct connections
- </p>
- <div className="flex items-center space-x-1 mt-2">
- <p className="text-foreground text-sm">$0</p>
- <p className="text-foreground-light translate-y-[1px]"> / month</p>
- </div>
- </div>
- </div>
- </Radio>
- {availableOptions.map((option) => (
- <Radio
- className="col-span-4 !p-0"
- name="ipv4"
- key={option.identifier}
- disabled={!hasAccessToIPv4 || !isAws}
- checked={selectedOption === option.identifier}
- label={option.name}
- value={option.identifier}
- >
- <div className="w-full group">
- <div className="border-b border-default px-4 py-2 group-hover:border-control">
- <p className="text-sm">Dedicated IPv4 address</p>
- </div>
- <div className="px-4 py-2">
- <p className="text-foreground-light">
- Allow direct database connections via IPv4 address
- </p>
- <div className="flex items-center space-x-1 mt-2">
- <p className="text-foreground text-sm" translate="no">
- {formatCurrency(option.price)}
- </p>
- <p className="text-foreground-light translate-y-[1px]">
- / month / database
- </p>
+ {ipv4Options.map((option) => (
+ <RadioGroupLargeItem_Shadcn_
+ key={option.id}
+ value={option.value}
+ label=""
+ showIndicator={false}
+ className={cn(
+ 'w-full gap-0 p-0 shadow-none bg-transparent cursor-pointer text-left',
+ 'border-default hover:border-control hover:bg-transparent'
+ )}
+ >
+ <div className="px-4 py-3">
+ <p className="text-sm font-medium">{option.title}</p>
+ <p className="text-foreground-light text-sm mt-1">{option.description}</p>
+ <div
+ className={cn(
+ 'flex items-center space-x-1 text-sm',
+ option.priceRowClassName
+ )}
+ >
+ {option.priceContent}
</div>
</div>
- </div>
- </Radio>
- ))}
- </Radio.Group>
- </div>
+ </RadioGroupLargeItem_Shadcn_>
+ ))}
+ </RadioGroup_Shadcn_>
+ </div>
+ )}
{hasChanges && (
<>
@@ -230,29 +212,25 @@ const IPv4SidePanel = () => {
/>
{selectedOption !== 'ipv4_none' && (
<p className="text-sm text-foreground-light">
- By default, this is only applied to the Primary database for your project. If{' '}
- <Link
- href="/docs/guides/platform/read-replicas"
- className="text-brand"
- target="_blank"
- >
- Read replicas
- </Link>{' '}
+ By default, this is only applied to the primary database for your project. If{' '}
+ <InlineLink href={`${DOCS_URL}/guides/platform/read-replicas`} target="_blank">
+ read replicas
+ </InlineLink>{' '}
are used, each replica also gets its own IPv4 address, with a corresponding{' '}
<span className="text-foreground">{formatCurrency(selectedIPv4?.price)}</span>{' '}
charge.
</p>
)}
<p className="text-sm text-foreground-light">
- There are no immediate charges. The addon is billed at the end of your billing cycle
- based on your usage and prorated to the hour.
+ There are no immediate charges. The add-on is billed at the end of your billing
+ cycle based on your usage and prorated to the hour.
</p>
</>
)}
{!hasAccessToIPv4 && (
<Admonition type="note" title="IPv4 add-on is unavailable on the Free Plan">
- <p>Upgrade your plan to enable a IPv4 address for your project</p>
+ <p>Upgrade your plan to enable an IPv4 address for your project</p>
<Button asChild type="default">
<Link
href={`/org/${organization?.slug}/billing?panel=subscriptionPlan&source=ipv4SidePanel`}
diff --git a/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx
index e243fb1dd29..0b16d1677e9 100644
--- a/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx
@@ -1,10 +1,4 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { ExternalLink } from 'lucide-react'
-import { useTheme } from 'next-themes'
-import Link from 'next/link'
-import { useEffect, useState } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import { subscriptionHasHipaaAddon } from 'components/interfaces/Billing/Subscription/Subscription.utils'
import { SupportLink } from 'components/interfaces/Support/SupportLink'
@@ -21,18 +15,23 @@ import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { BASE_PATH, DOCS_URL } from 'lib/constants'
import { formatCurrency } from 'lib/helpers'
+import { useTheme } from 'next-themes'
+import { useEffect, useState } from 'react'
+import { toast } from 'sonner'
import { useAddonsPagePanel } from 'state/addons-page'
import {
+ Alert_Shadcn_,
AlertDescription_Shadcn_,
AlertTitle_Shadcn_,
- Alert_Shadcn_,
Button,
+ cn,
CriticalIcon,
Radio,
SidePanel,
- cn,
} from 'ui'
+import { DocsButton } from '@/components/ui/DocsButton'
+
const PITR_CATEGORY_OPTIONS: {
id: 'off' | 'on'
name: string
@@ -165,17 +164,9 @@ const PITRSidePanel = () => {
: undefined
}
header={
- <div className="flex items-center justify-between">
+ <div className="flex w-full items-center justify-between">
<h4>Point in Time Recovery</h4>
- <Button asChild type="default" icon={<ExternalLink strokeWidth={1.5} />}>
- <Link
- href={`${DOCS_URL}/guides/platform/backups#point-in-time-recovery`}
- target="_blank"
- rel="noreferrer"
- >
- About point in time recovery
- </Link>
- </Button>
+ <DocsButton href={`${DOCS_URL}/guides/platform/backups#point-in-time-recovery`} />
</div>
}
>
diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
index 08419a505c3..b39caa3c99e 100644
--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
@@ -8,6 +8,7 @@ import z from 'zod'
import { useParams } from 'common'
import AlertError from 'components/ui/AlertError'
+import { Button } from 'ui'
import { DocsButton } from 'components/ui/DocsButton'
import { setValueAsNullableNumber } from 'components/ui/Forms/Form.constants'
import { FormActions } from 'components/ui/Forms/FormActions'
@@ -46,6 +47,7 @@ import { Admonition } from 'ui-patterns'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import { POOLING_OPTIMIZATIONS } from './ConnectionPooling.constants'
+import Link from 'next/link'
const formId = 'pooling-configuration-form'
@@ -161,15 +163,19 @@ export const ConnectionPooling = () => {
</PageSectionMeta>
<PageSectionContent className="space-y-4">
{isSuccessAddons && !disablePoolModeSelection && !hasIpv4Addon && (
- <Admonition type="default" title="Dedicated Pooler is not IPv4 compatible">
- <p className="!m-0">
- If your network only supports IPv4, consider purchasing the{' '}
- <InlineLink href={`/project/${projectRef}/settings/addons?panel=ipv4`}>
- IPv4 add-on
- </InlineLink>
- .
- </p>
- </Admonition>
+ <Admonition
+ type="default"
+ layout="responsive"
+ title="Dedicated pooler uses IPv6 by default"
+ description="Connections from IPv4-only networks require enabling the IPv4 add-on on your project instance."
+ actions={
+ <Button type="default" asChild>
+ <Link href={`/project/${projectRef}/settings/addons?panel=ipv4`}>
+ Enable IPv4 add-on
+ </Link>
+ </Button>
+ }
+ />
)}
<Panel