From 769253791f42f91586c18eb203d8eccf0db240b3 Mon Sep 17 00:00:00 2001 From: Khushboo Verma Date: Wed, 10 Sep 2025 18:03:51 +0530 Subject: [PATCH 1/3] Redirect to DNS Records from list rules --- src/lib/actions/analytics.ts | 1 + .../function-[function]/domains/+page.svelte | 2 +- .../function-[function]/domains/+page.ts | 41 +++++++++----- .../function-[function]/domains/table.svelte | 54 +++++++++++++++++-- .../settings/domains/+page.svelte | 2 +- .../settings/domains/+page.ts | 27 +++++++--- .../settings/domains/table.svelte | 52 +++++++++++++++++- .../sites/site-[site]/domains/+page.svelte | 2 +- .../sites/site-[site]/domains/+page.ts | 42 ++++++++++----- .../sites/site-[site]/domains/table.svelte | 52 +++++++++++++++++- 10 files changed, 229 insertions(+), 46 deletions(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 957b10e6b..2476cc9b9 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -155,6 +155,7 @@ export enum Click { DatabaseImportCsv = 'click_database_import_csv', DomainCreateClick = 'click_domain_create', DomainDeleteClick = 'click_domain_delete', + DomainDnsRecordsClick = 'click_domain_dns_records', DomainRetryDomainVerificationClick = 'click_domain_retry_domain_verification', FeedbackSubmitClick = 'click_leave_feedback', FilterApplyClick = 'click_apply_filter', diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte index 03d9fa88f..46599175e 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte @@ -36,7 +36,7 @@ {#if data.proxyRules.total} - +
{ +export const load: PageLoad = async ({ depends, params, url, route, parent }) => { depends(Dependencies.FUNCTION_DOMAINS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); @@ -21,23 +22,35 @@ export const load: PageLoad = async ({ depends, params, url, route }) => { const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); + const { organization } = await parent(); + + const proxyRules = await sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ + Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), + Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), + Query.equal('deploymentResourceId', params.function), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search: search || undefined + }); + + const organizationDomains = + isCloud && proxyRules.total > 0 + ? await sdk.forConsole.domains.list({ + queries: [Query.equal('teamId', organization.$id)] + }) + : null; + return { offset, limit, query, search, - proxyRules: await sdk.forProject(params.region, params.project).proxy.listRules({ - queries: [ - Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), - Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), - Query.equal('deploymentResourceId', params.function), - Query.equal('trigger', RuleTrigger.MANUAL), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search: search || undefined - }) + proxyRules, + organizationDomains }; }; diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte index 95d95fa22..51a0e2cb9 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte @@ -3,7 +3,12 @@ import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconRefresh, + IconTrash, + IconDocumentText + } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, Badge, @@ -17,11 +22,17 @@ import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; + import { goto } from '$app/navigation'; + import { base } from '$app/paths'; + import { getApexDomain } from '$lib/helpers/tlds'; + import { isCloud } from '$lib/system'; let { - proxyRules + proxyRules, + organizationDomains }: { proxyRules: Models.ProxyRuleList; + organizationDomains?: Models.DomainsList; } = $props(); let showDelete = $state(false); @@ -35,6 +46,33 @@ ? 'Deployed from ' + proxy.deploymentVcsProviderBranch : 'Active deployment'; }; + + function getDomainIdForRule(rule: Models.ProxyRule): string | null { + if (!isCloud || !organizationDomains) return null; + + const apexDomain = getApexDomain(rule.domain); + if (!apexDomain) return null; + + const domain = organizationDomains.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + return domain?.$id || null; + } + + function navigateToDnsRecords(rule: Models.ProxyRule) { + const apexDomain = getApexDomain(rule.domain); + const domain = organizationDomains.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + + trackEvent(Click.DomainDnsRecordsClick, { + source: 'functions_domain_overview', + domain: rule.domain, + apexDomain + }); + + goto(`${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`); + } @@ -101,6 +139,16 @@ Retry {/if} + {#if getDomainIdForRule(proxyRule)} + { + navigateToDnsRecords(proxyRule); + toggle(e); + }}> + DNS Records + + {/if} Delete diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.svelte index 927045162..ba7f3a22b 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/+page.svelte @@ -32,7 +32,7 @@ {#if data.rules.total} -
+
{ +export const load: PageLoad = async ({ depends, url, route, params, parent }) => { depends(Dependencies.DOMAINS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); @@ -22,18 +23,28 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); + const { organization } = await parent(); + + const rules = await sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [Query.equal('type', RuleType.API), Query.equal('trigger', RuleTrigger.MANUAL)], + search: search || undefined + }); + + // Only load organization domains if we have rules and are on Cloud + const organizationDomains = + isCloud && rules.total > 0 + ? await sdk.forConsole.domains.list({ + queries: [Query.equal('teamId', organization.$id)] + }) + : null; + return { - rules: await sdk.forProject(params.region, params.project).proxy.listRules({ - queries: [ - Query.equal('type', RuleType.API), - Query.equal('trigger', RuleTrigger.MANUAL) - ], - search: search || undefined - }), + rules, offset, limit, query, search, + organizationDomains, create: url.searchParams.get('create') !== null //TODO: port logic to new wizards }; }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte index ee740c672..33e447ffd 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte @@ -3,7 +3,12 @@ import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconRefresh, + IconTrash, + IconDocumentText + } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, Badge, @@ -16,11 +21,17 @@ import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import { regionalProtocol } from '../../store'; + import { goto } from '$app/navigation'; + import { base } from '$app/paths'; + import { getApexDomain } from '$lib/helpers/tlds'; + import { isCloud } from '$lib/system'; let { - domains + domains, + organizationDomains }: { domains: Models.ProxyRuleList; + organizationDomains?: Models.DomainsList; } = $props(); let showDelete = $state(false); @@ -36,6 +47,33 @@ width: { min: 200, max: 550 } } ]; + + function getDomainIdForRule(rule: Models.ProxyRule): string | null { + if (!isCloud || !organizationDomains) return null; + + const apexDomain = getApexDomain(rule.domain); + if (!apexDomain) return null; + + const domain = organizationDomains.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + return domain?.$id || null; + } + + function navigateToDnsRecords(rule: Models.ProxyRule) { + const apexDomain = getApexDomain(rule.domain); + const domain = organizationDomains.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + + trackEvent(Click.DomainDnsRecordsClick, { + source: 'settings_domain_overview', + domain: rule.domain, + apexDomain + }); + + goto(`${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`); + } @@ -100,6 +138,16 @@ Retry {/if} + {#if getDomainIdForRule(domain)} + { + navigateToDnsRecords(domain); + toggle(e); + }}> + DNS Records + + {/if} {#if data.proxyRules.total} -
+
{ +export const load = async ({ params, depends, url, route, parent }) => { depends(Dependencies.SITES_DOMAINS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); @@ -17,23 +18,36 @@ export const load = async ({ params, depends, url, route }) => { const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); + const { organization } = await parent(); + + const proxyRules = await sdk.forProject(params.region, params.project).proxy.listRules({ + queries: [ + Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search: search || undefined + }); + + // Only load organization domains if we have rules and are on Cloud + const organizationDomains = + isCloud && proxyRules.total > 0 + ? await sdk.forConsole.domains.list({ + queries: [Query.equal('teamId', organization.$id)] + }) + : null; + return { offset, limit, query, search, - proxyRules: await sdk.forProject(params.region, params.project).proxy.listRules({ - queries: [ - Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site), - Query.equal('trigger', RuleTrigger.MANUAL), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search: search || undefined - }) + proxyRules, + organizationDomains }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte index ea30c751c..7e0daf4ef 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte @@ -3,7 +3,12 @@ import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconRefresh, + IconTrash, + IconDocumentText + } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, Badge, @@ -17,11 +22,17 @@ import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; + import { goto } from '$app/navigation'; + import { base } from '$app/paths'; + import { getApexDomain } from '$lib/helpers/tlds'; + import { isCloud } from '$lib/system'; let { - proxyRules + proxyRules, + organizationDomains }: { proxyRules: Models.ProxyRuleList; + organizationDomains?: Models.DomainsList; } = $props(); let showDelete = $state(false); @@ -35,6 +46,33 @@ ? 'Deployed from ' + proxy.deploymentVcsProviderBranch : 'Active deployment'; }; + + function getDomainIdForRule(rule: Models.ProxyRule): string | null { + if (!isCloud || !organizationDomains) return null; + + const apexDomain = getApexDomain(rule.domain); + if (!apexDomain) return null; + + const domain = organizationDomains.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + return domain?.$id || null; + } + + function navigateToDnsRecords(rule: Models.ProxyRule) { + const apexDomain = getApexDomain(rule.domain); + const domain = organizationDomains.domains.find( + (d: Models.Domain) => d.domain === apexDomain + ); + + trackEvent(Click.DomainDnsRecordsClick, { + source: 'sites_domain_overview', + domain: rule.domain, + apexDomain + }); + + goto(`${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`); + } @@ -102,6 +140,16 @@ Retry {/if} + {#if getDomainIdForRule(rule)} + { + navigateToDnsRecords(rule); + toggle(e); + }}> + DNS Records + + {/if} Date: Thu, 11 Sep 2025 11:39:01 +0530 Subject: [PATCH 2/3] Reuse common code --- .../domains/dnsRecordsAction.svelte | 37 ++++++++++++++ src/lib/helpers/domains.ts | 28 +++++++++++ .../function-[function]/domains/+page.ts | 26 ++++------ .../function-[function]/domains/table.svelte | 50 ++----------------- .../settings/domains/+page.ts | 25 +++------- .../settings/domains/table.svelte | 50 ++----------------- .../sites/site-[site]/domains/+page.ts | 18 +++---- .../sites/site-[site]/domains/table.svelte | 50 ++----------------- 8 files changed, 98 insertions(+), 186 deletions(-) create mode 100644 src/lib/components/domains/dnsRecordsAction.svelte diff --git a/src/lib/components/domains/dnsRecordsAction.svelte b/src/lib/components/domains/dnsRecordsAction.svelte new file mode 100644 index 000000000..7aac6c983 --- /dev/null +++ b/src/lib/components/domains/dnsRecordsAction.svelte @@ -0,0 +1,37 @@ + + +{#if dnsData()} + + DNS Records + +{/if} diff --git a/src/lib/helpers/domains.ts b/src/lib/helpers/domains.ts index 840eb4b73..3ff713005 100644 --- a/src/lib/helpers/domains.ts +++ b/src/lib/helpers/domains.ts @@ -1,5 +1,8 @@ import { sdk } from '$lib/stores/sdk'; import type { Models } from '@appwrite.io/console'; +import { Query } from '@appwrite.io/console'; +import { getApexDomain } from './tlds'; +import { isCloud } from '$lib/system'; export async function createRecord(record: Partial, domainId: string) { switch (record.type) { @@ -203,3 +206,28 @@ export type ParsedRecords = { ALIAS: Partial[]; [key: string]: Partial[]; }; + +export async function fetchOrganizationDomainsForRules( + proxyRules: Models.ProxyRuleList, + organizationId: string +): Promise { + if (!isCloud || proxyRules.total === 0) { + return null; + } + + const uniqueApexDomains = [ + ...new Set( + proxyRules.rules + .map((rule) => getApexDomain(rule.domain)) + .filter((apexDomain) => apexDomain !== null) + ) + ]; + + if (uniqueApexDomains.length === 0) { + return null; + } + + return await sdk.forConsole.domains.list({ + queries: [Query.equal('teamId', organizationId), Query.equal('domain', uniqueApexDomains)] + }); +} diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts index 29ce2b60c..4145bf828 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts @@ -1,15 +1,11 @@ -import { Dependencies } from '$lib/constants'; -import { RuleType, DeploymentResourceType, RuleTrigger, sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; -import type { PageLoad } from './$types'; -import { getPage } from '$lib/helpers/load'; -import { getLimit } from '$lib/helpers/load'; -import { pageToOffset } from '$lib/helpers/load'; -import { getQuery } from '$lib/helpers/load'; -import { getSearch } from '$lib/helpers/load'; +import { sdk } from '$lib/stores/sdk'; +import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load'; +import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { queries, queryParamToMap } from '$lib/components/filters'; -import { PAGE_LIMIT } from '$lib/constants'; -import { isCloud } from '$lib/system'; +import { fetchOrganizationDomainsForRules } from '$lib/helpers/domains'; +import { RuleType, DeploymentResourceType, RuleTrigger } from '$lib/stores/sdk'; +import type { PageLoad } from './$types'; export const load: PageLoad = async ({ depends, params, url, route, parent }) => { depends(Dependencies.FUNCTION_DOMAINS); @@ -38,12 +34,10 @@ export const load: PageLoad = async ({ depends, params, url, route, parent }) => search: search || undefined }); - const organizationDomains = - isCloud && proxyRules.total > 0 - ? await sdk.forConsole.domains.list({ - queries: [Query.equal('teamId', organization.$id)] - }) - : null; + const organizationDomains = await fetchOrganizationDomainsForRules( + proxyRules, + organization.$id + ); return { offset, diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte index 51a0e2cb9..80f8663d4 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte @@ -3,12 +3,7 @@ import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { - IconDotsHorizontal, - IconRefresh, - IconTrash, - IconDocumentText - } from '@appwrite.io/pink-icons-svelte'; + import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, Badge, @@ -22,10 +17,7 @@ import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; - import { goto } from '$app/navigation'; - import { base } from '$app/paths'; - import { getApexDomain } from '$lib/helpers/tlds'; - import { isCloud } from '$lib/system'; + import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte'; let { proxyRules, @@ -46,33 +38,6 @@ ? 'Deployed from ' + proxy.deploymentVcsProviderBranch : 'Active deployment'; }; - - function getDomainIdForRule(rule: Models.ProxyRule): string | null { - if (!isCloud || !organizationDomains) return null; - - const apexDomain = getApexDomain(rule.domain); - if (!apexDomain) return null; - - const domain = organizationDomains.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - return domain?.$id || null; - } - - function navigateToDnsRecords(rule: Models.ProxyRule) { - const apexDomain = getApexDomain(rule.domain); - const domain = organizationDomains.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - - trackEvent(Click.DomainDnsRecordsClick, { - source: 'functions_domain_overview', - domain: rule.domain, - apexDomain - }); - - goto(`${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`); - } @@ -139,16 +104,7 @@ Retry {/if} - {#if getDomainIdForRule(proxyRule)} - { - navigateToDnsRecords(proxyRule); - toggle(e); - }}> - DNS Records - - {/if} + { depends(Dependencies.DOMAINS); @@ -30,13 +25,7 @@ export const load: PageLoad = async ({ depends, url, route, params, parent }) => search: search || undefined }); - // Only load organization domains if we have rules and are on Cloud - const organizationDomains = - isCloud && rules.total > 0 - ? await sdk.forConsole.domains.list({ - queries: [Query.equal('teamId', organization.$id)] - }) - : null; + const organizationDomains = await fetchOrganizationDomainsForRules(rules, organization.$id); return { rules, diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte index 33e447ffd..1558e8e3f 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte @@ -3,12 +3,7 @@ import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { - IconDotsHorizontal, - IconRefresh, - IconTrash, - IconDocumentText - } from '@appwrite.io/pink-icons-svelte'; + import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, Badge, @@ -21,10 +16,7 @@ import DeleteDomainModal from './deleteDomainModal.svelte'; import RetryDomainModal from './retryDomainModal.svelte'; import { regionalProtocol } from '../../store'; - import { goto } from '$app/navigation'; - import { base } from '$app/paths'; - import { getApexDomain } from '$lib/helpers/tlds'; - import { isCloud } from '$lib/system'; + import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte'; let { domains, @@ -47,33 +39,6 @@ width: { min: 200, max: 550 } } ]; - - function getDomainIdForRule(rule: Models.ProxyRule): string | null { - if (!isCloud || !organizationDomains) return null; - - const apexDomain = getApexDomain(rule.domain); - if (!apexDomain) return null; - - const domain = organizationDomains.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - return domain?.$id || null; - } - - function navigateToDnsRecords(rule: Models.ProxyRule) { - const apexDomain = getApexDomain(rule.domain); - const domain = organizationDomains.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - - trackEvent(Click.DomainDnsRecordsClick, { - source: 'settings_domain_overview', - domain: rule.domain, - apexDomain - }); - - goto(`${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`); - } @@ -138,16 +103,7 @@ Retry {/if} - {#if getDomainIdForRule(domain)} - { - navigateToDnsRecords(domain); - toggle(e); - }}> - DNS Records - - {/if} + { depends(Dependencies.SITES_DOMAINS); @@ -34,13 +33,10 @@ export const load = async ({ params, depends, url, route, parent }) => { search: search || undefined }); - // Only load organization domains if we have rules and are on Cloud - const organizationDomains = - isCloud && proxyRules.total > 0 - ? await sdk.forConsole.domains.list({ - queries: [Query.equal('teamId', organization.$id)] - }) - : null; + const organizationDomains = await fetchOrganizationDomainsForRules( + proxyRules, + organization.$id + ); return { offset, diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte index 7e0daf4ef..6451ebd2d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte @@ -3,12 +3,7 @@ import { Link } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import type { Models } from '@appwrite.io/console'; - import { - IconDotsHorizontal, - IconRefresh, - IconTrash, - IconDocumentText - } from '@appwrite.io/pink-icons-svelte'; + import { IconDotsHorizontal, IconRefresh, IconTrash } from '@appwrite.io/pink-icons-svelte'; import { ActionMenu, Badge, @@ -22,10 +17,7 @@ import RetryDomainModal from './retryDomainModal.svelte'; import { columns } from './store'; import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store'; - import { goto } from '$app/navigation'; - import { base } from '$app/paths'; - import { getApexDomain } from '$lib/helpers/tlds'; - import { isCloud } from '$lib/system'; + import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte'; let { proxyRules, @@ -46,33 +38,6 @@ ? 'Deployed from ' + proxy.deploymentVcsProviderBranch : 'Active deployment'; }; - - function getDomainIdForRule(rule: Models.ProxyRule): string | null { - if (!isCloud || !organizationDomains) return null; - - const apexDomain = getApexDomain(rule.domain); - if (!apexDomain) return null; - - const domain = organizationDomains.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - return domain?.$id || null; - } - - function navigateToDnsRecords(rule: Models.ProxyRule) { - const apexDomain = getApexDomain(rule.domain); - const domain = organizationDomains.domains.find( - (d: Models.Domain) => d.domain === apexDomain - ); - - trackEvent(Click.DomainDnsRecordsClick, { - source: 'sites_domain_overview', - domain: rule.domain, - apexDomain - }); - - goto(`${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`); - } @@ -140,16 +105,7 @@ Retry {/if} - {#if getDomainIdForRule(rule)} - { - navigateToDnsRecords(rule); - toggle(e); - }}> - DNS Records - - {/if} + Date: Thu, 11 Sep 2025 12:38:02 +0530 Subject: [PATCH 3/3] Use derivedBy --- src/lib/actions/analytics.ts | 1 - src/lib/components/domains/dnsRecordsAction.svelte | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 2476cc9b9..957b10e6b 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -155,7 +155,6 @@ export enum Click { DatabaseImportCsv = 'click_database_import_csv', DomainCreateClick = 'click_domain_create', DomainDeleteClick = 'click_domain_delete', - DomainDnsRecordsClick = 'click_domain_dns_records', DomainRetryDomainVerificationClick = 'click_domain_retry_domain_verification', FeedbackSubmitClick = 'click_leave_feedback', FilterApplyClick = 'click_apply_filter', diff --git a/src/lib/components/domains/dnsRecordsAction.svelte b/src/lib/components/domains/dnsRecordsAction.svelte index 7aac6c983..a1c7845ae 100644 --- a/src/lib/components/domains/dnsRecordsAction.svelte +++ b/src/lib/components/domains/dnsRecordsAction.svelte @@ -13,7 +13,7 @@ let { rule, organizationDomains }: Props = $props(); - const dnsData = $derived(() => { + const dnsData = $derived.by(() => { if (!isCloud || !organizationDomains) { return null; } @@ -30,8 +30,8 @@ }); -{#if dnsData()} - +{#if dnsData} + DNS Records {/if}