Skip to content

Commit d7808be

Browse files
committed
fix: tests.
1 parent f5fd38e commit d7808be

3 files changed

Lines changed: 32 additions & 31 deletions

File tree

src/lib/studio/domainsTable.svelte

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
Skeleton,
2323
Divider
2424
} from '@appwrite.io/pink-svelte';
25-
import { base, resolve } from '$app/paths';
26-
import { page } from '$app/state';
25+
import { resolve } from '$app/paths';
2726
import { Click, trackEvent } from '$lib/actions/analytics';
2827
import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
2928
import { goto } from '$app/navigation';
@@ -83,6 +82,18 @@
8382
previousDeleteState = showDelete;
8483
previousRetryState = showRetry;
8584
});
85+
86+
const addDomainUrl = $derived.by(() => {
87+
const baseUrl = resolve(
88+
'/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain',
89+
{
90+
region,
91+
project: projectId,
92+
site: siteId
93+
}
94+
);
95+
return `${baseUrl}?types=false`;
96+
});
8697
</script>
8798

8899
<Table.Root columns={[{ id: 'domain' }, { id: 'actions', width: 40 }]} let:root>
@@ -153,20 +164,7 @@
153164
</Table.Root>
154165

155166
<Layout.Stack style="width: min-content;">
156-
<Button
157-
compact
158-
on:onclick={async () => {
159-
await goto(
160-
resolve(
161-
'/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain?types=false',
162-
{
163-
region,
164-
project: projectId,
165-
site: siteId
166-
}
167-
)
168-
);
169-
}}>
167+
<Button compact on:onclick={async () => await goto(addDomainUrl)}>
170168
<Icon icon={IconPlus} size="s" />
171169
Add domain
172170
</Button>
@@ -180,11 +178,11 @@
180178
<RetryDomainModal bind:show={showRetry} {selectedProxyRule} />
181179
{/if}
182180

183-
{#snippet domainActions(rule: Models.ProxyRule, toggle: (e: Event) => void)}
181+
{#snippet domainActions(rule: Models.ProxyRule, toggle: () => void)}
184182
<ActionMenu.Root>
185-
<ActionMenu.Item.Link href={`${$regionalProtocol}${rule.domain}`} external>
183+
<ActionMenu.Item.Anchor href={`${$regionalProtocol}${rule.domain}`} external>
186184
Open domain
187-
</ActionMenu.Item.Link>
185+
</ActionMenu.Item.Anchor>
188186
{#if rule.status !== 'verified' && rule.status !== 'verifying'}
189187
<ActionMenu.Item.Button
190188
leadingIcon={IconRefresh}

src/lib/studio/studio.svelte

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import { Dependencies } from '$lib/constants';
1212
import { goto, invalidate } from '$app/navigation';
1313
import { IconExternalLink } from '@appwrite.io/pink-icons-svelte';
14-
import { Button, Layout, Typography, Icon } from '@appwrite.io/pink-svelte';
14+
import { Layout, Typography, Icon } from '@appwrite.io/pink-svelte';
1515
import { ensureStudioComponent, initImagine, getWebComponents } from './studio-widget';
1616
import DomainsTable from './domainsTable.svelte';
1717
import SideSheet from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/layout/sidesheet.svelte';
@@ -28,6 +28,18 @@
2828
let showManageDomainsSheet = $state(false);
2929
let primaryDomainForSite = $state(`imagine-${projectId}.stage.appwrite.network`);
3030
31+
const addDomainUrl = $derived.by(() => {
32+
const baseUrl = resolve(
33+
'/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain',
34+
{
35+
region,
36+
project: projectId,
37+
site: siteId
38+
}
39+
);
40+
return `${baseUrl}?types=false`;
41+
});
42+
3143
onMount(() => {
3244
ensureStudioComponent();
3345
@@ -36,16 +48,7 @@
3648
invalidate(Dependencies.PROJECT);
3749
},
3850
onAddDomain: async () => {
39-
await goto(
40-
resolve(
41-
'/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain?types=false',
42-
{
43-
region,
44-
project: projectId,
45-
site: siteId
46-
}
47-
)
48-
);
51+
await goto(addDomainUrl);
4952
},
5053
onManageDomains: (primaryDomain) => {
5154
if (primaryDomain) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
let statusCode = $state(StatusCode.TemporaryRedirect307);
4444
4545
let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`;
46-
let previousPage = routeBase;
46+
let previousPage = $state(routeBase);
4747
4848
afterNavigate(({ from }) => {
4949
if ($hideTypes) {

0 commit comments

Comments
 (0)