Skip to content

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

feat(studio): update region selector in create form (#51282)

kemal.earthb2dab2b896f0
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.test.ts b/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.test.ts
index dd5297f5a7a..e2b9efb621b 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.test.ts
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.test.ts
@@ -13,6 +13,7 @@ import {
getFreeTierGeneralRegionExperimentVariant,
getHighAvailabilityRegionCode,
getRegionSelectionType,
+ getSpecificRegionsLinkVariant,
resolveDefaultDbRegion,
} from './ProjectCreation.utils'
@@ -137,6 +138,12 @@ describe('getFreeTierGeneralRegionExperimentVariant', () => {
)
})
+ it('returns undefined when overridden, even if otherwise enrolled', () => {
+ expect(
+ getFreeTierGeneralRegionExperimentVariant({ ...base, isOverridden: true })
+ ).toBeUndefined()
+ })
+
it('returns undefined for a paid plan', () => {
expect(
getFreeTierGeneralRegionExperimentVariant({ ...base, isFreePlan: false })
@@ -197,4 +204,54 @@ describe('getRegionSelectionType', () => {
getRegionSelectionType({ dbRegion: 'Americas', availableRegions: undefined })
).toBeUndefined()
})
+
+ it('classifies an untouched field as auto, even if it resolved to a specific region', () => {
+ expect(
+ getRegionSelectionType({
+ dbRegion: 'East US (North Virginia)',
+ availableRegions,
+ isDbRegionDirty: false,
+ })
+ ).toBe('auto')
+ })
+
+ it('returns undefined for an untouched field holding a stale region matching neither list', () => {
+ expect(
+ getRegionSelectionType({
+ dbRegion: 'Nonexistent',
+ availableRegions,
+ isDbRegionDirty: false,
+ })
+ ).toBeUndefined()
+ })
+
+ it('classifies a touched field normally', () => {
+ expect(
+ getRegionSelectionType({ dbRegion: 'Americas', availableRegions, isDbRegionDirty: true })
+ ).toBe('general')
+ })
+})
+
+describe('getSpecificRegionsLinkVariant', () => {
+ const base = {
+ isFreePlan: true,
+ smartRegionEnabled: true,
+ linkFlag: true,
+ }
+
+ it('returns test when eligible and the flag is on', () => {
+ expect(getSpecificRegionsLinkVariant(base)).toBe('test')
+ })
+
+ it('returns control when eligible and the flag is off', () => {
+ expect(getSpecificRegionsLinkVariant({ ...base, linkFlag: false })).toBe('control')
+ })
+
+ it('returns undefined for a paid plan', () => {
+ expect(getSpecificRegionsLinkVariant({ ...base, isFreePlan: false })).toBeUndefined()
+ })
+
+ it('returns undefined when smart regions are disabled (AWS_NIMBUS)', () => {
+ expect(getSpecificRegionsLinkVariant({ ...base, smartRegionEnabled: false })).toBeUndefined()
+ })
})
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts b/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts
index 82835530311..17ec27470b8 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts
@@ -112,21 +112,25 @@ type GetFreeTierGeneralRegionExperimentVariantArgs = {
smartRegionEnabled: boolean
enrollmentFlag: boolean
selectionFlag: boolean
+ /** When true, another feature owns the region selector and the experiment is inactive */
+ isOverridden?: boolean
}
/**
* Org's arm in the freeTierGeneralRegionExperiment. The test arm only sees general regions.
- * Returns undefined when the org isn't enrolled.
+ * Returns undefined when the org isn't enrolled, or when the experiment is overridden.
*/
export function getFreeTierGeneralRegionExperimentVariant({
isFreePlan,
smartRegionEnabled,
enrollmentFlag,
selectionFlag,
+ isOverridden = false,
}: GetFreeTierGeneralRegionExperimentVariantArgs):
| FreeTierGeneralRegionExperimentVariant
| undefined {
- const isInExperiment = isFreePlan && smartRegionEnabled && enrollmentFlag === true
+ const isInExperiment =
+ !isOverridden && isFreePlan && smartRegionEnabled && enrollmentFlag === true
if (!isInExperiment) return undefined
return selectionFlag === true ? 'test' : 'control'
}
@@ -136,18 +140,47 @@ export type AvailableRegions = NonNullable<OrganizationAvailableRegionsData>['al
type GetRegionSelectionTypeArgs = {
dbRegion: string | undefined
availableRegions: AvailableRegions | undefined
+ /** Whether the user ever touched the region field. Defaults to true for untracked callers. */
+ isDbRegionDirty?: boolean
}
/**
- * Whether the selected region is a general region (e.g. Americas) or a specific one
- * (e.g. us-east-1). Returns undefined if it matches neither list.
+ * How the submitted region was arrived at: the auto-assigned default left untouched ('auto'),
+ * a smart group region picked by the user (e.g. Americas, 'general'), or an exact region picked
+ * by the user (e.g. us-east-1, 'specific'). Returns undefined if dbRegion matches neither list,
+ * regardless of whether the field was touched.
*/
export function getRegionSelectionType({
dbRegion,
availableRegions,
-}: GetRegionSelectionTypeArgs): 'general' | 'specific' | undefined {
+ isDbRegionDirty = true,
+}: GetRegionSelectionTypeArgs): 'general' | 'auto' | 'specific' | undefined {
if (!dbRegion || !availableRegions) return undefined
- if (availableRegions.smartGroup.some((region) => region.name === dbRegion)) return 'general'
- if (availableRegions.specific.some((region) => region.name === dbRegion)) return 'specific'
- return undefined
+ const isGeneral = availableRegions.smartGroup.some((region) => region.name === dbRegion)
+ const isSpecific = availableRegions.specific.some((region) => region.name === dbRegion)
+ if (!isGeneral && !isSpecific) return undefined
+ if (!isDbRegionDirty) return 'auto'
+ return isGeneral ? 'general' : 'specific'
+}
+
+export type SpecificRegionsLinkVariant = 'test' | 'control'
+
+type GetSpecificRegionsLinkVariantArgs = {
+ isFreePlan: boolean
+ smartRegionEnabled: boolean
+ linkFlag: boolean
+}
+
+/**
+ * Org's arm in the projectCreationSpecificRegionsLink experiment. Returns undefined when the
+ * org isn't in the eligible population (paid plan, or smart regions disabled for the selected
+ * cloud provider) — the link can never show for them regardless of the flag.
+ */
+export function getSpecificRegionsLinkVariant({
+ isFreePlan,
+ smartRegionEnabled,
+ linkFlag,
+}: GetSpecificRegionsLinkVariantArgs): SpecificRegionsLinkVariant | undefined {
+ if (!isFreePlan || !smartRegionEnabled) return undefined
+ return linkFlag === true ? 'test' : 'control'
}
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
index a1aa4b508e0..226544b4575 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreationForm.tsx
@@ -34,6 +34,7 @@ import {
getFreeTierGeneralRegionExperimentVariant,
getHighAvailabilityRegionCode,
getRegionSelectionType,
+ getSpecificRegionsLinkVariant,
instanceLabel,
monthlyInstancePrice,
resolveDefaultDbRegion,
@@ -207,7 +208,17 @@ export const ProjectCreationForm = ({
const highAvailabilityRegionCode = getHighAvailabilityRegionCode()
const { isPending: isPendingOrganizationCreatedAt } = useSelectedOrganizationCreatedAtQuery()
+ // Only free-plan orgs get the specific-regions link collapse behavior. When active for an
+ // org, it owns the region selector, so the free tier experiment stays inactive for that org.
+ const specificRegionsLinkFlag = useFlag('projectCreationSpecificRegionsLink') === true
+ const isSpecificRegionsLinkEnabled = specificRegionsLinkFlag && isFreePlan
+ const specificRegionsLinkVariant = getSpecificRegionsLinkVariant({
+ isFreePlan,
+ smartRegionEnabled,
+ linkFlag: specificRegionsLinkFlag,
+ })
const isResolvingFreeTierGeneralRegionExperiment =
+ !isSpecificRegionsLinkEnabled &&
isFreePlan &&
smartRegionEnabled &&
(!flagsLoaded || isPendingOrganizationCreatedAt || isConfigCatStale === true)
@@ -218,6 +229,7 @@ export const ProjectCreationForm = ({
smartRegionEnabled,
enrollmentFlag: freeTierGeneralRegionEnrollment,
selectionFlag: freeTierGeneralRegionSelection,
+ isOverridden: isSpecificRegionsLinkEnabled,
})
// Read dirty state during render rather than depending on form.formState in the
@@ -367,6 +379,7 @@ export const ProjectCreationForm = ({
? getRegionSelectionType({
dbRegion: form.getValues('dbRegion'),
availableRegions: availableRegionsData?.all,
+ isDbRegionDirty,
})
: undefined
track(
@@ -384,7 +397,11 @@ export const ProjectCreationForm = ({
...(freeTierGeneralRegionExperimentVariant !== undefined && {
freeTierGeneralRegionExperiment: freeTierGeneralRegionExperimentVariant,
}),
+ ...(specificRegionsLinkVariant !== undefined && {
+ specificRegionsLinkExperiment: specificRegionsLinkVariant,
+ }),
...(regionSelectionType !== undefined && { regionSelectionType }),
+ regionCode: res.region,
},
{
project: res.ref,
@@ -828,6 +845,7 @@ export const ProjectCreationForm = ({
instanceSize={instanceSize as DesiredInstanceSize}
showGeneralRegionsOnly={freeTierGeneralRegionExperimentVariant === 'test'}
isLoading={isResolvingFreeTierGeneralRegionExperiment}
+ isFreePlan={isFreePlan}
/>
{isVercelIntegrationFlow && !!externalId && <DataSeeding form={form} />}
diff --git a/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx b/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
index 093a2a67ab6..814b7e17854 100644
--- a/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
+++ b/apps/studio/components/interfaces/ProjectCreation/RegionSelector.tsx
@@ -1,6 +1,6 @@
import { useFeatureFlags, useFlag, useParams } from 'common'
import { Loader2 } from 'lucide-react'
-import { useEffect, useRef } from 'react'
+import { useEffect, useRef, useState } from 'react'
import { UseFormReturn } from 'react-hook-form'
import type { CloudProvider } from 'shared-data'
import {
@@ -38,7 +38,7 @@ import {
} from './RegionSelector.utils'
import { useRegionRestriction } from './useRegionRestriction'
import { AlertError } from '@/components/ui/AlertError'
-import { InlineLink } from '@/components/ui/InlineLink'
+import { InlineLink, InlineLinkClassName } from '@/components/ui/InlineLink'
import Panel from '@/components/ui/Panel'
import { RegionFlag } from '@/components/ui/RegionFlag'
import { useDefaultRegionQuery } from '@/data/misc/get-default-region-query'
@@ -55,6 +55,8 @@ interface RegionSelectorProps {
/** Hides specific regions and shows an upgrade prompt in their place */
showGeneralRegionsOnly?: boolean
isLoading?: boolean
+ /** Specific regions collapse behind the "Need a specific region?" link only for free-plan orgs */
+ isFreePlan: boolean
}
// [Joshen] Let's use a library to maintain the flag SVGs in the future
@@ -78,6 +80,7 @@ export const RegionSelector = ({
layout = 'horizontal',
showGeneralRegionsOnly = false,
isLoading: isParentLoading = false,
+ isFreePlan,
}: RegionSelectorProps) => {
const { slug } = useParams()
const track = useTrack()
@@ -90,6 +93,8 @@ export const RegionSelector = ({
const { hasLoaded: flagsLoaded } = useFeatureFlags()
const smartRegionEnabled = cloudProvider !== 'AWS_NIMBUS'
const isStatusPageEnabled = useFlag('incidentIoStatusPage') === true
+ const isSpecificRegionsLinkEnabled =
+ useFlag('projectCreationSpecificRegionsLink') === true && isFreePlan
const { getRegionRestriction } = useRegionRestriction()
@@ -181,6 +186,25 @@ export const RegionSelector = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [dbRegion, form])
+ // Behind projectCreationSpecificRegionsLink the dropdown opens on the general regions alone, with
+ // a link that reveals the full list — the same list that ships today, general selection intact.
+ const hasGeneralRegions = smartRegionEnabled && !highAvailability
+ const isSpecificRegionSelected = regionOptions.some((region) => region.name === dbRegion)
+ const [isOpen, setIsOpen] = useState(false)
+ const [hasRevealedSpecificRegions, setHasRevealedSpecificRegions] = useState(false)
+ const isSpecificRegionsCollapsedBehindLink =
+ isSpecificRegionsLinkEnabled &&
+ hasGeneralRegions &&
+ !hasRevealedSpecificRegions &&
+ !isSpecificRegionSelected
+ const showSpecificRegions = !isSpecificRegionsCollapsedBehindLink && !hideSpecificRegions
+
+ const handleRevealSpecificRegions = () => {
+ track('project_creation_specific_region_link_clicked')
+ setHasRevealedSpecificRegions(true)
+ setIsOpen(true)
+ }
+
if (isErrorAvailableRegions) {
return <AlertError subject="Error loading available regions" error={errorAvailableRegions} />
}
@@ -245,144 +269,161 @@ export const RegionSelector = ({
) : undefined
}
>
- <FormControl>
- <Select
- value={dbRegion}
- onValueChange={(value) => {
- if (value === '') return
- field.onChange(value)
- }}
- disabled={isLoading}
- >
- <SelectTrigger
- ref={field.ref}
- id="region"
- className="[&>:nth-child(1)]:w-full [&>:nth-child(1)]:flex [&>:nth-child(1)]:items-start"
+ <div className="flex flex-col items-start gap-y-1">
+ <FormControl>
+ <Select
+ open={isSpecificRegionsLinkEnabled ? isOpen : undefined}
+ onOpenChange={isSpecificRegionsLinkEnabled ? setIsOpen : undefined}
+ value={dbRegion}
+ onValueChange={(value) => {
+ if (value === '') return
+ field.onChange(value)
+ }}
+ disabled={isLoading}
>
- <SelectValue
- placeholder={
- isLoading
- ? 'Loading available regions...'
- : 'Select a region for your project..'
- }
+ <SelectTrigger
+ ref={field.ref}
+ id="region"
+ className="[&>:nth-child(1)]:w-full [&>:nth-child(1)]:flex [&>:nth-child(1)]:items-start"
>
- {dbRegion !== undefined && (
- <div className="flex items-center gap-x-3">
- {isLoading && <Loader2 size={14} className="animate-spin" />}
- {selectedRegion?.code && (
- <RegionFlag className="w-5" region={selectedRegion.code} />
- )}
- <span className="text-foreground">{triggerLabel}</span>
- </div>
+ <SelectValue
+ placeholder={
+ isLoading
+ ? 'Loading available regions...'
+ : 'Select a region for your project..'
+ }
+ >
+ {dbRegion !== undefined && (
+ <div className="flex items-center gap-x-3">
+ {isLoading && <Loader2 size={14} className="animate-spin" />}
+ {selectedRegion?.code && (
+ <RegionFlag className="w-5" region={selectedRegion.code} />
+ )}
+ <span className="text-foreground">{triggerLabel}</span>
+ </div>
+ )}
+ </SelectValue>
+ </SelectTrigger>
+ <SelectContent>
+ {hasGeneralRegions && (
+ <>
+ <SelectGroup>
+ <SelectLabel>General regions</SelectLabel>
+ {smartRegions.map((value) => {
+ return (
+ <SelectItem
+ key={value.code}
+ value={value.name}
+ className="w-full [&>:nth-child(2)]:w-full"
+ >
+ <div className="flex flex-row items-center justify-between w-full">
+ <div className="flex items-center gap-x-3">
+ <RegionFlag className="w-5" region={value.code} />
+ <span className="text-foreground">
+ {getDisplayNameForSmartRegion(value.name)}
+ </span>
+ </div>
+
+ <div>
+ {recommendedSmartRegions.has(value.code) && (
+ <Badge variant="success" className="mr-1">
+ Recommended
+ </Badge>
+ )}
+ </div>
+ </div>
+ </SelectItem>
+ )
+ })}
+ </SelectGroup>
+ {showSpecificRegions && <SelectSeparator />}
+ </>
)}
- </SelectValue>
- </SelectTrigger>
- <SelectContent>
- {smartRegionEnabled && !highAvailability && (
- <>
+
+ {showSpecificRegions && (
<SelectGroup>
- <SelectLabel>General regions</SelectLabel>
- {smartRegions.map((value) => {
+ <SelectLabel>
+ {highAvailability ? 'High Availability Regions' : 'Specific regions'}
+ </SelectLabel>
+ {regionOptionsWithRestriction.map((value) => {
+ const restrictionCopy =
+ value.restriction !== undefined
+ ? getRegionRestrictionCopy(value.restriction)
+ : undefined
return (
<SelectItem
key={value.code}
value={value.name}
- className="w-full [&>:nth-child(2)]:w-full"
+ className={cn(
+ 'w-full [&>:nth-child(2)]:w-full',
+ restrictionCopy !== undefined && 'pointer-events-auto!'
+ )}
>
- <div className="flex flex-row items-center justify-between w-full">
+ <div className="flex flex-row items-center justify-between w-full gap-x-2">
<div className="flex items-center gap-x-3">
<RegionFlag className="w-5" region={value.code} />
- <span className="text-foreground">
- {getDisplayNameForSmartRegion(value.name)}
- </span>
+ <div className="flex items-center gap-x-2">
+ <span className="text-foreground">{value.name}</span>
+ <span className="text-xs text-foreground-lighter font-mono">
+ {value.code}
+ </span>
+ </div>
</div>
- <div>
- {recommendedSmartRegions.has(value.code) && (
- <Badge variant="success" className="mr-1">
- Recommended
- </Badge>
- )}
- </div>
+ {recommendedSpecificRegions.has(value.code) && (
+ <Badge variant="success" className="mr-1">
+ Recommended
+ </Badge>
+ )}
+
+ {restrictionCopy !== undefined && (
+ <Tooltip>
+ <TooltipTrigger>
+ <Badge variant="warning" className="mr-1">
+ {restrictionCopy.badge}
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>{restrictionCopy.tooltip}</TooltipContent>
+ </Tooltip>
+ )}
</div>
</SelectItem>
)
})}
</SelectGroup>
- {!hideSpecificRegions && <SelectSeparator />}
- </>
- )}
-
- {!hideSpecificRegions && (
- <SelectGroup>
- <SelectLabel>
- {highAvailability ? 'High Availability Regions' : 'Specific regions'}
- </SelectLabel>
- {regionOptionsWithRestriction.map((value) => {
- const restrictionCopy =
- value.restriction !== undefined
- ? getRegionRestrictionCopy(value.restriction)
- : undefined
- return (
- <SelectItem
- key={value.code}
- value={value.name}
- className={cn(
- 'w-full [&>:nth-child(2)]:w-full',
- restrictionCopy !== undefined && 'pointer-events-auto!'
- )}
- >
- <div className="flex flex-row items-center justify-between w-full gap-x-2">
- <div className="flex items-center gap-x-3">
- <RegionFlag className="w-5" region={value.code} />
- <div className="flex items-center gap-x-2">
- <span className="text-foreground">{value.name}</span>
- <span className="text-xs text-foreground-lighter font-mono">
- {value.code}
- </span>
- </div>
- </div>
-
- {recommendedSpecificRegions.has(value.code) && (
- <Badge variant="success" className="mr-1">
- Recommended
- </Badge>
- )}
-
- {restrictionCopy !== undefined && (
- <Tooltip>
- <TooltipTrigger>
- <Badge variant="warning" className="mr-1">
- {restrictionCopy.badge}
- </Badge>
- </TooltipTrigger>
- <TooltipContent>{restrictionCopy.tooltip}</TooltipContent>
- </Tooltip>
- )}
- </div>
- </SelectItem>
- )
- })}
- </SelectGroup>
- )}
+ )}
- {hideSpecificRegions && (
- <div
- className="border-t px-3 py-2.5 text-xs text-foreground-light"
- onPointerDown={(e) => e.stopPropagation()}
- >
- <InlineLink
- href={`/org/${slug ?? '_'}/billing?panel=subscriptionPlan&source=freeTierGeneralRegionSelector`}
- onClick={() => track('free_tier_general_region_upgrade_clicked')}
+ {hideSpecificRegions && (
+ <div
+ className="border-t px-3 py-2.5 text-xs text-foreground-light"
+ onPointerDown={(e) => e.stopPropagation()}
>
- Upgrade to Pro
- </InlineLink>{' '}
- to choose a specific region.
- </div>
- )}
- </SelectContent>
- </Select>
- </FormControl>
+ <InlineLink
+ href={`/org/${slug ?? '_'}/billing?panel=subscriptionPlan&source=freeTierGeneralRegionSelector`}
+ onClick={() => track('free_tier_general_region_upgrade_clicked')}
+ >
+ Upgrade to Pro
+ </InlineLink>{' '}
+ to choose a specific region.
+ </div>
+ )}
+ </SelectContent>
+ </Select>
+ </FormControl>
+
+ {isSpecificRegionsCollapsedBehindLink && (
+ <p className="text-sm text-foreground-lighter">
+ <button
+ type="button"
+ tabIndex={0}
+ className={InlineLinkClassName}
+ onClick={handleRevealSpecificRegions}
+ >
+ Need a specific region?
+ </button>
+ </p>
+ )}
+ </div>
</FormItemLayout>
{isStatusPageEnabled ? (
diff --git a/apps/studio/tests/pages/new/[slug].test.tsx b/apps/studio/tests/pages/new/[slug].test.tsx
index af17b78e2eb..65c5dc9eb7b 100644
--- a/apps/studio/tests/pages/new/[slug].test.tsx
+++ b/apps/studio/tests/pages/new/[slug].test.tsx
@@ -284,6 +284,7 @@ const DEFAULT_FLAGS = {
disableOrioleProjectCreation: false,
defaultRegionRestrictedPool: false,
projectCreationRestrictedRegions: false,
+ projectCreationSpecificRegionsLink: false,
freeTierGeneralRegionEnrollment: false,
freeTierGeneralRegionSelection: false,
}
@@ -351,6 +352,12 @@ const getSelectTriggerByLabel = (labelText: string) => {
return trigger as HTMLElement
}
+const submitAndReadRegionSelection = async (onRequest: ReturnType<typeof vi.fn>) => {
+ fireEvent.click(screen.getByRole('button', { name: 'Create new project' }))
+ await waitFor(() => expect(onRequest).toHaveBeenCalled())
+ return onRequest.mock.calls[0][0].region_selection
+}
+
// Region is selected explicitly because the smart-region auto-fill is unreliable (FE-3884).
const selectRegion = async (optionName: string | RegExp) => {
await user.click(getSelectTriggerByLabel('Region'))
@@ -503,6 +510,63 @@ describe('project creation wizard', () => {
expect(onRequest.mock.calls[0][0].region_selection).toMatchObject({ name: 'Americas' })
})
+ describe('specific regions behind a link', () => {
+ const SPECIFIC_REGIONS_LINK_FLAG = { projectCreationSpecificRegionsLink: true }
+ const FREE_PLAN_ORG = [mockOrg({ plan: { id: 'free', name: 'Free' } })]
+
+ test('opens on the general regions alone for a free-plan org', async () => {
+ mockWizardEndpoints({ organizations: FREE_PLAN_ORG })
+
+ await renderWizard({ flags: SPECIFIC_REGIONS_LINK_FLAG })
+
+ await screen.findByPlaceholderText('Project name')
+ await user.click(getSelectTriggerByLabel('Region'))
+
+ expect(await screen.findByText('General regions')).toBeInTheDocument()
+ expect(screen.queryByText('Specific regions')).not.toBeInTheDocument()
+ })
+
+ test('the link reopens the dropdown on the full list with the general region still selected', async () => {
+ mockWizardEndpoints({ organizations: FREE_PLAN_ORG })
+ const onRequest = vi.fn()
+ mockCreateProject(onRequest)
+
+ await renderWizard({ flags: SPECIFIC_REGIONS_LINK_FLAG })
+
+ await fillProjectName('Specific Region Link Project')
+ await generateAndWaitForStrongPassword()
+ await selectRegion(/Americas/)
+
+ await user.click(screen.getByRole('button', { name: 'Need a specific region?' }))
+
+ expect(await screen.findByText('Specific regions')).toBeInTheDocument()
+ expect(screen.getByText('General regions')).toBeInTheDocument()
+ expect(getSelectTriggerByLabel('Region')).toHaveTextContent('Americas')
+
+ await user.click(await screen.findByRole('option', { name: /East US/ }))
+
+ expect(
+ screen.queryByRole('button', { name: 'Need a specific region?' })
+ ).not.toBeInTheDocument()
+ expect(await submitAndReadRegionSelection(onRequest)).toMatchObject({ code: 'us-east-1' })
+ })
+
+ test('has no effect for a paid-plan org: the full region list shows directly with no link', async () => {
+ mockWizardEndpoints()
+
+ await renderWizard({ flags: SPECIFIC_REGIONS_LINK_FLAG })
+
+ await screen.findByPlaceholderText('Project name')
+ await user.click(getSelectTriggerByLabel('Region'))
+
+ expect(await screen.findByText('General regions')).toBeInTheDocument()
+ expect(screen.getByText('Specific regions')).toBeInTheDocument()
+ expect(
+ screen.queryByRole('button', { name: 'Need a specific region?' })
+ ).not.toBeInTheDocument()
+ })
+ })
+
test('shows an error state when available regions fail to load', async () => {
mockWizardEndpoints({ availableRegions: 'error' })
@@ -576,6 +640,29 @@ describe('project creation wizard', () => {
expect(screen.queryByRole('link', { name: 'Upgrade to Pro' })).not.toBeInTheDocument()
})
+ test('the specific-regions link takes precedence when both flags are on', async () => {
+ mockWizardEndpoints({
+ organizations: [mockOrg({ plan: { id: 'free', name: 'Free' } })],
+ })
+
+ await renderWizard({
+ flags: {
+ projectCreationSpecificRegionsLink: true,
+ freeTierGeneralRegionEnrollment: true,
+ freeTierGeneralRegionSelection: true,
+ },
+ })
+
+ await screen.findByPlaceholderText('Project name')
+ await user.click(getSelectTriggerByLabel('Region'))
+
+ expect(await screen.findByText('General regions')).toBeInTheDocument()
+ expect(screen.queryByText('Specific regions')).not.toBeInTheDocument()
+ expect(screen.queryByRole('link', { name: 'Upgrade to Pro' })).not.toBeInTheDocument()
+ // The reveal button sits outside the open dropdown, so it is hidden from the a11y tree
+ expect(screen.getByText('Need a specific region?')).toBeInTheDocument()
+ })
+
test('shows the full region picker with no upgrade footer for a paid-plan org even when enrolled', async () => {
mockWizardEndpoints()
diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.ts
index b94df9b7024..70eaa27d2ef 100644
--- a/packages/common/telemetry-constants.ts
+++ b/packages/common/telemetry-constants.ts
@@ -456,11 +456,25 @@ export interface ProjectCreationSimpleVersionSubmittedEvent {
*/
freeTierGeneralRegionExperiment?: 'control' | 'test'
/**
- * Whether the submitted region is a smart region group ('general', e.g. Americas) or an
- * exact region ('specific', e.g. us-east-1). Only set when smart regions are enabled for
- * the selected cloud provider.
+ * Org's arm in the projectCreationSpecificRegionsLink experiment at submission time.
+ * Omitted when the org isn't in the eligible population (paid plan, or smart regions
+ * disabled for the selected cloud provider) — the link can never show for them regardless
+ * of the ConfigCat flag.
*/
- regionSelectionType?: 'general' | 'specific'
+ specificRegionsLinkExperiment?: 'control' | 'test'
+ /**
+ * How the submitted region was arrived at. 'auto' = the user never touched the region field
+ * and kept the auto-assigned default. 'general' = the user picked a smart region group (e.g.
+ * Americas). 'specific' = the user picked an exact region (e.g. us-east-1). Only set when
+ * smart regions are enabled for the selected cloud provider.
+ */
+ regionSelectionType?: 'general' | 'auto' | 'specific'
+ /**
+ * The exact region code the project was provisioned in (e.g. sa-east-1), as returned by
+ * the create-project API. This is the resolved region — for a smart group selection (e.g.
+ * Americas) it's the specific region the backend picked, not the group name.
+ */
+ regionCode?: string
}
groups: TelemetryGroups
}
@@ -548,6 +562,19 @@ export interface FreeTierGeneralRegionUpgradeClickedEvent {
groups: Omit<TelemetryGroups, 'project'>
}
+/**
+ * User clicked the "Need a specific region?" link to reveal the specific regions
+ * list in the project creation region selector.
+ *
+ * @group Events
+ * @source studio
+ * @page new/{slug}
+ */
+export interface ProjectCreationSpecificRegionLinkClickedEvent {
+ action: 'project_creation_specific_region_link_clicked'
+ groups: Omit<TelemetryGroups, 'project'>
+}
+
/**
* New-organization form was rendered and shown to the user. Passive impression that
* anchors the organization-creation funnel (exposed -> completed). Fires once per form
@@ -4183,6 +4210,7 @@ export type TelemetryEvent =
| ProjectCreationFormExposedEvent
| FreeTierGeneralRegionExperimentExposedEvent
| FreeTierGeneralRegionUpgradeClickedEvent
+ | ProjectCreationSpecificRegionLinkClickedEvent
| OrganizationCreationFormExposedEvent
| OrganizationCreationCompletedEvent
| TableApiAccessToggleClickedEvent