Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(studio): wait for organization before loading regions (#50572)

Jordi Enric8f6a6f7032db
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
index 93424c1c414..0ad0e897952 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
@@ -122,6 +122,7 @@ export const ProjectCreationForm = ({
const surface = isVercelIntegrationFlow ? 'vercel' : 'main'
const { data: currentOrg } = useSelectedOrganizationQuery()
+ const hasSelectedOrganization = currentOrg !== undefined
const isFreePlan = currentOrg?.plan?.id === 'free'
const canChooseInstanceSize = !isFreePlan
@@ -283,7 +284,7 @@ export const ProjectCreationForm = ({
desiredInstanceSize: instanceSize as DesiredInstanceSize,
},
{
- enabled: flagsLoaded && smartRegionEnabled,
+ enabled: flagsLoaded && smartRegionEnabled && hasSelectedOrganization,
refetchOnMount: false,
refetchOnWindowFocus: false,
refetchInterval: false,
@@ -792,6 +793,7 @@ export const ProjectCreationForm = ({
<RegionSelector
form={form}
+ hasSelectedOrganization={hasSelectedOrganization}
instanceSize={instanceSize as DesiredInstanceSize}
showBestAvailableRegionOption={showBestAvailableRegionOption}
isBestAvailableSelected={isBestAvailableSelected}
diff --git a/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx b/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
index f7eee08b492..739f811b928 100644
--- a/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
@@ -43,6 +43,7 @@ import type { DesiredInstanceSize } from '@/data/projects/new-project.constants'
interface RegionSelectorProps {
form: UseFormReturn<CreateProjectForm>
+ hasSelectedOrganization: boolean
instanceSize?: DesiredInstanceSize
layout?: 'vertical' | 'horizontal'
showBestAvailableRegionOption: boolean
@@ -84,6 +85,7 @@ const BestAvailableRegionIcon = () => (
export const RegionSelector = ({
form,
+ hasSelectedOrganization,
instanceSize,
layout = 'horizontal',
showBestAvailableRegionOption,
@@ -116,7 +118,10 @@ export const RegionSelector = ({
error: errorAvailableRegions,
} = useOrganizationAvailableRegionsQuery(
{ slug, cloudProvider, desiredInstanceSize: instanceSize },
- { enabled: smartRegionEnabled, staleTime: 1000 * 60 * 5 } // 5 minutes
+ {
+ enabled: smartRegionEnabled && hasSelectedOrganization,
+ staleTime: 1000 * 60 * 5,
+ }
)
const allSmartRegions = availableRegionsData?.all.smartGroup ?? []