Skip to content

Commit ca331d3

Browse files
authored
Merge pull request #1942 from appwrite/fix-wrong-domain-tab-selected
fix: wrong domain tab selected
2 parents 3939f42 + ca632fd commit ca331d3

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@
3434
$effect(() => {
3535
if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) {
3636
selectedTab = 'cname';
37-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
37+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
3838
selectedTab = 'a';
39-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
39+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
4040
selectedTab = 'aaaa';
41+
} else {
42+
selectedTab = 'nameserver';
4143
}
4244
});
4345
let verified = $state(false);

src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,16 @@
3131
const isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
3232
3333
let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
34+
3435
$effect(() => {
3536
if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) {
3637
selectedTab = 'cname';
37-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
38+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
3839
selectedTab = 'a';
39-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
40+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
4041
selectedTab = 'aaaa';
42+
} else {
43+
selectedTab = 'nameserver';
4144
}
4245
});
4346
let verified = $state(false);

src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@
3535
$effect(() => {
3636
if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) {
3737
selectedTab = 'cname';
38-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
38+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
3939
selectedTab = 'a';
40-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
40+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
4141
selectedTab = 'aaaa';
42+
} else {
43+
selectedTab = 'nameserver';
4244
}
4345
});
4446

src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@
2626
const isSubDomain = $derived.by(() => isASubdomain(selectedProxyRule?.domain));
2727
2828
let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
29+
2930
$effect(() => {
3031
if ($regionalConsoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) {
3132
selectedTab = 'cname';
32-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
33+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_A) {
3334
selectedTab = 'a';
34-
} else if ($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
35+
} else if (!isCloud && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) {
3536
selectedTab = 'aaaa';
37+
} else {
38+
selectedTab = 'nameserver';
3639
}
3740
});
3841
@@ -84,15 +87,15 @@
8487
Nameservers
8588
</Tabs.Item.Button>
8689
{/if}
87-
{#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
90+
{#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_A && $regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
8891
<Tabs.Item.Button
8992
{root}
9093
on:click={() => (selectedTab = 'a')}
9194
active={selectedTab === 'a'}>
9295
A
9396
</Tabs.Item.Button>
9497
{/if}
95-
{#if !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
98+
{#if !isCloud && !!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA && $regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
9699
<Tabs.Item.Button
97100
{root}
98101
on:click={() => (selectedTab = 'aaaa')}

0 commit comments

Comments
 (0)