Merge pull request #2349 from appwrite/feat-redirect-to-dns-records-from-list-rules

This commit is contained in:
Darshan authored and GitHub committed 2025-09-11 14:40:10 +05:30
commit a0a4b696b2
11 files changed
+159 -65

No files matched your search

@@ -0,0 +1,37 @@
<script lang="ts">
import { base } from '$app/paths';
import { getApexDomain } from '$lib/helpers/tlds';
import { isCloud } from '$lib/system';
import { IconDocumentText } from '@appwrite.io/pink-icons-svelte';
import { ActionMenu } from '@appwrite.io/pink-svelte';
import type { Models } from '@appwrite.io/console';
interface Props {
rule: Models.ProxyRule;
organizationDomains?: Models.DomainsList;
}
let { rule, organizationDomains }: Props = $props();
const dnsData = $derived.by(() => {
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
);
if (!domain) return null;
return `${base}/organization-${domain.teamId}/domains/domain-${domain.$id}`;
});
</script>
{#if dnsData}
<ActionMenu.Item.Anchor leadingIcon={IconDocumentText} href={dnsData}>
DNS Records
</ActionMenu.Item.Anchor>
{/if}
+28
View File
@@ -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<Models.DnsRecord>, domainId: string) {
switch (record.type) {
@@ -203,3 +206,28 @@ export type ParsedRecords = {
ALIAS: Partial<Models.DnsRecord>[];
[key: string]: Partial<Models.DnsRecord>[];
};
export async function fetchOrganizationDomainsForRules(
proxyRules: Models.ProxyRuleList,
organizationId: string
): Promise<Models.DomainsList | null> {
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)]
});
}
@@ -36,7 +36,7 @@
</Button>
</Layout.Stack>
{#if data.proxyRules.total}
<Table proxyRules={data.proxyRules} />
<Table proxyRules={data.proxyRules} organizationDomains={data.organizationDomains} />
<PaginationWithLimit
name="Domains"
@@ -1,16 +1,13 @@
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 { 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 }) => {
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
};
};
@@ -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
</ActionMenu.Item.Button>
{/if}
<DnsRecordsAction rule={proxyRule} {organizationDomains} />
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}
@@ -109,7 +113,7 @@
showDelete = true;
toggle(e);
trackEvent(Click.DomainDeleteClick, {
source: 'sites_domain_overview'
source: 'functions_domain_overview'
});
}}>
Delete
@@ -32,7 +32,7 @@
</Button>
</ResponsiveContainerHeader>
{#if data.rules.total}
<Table domains={data.rules} />
<Table domains={data.rules} organizationDomains={data.organizationDomains} />
<PaginationWithLimit
name="Domains"
@@ -1,17 +1,13 @@
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import { RuleTrigger, sdk } from '$lib/stores/sdk';
import { Query } from '@appwrite.io/console';
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 { fetchOrganizationDomainsForRules } from '$lib/helpers/domains';
import { RuleType, RuleTrigger } from '$lib/stores/sdk';
import type { PageLoad } from './$types';
import { getSearch } from '$lib/helpers/load';
import { RuleType } from '$lib/stores/sdk';
import { queries } from '$lib/components/filters';
import { queryParamToMap } from '$lib/components/filters';
import { getQuery } from '$lib/helpers/load';
import { pageToOffset } from '$lib/helpers/load';
import { getLimit } from '$lib/helpers/load';
import { getPage } from '$lib/helpers/load';
export const load: PageLoad = async ({ depends, url, route, params }) => {
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
};
};
@@ -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
</ActionMenu.Item.Button>
{/if}
<DnsRecordsAction rule={domain} {organizationDomains} />
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}
@@ -30,7 +30,7 @@
</Layout.Stack>
{#if data.proxyRules.total}
<Table proxyRules={data.proxyRules} />
<Table proxyRules={data.proxyRules} organizationDomains={data.organizationDomains} />
<PaginationWithLimit
name="Domains"
@@ -1,12 +1,12 @@
import { Query } from '@appwrite.io/console';
import { RuleTrigger, sdk } from '$lib/stores/sdk';
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 { RuleType } from '$lib/stores/sdk';
import { DeploymentResourceType } from '$lib/stores/sdk';
import { fetchOrganizationDomainsForRules } from '$lib/helpers/domains';
import { RuleType, DeploymentResourceType, RuleTrigger } from '$lib/stores/sdk';
export const load = async ({ params, depends, url, route }) => {
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
};
};
@@ -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
</ActionMenu.Item.Button>
{/if}
<DnsRecordsAction {rule} {organizationDomains} />
<ActionMenu.Item.Button
status="danger"
leadingIcon={IconTrash}