From cbade23982d8af0c8073557c773261b2015e27cb Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 21 May 2025 16:18:01 +0530 Subject: [PATCH 1/2] fix: use sites domain for cname records. --- src/lib/components/domains/recordTable.svelte | 5 ++++- .../sites/site-[site]/domains/retryDomainModal.svelte | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/lib/components/domains/recordTable.svelte b/src/lib/components/domains/recordTable.svelte index c2254fb01..6dc6e6724 100644 --- a/src/lib/components/domains/recordTable.svelte +++ b/src/lib/components/domains/recordTable.svelte @@ -13,13 +13,16 @@ export let domain: string; export let verified = false; export let variant: 'cname' | 'a' | 'aaaa'; + export let service: 'sites' | 'general' = 'general'; let subdomain = domain?.split('.')?.slice(0, -2)?.join('.'); function setTarget() { switch (variant) { case 'cname': - return $consoleVariables._APP_DOMAIN_TARGET_CNAME; + return service === 'general' + ? $consoleVariables._APP_DOMAIN_TARGET_CNAME + : $consoleVariables._APP_DOMAIN_SITES; case 'a': return $consoleVariables._APP_DOMAIN_TARGET_A; case 'aaaa': 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 e07402b8e..f3b2f63e7 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 @@ -28,7 +28,7 @@ let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver'); $effect(() => { - if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) { + if ($consoleVariables._APP_DOMAIN_SITES && isSubDomain) { selectedTab = 'cname'; } else if ($consoleVariables._APP_DOMAIN_TARGET_A) { selectedTab = 'a'; @@ -69,7 +69,7 @@
- {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_TARGET_CNAME && $consoleVariables._APP_DOMAIN_TARGET_CNAME !== 'localhost'} + {#if isSubDomain && !!$consoleVariables._APP_DOMAIN_SITES && $consoleVariables._APP_DOMAIN_SITES !== 'localhost'} (selectedTab = 'cname')} @@ -107,7 +107,12 @@ {#if selectedTab === 'nameserver'} {:else} - + {/if} From 0088b59e9d2a1e584dea4125a67a8a66fdd24d69 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 21 May 2025 16:40:26 +0530 Subject: [PATCH 2/2] lint. --- .../sites/site-[site]/domains/retryDomainModal.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 f3b2f63e7..f18c1b664 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 @@ -111,8 +111,7 @@ {verified} service="sites" variant={selectedTab} - domain={selectedDomain.domain} - /> + domain={selectedDomain.domain} /> {/if}