From 7cdcba94ffa756500bfcb1ebc80605131c54a0ff Mon Sep 17 00:00:00 2001 From: Darshan Date: Tue, 11 Nov 2025 19:59:34 +0530 Subject: [PATCH] address comments. --- src/lib/studio/studio.svelte | 22 ++++++------- .../domains/add-domain/+page.svelte | 32 ++++++++----------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/lib/studio/studio.svelte b/src/lib/studio/studio.svelte index 3edb0e9fe..69b891bb5 100644 --- a/src/lib/studio/studio.svelte +++ b/src/lib/studio/studio.svelte @@ -28,18 +28,6 @@ let showManageDomainsSheet = $state(false); let primaryDomainForSite = $state(`imagine-${projectId}.stage.appwrite.network`); - const addDomainUrl = $derived.by(() => { - const baseUrl = resolve( - '/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain', - { - region, - project: projectId, - site: siteId - } - ); - return `${baseUrl}?types=false`; - }); - onMount(() => { ensureStudioComponent(); @@ -48,7 +36,15 @@ invalidate(Dependencies.PROJECT); }, onAddDomain: async () => { - await goto(addDomainUrl); + const baseUrl = resolve( + '/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain', + { + region, + project: projectId, + site: siteId + } + ); + await goto(`${baseUrl}?types=false`); }, onManageDomains: (primaryDomain) => { if (primaryDomain) { diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte index 694699f30..ed408f97d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -31,7 +31,7 @@ import { getApexDomain } from '$lib/helpers/tlds'; import type { PageProps } from './$types'; - let { data }: PageProps = $props(); + let { data, params }: PageProps = $props(); let formComponent: Form; let isSubmitting = $state(writable(false)); @@ -42,7 +42,7 @@ let branch: string = $state(null); let statusCode = $state(StatusCode.TemporaryRedirect307); - let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`; + let routeBase = `${base}/project-${params.region}-${params.project}/sites/site-${params.site}/domains`; let previousPage = $state(routeBase); afterNavigate(({ from }) => { @@ -93,30 +93,26 @@ try { let rule: Models.ProxyRule; if (behaviour === 'BRANCH') { - rule = await sdk - .forProject(page.params.region, page.params.project) - .proxy.createSiteRule({ - domain: domainName, - siteId: page.params.site, - branch - }); + rule = await sdk.forProject(params.region, params.project).proxy.createSiteRule({ + domain: domainName, + siteId: params.site, + branch + }); } else if (behaviour === 'REDIRECT') { rule = await sdk - .forProject(page.params.region, page.params.project) + .forProject(params.region, params.project) .proxy.createRedirectRule({ domain: domainName, url: redirect, statusCode, - resourceId: page.params.site, + resourceId: params.site, resourceType: ProxyResourceType.Site }); } else if (behaviour === 'ACTIVE') { - rule = await sdk - .forProject(page.params.region, page.params.project) - .proxy.createSiteRule({ - domain: domainName, - siteId: page.params.site - }); + rule = await sdk.forProject(params.region, params.project).proxy.createSiteRule({ + domain: domainName, + siteId: params.site + }); } if (rule?.status === 'verified') { hideTypes.set(false); @@ -137,7 +133,7 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk.forProject(page.params.region, page.params.project).sites.update({ + await sdk.forProject(params.region, params.project).sites.update({ siteId: data.site.$id, name: data.site.name, framework: data.site.framework as Framework,