diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte index 1bedec8d81..c993782092 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte @@ -34,10 +34,12 @@ $effect(() => { if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { selectedTab = 'cname'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; } }); let verified = $state(false); diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte index a54d7e8d29..f5793b327b 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte @@ -31,13 +31,16 @@ const isSubDomain = $derived.by(() => isASubdomain(page.params.domain)); let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { selectedTab = 'cname'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; } }); let verified = $state(false); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index 846a5290a1..b79ba129c0 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -35,10 +35,12 @@ $effect(() => { if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { selectedTab = 'cname'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; } }); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte index 7b36770793..352109247d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte @@ -26,13 +26,16 @@ const isSubDomain = $derived.by(() => isASubdomain(selectedProxyRule?.domain)); let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); + $effect(() => { if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { selectedTab = 'cname'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; - } else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { + } else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) { selectedTab = 'aaaa'; + } else { + selectedTab = 'nameserver'; } }); @@ -84,7 +87,7 @@ Nameservers {/if} - {#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -92,7 +95,7 @@ A {/if} - {#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')}