Skip to content

Commit 7cdcba9

Browse files
committed
address comments.
1 parent d7808be commit 7cdcba9

2 files changed

Lines changed: 23 additions & 31 deletions

File tree

src/lib/studio/studio.svelte

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@
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-
4331
onMount(() => {
4432
ensureStudioComponent();
4533
@@ -48,7 +36,15 @@
4836
invalidate(Dependencies.PROJECT);
4937
},
5038
onAddDomain: async () => {
51-
await goto(addDomainUrl);
39+
const baseUrl = resolve(
40+
'/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain',
41+
{
42+
region,
43+
project: projectId,
44+
site: siteId
45+
}
46+
);
47+
await goto(`${baseUrl}?types=false`);
5248
},
5349
onManageDomains: (primaryDomain) => {
5450
if (primaryDomain) {

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import { getApexDomain } from '$lib/helpers/tlds';
3232
import type { PageProps } from './$types';
3333
34-
let { data }: PageProps = $props();
34+
let { data, params }: PageProps = $props();
3535
3636
let formComponent: Form;
3737
let isSubmitting = $state(writable(false));
@@ -42,7 +42,7 @@
4242
let branch: string = $state(null);
4343
let statusCode = $state(StatusCode.TemporaryRedirect307);
4444
45-
let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`;
45+
let routeBase = `${base}/project-${params.region}-${params.project}/sites/site-${params.site}/domains`;
4646
let previousPage = $state(routeBase);
4747
4848
afterNavigate(({ from }) => {
@@ -93,30 +93,26 @@
9393
try {
9494
let rule: Models.ProxyRule;
9595
if (behaviour === 'BRANCH') {
96-
rule = await sdk
97-
.forProject(page.params.region, page.params.project)
98-
.proxy.createSiteRule({
99-
domain: domainName,
100-
siteId: page.params.site,
101-
branch
102-
});
96+
rule = await sdk.forProject(params.region, params.project).proxy.createSiteRule({
97+
domain: domainName,
98+
siteId: params.site,
99+
branch
100+
});
103101
} else if (behaviour === 'REDIRECT') {
104102
rule = await sdk
105-
.forProject(page.params.region, page.params.project)
103+
.forProject(params.region, params.project)
106104
.proxy.createRedirectRule({
107105
domain: domainName,
108106
url: redirect,
109107
statusCode,
110-
resourceId: page.params.site,
108+
resourceId: params.site,
111109
resourceType: ProxyResourceType.Site
112110
});
113111
} else if (behaviour === 'ACTIVE') {
114-
rule = await sdk
115-
.forProject(page.params.region, page.params.project)
116-
.proxy.createSiteRule({
117-
domain: domainName,
118-
siteId: page.params.site
119-
});
112+
rule = await sdk.forProject(params.region, params.project).proxy.createSiteRule({
113+
domain: domainName,
114+
siteId: params.site
115+
});
120116
}
121117
if (rule?.status === 'verified') {
122118
hideTypes.set(false);
@@ -137,7 +133,7 @@
137133
138134
async function connect(selectedInstallationId: string, selectedRepository: string) {
139135
try {
140-
await sdk.forProject(page.params.region, page.params.project).sites.update({
136+
await sdk.forProject(params.region, params.project).sites.update({
141137
siteId: data.site.$id,
142138
name: data.site.name,
143139
framework: data.site.framework as Framework,

0 commit comments

Comments
 (0)