The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat: privatelink read replica (#48642)
Stephen Morgan9dc5c0faf320
diff --git a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx b/apps/studio/components/interfaces/Database/Replication/Destinations.tsxindex f316069eb77..ea4482fff97 100644--- a/apps/studio/components/interfaces/Database/Replication/Destinations.tsx+++ b/apps/studio/components/interfaces/Database/Replication/Destinations.tsx@@ -25,13 +25,13 @@ import { Input } from 'ui-patterns/DataInputs/Input'import { EmptyStatePresentational } from 'ui-patterns/EmptyStatePresentational'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'-import { REPLICA_STATUS } from '../../Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'import { DestinationPanel } from './DestinationPanel/DestinationPanel'import { DestinationType } from './DestinationPanel/DestinationPanel.types'import { DestinationRow } from './DestinationRow'import { DisablePipelinesDialog } from './DisablePipelinesDialog'import { EnablePipelinesModal } from './EnablePipelinesCallout'import { ReadReplicaRow } from './ReadReplicas/ReadReplicaRow'+import { REPLICA_STATUS } from './Replication.constants'import {useIsETLBigQueryPrivateAlpha,useIsETLClickHousePrivateAlpha,diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropReplicaConfirmationModal.tsx b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/DropReplicaConfirmationModal.tsxsimilarity index 76%rename from apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropReplicaConfirmationModal.tsxrename to apps/studio/components/interfaces/Database/Replication/ReadReplicas/DropReplicaConfirmationModal.tsxindex b66f78eebb1..40be7d2e1f6 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropReplicaConfirmationModal.tsx+++ b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/DropReplicaConfirmationModal.tsx@@ -1,9 +1,10 @@import { useQueryClient } from '@tanstack/react-query'import { useParams } from 'common'import { toast } from 'sonner'-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'-import { REPLICA_STATUS } from './InstanceConfiguration.constants'+import { REPLICA_STATUS } from '../Replication.constants'+import { InlineLink } from '@/components/ui/InlineLink'import { replicaKeys } from '@/data/read-replicas/keys'import { useReadReplicaRemoveMutation } from '@/data/read-replicas/replica-remove-mutation'import type { Database } from '@/data/read-replicas/replicas-query'@@ -23,6 +24,26 @@ export const DropReplicaConfirmationModal = ({const { ref: projectRef } = useParams()const queryClient = useQueryClient()const formattedId = formatDatabaseID(selectedReplica?.identifier ?? '')++ const getRemoveReplicaErrorMessage = (message: string) => {+ const isPrivateLinkAssociationError =+ /private\s*link/i.test(message) && /association/i.test(message)++ if (isPrivateLinkAssociationError) {+ return (+ <span>+ Remove the replica{' '}+ <InlineLink href={`/project/${projectRef}/settings/integrations`}>+ PrivateLink association+ </InlineLink>{' '}+ before dropping this read replica+ </span>+ )+ }++ return `Failed to remove read replica: ${message}`+ }+const { mutate: removeReadReplica, isPending: isRemoving } = useReadReplicaRemoveMutation({onSuccess: () => {toast.success(`Tearing down read replica (ID: ${formattedId})`)@@ -44,6 +65,9 @@ export const DropReplicaConfirmationModal = ({onSuccess()onCancel()},+ onError: (error) => {+ toast.error(getRemoveReplicaErrorMessage(error.message))+ },})const onConfirmRemove = async () => {diff --git a/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaDetails.tsx b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaDetails.tsxindex 75f200a5a28..15d9a3916ae 100644--- a/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaDetails.tsx+++ b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaDetails.tsx@@ -17,8 +17,8 @@ import { Input } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import { REPLICA_STATUS } from '../Replication.constants'import { REPORT_DATERANGE_HELPER_LABELS } from '@/components/interfaces/Reports/Reports.constants'-import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'import { ScaffoldContainer, ScaffoldSection } from '@/components/layouts/Scaffold'import { useInfraMonitoringAttributesQuery } from '@/data/analytics/infra-monitoring-query'import { useLoadBalancersQuery } from '@/data/read-replicas/load-balancers-query'diff --git a/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaRow.tsx b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaRow.tsxindex b278717dda8..51ee5787cdb 100644--- a/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaRow.tsx+++ b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaRow.tsx@@ -20,10 +20,10 @@ import {} from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { REPLICA_STATUS } from '../Replication.constants'+import { DropReplicaConfirmationModal } from './DropReplicaConfirmationModal'import { getIsInTransition, getStatusLabel } from './ReadReplicas.utils'-import { DropReplicaConfirmationModal } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropReplicaConfirmationModal'-import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'-import { RestartReplicaConfirmationModal } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/RestartReplicaConfirmationModal'+import { RestartReplicaConfirmationModal } from './RestartReplicaConfirmationModal'import { useReplicationLagQuery } from '@/data/read-replicas/replica-lag-query'import { type Database } from '@/data/read-replicas/replicas-query'import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'diff --git a/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicas.utils.ts b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicas.utils.tsindex 272f3d6edfe..1ecd1538016 100644--- a/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicas.utils.ts+++ b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/ReadReplicas.utils.ts@@ -1,4 +1,4 @@-import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'+import { REPLICA_STATUS } from '../Replication.constants'import { ReplicaInitializationStatus } from '@/data/read-replicas/replicas-status-query'export const getIsInTransition = ({diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/RestartReplicaConfirmationModal.tsx b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/RestartReplicaConfirmationModal.tsxsimilarity index 98%rename from apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/RestartReplicaConfirmationModal.tsxrename to apps/studio/components/interfaces/Database/Replication/ReadReplicas/RestartReplicaConfirmationModal.tsxindex c6f99f98dca..c8a6c2c5786 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/RestartReplicaConfirmationModal.tsx+++ b/apps/studio/components/interfaces/Database/Replication/ReadReplicas/RestartReplicaConfirmationModal.tsx@@ -3,7 +3,7 @@ import { useParams } from 'common'import { toast } from 'sonner'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'-import { REPLICA_STATUS } from './InstanceConfiguration.constants'+import { REPLICA_STATUS } from '../Replication.constants'import { useProjectRestartMutation } from '@/data/projects/project-restart-mutation'import { replicaKeys } from '@/data/read-replicas/keys'import { Database } from '@/data/read-replicas/replicas-query'diff --git a/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts b/apps/studio/components/interfaces/Database/Replication/Replication.constants.tsindex 3bcb22a7eca..ddefacbe243 100644--- a/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts+++ b/apps/studio/components/interfaces/Database/Replication/Replication.constants.ts@@ -1,3 +1,7 @@+import { components } from 'api-types'++import { PROJECT_STATUS } from '@/lib/constants'+export const STATUS_REFRESH_FREQUENCY_MS: number = 10000 // 10 secondsexport enum PipelineStatusName {@@ -8,3 +12,11 @@ export enum PipelineStatusName {STOPPING = 'stopping',UNKNOWN = 'unknown',}++export const REPLICA_STATUS: {+ [key: string]: components['schemas']['DatabaseStatusResponse']['status']+} = {+ ...PROJECT_STATUS,+ INIT_READ_REPLICA: 'INIT_READ_REPLICA',+ INIT_READ_REPLICA_FAILED: 'INIT_READ_REPLICA_FAILED',+}diff --git a/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx b/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsxindex 4f35e64e14e..757735cd0f9 100644--- a/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx+++ b/apps/studio/components/interfaces/Database/Replication/ReplicationDiagram/Edges.tsx@@ -5,8 +5,7 @@ import { useMemo } from 'react'import { cn } from 'ui'import { getStatusName } from '../Pipeline.utils'-import { STATUS_REFRESH_FREQUENCY_MS } from '../Replication.constants'-import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'+import { REPLICA_STATUS, STATUS_REFRESH_FREQUENCY_MS } from '../Replication.constants'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { useReplicationPipelineStatusQuery } from '@/data/replication/pipeline-status-query'import { useReplicationPipelinesQuery } from '@/data/replication/pipelines-query'diff --git a/apps/studio/components/interfaces/ProjectHome/TopSection.tsx b/apps/studio/components/interfaces/ProjectHome/TopSection.tsxindex 4002e029d2f..11247caecda 100644--- a/apps/studio/components/interfaces/ProjectHome/TopSection.tsx+++ b/apps/studio/components/interfaces/ProjectHome/TopSection.tsx@@ -97,7 +97,7 @@ export const TopSection = () => {)}><ReactFlowProvider>- <InstanceConfiguration diagramOnly />+ <InstanceConfiguration /></ReactFlowProvider></div></div>diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropAllReplicasConfirmationModal.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropAllReplicasConfirmationModal.tsxdeleted file mode 100644index b7e8e6d2008..00000000000--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropAllReplicasConfirmationModal.tsx+++ /dev/null@@ -1,80 +0,0 @@-import { useQueryClient } from '@tanstack/react-query'-import { useParams } from 'common'-import { toast } from 'sonner'-import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'--import { replicaKeys } from '@/data/read-replicas/keys'-import { useReadReplicaRemoveMutation } from '@/data/read-replicas/replica-remove-mutation'-import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'--interface DropAllReplicasConfirmationModalProps {- visible: boolean- onSuccess: () => void- onCancel: () => void-}--const DropAllReplicasConfirmationModal = ({- visible,- onSuccess,- onCancel,-}: DropAllReplicasConfirmationModalProps) => {- const { ref: projectRef } = useParams()- const queryClient = useQueryClient()- const { data: databases } = useReadReplicasQuery({ projectRef })- const { mutateAsync: removeReadReplica, isPending: isRemoving } = useReadReplicaRemoveMutation()-- const onConfirmRemove = async () => {- if (!projectRef) return console.error('Project is required')- if (databases === undefined) return console.error('Unable to retrieve replicas')- if (databases.length === 1) toast('Your project has no read replicas')-- const replicas = databases.filter((db) => db.identifier !== projectRef)- try {- await Promise.all(- replicas.map((db) =>- removeReadReplica({- projectRef,- identifier: db.identifier,- invalidateReplicaQueries: false,- })- )- )- toast.success(`Tearing down all read replicas`)-- await Promise.all([- queryClient.invalidateQueries({ queryKey: replicaKeys.list(projectRef) }),- queryClient.invalidateQueries({ queryKey: replicaKeys.loadBalancers(projectRef) }),- ])-- onSuccess()- onCancel()- } catch (error) {- toast.error('Failed to drop all replicas')- }- }-- return (- <ConfirmationModal- variant={'destructive'}- size="medium"- loading={isRemoving}- visible={visible}- title="Confirm to drop all read replicas?"- confirmLabel="Drop all replicas"- confirmLabelLoading="Dropping all replicas"- onCancel={() => onCancel()}- onConfirm={() => onConfirmRemove()}- alert={{- title: 'This action cannot be undone',- description: 'You may still deploy new replicas in this region thereafter',- }}- >- <p className="text-sm">Before deleting all replicas, consider:</p>- <ul className="text-sm text-foreground-light list-disc pl-6">- <li>Network traffic from this region may slow down</li>- </ul>- </ConfirmationModal>- )-}--export default DropAllReplicasConfirmationModaldiff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/Edge.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/Edge.tsxindex 2e078341cd7..e260871c763 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/Edge.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/Edge.tsx@@ -3,7 +3,8 @@ import { useParams } from 'common'import { Loader2 } from 'lucide-react'import { Tooltip, TooltipContent, TooltipTrigger } from 'ui'-import { EdgeData, REPLICA_STATUS } from './InstanceConfiguration.constants'+import { EdgeData } from './InstanceConfiguration.constants'+import { REPLICA_STATUS } from '@/components/interfaces/Database/Replication/Replication.constants'import { useReplicationLagQuery } from '@/data/read-replicas/replica-lag-query'import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.tsindex 25736d4eb57..2d49e4739cc 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts@@ -2,9 +2,6 @@ import { ReadReplicaSetupError, ReadReplicaSetupProgress } from '@supabase/shareimport type { AWS_REGIONS_KEYS } from 'shared-data'import { AWS_REGIONS } from 'shared-data'-import { components } from '@/data/api'-import { PROJECT_STATUS } from '@/lib/constants'-export interface Region {key: AWS_REGIONS_KEYSname: string@@ -59,14 +56,6 @@ export const NODE_HEIGHT_FALLBACKS: Record<string, number> = {REGION: REGION_NODE_HEIGHT,}-export const REPLICA_STATUS: {- [key: string]: components['schemas']['DatabaseStatusResponse']['status']-} = {- ...PROJECT_STATUS,- INIT_READ_REPLICA: 'INIT_READ_REPLICA',- INIT_READ_REPLICA_FAILED: 'INIT_READ_REPLICA_FAILED',-}-// [Joshen] Coordinates from https://github.com/tobilg/aws-edge-locations/blob/main/data/aws-edge-locations.json// In the format of [lon, lat]export const AWS_REGIONS_COORDINATES: { [key: string]: [number, number] } = {diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsxindex 4534fba7cea..5123d172de0 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx@@ -1,4 +1,3 @@-import { PermissionAction } from '@supabase/shared-types/out/constants'import {Background,ColorMode,@@ -9,74 +8,42 @@ import {useReactFlow,} from '@xyflow/react'import { partition } from 'lodash'-import { ChevronDown, Globe2, Loader2, Network } from 'lucide-react'+import { Globe2, Loader2, Network } from 'lucide-react'import { useTheme } from 'next-themes'-import Link from 'next/link'import { useEffect, useEffectEvent, useMemo, useState } from 'react'import '@xyflow/react/dist/style.css'import { useParams } from 'common'-import { useRouter } from 'next/router'-import {- Button,- cn,- DropdownMenu,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuSeparator,- DropdownMenuTrigger,-} from 'ui'+import { Button, cn } from 'ui'-import DropAllReplicasConfirmationModal from './DropAllReplicasConfirmationModal'-import { DropReplicaConfirmationModal } from './DropReplicaConfirmationModal'import { SmoothstepEdge } from './Edge'-import { REPLICA_STATUS } from './InstanceConfiguration.constants'import { addRegionNodes, generateNodes, getDagreGraphLayout } from './InstanceConfiguration.utils'import { LoadBalancerNode, PrimaryNode, RegionNode, ReplicaNode } from './InstanceNode'import MapView from './MapView'-import { RestartReplicaConfirmationModal } from './RestartReplicaConfirmationModal'-import { getInfrastructurePath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'+import { REPLICA_STATUS } from '@/components/interfaces/Database/Replication/Replication.constants'import { AlertError } from '@/components/ui/AlertError'-import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { useLoadBalancersQuery } from '@/data/read-replicas/load-balancers-query'-import { Database, useReadReplicasQuery } from '@/data/read-replicas/replicas-query'+import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import {ReplicaInitializationStatus,useReadReplicasStatusesQuery,} from '@/data/read-replicas/replicas-status-query'-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'-import {- useIsAwsCloudProvider,- useIsOrioleDb,- useSelectedProjectQuery,-} from '@/hooks/misc/useSelectedProject'+import { useIsAwsCloudProvider, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { timeout } from '@/lib/helpers'-interface InstanceConfigurationUIProps {- diagramOnly?: boolean-}--const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationUIProps) => {- const router = useRouter()+const InstanceConfigurationUI = () => {const reactFlow = useReactFlow()- const isOrioleDb = useIsOrioleDb()const { resolvedTheme } = useTheme()const { ref: projectRef } = useParams()const { isPending: isLoadingProject } = useSelectedProjectQuery()const isAws = useIsAwsCloudProvider()const { infrastructureReadReplicas } = useIsFeatureEnabled(['infrastructure:read_replicas'])- const newReplicaURL = `/project/${projectRef}/database/replication?destinationType=Read+Replica`const [view, setView] = useState<'flow' | 'map'>('flow')- const [showDeleteAllModal, setShowDeleteAllModal] = useState(false)const [refetchInterval, setRefetchInterval] = useState<number | false>(10000)- const [selectedReplicaToDrop, setSelectedReplicaToDrop] = useState<Database>()- const [selectedReplicaToRestart, setSelectedReplicaToRestart] = useState<Database>()-- const { can: canManageReplicas } = useAsyncCheckPermissions(PermissionAction.CREATE, 'projects')const {data: loadBalancers,@@ -152,8 +119,6 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationUprimary,replicas,loadBalancers: loadBalancers ?? [],- onSelectRestartReplica: setSelectedReplicaToRestart,- onSelectDropReplica: setSelectedReplicaToDrop,}): [],[isSuccessReplicas, isSuccessLoadBalancers, primary, replicas, loadBalancers]@@ -257,9 +222,9 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationU}, [nodesInitialized])return (- <div className={cn('nowheel', diagramOnly ? 'h-full' : 'border-y')}>+ <div className={cn('nowheel h-full')}><div- className={`${diagramOnly ? 'h-full' : 'h-[500px]'} w-full relative ${+ className={`h-full w-full relative ${isSuccessReplicas && !isLoadingProject ? '' : 'flex items-center justify-center px-28'}`}>@@ -269,48 +234,8 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationU{isError && <AlertError error={error} subject="Failed to retrieve replicas" />}{isSuccessReplicas && !isLoadingProject && (<>- {!diagramOnly && infrastructureReadReplicas && (+ {infrastructureReadReplicas && (<div className="z-10 absolute top-4 right-4 flex items-center justify-center gap-x-2">- <div className="flex items-center justify-center">- <ButtonTooltip- asChild- variant="default"- disabled={!canManageReplicas || isOrioleDb}- className={cn(replicas.length > 0 ? 'rounded-r-none' : '')}- tooltip={{- content: {- side: 'bottom',- text: !canManageReplicas- ? 'You need additional permissions to deploy replicas'- : isOrioleDb- ? 'Read replicas are not supported with OrioleDB'- : undefined,- },- }}- >- <Link href={newReplicaURL}>Deploy a new replica</Link>- </ButtonTooltip>- {replicas.length > 0 && (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button- variant="default"- icon={<ChevronDown size={16} />}- className="px-1 rounded-l-none border-l-0"- />- </DropdownMenuTrigger>- <DropdownMenuContent align="end" className="w-52 *:space-x-2">- <DropdownMenuItem asChild>- <Link href={getInfrastructurePath(projectRef)}>Resize databases</Link>- </DropdownMenuItem>- <DropdownMenuSeparator />- <DropdownMenuItem onClick={() => setShowDeleteAllModal(true)}>- <div>Remove all replicas</div>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- )}- </div>{isAws && (<div className="flex items-center justify-center"><Button@@ -361,49 +286,19 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationU<Background color={backgroundPatternColor} /></ReactFlow>) : (- <MapView- onSelectDeployNewReplica={() => router.push(newReplicaURL)}- onSelectRestartReplica={setSelectedReplicaToRestart}- onSelectDropReplica={setSelectedReplicaToDrop}- />+ <MapView />)}</>)}</div>-- {!diagramOnly && (- <>- <DropReplicaConfirmationModal- selectedReplica={selectedReplicaToDrop}- onSuccess={() => setRefetchInterval(5000)}- onCancel={() => setSelectedReplicaToDrop(undefined)}- />-- <DropAllReplicasConfirmationModal- visible={showDeleteAllModal}- onSuccess={() => setRefetchInterval(5000)}- onCancel={() => setShowDeleteAllModal(false)}- />-- <RestartReplicaConfirmationModal- selectedReplica={selectedReplicaToRestart}- onSuccess={() => setRefetchInterval(5000)}- onCancel={() => setSelectedReplicaToRestart(undefined)}- />- </>- )}</div>)}-interface InstanceConfigurationProps {- diagramOnly?: boolean-}--export const InstanceConfiguration = ({ diagramOnly = false }: InstanceConfigurationProps) => {+export const InstanceConfiguration = () => {return (<ReactFlowProvider>- <InstanceConfigurationUI diagramOnly={diagramOnly} />+ <InstanceConfigurationUI /></ReactFlowProvider>)}diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.tsindex 87f9d424722..81e89e5ae2b 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts@@ -21,14 +21,10 @@ export const generateNodes = ({primary,replicas,loadBalancers,- onSelectRestartReplica,- onSelectDropReplica,}: {primary: Databasereplicas: Database[]loadBalancers: LoadBalancer[]- onSelectRestartReplica: (database: Database) => void- onSelectDropReplica: (database: Database) => void}): Node[] => {const position = { x: 0, y: 0 }const regions = groupBy(replicas, (d) => {@@ -107,8 +103,6 @@ export const generateNodes = ({inserted_at: database.inserted_at,computeSize: database.size,status: database.status,- onSelectRestartReplica: () => onSelectRestartReplica(database),- onSelectDropReplica: () => onSelectDropReplica(database),},}})diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsxindex a36da60c59e..725260ff620 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx@@ -29,11 +29,11 @@ import {NODE_WIDTH,PrimaryNodeData,REGION_NODE_HEIGHT,- REPLICA_STATUS,ReplicaNodeData,} from './InstanceConfiguration.constants'import { formatSeconds } from './InstanceConfiguration.utils'import { metricColor } from './InstanceNode.utils'+import { REPLICA_STATUS } from '@/components/interfaces/Database/Replication/Replication.constants'import { SparkBar } from '@/components/ui/SparkBar'import {DatabaseInitEstimations,diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsxindex c8bc70c01fb..b551b4a707d 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/MapView.tsx@@ -1,4 +1,3 @@-import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import dayjs from 'dayjs'import { partition, uniqBy } from 'lodash'@@ -14,7 +13,6 @@ import {Marker,ZoomableGroup,} from 'react-simple-maps'-import type { AWS_REGIONS_KEYS } from 'shared-data'import {Badge,Button,@@ -25,31 +23,18 @@ import {DropdownMenuTrigger,ScrollArea,} from 'ui'+import { TimestampInfo } from 'ui-patterns/TimestampInfo'-import { AVAILABLE_REPLICA_REGIONS, REPLICA_STATUS } from './InstanceConfiguration.constants'+import { AVAILABLE_REPLICA_REGIONS } from './InstanceConfiguration.constants'import GeographyData from './MapData.json'-import { ButtonTooltip } from '@/components/ui/ButtonTooltip'-import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'-import { Database, useReadReplicasQuery } from '@/data/read-replicas/replicas-query'+import { REPLICA_STATUS } from '@/components/interfaces/Database/Replication/Replication.constants'+import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'-import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { BASE_PATH } from '@/lib/constants'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'-// [Joshen] Foresee that we'll skip this view for initial launch--interface MapViewProps {- onSelectDeployNewReplica: (region: AWS_REGIONS_KEYS) => void- onSelectRestartReplica: (database: Database) => void- onSelectDropReplica: (database: Database) => void-}--const MapView = ({- onSelectDeployNewReplica,- onSelectRestartReplica,- onSelectDropReplica,-}: MapViewProps) => {+const MapView = () => {const { ref } = useParams()const dbSelectorState = useDatabaseSelectorStateSnapshot()const { projectHomepageShowInstanceSize } = useIsFeatureEnabled([@@ -64,7 +49,6 @@ const MapView = ({y: numberregion: { key: string; country?: string; name?: string; region?: string }}>()- const { can: canManageReplicas } = useAsyncCheckPermissions(PermissionAction.CREATE, 'projects')const [, setShowConnect] = useQueryState('showConnect', parseAsBoolean.withDefault(false))const { data } = useReadReplicasQuery({ projectRef: ref })@@ -260,7 +244,7 @@ const MapView = ({<ScrollArea style={{ height: databasesInSelectedRegion.length > 2 ? '180px' : 'auto' }}><ul className={`flex flex-col divide-y`}>{databasesInSelectedRegion.map((database) => {- const created = dayjs(database.inserted_at).format('DD MMM YYYY, HH:mm:ss (ZZ)')+ const created = dayjs(database.inserted_at).format('DD MMM YYYY')return (<li@@ -287,12 +271,17 @@ const MapView = ({<Badge variant="warning">Unhealthy</Badge>)}</p>- <p className="text-xs text-foreground-light">- AWS{projectHomepageShowInstanceSize ? ` • ${database.size}` : ''}- </p>- {database.identifier !== ref && (- <p className="text-xs text-foreground-light">Created on: {created}</p>- )}+ <div>+ <p className="text-xs text-foreground-light">+ AWS{projectHomepageShowInstanceSize ? ` • ${database.size}` : ''}+ </p>+ {database.identifier !== ref && (+ <p className="text-xs text-foreground-light">+ Created on:{' '}+ <TimestampInfo label={created} utcTimestamp={database.inserted_at} />+ </p>+ )}+ </div></div>{database.identifier !== ref && (<DropdownMenu>@@ -310,40 +299,16 @@ const MapView = ({>View connection string</DropdownMenuItem>- <DropdownMenuItem- className="gap-x-2"- disabled={database.status !== REPLICA_STATUS.ACTIVE_HEALTHY}- >- <Link- href={`/project/${ref}/observability/database?db=${database.identifier}&chart=replication-lag`}- >- View replication lag- </Link>- </DropdownMenuItem><DropdownMenuSeparator />- <DropdownMenuItem- className="gap-x-2"- onClick={() => onSelectRestartReplica(database)}- disabled={database.status !== REPLICA_STATUS.ACTIVE_HEALTHY}- >- Restart replica+ <DropdownMenuItem className="gap-x-2">+ <Link+ href={`/project/${ref}/database/replication/replica/${database.identifier}`}+ >+ Manage replica+ </Link></DropdownMenuItem>-- <DropdownMenuItemTooltip- className="gap-x-2 pointer-events-auto!"- disabled={!canManageReplicas}- onClick={() => onSelectDropReplica(database)}- tooltip={{- content: {- side: 'left',- text: 'You need additional permissions to drop replicas',- },- }}- >- Drop replica- </DropdownMenuItemTooltip></DropdownMenuContent></DropdownMenu>)}@@ -355,25 +320,10 @@ const MapView = ({)}<div- className={`flex items-center justify-end gap-x-2 px-4 py-4 ${+ className={`flex items-center justify-end gap-x-2 px-4 py-2 ${databasesInSelectedRegion.length > 0 ? 'border-t' : ''}`}>- <ButtonTooltip- variant="default"- disabled={!canManageReplicas}- onClick={() => onSelectDeployNewReplica(selectedRegion.key)}- tooltip={{- content: {- side: 'bottom',- text: !canManageReplicas- ? 'You need additional permissions to deploy replicas'- : undefined,- },- }}- >- Deploy new replica here- </ButtonTooltip><Buttonvariant="default"onClick={() => {diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsxindex 6f333c7c175..6d7af86331d 100644--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkAccountItem.tsx@@ -10,9 +10,13 @@ import {DropdownMenuTrigger,} from 'ui'+import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'+interface AWSPrivateLinkAccountItemProps {aws_account_id: stringaccount_name?: string+ database_type?: 'PRIMARY' | 'READ_REPLICA'+ database_identifier?: stringstatus:| 'CREATING'| 'READY'@@ -28,10 +32,17 @@ interface AWSPrivateLinkAccountItemProps {export const AWSPrivateLinkAccountItem = ({aws_account_id,account_name,+ database_type,+ database_identifier,status,onEdit,onDelete,}: AWSPrivateLinkAccountItemProps) => {+ const databaseTarget =+ database_type === 'READ_REPLICA'+ ? `Read replica (ID: ${database_identifier ? formatDatabaseID(database_identifier) : 'Unknown identifier'})`+ : 'Primary database'+const getStatusBadge = () => {switch (status) {case 'ASSOCIATION_ACCEPTED':@@ -55,6 +66,7 @@ export const AWSPrivateLinkAccountItem = ({<CardContent className="flex items-center justify-between text-sm gap-4"><div className="flex-1"><div>{aws_account_id}</div>+ <div className="text-xs text-foreground-lighter">{databaseTarget}</div><div className="text-sm text-foreground-lighter">{account_name || 'No description'}</div></div>diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsxindex 2dc4c347376..a41ec80e7b3 100644--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsx+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsx@@ -1,3 +1,5 @@+import { useFlag } from 'common'+import { ExternalLink } from 'lucide-react'import Link from 'next/link'import { useEffect } from 'react'import { useForm } from 'react-hook-form'@@ -9,6 +11,11 @@ import {FormControl,FormField,Input,+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,Sheet,SheetContent,SheetDescription,@@ -23,6 +30,8 @@ import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { InlineLink } from '@/components/ui/InlineLink'import { useAWSAccountCreateMutation } from '@/data/aws-accounts/aws-account-create-mutation'import type { AWSAccount } from '@/data/aws-accounts/aws-accounts-query'+import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'+import { formatDatabaseID, formatDatabaseRegion } from '@/data/read-replicas/replicas.utils'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { DOCS_URL } from '@/lib/constants'@@ -35,25 +44,37 @@ interface AWSPrivateLinkFormProps {interface FormValues {awsAccountId: stringaccountName: string+ databaseIdentifier: string}export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLinkFormProps) => {const isNew = !accountconst { data: project } = useSelectedProjectQuery()+ const showPrivateLinkReadReplica = useFlag('privatelinkReadReplica')+ const shouldLoadReadReplicas =+ !!project?.ref &&+ (isNew ? showPrivateLinkReadReplica : account?.database_type === 'READ_REPLICA')+ const { data: databases = [] } = useReadReplicasQuery(+ { projectRef: project?.ref },+ { enabled: shouldLoadReadReplicas }+ )const { mutate: createAccount, isPending } = useAWSAccountCreateMutation()- const form = useForm<FormValues>({- defaultValues: {- awsAccountId: account?.aws_account_id ?? '',- accountName: account?.account_name ?? '',- },- })+ const readReplicas = databases.filter((database) => database.identifier !== project?.ref)++ const defaultValues = {+ awsAccountId: account?.aws_account_id ?? '',+ accountName: account?.account_name ?? '',+ databaseIdentifier: account?.database_identifier ?? project?.ref ?? '',+ }++ const form = useForm<FormValues>({ defaultValues })const title =account?.status === 'ASSOCIATION_ACCEPTED'? 'This connection is active': account?.status === 'READY'- ? 'Connection is ready'+ ? 'Connection is ready to accept': account?.status === 'CREATING'? 'This account connection is being created': account?.status === 'DELETING'@@ -83,9 +104,14 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLiprojectRef: project.ref,awsAccountId: values.awsAccountId,accountName: values.accountName,+ databaseIdentifier:+ values.databaseIdentifier && values.databaseIdentifier !== project.ref+ ? values.databaseIdentifier+ : undefined,},{onSuccess: () => {+ form.reset(defaultValues)toast.success('Successfully added AWS account')onOpenChange(false)},@@ -99,8 +125,9 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLiform.reset({awsAccountId: account?.aws_account_id ?? '',accountName: account?.account_name ?? '',+ databaseIdentifier: account?.database_identifier ?? project?.ref ?? '',})- }, [account, form])+ }, [account, form, project?.ref])return (<Sheet open={open} onOpenChange={onOpenChange}>@@ -126,6 +153,7 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLi<><span>{title}</span><Badge+ className="ml-2"variant={account.status === 'ASSOCIATION_ACCEPTED'? 'success'@@ -158,7 +186,7 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLidescription={description}actions={account.status === 'READY' && (- <Button variant="default" className="w-min mt-2">+ <Button variant="default" className="w-min" icon={<ExternalLink />}><Linktarget="_blank"rel="noopener noreferrer"@@ -172,6 +200,46 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLi/></>)}+ {(showPrivateLinkReadReplica || !isNew) && (+ <FormField+ control={form.control}+ name="databaseIdentifier"+ render={({ field }) => (+ <FormItemLayout+ label="Database target"+ description="Associations are created per database target. The same AWS account can be associated with both primary and replica databases."+ >+ <FormControl>+ <Select+ value={field.value}+ disabled={!isNew || !project?.ref}+ onValueChange={field.onChange}+ >+ <SelectTrigger>+ <SelectValue placeholder="Select a database" />+ </SelectTrigger>+ <SelectContent>+ {project?.ref && (+ <SelectItem value={project.ref}>Primary database</SelectItem>+ )}+ {readReplicas.map((database) => {+ const region =+ formatDatabaseRegion(database.region) ?? database.region+ const id = formatDatabaseID(database.identifier)++ return (+ <SelectItem key={database.identifier} value={database.identifier}>+ {`Read replica (${region} - ${id})`}+ </SelectItem>+ )+ })}+ </SelectContent>+ </Select>+ </FormControl>+ </FormItemLayout>+ )}+ />+ )}<FormFieldcontrol={form.control}name="awsAccountId"diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsxindex 7c5be765ce6..e8d1595f239 100644--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkSection.tsx@@ -19,6 +19,7 @@ import { UpgradeToPro } from '@/components/ui/UpgradeToPro'import { useAWSAccountDeleteMutation } from '@/data/aws-accounts/aws-account-delete-mutation'import type { AWSAccount } from '@/data/aws-accounts/aws-accounts-query'import { useAWSAccountsQuery } from '@/data/aws-accounts/aws-accounts-query'+import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { IS_PLATFORM } from '@/lib/constants'@@ -59,7 +60,14 @@ export const AWSPrivateLinkSection = () => {const onConfirmDelete = () => {if (selectedAccount && project) {- deleteAccount({ projectRef: project.ref, awsAccountId: selectedAccount.aws_account_id })+ deleteAccount({+ projectRef: project.ref,+ awsAccountId: selectedAccount.aws_account_id,+ databaseIdentifier:+ selectedAccount.database_type === 'READ_REPLICA'+ ? selectedAccount.database_identifier+ : undefined,+ })}}@@ -101,7 +109,7 @@ export const AWSPrivateLinkSection = () => {<ResourceList>{accounts?.map((account) => (<AWSPrivateLinkAccountItem- key={account.aws_account_id}+ key={`${account.aws_account_id}-${account.database_identifier ?? 'primary'}`}{...account}onEdit={() => onEditAccount(account)}onDelete={() => onDeleteAccount(account)}@@ -135,6 +143,15 @@ export const AWSPrivateLinkSection = () => {Are you sure you want to delete the AWS account connection for{' '}{selectedAccount?.aws_account_id}?</p>+ <p className="text-sm text-foreground-lighter mt-1">+ Database:{' '}+ {selectedAccount &&+ ` ${+ selectedAccount.database_type === 'READ_REPLICA'+ ? `Read replica (ID: ${selectedAccount.database_identifier ? formatDatabaseID(selectedAccount.database_identifier) : 'Unknown identifier'})`+ : 'Primary database'+ }`}+ </p></ConfirmationModal></>)diff --git a/apps/studio/components/ui/DatabaseSelector.tsx b/apps/studio/components/ui/DatabaseSelector.tsxindex bea0ab15770..8c4de479bc5 100644--- a/apps/studio/components/ui/DatabaseSelector.tsx+++ b/apps/studio/components/ui/DatabaseSelector.tsx@@ -22,9 +22,9 @@ import {TooltipTrigger,} from 'ui'+import { REPLICA_STATUS } from '../interfaces/Database/Replication/Replication.constants'import { Markdown } from '@/components/interfaces/Markdown'import { getInfrastructurePath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'-import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { formatDatabaseID, formatDatabaseRegion } from '@/data/read-replicas/replicas.utils'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'diff --git a/apps/studio/data/aws-accounts/aws-account-create-mutation.ts b/apps/studio/data/aws-accounts/aws-account-create-mutation.tsindex 5680685cb76..9bfe6bedf8c 100644--- a/apps/studio/data/aws-accounts/aws-account-create-mutation.ts+++ b/apps/studio/data/aws-accounts/aws-account-create-mutation.ts@@ -9,12 +9,14 @@ export type AWSAccountCreateVariables = {projectRef: stringawsAccountId: stringaccountName?: string+ databaseIdentifier?: string}export async function createAWSAccount({projectRef,awsAccountId,accountName,+ databaseIdentifier,}: AWSAccountCreateVariables) {const { data, error } = await post('/platform/projects/{ref}/privatelink/associations/aws-account',@@ -25,6 +27,7 @@ export async function createAWSAccount({body: {aws_account_id: awsAccountId,account_name: accountName,+ database_identifier: databaseIdentifier,},})diff --git a/apps/studio/data/aws-accounts/aws-account-delete-mutation.ts b/apps/studio/data/aws-accounts/aws-account-delete-mutation.tsindex 9d01fec1af6..9389d2eca95 100644--- a/apps/studio/data/aws-accounts/aws-account-delete-mutation.ts+++ b/apps/studio/data/aws-accounts/aws-account-delete-mutation.ts@@ -8,20 +8,36 @@ import type { ResponseError } from '@/types'export type AWSAccountDeleteVariables = {projectRef: stringawsAccountId: string+ databaseIdentifier?: string}-export async function deleteAWSAccount({ projectRef, awsAccountId }: AWSAccountDeleteVariables) {- const { data, error } = await del(- '/platform/projects/{ref}/privatelink/associations/aws-account/{aws_account_id}',- {+export async function deleteAWSAccount({+ projectRef,+ awsAccountId,+ databaseIdentifier,+}: AWSAccountDeleteVariables) {+ const deleteRequest = del as unknown as (+ path: string,+ init: {params: {- path: {- ref: projectRef,- aws_account_id: awsAccountId,- },- },+ path: Record<string, string>+ }}- )+ ) => Promise<{ data: unknown; error: unknown }>++ const path = databaseIdentifier+ ? '/platform/projects/{ref}/privatelink/associations/aws-account/{aws_account_id}/database/{database_identifier}'+ : '/platform/projects/{ref}/privatelink/associations/aws-account/{aws_account_id}'++ const { data, error } = await deleteRequest(path, {+ params: {+ path: {+ ref: projectRef,+ aws_account_id: awsAccountId,+ ...(databaseIdentifier ? { database_identifier: databaseIdentifier } : {}),+ },+ },+ })if (error) handleError(error)return datadiff --git a/apps/studio/data/aws-accounts/aws-accounts-query.ts b/apps/studio/data/aws-accounts/aws-accounts-query.tsindex 3800425bd63..19f2208ef0a 100644--- a/apps/studio/data/aws-accounts/aws-accounts-query.ts+++ b/apps/studio/data/aws-accounts/aws-accounts-query.ts@@ -1,5 +1,6 @@import type { UseQueryOptions } from '@tanstack/react-query'import { useQuery } from '@tanstack/react-query'+import { components } from 'api-types'import { awsAccountKeys } from './keys'import { get, handleError } from '@/data/fetchers'@@ -10,18 +11,12 @@ type AWSAccountsVariables = {projectRef?: string}-export interface AWSAccount {- aws_account_id: string- account_name?: string- status:- | 'CREATING'- | 'READY'- | 'ASSOCIATION_REQUEST_EXPIRED'- | 'ASSOCIATION_ACCEPTED'- | 'CREATION_FAILED'- | 'DELETING'- shared_at: string | null-}+// [Joshen] API types should be updated with these 2 parameters, so remove once verified+export type AWSAccount =+ components['schemas']['GetPrivateLinkResponse']['private_link_associations'][number] & {+ database_type?: 'PRIMARY' | 'READ_REPLICA'+ database_identifier?: string+ }async function getAWSAccounts({ projectRef }: AWSAccountsVariables, signal?: AbortSignal) {if (!projectRef) throw new Error('Project ref is required')diff --git a/apps/studio/pages/project/[ref]/database/replication/replica/[replicaId].tsx b/apps/studio/pages/project/[ref]/database/replication/replica/[replicaId].tsxindex f622cc986f3..ffabcbeed20 100644--- a/apps/studio/pages/project/[ref]/database/replication/replica/[replicaId].tsx+++ b/apps/studio/pages/project/[ref]/database/replication/replica/[replicaId].tsx@@ -8,14 +8,14 @@ import { AWS_REGIONS } from 'shared-data'import { Badge, Button } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { DropReplicaConfirmationModal } from '@/components/interfaces/Database/Replication/ReadReplicas/DropReplicaConfirmationModal'import { ReadReplicaDetails } from '@/components/interfaces/Database/Replication/ReadReplicas/ReadReplicaDetails'import {getIsInTransition,getStatusLabel,} from '@/components/interfaces/Database/Replication/ReadReplicas/ReadReplicas.utils'-import { DropReplicaConfirmationModal } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/DropReplicaConfirmationModal'-import { REPLICA_STATUS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'-import { RestartReplicaConfirmationModal } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/RestartReplicaConfirmationModal'+import { RestartReplicaConfirmationModal } from '@/components/interfaces/Database/Replication/ReadReplicas/RestartReplicaConfirmationModal'+import { REPLICA_STATUS } from '@/components/interfaces/Database/Replication/Replication.constants'import DatabaseLayout from '@/components/layouts/DatabaseLayout/DatabaseLayout'import { DefaultLayout } from '@/components/layouts/DefaultLayout'import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'