Skip to content

Commit f81d05e

Browse files
committed
Migrate to svelte 5 syntax
1 parent ffbab00 commit f81d05e

File tree

3 files changed

+62
-34
lines changed

3 files changed

+62
-34
lines changed

src/lib/components/domains/cnameTable.svelte

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,23 @@
1212
} from '@appwrite.io/pink-svelte';
1313
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
1414
15-
export let domain: string;
16-
export let verified: boolean | undefined = undefined;
17-
export let ruleStatus: string | undefined = undefined;
15+
let {
16+
domain,
17+
verified = undefined,
18+
ruleStatus = undefined
19+
}: {
20+
domain: string;
21+
verified?: boolean | undefined;
22+
ruleStatus?: string | undefined;
23+
} = $props();
1824
19-
let subdomain = getSubdomain(domain);
25+
const subdomain = $derived(getSubdomain(domain));
26+
27+
const caaText = $derived(
28+
$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA?.includes(' ')
29+
? $regionalConsoleVariables._APP_DOMAIN_TARGET_CAA
30+
: `0 issue "${$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA}"`
31+
);
2032
</script>
2133

2234
<Layout.Stack gap="xl">
@@ -71,12 +83,7 @@
7183
</Table.Cell>
7284
<Table.Cell {root}>@</Table.Cell>
7385
<Table.Cell {root}>
74-
<InteractiveText
75-
variant="copy"
76-
isVisible
77-
text={$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA.includes(' ')
78-
? $regionalConsoleVariables._APP_DOMAIN_TARGET_CAA
79-
: `0 issue "${$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA}"`} />
86+
<InteractiveText variant="copy" isVisible text={caaText} />
8087
</Table.Cell>
8188
</Table.Row.Base>
8289
{/if}

src/lib/components/domains/nameserverTable.svelte

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
44
import { Badge, Layout, Typography, Table, InteractiveText } from '@appwrite.io/pink-svelte';
55
6-
export let domain: string;
7-
export let verified: boolean | undefined = undefined;
8-
export let ruleStatus: string | undefined = undefined;
6+
let {
7+
domain,
8+
verified = undefined,
9+
ruleStatus = undefined
10+
}: {
11+
domain: string;
12+
verified?: boolean | undefined;
13+
ruleStatus?: string | undefined;
14+
} = $props();
915
1016
const nameserverList = $regionalConsoleVariables?._APP_DOMAINS_NAMESERVERS
1117
? $regionalConsoleVariables?._APP_DOMAINS_NAMESERVERS?.split(',')

src/lib/components/domains/recordTable.svelte

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,45 @@
1111
import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
1212
import { isCloud } from '$lib/system';
1313
import { getSubdomain } from '$lib/helpers/tlds';
14-
export let domain: string;
15-
export let verified: boolean | undefined = undefined;
16-
export let variant: 'cname' | 'a' | 'aaaa';
17-
export let service: 'sites' | 'general' = 'general';
18-
export let ruleStatus: string | undefined = undefined;
19-
export let onNavigateToNameservers: () => void = () => {};
20-
export let onNavigateToA: () => void = () => {};
21-
export let onNavigateToAAAA: () => void = () => {};
2214
23-
let subdomain = getSubdomain(domain);
15+
let {
16+
domain,
17+
verified = undefined,
18+
variant,
19+
service = 'general',
20+
ruleStatus = undefined,
21+
onNavigateToNameservers = () => {},
22+
onNavigateToA = () => {},
23+
onNavigateToAAAA = () => {}
24+
}: {
25+
domain: string;
26+
verified?: boolean | undefined;
27+
variant: 'cname' | 'a' | 'aaaa';
28+
service?: 'sites' | 'general';
29+
ruleStatus?: string | undefined;
30+
onNavigateToNameservers?: () => void;
31+
onNavigateToA?: () => void;
32+
onNavigateToAAAA?: () => void;
33+
} = $props();
2434
25-
const aTabVisible =
35+
const subdomain = $derived(getSubdomain(domain));
36+
37+
const aTabVisible = $derived(
2638
!isCloud &&
27-
!!$regionalConsoleVariables._APP_DOMAIN_TARGET_A &&
28-
$regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1';
29-
const aaaaTabVisible =
39+
Boolean($regionalConsoleVariables._APP_DOMAIN_TARGET_A) &&
40+
$regionalConsoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'
41+
);
42+
const aaaaTabVisible = $derived(
3043
!isCloud &&
31-
!!$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA &&
32-
$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1';
44+
Boolean($regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA) &&
45+
$regionalConsoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'
46+
);
47+
48+
const caaText = $derived(
49+
$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA?.includes(' ')
50+
? $regionalConsoleVariables._APP_DOMAIN_TARGET_CAA
51+
: `0 issue "${$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA}"`
52+
);
3353
3454
function setTarget() {
3555
switch (variant) {
@@ -94,12 +114,7 @@
94114
</Table.Cell>
95115
<Table.Cell {root}>@</Table.Cell>
96116
<Table.Cell {root}>
97-
<InteractiveText
98-
variant="copy"
99-
isVisible
100-
text={$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA.includes(' ')
101-
? $regionalConsoleVariables._APP_DOMAIN_TARGET_CAA
102-
: `0 issue "${$regionalConsoleVariables._APP_DOMAIN_TARGET_CAA}"`} />
117+
<InteractiveText variant="copy" isVisible text={caaText} />
103118
</Table.Cell>
104119
</Table.Row.Base>
105120
{/if}

0 commit comments

Comments
 (0)