The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
HA continued surface coverage (#48425)
Saxon Fletcherddc1f4175f1a
diff --git a/apps/studio/components/interfaces/Database/Publications/PublicationsAvailability.test.tsx b/apps/studio/components/interfaces/Database/Publications/PublicationsAvailability.test.tsxnew file mode 100644index 00000000000..244222531a9--- /dev/null+++ b/apps/studio/components/interfaces/Database/Publications/PublicationsAvailability.test.tsx@@ -0,0 +1,53 @@+import { render, screen } from '@testing-library/react'+import { beforeEach, describe, expect, it, vi } from 'vitest'++import { PublicationsAvailability } from './PublicationsAvailability'++const { mockUseHighAvailability } = vi.hoisted(() => ({+ mockUseHighAvailability: vi.fn(),+}))++vi.mock('@/hooks/misc/useHighAvailability', () => ({+ useHighAvailability: mockUseHighAvailability,+}))++describe('PublicationsAvailability', () => {+ beforeEach(() => {+ vi.clearAllMocks()+ })++ it('shows the disabled empty state instead of page content for High Availability projects', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: true })++ render(+ <PublicationsAvailability>+ <div>Publications content</div>+ </PublicationsAvailability>+ )++ expect(+ screen.getByText('Publications unavailable on High Availability projects')+ ).toBeInTheDocument()+ expect(+ screen.getByText(+ "We're working to bring publications to High Availability projects. Contact support if this is blocking your work."+ )+ ).toBeInTheDocument()+ expect(screen.queryByText('Publications content')).not.toBeInTheDocument()+ })++ it('renders page content for non-High Availability projects', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: false })++ render(+ <PublicationsAvailability>+ <div>Publications content</div>+ </PublicationsAvailability>+ )++ expect(screen.getByText('Publications content')).toBeInTheDocument()+ expect(+ screen.queryByText('Publications unavailable on High Availability projects')+ ).not.toBeInTheDocument()+ })+})diff --git a/apps/studio/components/interfaces/Database/Publications/PublicationsAvailability.tsx b/apps/studio/components/interfaces/Database/Publications/PublicationsAvailability.tsxnew file mode 100644index 00000000000..d38156ada71--- /dev/null+++ b/apps/studio/components/interfaces/Database/Publications/PublicationsAvailability.tsx@@ -0,0 +1,23 @@+import { BookOpen } from 'lucide-react'+import type { PropsWithChildren } from 'react'++import { HighAvailabilityDisabledEmptyState } from '@/components/ui/HighAvailability/HighAvailabilityDisabledEmptyState'+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'++export const PublicationsAvailability = ({ children }: PropsWithChildren) => {+ const { isHighAvailability } = useHighAvailability()++ if (isHighAvailability) {+ return (+ <div className="flex h-full w-full items-center justify-center p-6">+ <HighAvailabilityDisabledEmptyState+ icon={BookOpen}+ title="Publications unavailable on High Availability projects"+ description="We're working to bring publications to High Availability projects. Contact support if this is blocking your work."+ />+ </div>+ )+ }++ return children+}diff --git a/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsx b/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsxnew file mode 100644index 00000000000..9718945acbc--- /dev/null+++ b/apps/studio/components/interfaces/Organization/Usage/Usage.test.tsx@@ -0,0 +1,90 @@+import { screen } from '@testing-library/react'+import { beforeEach, describe, expect, it, vi } from 'vitest'++import { Usage } from './Usage'+import { customRender } from '@/tests/lib/custom-render'++const {+ mockUseAsyncCheckPermissions,+ mockUseOrgDailyStatsQuery,+ mockUseOrgSubscriptionQuery,+ mockUseProjectDetailQuery,+} = vi.hoisted(() => ({+ mockUseAsyncCheckPermissions: vi.fn(),+ mockUseOrgDailyStatsQuery: vi.fn(),+ mockUseOrgSubscriptionQuery: vi.fn(),+ mockUseProjectDetailQuery: vi.fn(),+}))++vi.mock('common', async (importOriginal) => ({+ ...(await importOriginal<typeof import('common')>()),+ useParams: () => ({ slug: 'test-org' }),+}))++vi.mock('@/hooks/misc/useCheckPermissions', () => ({+ useAsyncCheckPermissions: mockUseAsyncCheckPermissions,+}))++vi.mock('@/data/analytics/org-daily-stats-query', async (importOriginal) => ({+ ...(await importOriginal<typeof import('@/data/analytics/org-daily-stats-query')>()),+ useOrgDailyStatsQuery: mockUseOrgDailyStatsQuery,+}))++vi.mock('@/data/projects/project-detail-query', () => ({+ useProjectDetailQuery: mockUseProjectDetailQuery,+}))++vi.mock('@/data/subscriptions/org-subscription-query', () => ({+ useOrgSubscriptionQuery: mockUseOrgSubscriptionQuery,+}))++describe('Usage', () => {+ beforeEach(() => {+ vi.clearAllMocks()++ mockUseAsyncCheckPermissions.mockReturnValue({ can: true, isLoading: false })+ mockUseProjectDetailQuery.mockReturnValue({+ data: {+ ref: 'ha-project',+ name: 'HA project',+ high_availability: true,+ },+ isPending: false,+ })+ mockUseOrgSubscriptionQuery.mockReturnValue({+ data: undefined,+ error: undefined,+ isPending: false,+ isError: false,+ isSuccess: false,+ })+ mockUseOrgDailyStatsQuery.mockReturnValue({+ data: undefined,+ error: undefined,+ isPending: false,+ isError: false,+ })+ })++ it('shows a coming-soon empty state for a High Availability project', () => {+ customRender(<Usage />, {+ nuqs: { searchParams: { projectRef: 'ha-project' } },+ })++ expect(screen.getByText('Usage unavailable on High Availability projects')).toBeInTheDocument()+ expect(+ screen.getByText('Usage insights for High Availability projects are coming soon.')+ ).toBeInTheDocument()+ expect(screen.queryByText('Usage filtered by project')).not.toBeInTheDocument()++ expect(mockUseProjectDetailQuery).toHaveBeenCalledWith({ ref: 'ha-project' })+ expect(mockUseOrgSubscriptionQuery).toHaveBeenCalledWith(+ { orgSlug: 'test-org' },+ { enabled: false }+ )+ expect(mockUseOrgDailyStatsQuery).toHaveBeenCalledWith(+ expect.objectContaining({ orgSlug: 'test-org', projectRef: 'ha-project' }),+ { enabled: false }+ )+ })+})diff --git a/apps/studio/components/interfaces/Organization/Usage/Usage.tsx b/apps/studio/components/interfaces/Organization/Usage/Usage.tsxindex 436a2894f77..90138f2caec 100644--- a/apps/studio/components/interfaces/Organization/Usage/Usage.tsx+++ b/apps/studio/components/interfaces/Organization/Usage/Usage.tsx@@ -1,7 +1,7 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import dayjs from 'dayjs'-import { Check, ChevronDown } from 'lucide-react'+import { ChartArea, Check, ChevronDown } from 'lucide-react'import Link from 'next/link'import { useQueryState } from 'nuqs'import { useMemo, useState } from 'react'@@ -26,12 +26,14 @@ import {} from '@/components/layouts/Scaffold'import { AlertError } from '@/components/ui/AlertError'import { DateRangePicker } from '@/components/ui/DateRangePicker'+import { HighAvailabilityDisabledEmptyState } from '@/components/ui/HighAvailability/HighAvailabilityDisabledEmptyState'import { NoPermission } from '@/components/ui/NoPermission'import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'import { useOrgDailyStatsQuery } from '@/data/analytics/org-daily-stats-query'import { useProjectDetailQuery } from '@/data/projects/project-detail-query'import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { resolveHighAvailability } from '@/hooks/misc/useHighAvailability'import { TIME_PERIODS_BILLING, TIME_PERIODS_REPORTS } from '@/lib/constants/metrics'export const Usage = () => {@@ -42,6 +44,12 @@ export const Usage = () => {const [selectedProjectRef, setSelectedProjectRef] = useQueryState('projectRef')const [openProjectSelector, setOpenProjectSelector] = useState(false)+ const { data: selectedProject, isPending: isLoadingSelectedProject } = useProjectDetailQuery({+ ref: selectedProjectRef ?? undefined,+ })+ const isHighAvailability = resolveHighAvailability(selectedProject)+ const canLoadUsage = !selectedProjectRef || (!isLoadingSelectedProject && !isHighAvailability)+const { can: canReadSubscriptions, isLoading: isLoadingPermissions } = useAsyncCheckPermissions(PermissionAction.BILLING_READ,'stripe.subscriptions'@@ -53,11 +61,7 @@ export const Usage = () => {isPending: isLoadingSubscription,isError: isErrorSubscription,isSuccess: isSuccessSubscription,- } = useOrgSubscriptionQuery({ orgSlug: slug })-- const { data: selectedProject } = useProjectDetailQuery({- ref: selectedProjectRef ?? undefined,- })+ } = useOrgSubscriptionQuery({ orgSlug: slug }, { enabled: canLoadUsage })const billingCycleStart = useMemo(() => {return dayjs.unix(subscription?.current_period_start ?? 0).utc()@@ -107,12 +111,27 @@ export const Usage = () => {error: orgDailyStatsError,isPending: isLoadingOrgDailyStats,isError: isErrorOrgDailyStats,- } = useOrgDailyStatsQuery({- orgSlug: slug,- projectRef: selectedProjectRef ?? undefined,- startDate,- endDate,- })+ } = useOrgDailyStatsQuery(+ {+ orgSlug: slug,+ projectRef: selectedProjectRef ?? undefined,+ startDate,+ endDate,+ },+ { enabled: canLoadUsage }+ )++ if (isHighAvailability) {+ return (+ <div className="flex flex-1 items-center justify-center p-6">+ <HighAvailabilityDisabledEmptyState+ icon={ChartArea}+ title="Usage unavailable on High Availability projects"+ description="Usage insights for High Availability projects are coming soon."+ />+ </div>+ )+ }return (<>diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsxnew file mode 100644index 00000000000..491aaf978fe--- /dev/null+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.test.tsx@@ -0,0 +1,154 @@+import { screen } from '@testing-library/react'+import { beforeEach, describe, expect, it, vi } from 'vitest'++import { ConnectionPooling } from './ConnectionPooling'+import { customRender } from '@/tests/lib/custom-render'++const {+ mockUpdatePoolerConfig,+ mockUseAsyncCheckPermissions,+ mockUseCheckEntitlements,+ mockUseHighAvailability,+ mockUseMaxConnectionsQuery,+ mockUsePgbouncerConfigQuery,+ mockUsePgbouncerConfigurationUpdateMutation,+ mockUseProjectAddonsQuery,+ mockUseSelectedProjectQuery,+} = vi.hoisted(() => ({+ mockUpdatePoolerConfig: vi.fn(),+ mockUseAsyncCheckPermissions: vi.fn(),+ mockUseCheckEntitlements: vi.fn(),+ mockUseHighAvailability: vi.fn(),+ mockUseMaxConnectionsQuery: vi.fn(),+ mockUsePgbouncerConfigQuery: vi.fn(),+ mockUsePgbouncerConfigurationUpdateMutation: vi.fn(),+ mockUseProjectAddonsQuery: vi.fn(),+ mockUseSelectedProjectQuery: vi.fn(),+}))++vi.mock('common', async (importOriginal) => ({+ ...(await importOriginal<typeof import('common')>()),+ useParams: () => ({ ref: 'ha-project' }),+}))++vi.mock('@/hooks/misc/useCheckPermissions', () => ({+ useAsyncCheckPermissions: mockUseAsyncCheckPermissions,+}))++vi.mock('@/hooks/misc/useCheckEntitlements', () => ({+ useCheckEntitlements: mockUseCheckEntitlements,+}))++vi.mock('@/hooks/misc/useHighAvailability', () => ({+ useHighAvailability: mockUseHighAvailability,+}))++vi.mock('@/hooks/misc/useSelectedProject', () => ({+ useSelectedProjectQuery: mockUseSelectedProjectQuery,+}))++vi.mock('@/data/database/max-connections-query', () => ({+ useMaxConnectionsQuery: mockUseMaxConnectionsQuery,+}))++vi.mock('@/data/database/pgbouncer-config-query', () => ({+ usePgbouncerConfigQuery: mockUsePgbouncerConfigQuery,+}))++vi.mock('@/data/database/pgbouncer-config-update-mutation', () => ({+ usePgbouncerConfigurationUpdateMutation: mockUsePgbouncerConfigurationUpdateMutation,+}))++vi.mock('@/data/subscriptions/project-addons-query', () => ({+ useProjectAddonsQuery: mockUseProjectAddonsQuery,+}))++const expectEveryQueryCall = (queryMock: ReturnType<typeof vi.fn>, enabled: boolean) => {+ expect(queryMock).toHaveBeenCalled()+ for (const [, options] of queryMock.mock.calls) {+ expect(options).toEqual({ enabled })+ }+}++describe('ConnectionPooling', () => {+ beforeEach(() => {+ vi.clearAllMocks()++ mockUseSelectedProjectQuery.mockReturnValue({+ data: {+ id: 1,+ ref: 'ha-project',+ infra_compute_size: 'small',+ connectionString: 'postgresql://example',+ },+ })+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: true, isPending: false })+ mockUseAsyncCheckPermissions.mockReturnValue({ can: true })+ mockUseCheckEntitlements.mockReturnValue({ hasAccess: true })+ mockUsePgbouncerConfigQuery.mockReturnValue({+ data: undefined,+ error: undefined,+ isPending: false,+ isError: false,+ isSuccess: false,+ })+ mockUseMaxConnectionsQuery.mockReturnValue({ data: undefined })+ mockUseProjectAddonsQuery.mockReturnValue({+ data: {+ selected_addons: [+ {+ type: 'compute_instance',+ variant: { name: 'Small', identifier: 'ci_small' },+ },+ ],+ },+ isSuccess: true,+ })+ mockUsePgbouncerConfigurationUpdateMutation.mockReturnValue({+ mutate: mockUpdatePoolerConfig,+ isPending: false,+ })+ })++ it('renders High Availability pooling settings as read-only', () => {+ customRender(<ConnectionPooling />)++ expect(+ screen.getAllByText(+ 'Connection pooling settings are managed automatically on High Availability projects'+ )+ ).toHaveLength(1)+ expect(screen.getByRole('link', { name: 'Learn more' })).toHaveAttribute(+ 'href',+ 'https://multigres.com/blog/pooling-without-choosing-a-mode'+ )++ expect(screen.queryByText('Enable IPv4 add-on')).not.toBeInTheDocument()+ expect(screen.getByPlaceholderText('Managed automatically')).toBeDisabled()+ expect(screen.getByDisplayValue('100000')).toBeDisabled()+ expect(screen.queryByRole('button', { name: 'Cancel' })).not.toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument()+ expect(mockUpdatePoolerConfig).not.toHaveBeenCalled()++ expectEveryQueryCall(mockUsePgbouncerConfigQuery, false)+ expectEveryQueryCall(mockUseMaxConnectionsQuery, false)+ })++ it('does not fetch pooling config while the high availability state is pending', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: true })++ customRender(<ConnectionPooling />)++ expectEveryQueryCall(mockUsePgbouncerConfigQuery, false)+ expectEveryQueryCall(mockUseMaxConnectionsQuery, false)+ })++ it('fetches pooling config for non high availability projects', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: false })++ customRender(<ConnectionPooling />)++ expectEveryQueryCall(mockUsePgbouncerConfigQuery, true)+ expectEveryQueryCall(mockUseMaxConnectionsQuery, true)+ })+})diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsxindex 79f46c844e1..d6d3a31638b 100644--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx@@ -38,6 +38,7 @@ import { POOLING_OPTIMIZATIONS } from './ConnectionPooling.constants'import { AlertError } from '@/components/ui/AlertError'import { DocsButton } from '@/components/ui/DocsButton'import { FormActions } from '@/components/ui/Forms/FormActions'+import { HighAvailabilityDisabledSectionNotice } from '@/components/ui/HighAvailability/HighAvailabilityDisabledSectionNotice'import { InlineLink } from '@/components/ui/InlineLink'import Panel from '@/components/ui/Panel'import { useMaxConnectionsQuery } from '@/data/database/max-connections-query'@@ -46,10 +47,14 @@ import { usePgbouncerConfigurationUpdateMutation } from '@/data/database/pgbouncimport { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'const formId = 'pooling-configuration-form'+const HIGH_AVAILABILITY_MAX_CLIENT_CONNECTIONS = 100_000+const HA_DISABLED_TITLE =+ 'Connection pooling settings are managed automatically on High Availability projects'const PoolingConfigurationFormSchema = z.object({default_pool_size: z.preprocess(@@ -68,6 +73,8 @@ const PoolingConfigurationFormSchema = z.object({export const ConnectionPooling = () => {const { ref: projectRef } = useParams()const { data: project } = useSelectedProjectQuery()+ const { isHighAvailability, isPending: isHighAvailabilityPending } = useHighAvailability()+ const canLoadPoolingConfig = !isHighAvailability && !isHighAvailabilityPendingconst { can: canUpdateConnectionPoolingConfiguration } = useAsyncCheckPermissions(PermissionAction.UPDATE,'projects',@@ -80,15 +87,18 @@ export const ConnectionPooling = () => {isPending: isLoadingPgbouncerConfig,isError: isErrorPgbouncerConfig,isSuccess: isSuccessPgbouncerConfig,- } = usePgbouncerConfigQuery({ projectRef })+ } = usePgbouncerConfigQuery({ projectRef }, { enabled: canLoadPoolingConfig })const { hasAccess: hasDedicatedPooler } = useCheckEntitlements('dedicated_pooler')const disablePoolModeSelection = !hasDedicatedPooler- const { data: maxConnData } = useMaxConnectionsQuery({- projectRef: project?.ref,- connectionString: project?.connectionString,- })+ const { data: maxConnData } = useMaxConnectionsQuery(+ {+ projectRef: project?.ref,+ connectionString: project?.connectionString,+ },+ { enabled: canLoadPoolingConfig }+ )const { data: addons, isSuccess: isSuccessAddons } = useProjectAddonsQuery({ projectRef })const { mutate: updatePoolerConfig, isPending: isUpdatingPoolerConfig } =@@ -120,7 +130,7 @@ export const ConnectionPooling = () => {const onSubmit: SubmitHandler<z.infer<typeof PoolingConfigurationFormSchema>> = async (data) => {const { default_pool_size } = data- if (!projectRef) return console.error('Project ref is required')+ if (!projectRef || isHighAvailability) returnupdatePoolerConfig({@@ -165,7 +175,24 @@ export const ConnectionPooling = () => {</PageSectionAside></PageSectionMeta><PageSectionContent className="space-y-4">- {isSuccessAddons && !disablePoolModeSelection && !hasIpv4Addon && (+ {isHighAvailability && (+ <HighAvailabilityDisabledSectionNotice+ title={HA_DISABLED_TITLE}+ description={+ <>+ High Availability projects run one pooler per Postgres pod, each supporting up to{' '}+ {HIGH_AVAILABILITY_MAX_CLIENT_CONNECTIONS.toLocaleString()} active or passive+ connections, with pooling behavior selected automatically.{' '}+ <InlineLink href="https://multigres.com/blog/pooling-without-choosing-a-mode">+ Learn more+ </InlineLink>+ .+ </>+ }+ />+ )}++ {isSuccessAddons && !isHighAvailability && !disablePoolModeSelection && !hasIpv4Addon && (<Admonitiontype="default"layout="responsive"@@ -184,21 +211,23 @@ export const ConnectionPooling = () => {<PanelnoMarginfooter={- <FormActions- form={formId}- isSubmitting={isUpdatingPoolerConfig}- hasChanges={form.formState.isDirty}- handleReset={() => resetForm()}- helper={- !canUpdateConnectionPoolingConfiguration- ? 'You need additional permissions to update connection pooling settings'- : undefined- }- />+ isHighAvailability ? undefined : (+ <FormActions+ form={formId}+ isSubmitting={isUpdatingPoolerConfig}+ hasChanges={form.formState.isDirty}+ handleReset={() => resetForm()}+ helper={+ !canUpdateConnectionPoolingConfiguration+ ? 'You need additional permissions to update connection pooling settings'+ : undefined+ }+ />+ )}><Panel.Content>- {isLoadingPgbouncerConfig && (+ {!isHighAvailability && isLoadingPgbouncerConfig && (<div className="flex flex-col gap-y-4">{Array.from({ length: 4 }).map((_, i) => (<Fragment key={`loader-${i}`}>@@ -213,31 +242,40 @@ export const ConnectionPooling = () => {<ShimmeringLoader className="h-8 w-full" /></div>)}- {isErrorPgbouncerConfig && (+ {!isHighAvailability && isErrorPgbouncerConfig && (<AlertErrorerror={pgbouncerConfigError}subject="Failed to retrieve connection pooler configuration"/>)}- {connectionPoolingUnavailable && (+ {!isHighAvailability && connectionPoolingUnavailable && (<Admonitiontype="default"title="Unable to retrieve pooling configuration"description="Please start a new project to enable this feature"/>)}- {isSuccessPgbouncerConfig && !connectionPoolingUnavailable && (+ {(isHighAvailability ||+ (isSuccessPgbouncerConfig && !connectionPoolingUnavailable)) && (<><div className="flex flex-row gap-2 justify-between w-full"><div className="flex flex-col text-sm"><h5 className="text-foreground font-normal">Connection poolers</h5><p className="text-foreground-lighter">- Configuration is shared across all connection poolers.+ {isHighAvailability+ ? 'One pooler runs for each Postgres pod in the cluster.'+ : 'Configuration is shared across all connection poolers.'}</p></div><div className="flex flex-row gap-1 items-center">- <Badge>Shared</Badge>- {!disablePoolModeSelection && <Badge>Dedicated</Badge>}+ {isHighAvailability ? (+ <Badge>High Availability</Badge>+ ) : (+ <>+ <Badge>Shared</Badge>+ {!disablePoolModeSelection && <Badge>Dedicated</Badge>}+ </>+ )}</div></div><Separator className="bg-border -mx-6 w-[calc(100%+3rem)] my-4" />@@ -255,11 +293,18 @@ export const ConnectionPooling = () => {layout="flex-row-reverse"label="Connection pool size"description={- <p>- The maximum number of connections made to the underlying Postgres- cluster, per user+db combination. Pool size has a default of{' '}- {defaultPoolSize} based on your compute size of {computeSize}.- </p>+ isHighAvailability ? (+ <p>+ Pool size is managed automatically for each Postgres pod and cannot+ be changed.+ </p>+ ) : (+ <p>+ The maximum number of connections made to the underlying Postgres+ cluster, per user+db combination. Pool size has a default of{' '}+ {defaultPoolSize} based on your compute size of {computeSize}.+ </p>+ )}className="[&>div]:md:w-1/2 [&>div]:xl:w-2/5 [&>div>div]:w-full">@@ -267,10 +312,15 @@ export const ConnectionPooling = () => {<InputGroup><FormInputGroupInput{...field}+ disabled={isHighAvailability}type="number"className="w-full"- value={field.value ?? ''}- placeholder={defaultPoolSize.toString()}+ value={isHighAvailability ? '' : (field.value ?? '')}+ placeholder={+ isHighAvailability+ ? 'Managed automatically'+ : defaultPoolSize.toString()+ }onChange={(event) =>field.onChange(isNaN(event.target.valueAsNumber)@@ -279,12 +329,15 @@ export const ConnectionPooling = () => {)}/>- <InputGroupAddon align="inline-end">- <InputGroupText>connections</InputGroupText>- </InputGroupAddon>+ {!isHighAvailability && (+ <InputGroupAddon align="inline-end">+ <InputGroupText>connections</InputGroupText>+ </InputGroupAddon>+ )}</InputGroup></FormControl>- {!!maxConnData &&+ {!isHighAvailability &&+ !!maxConnData &&(default_pool_size ?? 15) > maxConnData.maxConnections * 0.8 && (<Alert variant="warning" className="mt-2"><AlertTitle className="text-foreground">@@ -313,7 +366,14 @@ export const ConnectionPooling = () => {label="Max client connections"className="[&>div]:md:w-1/2 [&>div]:xl:w-2/5 [&>div>div]:w-full"description={- <>+ isHighAvailability ? (+ <p>+ Each pooler can support up to{' '}+ {HIGH_AVAILABILITY_MAX_CLIENT_CONNECTIONS.toLocaleString()} active+ or passive client connections. This value is managed automatically+ and cannot be changed.+ </p>+ ) : (<p>The maximum number of concurrent client connections allowed. Thisvalue is fixed at {defaultMaxClientConn} based on your compute size@@ -324,7 +384,7 @@ export const ConnectionPooling = () => {Learn more</InlineLink></p>- </>+ )}><FormControl>@@ -333,8 +393,16 @@ export const ConnectionPooling = () => {{...field}type="number"className="w-full"- value={pgbouncerConfig?.max_client_conn ?? ''}- placeholder={defaultMaxClientConn.toString()}+ value={+ isHighAvailability+ ? HIGH_AVAILABILITY_MAX_CLIENT_CONNECTIONS+ : (pgbouncerConfig?.max_client_conn ?? '')+ }+ placeholder={+ isHighAvailability+ ? HIGH_AVAILABILITY_MAX_CLIENT_CONNECTIONS.toString()+ : defaultMaxClientConn.toString()+ }onChange={(event) =>field.onChange(isNaN(event.target.valueAsNumber)diff --git a/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.test.tsx b/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.test.tsxnew file mode 100644index 00000000000..3258a0327b1--- /dev/null+++ b/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.test.tsx@@ -0,0 +1,84 @@+import { screen } from '@testing-library/react'+import { beforeEach, describe, expect, it, vi } from 'vitest'++import { PoolingModesModal } from './PoolingModesModal'+import { customRender } from '@/tests/lib/custom-render'++const {+ mockUseDatabaseSelectorStateSnapshot,+ mockUseDatabaseSettingsStateSnapshot,+ mockUseHighAvailability,+ mockUseSupavisorConfigurationQuery,+} = vi.hoisted(() => ({+ mockUseDatabaseSelectorStateSnapshot: vi.fn(),+ mockUseDatabaseSettingsStateSnapshot: vi.fn(),+ mockUseHighAvailability: vi.fn(),+ mockUseSupavisorConfigurationQuery: vi.fn(),+}))++vi.mock('common', async (importOriginal) => ({+ ...(await importOriginal<typeof import('common')>()),+ useParams: () => ({ ref: 'ha-project' }),+}))++vi.mock('@/hooks/misc/useHighAvailability', () => ({+ useHighAvailability: mockUseHighAvailability,+}))++vi.mock('@/data/database/supavisor-configuration-query', () => ({+ useSupavisorConfigurationQuery: mockUseSupavisorConfigurationQuery,+}))++vi.mock('@/state/database-selector', () => ({+ useDatabaseSelectorStateSnapshot: mockUseDatabaseSelectorStateSnapshot,+}))++vi.mock('@/state/database-settings', () => ({+ useDatabaseSettingsStateSnapshot: mockUseDatabaseSettingsStateSnapshot,+}))++const expectEveryQueryCall = (queryMock: ReturnType<typeof vi.fn>, enabled: boolean) => {+ expect(queryMock).toHaveBeenCalled()+ for (const [, options] of queryMock.mock.calls) {+ expect(options).toEqual({ enabled })+ }+}++describe('PoolingModesModal', () => {+ beforeEach(() => {+ vi.clearAllMocks()++ mockUseDatabaseSettingsStateSnapshot.mockReturnValue({+ showPoolingModeHelper: true,+ setShowPoolingModeHelper: vi.fn(),+ })+ mockUseDatabaseSelectorStateSnapshot.mockReturnValue({ selectedDatabaseId: 'ha-project' })+ mockUseSupavisorConfigurationQuery.mockReturnValue({ data: undefined })+ })++ it('renders nothing and skips the supavisor query for High Availability projects', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: true, isPending: false })++ const { container } = customRender(<PoolingModesModal />)++ expect(container).toBeEmptyDOMElement()+ expectEveryQueryCall(mockUseSupavisorConfigurationQuery, false)+ })++ it('does not fetch supavisor config while the high availability state is pending', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: true })++ customRender(<PoolingModesModal />)++ expectEveryQueryCall(mockUseSupavisorConfigurationQuery, false)+ })++ it('renders the modal and fetches supavisor config for non high availability projects', () => {+ mockUseHighAvailability.mockReturnValue({ isHighAvailability: false, isPending: false })++ customRender(<PoolingModesModal />)++ expect(screen.getByText('Which pooling mode should I use?')).toBeInTheDocument()+ expectEveryQueryCall(mockUseSupavisorConfigurationQuery, true)+ })+})diff --git a/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsx b/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsxindex d9ef6ce37ac..3e16bc7b8cb 100644--- a/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsx+++ b/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsx@@ -19,6 +19,7 @@ import {import { Markdown } from '@/components/interfaces/Markdown'import { DocsButton } from '@/components/ui/DocsButton'import { useSupavisorConfigurationQuery } from '@/data/database/supavisor-configuration-query'+import { useHighAvailability } from '@/hooks/misc/useHighAvailability'import { DOCS_URL } from '@/lib/constants'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'import { useDatabaseSettingsStateSnapshot } from '@/state/database-settings'@@ -27,8 +28,12 @@ export const PoolingModesModal = () => {const { ref: projectRef } = useParams()const snap = useDatabaseSettingsStateSnapshot()const state = useDatabaseSelectorStateSnapshot()+ const { isHighAvailability, isPending: isHighAvailabilityPending } = useHighAvailability()- const { data } = useSupavisorConfigurationQuery({ projectRef: projectRef })+ const { data } = useSupavisorConfigurationQuery(+ { projectRef: projectRef },+ { enabled: !isHighAvailability && !isHighAvailabilityPending }+ )const primaryConfig = data?.find((x) => x.identifier === state.selectedDatabaseId)const navigateToPoolerSettings = () => {@@ -36,6 +41,8 @@ export const PoolingModesModal = () => {if (el) el.scrollIntoView({ behavior: 'smooth', block: 'center' })}+ if (isHighAvailability) return null+return (<Dialog open={snap.showPoolingModeHelper} onOpenChange={snap.setShowPoolingModeHelper}><DialogContent hideClose className="sm:max-w-4xl">diff --git a/apps/studio/pages/project/[ref]/database/publications/[id].tsx b/apps/studio/pages/project/[ref]/database/publications/[id].tsxindex 965c22faa2a..8ae7129b577 100644--- a/apps/studio/pages/project/[ref]/database/publications/[id].tsx+++ b/apps/studio/pages/project/[ref]/database/publications/[id].tsx@@ -4,6 +4,7 @@ import { PageContainer } from 'ui-patterns/PageContainer'import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { PublicationsAvailability } from '@/components/interfaces/Database/Publications/PublicationsAvailability'import { PublicationsTables } from '@/components/interfaces/Database/Publications/PublicationsTables'import DatabaseLayout from '@/components/layouts/DatabaseLayout/DatabaseLayout'import { DefaultLayout } from '@/components/layouts/DefaultLayout'@@ -14,7 +15,7 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import type { NextPageWithLayout } from '@/types'-const DatabasePublications: NextPageWithLayout = () => {+const DatabasePublicationsContent = () => {const { ref, id } = useParams()const { data: project } = useSelectedProjectQuery()const { can: canViewPublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(@@ -54,6 +55,12 @@ const DatabasePublications: NextPageWithLayout = () => {)}+const DatabasePublications: NextPageWithLayout = () => (+ <PublicationsAvailability>+ <DatabasePublicationsContent />+ </PublicationsAvailability>+)+DatabasePublications.getLayout = (page) => (<DefaultLayout><DatabaseLayout title="Publications">{page}</DatabaseLayout>diff --git a/apps/studio/pages/project/[ref]/database/publications/index.tsx b/apps/studio/pages/project/[ref]/database/publications/index.tsxindex ded564a278a..59cd351d97b 100644--- a/apps/studio/pages/project/[ref]/database/publications/index.tsx+++ b/apps/studio/pages/project/[ref]/database/publications/index.tsx@@ -2,6 +2,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { PageContainer } from 'ui-patterns/PageContainer'import { PageSection } from 'ui-patterns/PageSection'+import { PublicationsAvailability } from '@/components/interfaces/Database/Publications/PublicationsAvailability'import { PublicationsList } from '@/components/interfaces/Database/Publications/PublicationsList'import DatabaseLayout from '@/components/layouts/DatabaseLayout/DatabaseLayout'import { DefaultLayout } from '@/components/layouts/DefaultLayout'@@ -10,7 +11,7 @@ import { NoPermission } from '@/components/ui/NoPermission'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import type { NextPageWithLayout } from '@/types'-const DatabasePublications: NextPageWithLayout = () => {+const DatabasePublicationsContent = () => {const { can: canViewPublications, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(PermissionAction.TENANT_SQL_ADMIN_READ,'publications'@@ -31,6 +32,12 @@ const DatabasePublications: NextPageWithLayout = () => {)}+const DatabasePublications: NextPageWithLayout = () => (+ <PublicationsAvailability>+ <DatabasePublicationsContent />+ </PublicationsAvailability>+)+DatabasePublications.getLayout = (page) => (<DefaultLayout><DatabaseLayout title="Publications">{page}</DatabaseLayout>