mirror of
https://github.com/supabase/supabase.git
synced 2026-10-08 02:45:07 +03:00
## 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>
228 lines
9.2 KiB
TypeScript
228 lines
9.2 KiB
TypeScript
import Link from 'next/link'
|
|
import { useMemo } from 'react'
|
|
import { Alert, AlertDescription, AlertTitle, Button, cn, CriticalIcon } from 'ui'
|
|
import { InfoTooltip } from 'ui-patterns/info-tooltip'
|
|
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
|
|
|
|
import { SectionContent } from '../SectionContent'
|
|
import { CategoryAttribute } from '../Usage.constants'
|
|
import { getInfrastructurePath } from '@/components/interfaces/Settings/Infrastructure/Infrastructure.utils'
|
|
import { AlertError } from '@/components/ui/AlertError'
|
|
import Panel from '@/components/ui/Panel'
|
|
import { PricingMetric } from '@/data/analytics/org-daily-stats-query'
|
|
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
|
|
import type { OrgSubscription } from '@/data/subscriptions/types'
|
|
import { OrgUsageResponse } from '@/data/usage/org-usage-query'
|
|
import { PROJECT_STATUS } from '@/lib/constants'
|
|
|
|
export interface DiskUsageProps {
|
|
slug: string
|
|
projectRef?: string | null
|
|
attribute: CategoryAttribute
|
|
subscription?: OrgSubscription
|
|
usage?: OrgUsageResponse
|
|
|
|
currentBillingCycleSelected: boolean
|
|
}
|
|
|
|
export const DiskUsage = ({
|
|
slug,
|
|
projectRef,
|
|
attribute,
|
|
subscription,
|
|
usage,
|
|
currentBillingCycleSelected,
|
|
}: DiskUsageProps) => {
|
|
const {
|
|
data,
|
|
isError,
|
|
isPending: isLoading,
|
|
isSuccess,
|
|
error,
|
|
} = useOrgProjectsInfiniteQuery({ slug }, { enabled: currentBillingCycleSelected })
|
|
const projects = useMemo(() => data?.pages.flatMap((page) => page.projects) || [], [data?.pages])
|
|
|
|
const relevantProjects = useMemo(() => {
|
|
return isSuccess
|
|
? projects
|
|
.filter((project) => {
|
|
// We do want to show branches that are exceeding the 8 GB limit, as people could have persistent or very long-living branches
|
|
const isBranchExceedingFreeQuota =
|
|
project.is_branch && project.databases.some((db) => (db.disk_volume_size_gb ?? 8) > 8)
|
|
|
|
const isActiveProject = project.status !== PROJECT_STATUS.INACTIVE
|
|
|
|
const isHostedOnAws = project.databases.every((db) => db.cloud_provider === 'AWS')
|
|
|
|
return (
|
|
(!project.is_branch || isBranchExceedingFreeQuota) && isActiveProject && isHostedOnAws
|
|
)
|
|
})
|
|
.filter((it) => it.ref === projectRef || !projectRef)
|
|
: []
|
|
}, [isSuccess, projects, projectRef])
|
|
|
|
const hasProjectsExceedingDiskSize = useMemo(() => {
|
|
return relevantProjects.some((it) =>
|
|
it.databases.some(
|
|
(db) => db.type === 'READ_REPLICA' || (db.disk_volume_size_gb && db.disk_volume_size_gb > 8)
|
|
)
|
|
)
|
|
}, [relevantProjects])
|
|
|
|
const gp3UsageInPeriod = usage?.usages.find(
|
|
(it) => it.metric === PricingMetric.DISK_SIZE_GB_HOURS_GP3
|
|
)
|
|
const io2UsageInPeriod = usage?.usages.find(
|
|
(it) => it.metric === PricingMetric.DISK_SIZE_GB_HOURS_IO2
|
|
)
|
|
|
|
return (
|
|
<div id={attribute.anchor} className="scroll-my-12">
|
|
<SectionContent section={attribute}>
|
|
{isLoading && (
|
|
<div className="space-y-2">
|
|
<ShimmeringLoader />
|
|
<ShimmeringLoader className="w-3/4" />
|
|
<ShimmeringLoader className="w-1/2" />
|
|
</div>
|
|
)}
|
|
{isError && <AlertError subject="Failed to retrieve usage data" error={error} />}
|
|
{isSuccess && (
|
|
<div className="space-y-4">
|
|
{currentBillingCycleSelected &&
|
|
subscription?.usage_billing_enabled === false &&
|
|
hasProjectsExceedingDiskSize && (
|
|
<Alert variant="warning">
|
|
<CriticalIcon />
|
|
<AlertTitle>Projects exceeding quota</AlertTitle>
|
|
<AlertDescription>
|
|
You have projects that are exceeding 8 GB of provisioned disk size, but do not
|
|
allow any overages with the Spend Cap on. Reduce the disk size or disable the
|
|
spend cap.
|
|
</AlertDescription>
|
|
</Alert>
|
|
)}
|
|
|
|
<div>
|
|
<div className="flex items-center justify-between">
|
|
<div className="flex items-center space-x-4">
|
|
<p className="text-sm">{attribute.name} usage</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-between border-b py-1">
|
|
<p className="text-xs text-foreground-light">
|
|
Included in {subscription?.plan?.name} Plan
|
|
</p>
|
|
<p className="text-xs">8 GB GP3 disk per project</p>
|
|
</div>
|
|
|
|
<div className="flex items-center justify-between py-1">
|
|
<p className="text-xs text-foreground-light">Overage in period</p>
|
|
<p className="text-xs">
|
|
{(gp3UsageInPeriod?.usage ?? 0).toLocaleString()} GP3 GB-Hrs
|
|
{io2UsageInPeriod?.usage
|
|
? ` / ${io2UsageInPeriod.usage.toLocaleString()} IO2 GB-Hrs`
|
|
: ``}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
{currentBillingCycleSelected ? (
|
|
<div className="space-y-4">
|
|
<div className="space-y-1">
|
|
<p className="text-sm">Current disk size per project</p>
|
|
<p className="text-sm text-foreground-light">
|
|
Breakdown of disk per project. Head to your project's disk management section to
|
|
see database size used.
|
|
</p>
|
|
</div>
|
|
|
|
{relevantProjects.length === 0 && (
|
|
<Panel>
|
|
<Panel.Content>
|
|
<div className="flex flex-col items-center justify-center">
|
|
<p className="text-sm">No active projects</p>
|
|
<p className="text-sm text-foreground-light">
|
|
You don't have any active projects in this organization.
|
|
</p>
|
|
</div>
|
|
</Panel.Content>
|
|
</Panel>
|
|
)}
|
|
|
|
<div className="flex flex-col gap-y-2">
|
|
{relevantProjects.map((project, idx) => {
|
|
const primaryDiskUsage = project.databases
|
|
.filter((it) => it.type === 'PRIMARY')
|
|
.reduce((acc, curr) => acc + (curr.disk_volume_size_gb ?? 8), 0)
|
|
const replicaDbs = project.databases.filter((it) => it.type !== 'PRIMARY')
|
|
const replicaDiskUsage = replicaDbs.reduce(
|
|
(acc, curr) => acc + (curr.disk_volume_size_gb ?? 8),
|
|
0
|
|
)
|
|
|
|
const totalDiskUsage = primaryDiskUsage + replicaDiskUsage
|
|
|
|
return (
|
|
<div
|
|
key={`usage-project-${project.ref}`}
|
|
className={cn(
|
|
'flex items-center justify-between',
|
|
idx !== relevantProjects.length - 1 && 'border-b pb-2'
|
|
)}
|
|
>
|
|
<div>
|
|
<p className="text-foreground-light text-sm flex items-center gap-2">
|
|
{project.name}
|
|
</p>
|
|
<div className="flex items-center gap-x-2">
|
|
<span className="text-foreground-lighter text-sm flex items-center gap-2">
|
|
{totalDiskUsage} GB Disk provisioned
|
|
</span>
|
|
<InfoTooltip side="right">
|
|
<p>{primaryDiskUsage} GB for Primary Database</p>
|
|
{replicaDbs.length > 0 && (
|
|
<>
|
|
<p>
|
|
{replicaDiskUsage} GB for {replicaDbs.length} Read{' '}
|
|
{replicaDbs.length === 1 ? 'Replica' : 'Replicas'}
|
|
</p>
|
|
<p className="mt-1">
|
|
Read replicas have their own disk and use 25% more disk to
|
|
account for WAL files.
|
|
</p>
|
|
</>
|
|
)}
|
|
</InfoTooltip>
|
|
</div>
|
|
</div>
|
|
|
|
<Button asChild variant="default" size="tiny">
|
|
<Link href={getInfrastructurePath(project.ref)}>Manage Disk</Link>
|
|
</Button>
|
|
</div>
|
|
)
|
|
})}
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<Panel>
|
|
<Panel.Content>
|
|
<div className="flex flex-col items-center justify-center">
|
|
<p className="text-sm">Data not available</p>
|
|
<p className="text-sm text-foreground-light">
|
|
Switch to current billing cycle to see current disk size per project.
|
|
</p>
|
|
</div>
|
|
</Panel.Content>
|
|
</Panel>
|
|
)}
|
|
</div>
|
|
)}
|
|
</SectionContent>
|
|
</div>
|
|
)
|
|
}
|