The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): use measured node heights for instance diagram layout (#46075)
Charis3aec96f9c6a9
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.tsindex 401be527910..79a3b89516e 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts@@ -45,9 +45,20 @@ export type EdgeData = {// ReactFlow is scaling everything by the factor of 2export const NODE_WIDTH = 660-export const NODE_ROW_HEIGHT = 50export const NODE_SEP = 20+// The region wrapper is a static, non-measured sibling node with a fixed size.+export const REGION_NODE_HEIGHT = 162++// First-paint fallback heights for the dagre layout, only used before React+// Flow has measured the real nodes. Subsequent layouts use node.measured.height.+export const NODE_HEIGHT_FALLBACKS: Record<string, number> = {+ LOAD_BALANCER: 64,+ PRIMARY: 140,+ READ_REPLICA: 140,+ REGION: REGION_NODE_HEIGHT,+}+export const REPLICA_STATUS: {[key: string]: components['schemas']['DatabaseStatusResponse']['status']} = {diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsxindex b9fe1d40101..ba04d4c3d66 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.tsx@@ -5,6 +5,7 @@ import {Edge,ReactFlow,ReactFlowProvider,+ useNodesInitialized,useReactFlow,} from '@xyflow/react'import { partition } from 'lodash'@@ -50,6 +51,7 @@ import {useIsOrioleDb,useSelectedProjectQuery,} from '@/hooks/misc/useSelectedProject'+import { useStaticEffectEvent } from '@/hooks/useStaticEffectEvent'import { timeout } from '@/lib/helpers'interface InstanceConfigurationUIProps {@@ -210,8 +212,17 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationU[])- const setReactFlow = async () => {- const graph = getDagreGraphLayout(nodes, edges)+ const nodesInitialized = useNodesInitialized()+ const [hasMeasuredLayout, setHasMeasuredLayout] = useState(false)++ const setReactFlow = async ({ measured }: { measured: boolean }) => {+ // Merge in React Flow's measured dimensions (if any) so dagre can use real+ // heights instead of the first-paint fallbacks.+ const measuredNodes = nodes.map((node) => {+ const existing = reactFlow.getNode(node.id)+ return existing?.measured ? { ...node, measured: existing.measured } : node+ })+ const graph = getDagreGraphLayout(measuredNodes, edges)const { nodes: updatedNodes } = addRegionNodes(graph.nodes, graph.edges)reactFlow.setNodes(updatedNodes)reactFlow.setEdges(graph.edges)@@ -219,16 +230,32 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationU// [Joshen] Odd fix to ensure that react flow snaps back to center when adding nodesawait timeout(1)reactFlow.fitView({ maxZoom: 0.9, minZoom: 0.9 })+ if (measured) setHasMeasuredLayout(true)}+ // First pass: lay out using fallback heights for any not-yet-measured nodes.+ // The diagram is kept invisible until the measured pass below has run, so the+ // user never sees the fallback positions.// [Joshen] Just FYI this block is oddly triggering whenever we refocus on the viewport// even if I change the dependency array to just data. Not blocker, just an area to optimizeuseEffect(() => {if (isSuccessReplicas && isSuccessLoadBalancers && nodes.length > 0 && view === 'flow') {- setReactFlow()+ setReactFlow({ measured: false })}}, [isSuccessReplicas, isSuccessLoadBalancers, nodes, edges, view])+ // Second pass: once React Flow has measured the nodes, re-run the layout so+ // dagre uses real heights. Only `nodesInitialized` going true should trigger+ // this — the first-pass effect above handles node/view changes.+ const runMeasuredLayout = useStaticEffectEvent(() => {+ if (nodesInitialized && nodes.length > 0 && view === 'flow') {+ setReactFlow({ measured: true })+ }+ })+ useEffect(() => {+ runMeasuredLayout()+ }, [nodesInitialized, runMeasuredLayout])+return (<div className={cn('nowheel', diagramOnly ? 'h-full' : 'border-y')}><div@@ -314,7 +341,12 @@ const InstanceConfigurationUI = ({ diagramOnly = false }: InstanceConfigurationUcolorMode={'' as unknown as ColorMode}fitViewfitViewOptions={{ minZoom: 0.9, maxZoom: 0.9 }}- className="instance-configuration"+ // Keep the diagram invisible (but laid out, so nodes can be+ // measured) until the measured-height layout pass has run.+ className={cn(+ 'instance-configuration transition-opacity duration-150',+ hasMeasuredLayout ? 'opacity-100' : 'opacity-0'+ )}zoomOnPinch={false}zoomOnScroll={false}nodesDraggable={false}diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.tsindex f7d9022e64b..ee48ae2564c 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts@@ -6,7 +6,7 @@ import { AWS_REGIONS, AWS_REGIONS_KEYS } from 'shared-data'import {AVAILABLE_REPLICA_REGIONS,AWS_REGIONS_COORDINATES,- NODE_ROW_HEIGHT,+ NODE_HEIGHT_FALLBACKS,NODE_SEP,NODE_WIDTH,ReplicaNodeData,@@ -123,15 +123,20 @@ export const generateNodes = ({]}+const getDagreNodeHeight = (node: Node) => {+ if (node.measured?.height) return node.measured.height+ return NODE_HEIGHT_FALLBACKS[node.type ?? ''] ?? 100+}+export const getDagreGraphLayout = (nodes: Node[], edges: Edge[]) => {const dagreGraph = new dagre.graphlib.Graph()dagreGraph.setDefaultEdgeLabel(() => ({}))- dagreGraph.setGraph({ rankdir: 'TB', ranksep: 160, nodesep: NODE_SEP })+ dagreGraph.setGraph({ rankdir: 'TB', ranksep: 60, nodesep: NODE_SEP })nodes.forEach((node) => {dagreGraph.setNode(node.id, {width: NODE_WIDTH / 2,- height: node.id === 'load-balancer' ? -70 : NODE_ROW_HEIGHT / 2,+ height: getDagreNodeHeight(node),})})diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsxindex b9141f61208..203ecbb0b12 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceNode.tsx@@ -28,6 +28,7 @@ import {NODE_SEP,NODE_WIDTH,PrimaryNodeData,+ REGION_NODE_HEIGHT,REPLICA_STATUS,ReplicaNodeData,} from './InstanceConfiguration.constants'@@ -435,7 +436,7 @@ export const RegionNode = ({ data }: any) => {return (<divclassName="relative flex justify-between rounded-sm bg-black/10 border border-default border-white/10 border-2 p-3"- style={{ width: regionNodeWidth, height: 162 }}+ style={{ width: regionNodeWidth, height: REGION_NODE_HEIGHT }}><div className="absolute bottom-2 flex items-center justify-between gap-x-2"><img