diff --git a/src/lib/components/domains/dnsRecordsAction.svelte b/src/lib/components/domains/dnsRecordsAction.svelte
new file mode 100644
index 000000000..a1c7845ae
--- /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.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 +18,33 @@ 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 = await fetchOrganizationDomainsForRules(
+ proxyRules,
+ organization.$id
+ );
+
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..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
@@ -17,11 +17,14 @@
import RetryDomainModal from './retryDomainModal.svelte';
import { columns } from './store';
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
+ import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte';
let {
- proxyRules
+ proxyRules,
+ organizationDomains
}: {
proxyRules: Models.ProxyRuleList;
+ organizationDomains?: Models.DomainsList;
} = $props();
let showDelete = $state(false);
@@ -101,6 +104,7 @@
Retry
{/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 +18,22 @@ 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
+ });
+
+ const organizationDomains = await fetchOrganizationDomainsForRules(rules, organization.$id);
+
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..1558e8e3f 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/table.svelte
@@ -16,11 +16,14 @@
import DeleteDomainModal from './deleteDomainModal.svelte';
import RetryDomainModal from './retryDomainModal.svelte';
import { regionalProtocol } from '../../store';
+ import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte';
let {
- domains
+ domains,
+ organizationDomains
}: {
domains: Models.ProxyRuleList;
+ organizationDomains?: Models.DomainsList;
} = $props();
let showDelete = $state(false);
@@ -100,6 +103,7 @@
Retry
{/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 +17,33 @@ 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
+ });
+
+ const organizationDomains = await fetchOrganizationDomainsForRules(
+ proxyRules,
+ organization.$id
+ );
+
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..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
@@ -17,11 +17,14 @@
import RetryDomainModal from './retryDomainModal.svelte';
import { columns } from './store';
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
+ import DnsRecordsAction from '$lib/components/domains/dnsRecordsAction.svelte';
let {
- proxyRules
+ proxyRules,
+ organizationDomains
}: {
proxyRules: Models.ProxyRuleList;
+ organizationDomains?: Models.DomainsList;
} = $props();
let showDelete = $state(false);
@@ -102,6 +105,7 @@
Retry
{/if}
+