The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
[FE-2478] feat(studio): simplify Connect modal for HA projects (#44695)
Alaister Youngdd41a34706cb
diff --git a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsxindex 2847e037999..2ef2dc80622 100644--- a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx+++ b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/content.tsx@@ -31,6 +31,7 @@ import { useSupavisorConfigurationQuery } from '@/data/database/supavisor-configimport { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'import { pluckObjectFields } from '@/lib/helpers'import { useTrack } from '@/lib/telemetry/track'@@ -130,6 +131,7 @@ function DirectConnectionContent({ state }: StepContentProps) {const track = useTrack()const { ref: projectRef } = useParams()const { hasAccess: hasDedicatedPooler } = useCheckEntitlements('dedicated_pooler')+ const isHighAvailability = useIsHighAvailability()const connectionSource = state.connectionSourceconst connectionType = (state.connectionType as DatabaseConnectionType) ?? 'uri'@@ -257,7 +259,11 @@ function DirectConnectionContent({ state }: StepContentProps) {return (<div className="flex flex-col gap-2">- <div className="flex items-center gap-x-2">{poolerBadge && <Badge>{poolerBadge}</Badge>}</div>+ {poolerBadge && !isHighAvailability && (+ <div className="flex items-center gap-x-2">+ <Badge>{poolerBadge}</Badge>+ </div>+ )}<CodeBlockclassName="[&_code]:text-foreground"wrapperClassName="lg:col-span-2"@@ -268,7 +274,7 @@ function DirectConnectionContent({ state }: StepContentProps) {>{connectionString}</CodeBlock>- {projectRef && (+ {projectRef && !isHighAvailability && (<div className="mt-2"><IPv4StatusPanelmethod={connectionMethod}diff --git a/apps/studio/components/interfaces/ConnectSheet/useConnectState.test.ts b/apps/studio/components/interfaces/ConnectSheet/useConnectState.test.tsindex 24cf65b48a4..6638dedddc7 100644--- a/apps/studio/components/interfaces/ConnectSheet/useConnectState.test.ts+++ b/apps/studio/components/interfaces/ConnectSheet/useConnectState.test.ts@@ -15,6 +15,10 @@ vi.mock('@/hooks/misc/useCheckEntitlements', () => ({useCheckEntitlements: vi.fn().mockImplementation(() => ({ hasAccess: true })),}))+vi.mock('@/hooks/misc/useSelectedProject', () => ({+ useIsHighAvailability: vi.fn().mockImplementation(() => false),+}))+describe('useConnectState', () => {// ============================================================================// Initial State Tests@@ -484,6 +488,58 @@ describe('useConnectState', () => {})})+ // ============================================================================+ // High Availability Tests+ // ============================================================================++ describe('high availability projects', () => {+ test('should hide connectionMethod field for HA projects', async () => {+ const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')+ vi.mocked(useIsHighAvailability).mockReturnValue(true)++ const { result } = renderHook(() => useConnectState({ mode: 'direct' }))++ const fieldIds = result.current.activeFields.map((f) => f.id)+ expect(fieldIds).not.toContain('connectionMethod')+ })++ test('should hide useSharedPooler field for HA projects', async () => {+ const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')+ vi.mocked(useIsHighAvailability).mockReturnValue(true)++ const { result } = renderHook(() =>+ useConnectState({ mode: 'direct', connectionMethod: 'transaction' })+ )++ const fieldIds = result.current.activeFields.map((f) => f.id)+ expect(fieldIds).not.toContain('useSharedPooler')+ })++ test('should rename connectionType label to "Connection Type" for HA projects', async () => {+ const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')+ vi.mocked(useIsHighAvailability).mockReturnValue(true)++ const { result } = renderHook(() => useConnectState({ mode: 'direct' }))++ const connectionTypeField = result.current.activeFields.find((f) => f.id === 'connectionType')+ expect(connectionTypeField?.label).toBe('Connection Type')+ })++ test('should not affect non-HA projects', async () => {+ const { useIsHighAvailability } = await import('@/hooks/misc/useSelectedProject')+ vi.mocked(useIsHighAvailability).mockReturnValue(false)++ const { result } = renderHook(() => useConnectState({ mode: 'direct' }))++ const fieldIds = result.current.activeFields.map((f) => f.id)+ expect(fieldIds).toContain('connectionMethod')+ expect(fieldIds).toContain('connectionType')++ const connectionTypeField = result.current.activeFields.find((f) => f.id === 'connectionType')+ expect(connectionTypeField?.label).toBe('Type')+ })+ })+// ============================================================================// Schema Access Tests// ============================================================================diff --git a/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts b/apps/studio/components/interfaces/ConnectSheet/useConnectState.tsindex 9bccdbd626d..ffa3428151a 100644--- a/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts+++ b/apps/studio/components/interfaces/ConnectSheet/useConnectState.ts@@ -28,6 +28,7 @@ import { resolveFrameworkLibraryKey } from './Connect.utils'import { Database, useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { formatDatabaseID, formatDatabaseRegion } from '@/data/read-replicas/replicas.utils'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'+import { useIsHighAvailability } from '@/hooks/misc/useSelectedProject'// ============================================================================// Data Source Helpers@@ -196,6 +197,7 @@ export function useConnectState(initialState?: Partial<ConnectState>): UseConnecconst { ref: projectRef } = useParams()const { data: databases = [] } = useReadReplicasQuery({ projectRef })const { hasAccess: hasDedicatedPooler } = useCheckEntitlements('dedicated_pooler')+ const isHighAvailability = useIsHighAvailability()const [state, setState] = useState<ConnectState>(() => {const defaults = getDefaultState({ schema: connectSchema })@@ -321,12 +323,17 @@ export function useConnectState(initialState?: Partial<ConnectState>): UseConnec)const activeFields = useMemo(() => {- const fields = getActiveFields(connectSchema, state)+ let fields = getActiveFields(connectSchema, state)if (!hasDedicatedPooler) {- return fields.filter((f) => f.id !== 'useSharedPooler')+ fields = fields.filter((f) => f.id !== 'useSharedPooler')+ }+ if (isHighAvailability) {+ fields = fields+ .filter((f) => f.id !== 'connectionMethod' && f.id !== 'useSharedPooler')+ .map((f) => (f.id === 'connectionType' ? { ...f, label: 'Connection Type' } : f))}return fields- }, [state, hasDedicatedPooler])+ }, [state, hasDedicatedPooler, isHighAvailability])const resolvedSteps = useMemo(() => resolveSteps(connectSchema, state), [state])diff --git a/apps/studio/hooks/misc/useSelectedProject.ts b/apps/studio/hooks/misc/useSelectedProject.tsindex 4ea95bc0a8b..27dd57a4b9a 100644--- a/apps/studio/hooks/misc/useSelectedProject.ts+++ b/apps/studio/hooks/misc/useSelectedProject.ts@@ -54,6 +54,11 @@ export const useIsOrioleDbInAws = () => {return isOrioleDbInAws}+export const useIsHighAvailability = () => {+ const { data: project } = useSelectedProjectQuery()+ return project?.high_availability ?? false+}+export const useIsProjectActive = () => {const { data: project } = useSelectedProjectQuery()return project?.status === PROJECT_STATUS.ACTIVE_HEALTHY