mirror of
https://github.com/supabase/supabase.git
synced 2026-10-05 17:35:10 +03:00
## Summary - Fixes MUL-1678: toggling High Availability on in the project-creation wizard 400'd for orgs that are HA-entitled but not enrolled in the "V3 rollout ramp" feature flag on the backend, because two pre-flight endpoints Studio calls before project creation didn't know about HA and hit the ramp check the real create-project call already bypasses. - Threads `highAvailability` through `useOrganizationAvailableRegionsQuery` (`GET /platform/projects/available-regions`, sent as `high_availability=true|false` on the query string) and `useProjectCreationPostgresVersionsQuery` / `useAvailableOrioleImageVersion` (`POST /platform/organizations/:slug/available-versions`, sent as `high_availability` in the body), including their query-key cache keys so HA and non-HA responses for the same org/provider/size don't collide. - Wires the (already form-tracked) `highAvailability` value into every call site: `ProjectCreationForm.tsx`, `RegionSelector.tsx`, and a new `highAvailability` prop on `PostgresVersionSelector.tsx` passed from `InternalOnlyConfiguration.tsx`. ## Problem The project-creation wizard's HA toggle is wired into the actual project-create request, but two pre-flight calls Studio makes before that (available regions, available Postgres versions) had no way to signal HA, so the backend's ramp-flag gate rejected them for HA-entitled orgs outside the ramp. ## Solution Add an optional `highAvailability` field end-to-end on the Studio side: query hook variables, cache keys, request serialization, and the components that already track the toggle via `useWatch`. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Available regions and database versions in project creation now reflect the selected high-availability setting. * The Create button remains disabled while available regions are loading. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: GuptaManan100 <guptamanan100@gmail.com> Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
188 lines
6.4 KiB
TypeScript
188 lines
6.4 KiB
TypeScript
import { useEffect } from 'react'
|
|
import { ControllerRenderProps, UseFormReturn, useWatch } from 'react-hook-form'
|
|
import type { CloudProvider } from 'shared-data'
|
|
import {
|
|
Badge,
|
|
Select,
|
|
SelectContent,
|
|
SelectGroup,
|
|
SelectItem,
|
|
SelectTrigger,
|
|
SelectValue,
|
|
} from 'ui'
|
|
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
|
|
|
|
import { smartRegionToExactRegion } from './ProjectCreation.utils'
|
|
import { useProjectCreationPostgresVersionsQuery } from '@/data/config/project-creation-postgres-versions-query'
|
|
import { useProjectUnpausePostgresVersionsQuery } from '@/data/config/project-unpause-postgres-versions-query'
|
|
import { PostgresEngine, ReleaseChannel } from '@/data/projects/new-project.constants'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
|
|
interface PostgresVersionDetails {
|
|
postgresEngine?: Exclude<PostgresEngine, '13' | '14'>
|
|
releaseChannel?: ReleaseChannel
|
|
}
|
|
|
|
interface PostgresVersionSelectorProps {
|
|
cloudProvider: CloudProvider
|
|
dbRegion: string
|
|
disabled?: boolean
|
|
organizationSlug?: string
|
|
highAvailability?: boolean
|
|
field: ControllerRenderProps<any, 'postgresVersionSelection'>
|
|
form: UseFormReturn<any>
|
|
/**
|
|
* Owned by the form owner (not this component) so the last valid selection
|
|
* survives this selector unmounting, e.g. when its collapsible section
|
|
* closes. Create it with useRef('') alongside the form.
|
|
*/
|
|
lastValidSelectionRef: { current: string }
|
|
type?: 'create' | 'unpause'
|
|
layout?: 'vertical' | 'horizontal'
|
|
label?: string
|
|
}
|
|
|
|
const formatValue = ({
|
|
postgres_engine,
|
|
release_channel,
|
|
}: {
|
|
postgres_engine: string
|
|
release_channel: string
|
|
}) => {
|
|
return `${postgres_engine}|${release_channel}`
|
|
}
|
|
|
|
export const extractPostgresVersionDetails = (value: string): PostgresVersionDetails => {
|
|
if (!value) {
|
|
return { postgresEngine: undefined, releaseChannel: undefined }
|
|
}
|
|
|
|
const [postgresEngine, releaseChannel] = value.split('|')
|
|
return { postgresEngine, releaseChannel } as PostgresVersionDetails
|
|
}
|
|
|
|
export const PostgresVersionSelector = ({
|
|
cloudProvider,
|
|
dbRegion,
|
|
disabled = false,
|
|
organizationSlug,
|
|
highAvailability,
|
|
field,
|
|
form,
|
|
lastValidSelectionRef,
|
|
type = 'create',
|
|
layout = 'horizontal',
|
|
label = 'Postgres version',
|
|
}: PostgresVersionSelectorProps) => {
|
|
const { data: project } = useSelectedProjectQuery()
|
|
|
|
const dbRegionExact = smartRegionToExactRegion(dbRegion)
|
|
|
|
const {
|
|
data: createVersions,
|
|
isPending: isLoadingProjectCreateVersions,
|
|
isSuccess,
|
|
} = useProjectCreationPostgresVersionsQuery(
|
|
{
|
|
cloudProvider,
|
|
dbRegion: dbRegionExact,
|
|
organizationSlug,
|
|
highAvailability,
|
|
},
|
|
{ enabled: type === 'create' }
|
|
)
|
|
|
|
const { data: unpauseVersions, isPending: isLoadingProjectUnpauseVersions } =
|
|
useProjectUnpausePostgresVersionsQuery(
|
|
{ projectRef: project?.ref },
|
|
{ enabled: type === 'unpause' }
|
|
)
|
|
|
|
const versions =
|
|
type === 'create'
|
|
? (createVersions?.available_versions ?? [])
|
|
: (unpauseVersions?.available_versions ?? [])
|
|
const availableVersions = versions.sort((a, b) => a.version.localeCompare(b.version)).reverse()
|
|
const postgresVersionSelection = useWatch({
|
|
control: form.control,
|
|
name: 'postgresVersionSelection',
|
|
})
|
|
|
|
// react-hook-form intermittently drops this field's value when its Controller
|
|
// remounts, so a one-shot "set the default once versions load" effect leaves
|
|
// the select stuck empty. Instead this effect re-asserts off the watched value:
|
|
// a selection present in the current list is kept (and remembered in the
|
|
// owner-held lastValidSelectionRef), and when the value is missing or cleared
|
|
// out from under us it restores the last valid selection, falling back to the
|
|
// GA default.
|
|
useEffect(() => {
|
|
if (availableVersions.length === 0) return
|
|
const isSelectionAvailable = (selection: string) =>
|
|
availableVersions.some((version) => formatValue(version) === selection)
|
|
|
|
if (postgresVersionSelection && isSelectionAvailable(postgresVersionSelection)) {
|
|
lastValidSelectionRef.current = postgresVersionSelection
|
|
return
|
|
}
|
|
|
|
if (isSelectionAvailable(lastValidSelectionRef.current)) {
|
|
form.setValue('postgresVersionSelection', lastValidSelectionRef.current)
|
|
return
|
|
}
|
|
|
|
const gaVersion = availableVersions.find((x) => x.release_channel === 'ga')
|
|
const defaultValue = gaVersion ? formatValue(gaVersion) : formatValue(availableVersions[0])
|
|
form.setValue('postgresVersionSelection', defaultValue)
|
|
}, [isSuccess, availableVersions, postgresVersionSelection, lastValidSelectionRef, form])
|
|
|
|
return (
|
|
<FormItemLayout id={field.name} label={label} layout={layout}>
|
|
<Select
|
|
value={postgresVersionSelection}
|
|
onValueChange={field.onChange}
|
|
disabled={
|
|
disabled ||
|
|
availableVersions.length === 0 ||
|
|
(type === 'create' && isLoadingProjectCreateVersions) ||
|
|
(type === 'unpause' && isLoadingProjectUnpauseVersions)
|
|
}
|
|
>
|
|
<SelectTrigger
|
|
id={field.name}
|
|
className="[&>:nth-child(1)]:w-full [&>:nth-child(1)]:flex [&>:nth-child(1)]:items-start"
|
|
>
|
|
<SelectValue placeholder="Select a Postgres version for your project" />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectGroup>
|
|
{availableVersions.map((value) => {
|
|
const postgresVersion = value.version
|
|
.split('supabase-postgres-')[1]
|
|
.replace('-orioledb', '')
|
|
return (
|
|
<SelectItem
|
|
key={formatValue(value)}
|
|
value={formatValue(value)}
|
|
className="w-full [&>:nth-child(2)]:w-full"
|
|
>
|
|
<div className="flex flex-row items-center justify-between w-full">
|
|
<span className="text-foreground">{postgresVersion}</span>
|
|
<div className="flex flex-row gap-x-2">
|
|
{value.release_channel !== 'ga' && (
|
|
<Badge variant="warning">{value.release_channel}</Badge>
|
|
)}
|
|
{value.postgres_engine.includes('oriole') && (
|
|
<Badge variant="default">OrioleDB</Badge>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</SelectItem>
|
|
)
|
|
})}
|
|
</SelectGroup>
|
|
</SelectContent>
|
|
</Select>
|
|
</FormItemLayout>
|
|
)
|
|
}
|