From d3e51c6e7c1b0c9a7ff97b741315f9b35b4c82d9 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 22 May 2025 18:11:43 +0530 Subject: [PATCH 1/6] update: badge sizes. --- src/lib/components/domains/nameserverTable.svelte | 2 +- src/lib/components/domains/recordTable.svelte | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/domains/nameserverTable.svelte b/src/lib/components/domains/nameserverTable.svelte index da5375bcef..f9cbcecfc2 100644 --- a/src/lib/components/domains/nameserverTable.svelte +++ b/src/lib/components/domains/nameserverTable.svelte @@ -17,7 +17,7 @@ {domain} {#if verified} - + {:else if verified === false} {/if} diff --git a/src/lib/components/domains/recordTable.svelte b/src/lib/components/domains/recordTable.svelte index 6dc6e6724e..f099fa0032 100644 --- a/src/lib/components/domains/recordTable.svelte +++ b/src/lib/components/domains/recordTable.svelte @@ -38,9 +38,9 @@ {domain} {#if verified} - + {:else if verified === false} - + {:else} Date: Thu, 22 May 2025 18:12:02 +0530 Subject: [PATCH 2/6] update: DNS tabs on sites. --- .../domains/add-domain/verify-[domain]/+page.svelte | 6 +++--- .../domains/add-domain/verify-[domain]/+page.ts | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) 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 108d34030f..73a4eba460 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 @@ -129,7 +129,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -137,7 +137,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} @@ -148,7 +148,7 @@ - {#if selectedTab === 'nameserver'} + {#if isCloud && selectedTab === 'nameserver'} {:else} { +export const load = async ({ parent, depends }) => { const { site } = await parent(); depends(Dependencies.SITES_DOMAINS); - let domain: Domain; let domainsList: DomainsList; if (isCloud) { domainsList = await sdk.forConsole.domains.list(); - const domainId = domainsList.domains.find( - (domain: Domain) => domain.domain === params.domain - ).$id; - domain = await sdk.forConsole.domains.get(domainId); } return { site, - domain, domainsList }; }; From 757f20cfdfab699c5e4be7995102f25ae6210457 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 22 May 2025 18:13:46 +0530 Subject: [PATCH 3/6] update: DNS tabs on settings. --- .../domains/add-domain/verify-[domain]/+page.svelte | 4 ++-- .../domains/add-domain/verify-[domain]/+page.ts | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) 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 9866c94f08..dc9946534c 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 @@ -126,7 +126,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -134,7 +134,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts index 5fbb56d854..a5f6b1910f 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts @@ -1,23 +1,17 @@ import { sdk } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; import { isCloud } from '$lib/system'; -import type { Domain, DomainsList } from '$lib/sdk/domains.js'; +import { Dependencies } from '$lib/constants.js'; +import type { DomainsList } from '$lib/sdk/domains.js'; -export const load = async ({ depends, params }) => { +export const load = async ({ depends }) => { depends(Dependencies.DOMAINS); - let domain: Domain; let domainsList: DomainsList; if (isCloud) { domainsList = await sdk.forConsole.domains.list(); - const domainId = domainsList.domains.find( - (domain: Domain) => domain.domain === params.domain - ).$id; - domain = await sdk.forConsole.domains.get(domainId); } return { - domain, domainsList }; }; From a07f7e269fb6ebfdd088f9761d89e0b2950d3def Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 22 May 2025 18:14:45 +0530 Subject: [PATCH 4/6] update: DNS tabs on functions. --- .../domains/add-domain/verify-[domain]/+page.svelte | 4 ++-- .../domains/add-domain/verify-[domain]/+page.ts | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) 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 be84fec9fa..0ca8e0f525 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 @@ -127,7 +127,7 @@ Nameservers {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} + {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'} (selectedTab = 'a')} @@ -135,7 +135,7 @@ A {/if} - {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} + {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'} (selectedTab = 'aaaa')} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts index 5fbb56d854..a5f6b1910f 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts @@ -1,23 +1,17 @@ import { sdk } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants.js'; import { isCloud } from '$lib/system'; -import type { Domain, DomainsList } from '$lib/sdk/domains.js'; +import { Dependencies } from '$lib/constants.js'; +import type { DomainsList } from '$lib/sdk/domains.js'; -export const load = async ({ depends, params }) => { +export const load = async ({ depends }) => { depends(Dependencies.DOMAINS); - let domain: Domain; let domainsList: DomainsList; if (isCloud) { domainsList = await sdk.forConsole.domains.list(); - const domainId = domainsList.domains.find( - (domain: Domain) => domain.domain === params.domain - ).$id; - domain = await sdk.forConsole.domains.get(domainId); } return { - domain, domainsList }; }; From 4b23c8edfd11402352322cad920e1ede5eca4da6 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 22 May 2025 18:21:49 +0530 Subject: [PATCH 5/6] fix: check. --- .../domains/add-domain/verify-[domain]/+page.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 73a4eba460..9e30d8a053 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 @@ -148,14 +148,14 @@ - {#if isCloud && selectedTab === 'nameserver'} + {#if selectedTab === 'nameserver'} {:else} + domain={page.params.domain} /> {/if} From 0126622e5103903f6356fcc47f0c46c16ed1171d Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 22 May 2025 18:41:09 +0530 Subject: [PATCH 6/6] fix: return to domains list on deletion. --- .../domains/deleteDomainModal.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte index cdbb00b8c5..b30ec8bf18 100644 --- a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte @@ -1,27 +1,31 @@