From f098718a3b9f3a4e9ba1bb8cd74b37a5a9e25712 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 27 Feb 2025 11:53:19 +0100 Subject: [PATCH] chore: fix build? --- src/lib/pages/domains/delete.svelte | 8 ++++---- src/lib/pages/domains/index.svelte | 10 ++++------ src/lib/pages/domains/wizard/step1.svelte | 9 ++------- src/lib/pages/domains/wizard/store.ts | 3 +-- .../functions/function-[function]/domains/+page.svelte | 6 +----- .../project-[project]/settings/domains/+page.svelte | 7 +------ 6 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/lib/pages/domains/delete.svelte b/src/lib/pages/domains/delete.svelte index a1edc8f14..e3bbdde0c 100644 --- a/src/lib/pages/domains/delete.svelte +++ b/src/lib/pages/domains/delete.svelte @@ -14,13 +14,13 @@ let error: string; function getCorrectMessage(): string { - const resourceType = selectedDomain.resourceType; + const resourceType = selectedDomain.type; switch (resourceType) { case 'api': return `access ${resourceType}`; - case 'function': - return `execute your ${resourceType}`; - case 'site': + case 'deployment': + return `view your ${resourceType}`; + case 'redirect': return `view your ${resourceType} `; } } diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte index f1da105a9..aaa0d85a2 100644 --- a/src/lib/pages/domains/index.svelte +++ b/src/lib/pages/domains/index.svelte @@ -2,11 +2,11 @@ import { Empty, Modal, SearchQuery } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { onMount } from 'svelte'; - import { dependencyStore, domain, typeStore } from './wizard/store'; + import { dependencyStore } from './wizard/store'; import { toLocaleDate } from '$lib/helpers/date'; import { wizard } from '$lib/stores/wizard'; import type { Dependencies } from '$lib/constants'; - import type { Models, ResourceType } from '@appwrite.io/console'; + import type { Models } from '@appwrite.io/console'; import Create from './create.svelte'; import Delete from './delete.svelte'; import Retry from './wizard/retry.svelte'; @@ -31,9 +31,8 @@ import { page } from '$app/stores'; import { base } from '$app/paths'; - export let search: string; + export let search: string = null; export let rules: Models.ProxyRuleList; - export let type: ResourceType; export let dependency: Dependencies; let showDelete = false; @@ -42,7 +41,6 @@ let retryError = null; onMount(() => { - typeStore.set(type); dependencyStore.set(dependency); }); @@ -83,7 +81,7 @@ {/if} - {#each rules.rules as domain, index} + {#each rules.rules as domain} diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte index a9c2df49b..5a7150194 100644 --- a/src/lib/pages/domains/wizard/step1.svelte +++ b/src/lib/pages/domains/wizard/step1.svelte @@ -6,9 +6,8 @@ import { sdk } from '$lib/stores/sdk'; import { isSelfHosted } from '$lib/system'; import { func } from '$routes/(console)/project-[project]/functions/function-[function]/store'; - import { domain, typeStore } from './store'; + import { domain } from './store'; import { consoleVariables } from '$routes/(console)/store'; - import { ResourceType } from '@appwrite.io/console'; let error = null; const isDomainsEnabled = $consoleVariables?._APP_DOMAIN_ENABLED === true; @@ -20,11 +19,7 @@ } // TODO: move to new api methods - $domain = await sdk.forProject.proxy.createRule( - $domain.domain, - $typeStore, - $typeStore === ResourceType.Function ? $func.$id : undefined - ); + $domain = await sdk.forProject.proxy.createFunctionRule($domain.domain, $func.$id); trackEvent(Submit.DomainCreate); } catch (e) { diff --git a/src/lib/pages/domains/wizard/store.ts b/src/lib/pages/domains/wizard/store.ts index b6c6d486b..96e3caff2 100644 --- a/src/lib/pages/domains/wizard/store.ts +++ b/src/lib/pages/domains/wizard/store.ts @@ -1,7 +1,6 @@ -import type { Models, ResourceType } from '@appwrite.io/console'; +import type { Models } from '@appwrite.io/console'; import { writable } from 'svelte/store'; import type { Dependencies } from '$lib/constants'; export const domain = writable>({ $id: '', domain: '' }); -export const typeStore = writable(); export const dependencyStore = writable(); diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte index a10b67620..603219642 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/domains/+page.svelte @@ -3,16 +3,12 @@ import type { PageData } from './$types'; import { ProxyRulesPage } from '$lib/pages/domains'; import { Dependencies } from '$lib/constants'; - import { ResourceType } from '@appwrite.io/console'; export let data: PageData; - + Domains diff --git a/src/routes/(console)/project-[project]/settings/domains/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/+page.svelte index c2a2a82a5..0ce2b644b 100644 --- a/src/routes/(console)/project-[project]/settings/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/+page.svelte @@ -3,17 +3,12 @@ import type { PageData } from './$types'; import { ProxyRulesPage } from '$lib/pages/domains'; import { Dependencies } from '$lib/constants'; - import { ResourceType } from '@appwrite.io/console'; export let data: PageData; - + Custom domains