Files
Saxon FletcherandAlaister Young ad203ae277 Merge compute and disk into Infrastructure (#48370)
## Summary

This is the final step in merging compute and disk with infrastructure
to become a single place to manage everything. This moves everything
we've done in compute and disk over to infrastructure along with
redirects.

- Makes Infrastructure canonical for the completed compute and disk
configuration and usage charts.
- Moves Service Versions to General Project Settings.
- Removes the legacy Infrastructure activity implementation and
constants.
- Updates settings navigation, shortcuts, banners, billing links,
warning CTAs, usage pages, support suggestions, and other internal entry
points.
- Adds the permanent `/settings/compute-and-disk` redirect, removes its
Next and TanStack routes, regenerates the route tree, and updates the
migration checklist.
- Preserves query parameters and legacy metric anchors, including
`#cpu`.

## Stack

1. #48368
2. #48369
3. #48370 (this PR)

## How to test

1. Check out `chore/infra-compute-3-cutover`.
2. Test the Next implementation with `pnpm dev:studio`, then stop it and
test TanStack with `STUDIO_FRAMEWORK=tanstack pnpm dev:studio`.
3. In each implementation, open
`/project/<ref>/settings/infrastructure`. Confirm the page contains the
usage charts and the Scaling, Compute, Disk, and Advanced configuration
sections.
4. Open `/project/<ref>/settings/general`. Confirm Service Versions
appears there with its existing name, content, and styling, and no
longer appears on Infrastructure.
5. Open `/project/<ref>/settings/compute-and-disk?upgrade=micro#disk`.
Confirm it permanently redirects to
`/project/<ref>/settings/infrastructure?upgrade=micro#disk`, preserving
the query string and hash.
6. Confirm the settings menu exposes Infrastructure and no longer
exposes Compute and Disk. Repeat with platform and self-hosted settings.
7. Follow representative entry points from billing usage, resource
warning CTAs, upgrade banners, shortcuts, and support suggestions.
Confirm they land on Infrastructure and preserve any query parameters or
metric anchors such as `#cpu`.
8. Smoke-test compute and disk updates from Infrastructure, including
validation, the sticky review footer, and warning/critical chart states.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Consolidated compute and disk management under the **Infrastructure**
project settings page.
* Added a **Service versions** section to **General** project settings.
* **Bug Fixes**
* Updated links and upgrade CTAs across the product to route to the
correct **Infrastructure** or **Service versions** destinations.
* Added permanent redirects from legacy **Compute and Disk** to
**Infrastructure**, preserving query/hash.
  * Improved resource warning upgrade routing for compute scenarios.
* **Tests**
* Expanded automated coverage for **Infrastructure**, **Service
versions**, redirects, and warning-link routing.
* **Chores**
  * Updated ESLint rule baseline configuration for the studio app.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
2026-07-29 19:26:28 +08:00

113 lines
4.3 KiB
TypeScript

import { useParams } from 'common'
import { ExternalLink, Loader, Monitor, Server } from 'lucide-react'
import Link from 'next/link'
import { useEffect, useRef } from 'react'
import { Badge, Button } from 'ui'
import { getInfrastructurePath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
import ShimmerLine from '@/components/ui/ShimmerLine'
import {
useInvalidateProjectDetailsQuery,
useSetProjectPostgrestStatus,
type Project,
} from '@/data/projects/project-detail-query'
import { DOCS_URL } from '@/lib/constants'
import pingPostgrest from '@/lib/pingPostgrest'
export interface ConnectingStateProps {
project: Project
}
const ConnectingState = ({ project }: ConnectingStateProps) => {
const { ref } = useParams()
const checkProjectConnectionIntervalRef = useRef<number>(null)
const { setProjectPostgrestStatus } = useSetProjectPostgrestStatus()
const { invalidateProjectDetailsQuery } = useInvalidateProjectDetailsQuery()
useEffect(() => {
if (!project.restUrl) return
// Check project connection status every 4 seconds
// pingPostgrest timeouts in 2s, wait for another 2s before checking again
checkProjectConnectionIntervalRef.current = window.setInterval(testProjectConnection, 4000)
return () => {
if (checkProjectConnectionIntervalRef.current) {
clearInterval(checkProjectConnectionIntervalRef.current)
}
}
}, [project])
const testProjectConnection = async () => {
const result = await pingPostgrest(project.ref)
if (result) {
if (checkProjectConnectionIntervalRef.current) {
clearInterval(checkProjectConnectionIntervalRef.current)
}
setProjectPostgrestStatus(project.ref, 'ONLINE')
await invalidateProjectDetailsQuery(project.ref)
}
}
return (
<>
<div className="mx-auto my-16 w-full max-w-7xl space-y-16">
<div className="mx-6 space-y-16">
<div className="flex flex-col space-y-4 lg:flex-row lg:items-center lg:space-y-0 lg:space-x-6">
<h1 className="text-3xl">{project.name}</h1>
<div>
<Badge variant="success">
<div className="flex items-center gap-2">
<Loader className="animate-spin" size={12} />
<span>Connecting to project</span>
</div>
</Badge>
</div>
</div>
<div className="flex h-[500px] items-center justify-center rounded-sm border border-overlay bg-surface-100 p-8">
<div className="w-[440px] space-y-4">
<div className="mx-auto flex max-w-[300px] items-center justify-center">
<div>
<div className="flex items-center justify-center w-12 h-12 rounded-md border">
<Monitor className="text-foreground-light" size={30} strokeWidth={1.5} />
</div>
</div>
<ShimmerLine active />
<div>
<div className="flex items-center justify-center w-12 h-12 rounded-md border">
<Server className="text-foreground-light" size={30} strokeWidth={1.5} />
</div>
</div>
</div>
<div className="space-y-1">
<p className="text-center">Connecting to {project.name}</p>
<p className="text-center text-sm text-foreground-light">
If you are unable to connect after a few minutes, check your project's health to
verify if it's running into any resource constraints.
</p>
</div>
<div className="flex items-center justify-center space-x-2">
<Button asChild variant="default">
<Link href={getInfrastructurePath(ref)}>Check database health</Link>
</Button>
<Button asChild variant="default" icon={<ExternalLink strokeWidth={1.5} />}>
<Link
href={`${DOCS_URL}/guides/troubleshooting?products=platform#unable-to-connect-to-your-supabase-project`}
className="translate-y-px"
>
Troubleshooting
</Link>
</Button>
</div>
</div>
</div>
</div>
</div>
</>
)
}
export default ConnectingState