Skip to content

Manage DNS tabs #1875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 22, 2025
Merged

Manage DNS tabs #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3e51c6
update: badge sizes.
ItzNotABug May 22, 2025
4af7da2
update: DNS tabs on sites.
ItzNotABug May 22, 2025
757f20c
update: DNS tabs on settings.
ItzNotABug May 22, 2025
a07f7e2
update: DNS tabs on functions.
ItzNotABug May 22, 2025
1c055ee
Merge branch 'main' of https://github.com/appwrite/console
ItzNotABug May 22, 2025
4b23c8e
fix: check.
ItzNotABug May 22, 2025
0126622
fix: return to domains list on deletion.
ItzNotABug May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/components/domains/nameserverTable.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{domain}
</Typography.Text>
{#if verified}
<Badge variant="secondary" type="success" content="Verified" />
<Badge variant="secondary" type="success" size="xs" content="Verified" />
{:else if verified === false}
<Badge variant="secondary" type="warning" size="xs" content="Pending verification" />
{/if}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/domains/recordTable.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
{domain}
</Typography.Text>
{#if verified}
<Badge variant="secondary" type="success" content="Verified" />
<Badge variant="secondary" type="success" size="xs" content="Verified" />
{:else if verified === false}
<Badge variant="secondary" type="error" content="Verification failed" />
<Badge variant="secondary" type="error" size="xs" content="Verification failed" />
{:else}
<Badge
variant="secondary"
Expand Down
8 changes: 6 additions & 2 deletions src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
<script lang="ts">
import { sdk } from '$lib/stores/sdk';
import { addNotification } from '$lib/stores/notifications';
import { invalidate } from '$app/navigation';
import { goto, invalidate } from '$app/navigation';
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
import { Dependencies } from '$lib/constants';
import { Confirm } from '$lib/components';
import type { Domain } from '$lib/sdk/domains';
import { base } from '$app/paths';
import { page } from '$app/state';

export let show = false;
export let selectedDomain: Domain;

let error = '';
let domainsList = `${base}/organization-${page.params.organization}/domains`;

async function deleteDomain() {
try {
await sdk.forConsole.domains.delete(selectedDomain.$id);
await invalidate(Dependencies.DOMAINS);
show = false;
addNotification({
type: 'success',
message: `${selectedDomain.domain} has been deleted`
});
trackEvent(Submit.DomainDelete);
await goto(domainsList);
await invalidate(Dependencies.DOMAINS);
} catch (e) {
error = e.message;
trackError(e, Submit.DomainDelete);
Expand Down
4 changes: 2 additions & 2 deletions ...]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@
Nameservers
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'a')}
active={selectedTab === 'a'}>
A
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'aaaa')}
Expand Down
12 changes: 3 additions & 9 deletions ...gion]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
};
};
4 changes: 2 additions & 2 deletions ...sole)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@
Nameservers
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'a')}
active={selectedTab === 'a'}>
A
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'aaaa')}
Expand Down
12 changes: 3 additions & 9 deletions ...(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
};
};
8 changes: 4 additions & 4 deletions ...ject-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@
Nameservers
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'a')}
active={selectedTab === 'a'}>
A
</Tabs.Item.Button>
{/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'}
<Tabs.Item.Button
{root}
on:click={() => (selectedTab = 'aaaa')}
Expand All @@ -152,10 +152,10 @@
<NameserverTable domain={page.params.domain} {verified} />
{:else}
<RecordTable
domain={page.params.domain}
{verified}
service="sites"
variant={selectedTab}
service="sites" />
domain={page.params.domain} />
{/if}
<Divider />
<Layout.Stack direction="row" justifyContent="flex-end">
Expand Down
10 changes: 2 additions & 8 deletions .../project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
import { sdk } from '$lib/stores/sdk';
import { isCloud } from '$lib/system';
import { Dependencies } from '$lib/constants.js';
import type { Domain, DomainsList } from '$lib/sdk/domains.js';
import type { DomainsList } from '$lib/sdk/domains';

export const load = async ({ parent, depends, params }) => {
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
};
};
Loading