From dca376c3107683c84f9b9c2dd336c34398af16cd Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 4 Jun 2025 11:19:59 +0000 Subject: [PATCH 1/9] Fix: blocked resource info --- .../databases/+page.svelte | 110 ++++++++++-------- .../databases/+page.ts | 44 ++++--- .../errorFailedToLoad.svelte | 15 +++ .../errorResourceBlocked.svelte | 16 +++ 4 files changed, 119 insertions(+), 66 deletions(-) create mode 100644 src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte create mode 100644 src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte index df3e783aa..f807e8487 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte @@ -17,6 +17,8 @@ import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import EmptySearch from '$lib/components/emptySearch.svelte'; + import ErrorResourceBlocked from '../errorResourceBlocked.svelte'; + import ErrorFailedToLoad from '../errorFailedToLoad.svelte'; export let data: PageData; @@ -46,56 +48,64 @@ ]); - - - - - - - - {#if $canWriteDatabases} - - {/if} - - - - {#if data.databases.total} - {#if data.view === 'grid'} - - {:else} - - {/if} - - - {:else if data.search} - - - +{#if data.error} + {#if data.error.type === 'general_resource_blocked'} + {:else} - (showCreate = true)} /> + {/if} - +{:else} + + + + + + + + {#if $canWriteDatabases} + + {/if} + + - + {#if data.databases.total} + {#if data.view === 'grid'} + + {:else} +
+ {/if} + + + {:else if data.search} + + + + {:else} + (showCreate = true)} /> + {/if} + + + +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts index 6abcffdc5..f78a84442 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -21,23 +21,35 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => // already loaded by parent. const { currentPlan } = await parent(); - const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( - limit, - offset, - params, - search, - currentPlan - ); + try { + const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( + limit, + offset, + params, + search, + currentPlan + ); + return { + offset, + limit, + view, + search, + policies, + databases, + lastBackups + }; - return { - offset, - limit, - view, - search, - policies, - databases, - lastBackups - }; + } catch (error) { + return { + error: { + type: error.type, + }, + offset, + limit, + view, + search, + }; + } }; async function fetchDatabasesAndBackups( diff --git a/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte b/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte new file mode 100644 index 000000000..2e458f043 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte @@ -0,0 +1,15 @@ + + + + + Failed to load {resource} +

+ An error occurred while trying to load the {resource.toLowerCase()}. Please try again later or contact support if the issue persists. +

+
+
diff --git a/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte b/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte new file mode 100644 index 000000000..28841852f --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte @@ -0,0 +1,16 @@ + + + + + Your {resource} is paused +

+ We've detected unusual activity and temporarily paused your {resource}. If you believe + this is a mistake or need urgent access, please contact support@appwrite.io. +

+
+
From 8c5129f6f25487d7266269d0ec5303d390648e9e Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 4 Jun 2025 12:26:09 +0000 Subject: [PATCH 2/9] error handling --- src/global.d.ts | 9 +- .../project-[region]-[project]/+error.svelte | 23 +++- .../databases/+page.svelte | 110 ++++++++---------- .../databases/+page.ts | 17 ++- .../errorFailedToLoad.svelte | 15 --- .../errorResourceBlocked.svelte | 16 --- 6 files changed, 82 insertions(+), 108 deletions(-) delete mode 100644 src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte delete mode 100644 src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte diff --git a/src/global.d.ts b/src/global.d.ts index db6b03f38..323101468 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -1,2 +1,9 @@ /// -interface Window {} +interface Window { } + +namespace App { + interface Error { + type: string, + resource: ?string = '', + } +} \ No newline at end of file diff --git a/src/routes/(console)/project-[region]-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte index 9ef91393f..b5a41b2ec 100644 --- a/src/routes/(console)/project-[region]-[project]/+error.svelte +++ b/src/routes/(console)/project-[region]-[project]/+error.svelte @@ -1,13 +1,24 @@ - {'status' in page.error - ? page.error.status || 'Invalid Argument' - : 'Invalid Argument'} -

{page.error.message}

+ {#if page.error.type === 'general_resource_blocked'} + {@const resource = page.error.resource || 'project'} + + Your {resource} is paused +

+ We've detected unusual activity and temporarily paused your {resource}. If you + believe this is a mistake or need urgent access, please contact support@appwrite.io. +

+
+ {:else} + {'status' in page.error + ? page.error.status || 'Invalid Argument' + : 'Invalid Argument'} +

{page.error.message}

+ {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte index f807e8487..df3e783aa 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte @@ -17,8 +17,6 @@ import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import EmptySearch from '$lib/components/emptySearch.svelte'; - import ErrorResourceBlocked from '../errorResourceBlocked.svelte'; - import ErrorFailedToLoad from '../errorFailedToLoad.svelte'; export let data: PageData; @@ -48,64 +46,56 @@ ]); -{#if data.error} - {#if data.error.type === 'general_resource_blocked'} - - {:else} - - {/if} -{:else} - - - - - - - - {#if $canWriteDatabases} - - {/if} - + + + + - - {#if data.databases.total} - {#if data.view === 'grid'} - - {:else} -
- {/if} - - - {:else if data.search} - + + + {#if $canWriteDatabases} - - {:else} - (showCreate = true)} /> - {/if} - + on:click={() => (showCreate = true)} + event="create_database" + disabled={isCreationDisabled}> + + Create database + + {/if} + + - -{/if} + {#if data.databases.total} + {#if data.view === 'grid'} + + {:else} +
+ {/if} + + + {:else if data.search} + + + + {:else} + (showCreate = true)} /> + {/if} + + + diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts index f78a84442..ba5651226 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -8,6 +8,7 @@ import type { BackupPolicy } from '$lib/sdk/backups'; import { isSelfHosted } from '$lib/system'; import { isCloud } from '$lib/system'; import type { Plan } from '$lib/sdk/billing'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ url, route, depends, params, parent }) => { depends(Dependencies.DATABASES); @@ -39,16 +40,12 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => lastBackups }; - } catch (error) { - return { - error: { - type: error.type, - }, - offset, - limit, - view, - search, - }; + } catch (e) { + error(e.status || 500, { + message: e.message, + type: e.type || 'unknown', + resource: 'databases' + }); } }; diff --git a/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte b/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte deleted file mode 100644 index 2e458f043..000000000 --- a/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Failed to load {resource} -

- An error occurred while trying to load the {resource.toLowerCase()}. Please try again later or contact support if the issue persists. -

-
-
diff --git a/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte b/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte deleted file mode 100644 index 28841852f..000000000 --- a/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Your {resource} is paused -

- We've detected unusual activity and temporarily paused your {resource}. If you believe - this is a mistake or need urgent access, please contact support@appwrite.io. -

-
-
From ac85bfccaa6714cd3c7a4d5b05c3407b3f7e4736 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 01:19:33 +0000 Subject: [PATCH 3/9] handle blocks in other project routes --- .../functions/+layout.ts | 34 +++++++++++------ .../messaging/+page.ts | 38 +++++++++++++------ .../settings/+page.ts | 33 ++++++++++------ .../project-[region]-[project]/sites/+page.ts | 38 ++++++++++++------- .../storage/+page.ts | 29 +++++++++----- 5 files changed, 113 insertions(+), 59 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/functions/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts index 4cc6fe3d9..fa4a5aa51 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts @@ -4,21 +4,31 @@ import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ depends, params }) => { depends(Dependencies.FUNCTION_INSTALLATIONS); - const [runtimesList, installations, specificationsList] = await Promise.all([ - sdk.forProject(params.region, params.project).functions.listRuntimes(), - sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]), - sdk.forProject(params.region, params.project).functions.listSpecifications() - ]); + try { - return { - header: Header, - breadcrumbs: Breadcrumbs, - runtimesList, - installations, - specificationsList - }; + const [runtimesList, installations, specificationsList] = await Promise.all([ + sdk.forProject(params.region, params.project).functions.listRuntimes(), + sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]), + sdk.forProject(params.region, params.project).functions.listSpecifications() + ]); + + return { + header: Header, + breadcrumbs: Breadcrumbs, + runtimesList, + installations, + specificationsList + }; + } catch (e) { + error(e.code || 500, { + message: e.message, + type: e.type || 'unknown', + resource: 'functions' + }); + } }; diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts index 0436e02e7..7d4397fd2 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts @@ -12,6 +12,7 @@ import { import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@appwrite.io/console'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ depends, url, route, params }) => { depends(Dependencies.MESSAGING_MESSAGES); @@ -26,14 +27,8 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); - return { - offset, - limit, - search, - query, - page, - view, - messages: (await sdk + try { + const messages = (await sdk .forProject(params.region, params.project) .messaging.listMessages( [ @@ -44,8 +39,27 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { ], search || undefined )) as { - total: number; - messages: (Models.Message & { data: Record })[]; // Add typing for message.data - } - }; + total: number; + messages: (Models.Message & { data: Record })[]; // Add typing for message.data + }; + + return { + messages, + offset, + limit, + search, + query, + page, + view, + }; + } catch (e) { + return error( + e.code || 500, + { + message: e.message, + type: e.type || 'unknown', + resource: 'messaging' + } + ) + } }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts index e6f31e223..be82f4724 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts @@ -2,6 +2,7 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ depends, url, params }) => { depends(Dependencies.PROJECT_VARIABLES); @@ -9,17 +10,25 @@ export const load: PageLoad = async ({ depends, url, params }) => { const limit = PAGE_LIMIT; const offset = Number(url.searchParams.get('offset') ?? 0); - const [variables, installations] = await Promise.all([ - sdk.forProject(params.region, params.project).projectApi.listVariables(), - sdk - .forProject(params.region, params.project) - .vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) - ]); + try { + const [variables, installations] = await Promise.all([ + sdk.forProject(params.region, params.project).projectApi.listVariables(), + sdk + .forProject(params.region, params.project) + .vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) + ]); - return { - limit, - offset, - variables, - installations - }; + return { + limit, + offset, + variables, + installations + }; + } catch (e) { + error(e.code || 500, { + message: e.message, + type: e.type || 'unknown', + resource: 'project' + }); + } }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts index b76ee678e..c32143162 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -2,6 +2,7 @@ import { Query, type Models } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; +import { error } from '@sveltejs/kit'; export const load = async ({ url, depends, route, params }) => { depends(Dependencies.SITES); @@ -26,19 +27,28 @@ export const load = async ({ url, depends, route, params }) => { } as Models.SiteList }; - const siteList = await sdk - .forProject(params.region, params.project) - .sites.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ); + try { + const siteList = await sdk + .forProject(params.region, params.project) + .sites.list( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search || undefined + ); - return { - sitesLive, - offset, - limit, - search, - siteList, - view - }; + return { + sitesLive, + offset, + limit, + search, + siteList, + view + }; + } catch (e) { + error(e.code || 500, + { + message: e.message, + type: e.type || 'unknown', + resource: 'sites' + }); + } }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts index 61cb3d856..361dd0548 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts @@ -3,6 +3,7 @@ import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ url, route, params }) => { const page = getPage(url); @@ -10,17 +11,27 @@ export const load: PageLoad = async ({ url, route, params }) => { const view = getView(url, route, View.Grid); const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); - - return { - offset, - limit, - view, - search, - buckets: await sdk + try { + const buckets = await sdk .forProject(params.region, params.project) .storage.listBuckets( [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search || undefined - ) - }; + ); + + return { + offset, + limit, + view, + search, + buckets, + }; + } catch (e) { + error(e.code || 500, { + message: e.message, + type: e.type || 'unknown', + resource: 'storage' + } + ); + } }; From 5a594e083ec6dc2efcb9372cbad719002afa0bec Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 04:12:25 +0000 Subject: [PATCH 4/9] fix default value --- src/global.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/global.d.ts b/src/global.d.ts index 323101468..5ce13e6be 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -3,7 +3,7 @@ interface Window { } namespace App { interface Error { - type: string, - resource: ?string = '', + type: string = 'unknown', + resource: string = 'project', } } \ No newline at end of file From 9042ca6f0b1a9ccdf9e64702c7be8334c21f1d13 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 05:30:34 +0000 Subject: [PATCH 5/9] refactored error handling and resource blocked message --- src/global.d.ts | 7 +- src/hooks.client.ts | 7 +- .../project-[region]-[project]/+error.svelte | 11 +- .../project-[region]-[project]/+layout.ts | 84 ++++++------- .../auth/teams/team-[team]/+layout.ts | 16 +-- .../auth/usage/[[period]]/+page.ts | 8 +- .../auth/user-[user]/+layout.ts | 25 ++-- .../databases/+page.ts | 42 +++---- .../databases/database-[database]/+layout.ts | 19 ++- .../collection-[collection]/+layout.ts | 36 +++--- .../document-[document]/+layout.ts | 60 +++++---- .../databases/usage/[[period]]/+page.ts | 7 +- .../functions/+layout.ts | 34 ++---- .../functions/function-[function]/+layout.ts | 43 +++---- .../usage/[[period]]/+page.ts | 18 ++- .../functions/usage/[[period]]/+page.ts | 8 +- .../messaging/+page.ts | 32 ++--- .../messaging/message-[message]/+layout.ts | 114 +++++++++--------- .../settings/+page.ts | 34 ++---- .../settings/webhooks/[webhook]/+layout.ts | 15 +-- .../project-[region]-[project]/sites/+page.ts | 33 ++--- .../sites/site-[site]/+layout.ts | 21 ++-- .../deployment-[deployment]/+layout.ts | 14 +-- .../site-[site]/usage/[[period]]/+page.ts | 8 +- .../sites/usage/[[period]]/+page.ts | 7 +- .../storage/+page.ts | 37 +++--- .../storage/bucket-[bucket]/+layout.ts | 19 ++- .../bucket-[bucket]/file-[file]/+layout.ts | 25 ++-- .../storage/usage/[[period]]/+page.ts | 14 +-- 29 files changed, 331 insertions(+), 467 deletions(-) diff --git a/src/global.d.ts b/src/global.d.ts index 5ce13e6be..b90c917c5 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -4,6 +4,11 @@ interface Window { } namespace App { interface Error { type: string = 'unknown', - resource: string = 'project', + } + + interface HandleClientError { + message: string; + status?: number; + type: string; } } \ No newline at end of file diff --git a/src/hooks.client.ts b/src/hooks.client.ts index 5419792a0..c04dece39 100644 --- a/src/hooks.client.ts +++ b/src/hooks.client.ts @@ -13,13 +13,16 @@ Sentry.init({ export const handleError: HandleClientError = ({ error, message, status }) => { console.error(error); + let type = 'unknown'; if (error instanceof AppwriteException) { status = error.code === 0 ? undefined : error.code; message = error.message; + type = error.type } return { message, - status - }; + status, + type + } }; diff --git a/src/routes/(console)/project-[region]-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte index b5a41b2ec..9b988b401 100644 --- a/src/routes/(console)/project-[region]-[project]/+error.svelte +++ b/src/routes/(console)/project-[region]-[project]/+error.svelte @@ -1,12 +1,19 @@ - {#if page.error.type === 'general_resource_blocked'} - {@const resource = page.error.resource || 'project'} + {@const resource = getResource(page.route.id)} Your {resource} is paused

diff --git a/src/routes/(console)/project-[region]-[project]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts index d9a79cbc1..518d5348a 100644 --- a/src/routes/(console)/project-[region]-[project]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/+layout.ts @@ -1,6 +1,5 @@ import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; -import { error } from '@sveltejs/kit'; import type { LayoutLoad } from './$types'; import { preferences } from '$lib/stores/preferences'; import { failedInvoice } from '$lib/stores/billing'; @@ -17,50 +16,47 @@ export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.PROJECT); let currentPlan: Plan = null; - try { - const project = await sdk.forConsole.projects.get(params.project); - const [organization, prefs, regionalConsoleVariables, _] = await Promise.all([ - sdk.forConsole.teams.get(project.teamId) as Promise, - sdk.forConsole.account.getPrefs(), - sdk.forConsoleIn(project.region).console.variables(), - loadAvailableRegions(project.teamId) - ]); - if (prefs?.organization !== project.teamId) { - sdk.forConsole.account.updatePrefs({ - ...prefs, - organization: project.teamId - }); - } - await preferences.loadTeamPrefs(project.teamId); - let roles = isCloud ? [] : defaultRoles; - let scopes = isCloud ? [] : defaultScopes; - if (isCloud) { - currentPlan = await sdk.forConsole.billing.getOrganizationPlan(project.teamId); - const res = await sdk.forConsole.billing.getRoles(project.teamId); - roles = res.roles; - scopes = res.scopes; - if (scopes.includes('billing.read')) { - await failedInvoice.load(project.teamId); - if (get(failedInvoice)) { - headerAlert.add({ - show: true, - component: PaymentFailed, - id: 'paymentFailed', - importance: 1 - }); - } + const project = await sdk.forConsole.projects.get(params.project); + const [organization, prefs, regionalConsoleVariables, _] = await Promise.all([ + sdk.forConsole.teams.get(project.teamId) as Promise, + sdk.forConsole.account.getPrefs(), + sdk.forConsoleIn(project.region).console.variables(), + loadAvailableRegions(project.teamId) + ]); + if (prefs?.organization !== project.teamId) { + sdk.forConsole.account.updatePrefs({ + ...prefs, + organization: project.teamId + }); + } + await preferences.loadTeamPrefs(project.teamId); + let roles = isCloud ? [] : defaultRoles; + let scopes = isCloud ? [] : defaultScopes; + if (isCloud) { + currentPlan = await sdk.forConsole.billing.getOrganizationPlan(project.teamId); + const res = await sdk.forConsole.billing.getRoles(project.teamId); + roles = res.roles; + scopes = res.scopes; + if (scopes.includes('billing.read')) { + await failedInvoice.load(project.teamId); + if (get(failedInvoice)) { + headerAlert.add({ + show: true, + component: PaymentFailed, + id: 'paymentFailed', + importance: 1 + }); } } - - return { - project, - organization, - regionalConsoleVariables, - roles, - scopes, - currentPlan - }; - } catch (e) { - error(e.code, e.message); } + + return { + project, + organization, + regionalConsoleVariables, + roles, + scopes, + currentPlan + }; + }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts index 1134e2cf8..72053f51a 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts @@ -3,17 +3,13 @@ import Header from './header.svelte'; import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; import { Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.TEAM); - try { - return { - header: Header, - breadcrumbs: Breadcrumbs, - team: await sdk.forProject(params.region, params.project).teams.get(params.team) - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + team: await sdk.forProject(params.region, params.project).teams.get(params.team) + }; + }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts index 57ff9ed91..3a6d51d15 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts @@ -2,15 +2,11 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; import { UserUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(UserUsageRange, params.period) ? params.period : UserUsageRange.ThirtyDays; - try { - return sdk.forProject(params.region, params.project).users.getUsage(period); - } catch (e) { - error(e.code, e.message); - } + return sdk.forProject(params.region, params.project).users.getUsage(period); + }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts index 698ceaab5..4a712271d 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/+layout.ts @@ -3,24 +3,19 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.USER); - try { - const [user, userFactors] = await Promise.all([ - sdk.forProject(params.region, params.project).users.get(params.user), - sdk.forProject(params.region, params.project).users.listMfaFactors(params.user) - ]); + const [user, userFactors] = await Promise.all([ + sdk.forProject(params.region, params.project).users.get(params.user), + sdk.forProject(params.region, params.project).users.listMfaFactors(params.user) + ]); - return { - header: Header, - breadcrumbs: Breadcrumbs, - user, - userFactors - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + user, + userFactors + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts index ba5651226..35841ef15 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -8,7 +8,6 @@ import type { BackupPolicy } from '$lib/sdk/backups'; import { isSelfHosted } from '$lib/system'; import { isCloud } from '$lib/system'; import type { Plan } from '$lib/sdk/billing'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ url, route, depends, params, parent }) => { depends(Dependencies.DATABASES); @@ -22,31 +21,22 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => // already loaded by parent. const { currentPlan } = await parent(); - try { - const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( - limit, - offset, - params, - search, - currentPlan - ); - return { - offset, - limit, - view, - search, - policies, - databases, - lastBackups - }; - - } catch (e) { - error(e.status || 500, { - message: e.message, - type: e.type || 'unknown', - resource: 'databases' - }); - } + const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( + limit, + offset, + params, + search, + currentPlan + ); + return { + offset, + limit, + view, + search, + policies, + databases, + lastBackups + }; }; async function fetchDatabasesAndBackups( diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts index b8eee5361..52825a46f 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts @@ -1,6 +1,5 @@ import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; @@ -8,15 +7,11 @@ import Header from './header.svelte'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.DATABASE); - try { - return { - header: Header, - breadcrumbs: Breadcrumbs, - database: await sdk - .forProject(params.region, params.project) - .databases.get(params.database) - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + database: await sdk + .forProject(params.region, params.project) + .databases.get(params.database) + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts index fb946c011..01b7a47ca 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -3,30 +3,26 @@ import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { error } from '@sveltejs/kit'; import SubNavigation from './subNavigation.svelte'; import { Query } from '@appwrite.io/console'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.COLLECTION); - try { - const [collection, allCollections] = await Promise.all([ - sdk - .forProject(params.region, params.project) - .databases.getCollection(params.database, params.collection), - sdk - .forProject(params.region, params.project) - .databases.listCollections(params.database, [Query.orderDesc(''), Query.limit(100)]) - ]); - return { - header: Header, - breadcrumbs: Breadcrumbs, - subNavigation: SubNavigation, - collection, - allCollections - }; - } catch (e) { - error(e.code, e.message); - } + const [collection, allCollections] = await Promise.all([ + sdk + .forProject(params.region, params.project) + .databases.getCollection(params.database, params.collection), + sdk + .forProject(params.region, params.project) + .databases.listCollections(params.database, [Query.orderDesc(''), Query.limit(100)]) + ]); + + return { + header: Header, + breadcrumbs: Breadcrumbs, + subNavigation: SubNavigation, + collection, + allCollections + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts index 1642fda56..de89e5593 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts @@ -3,47 +3,43 @@ import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { error } from '@sveltejs/kit'; import type { Attributes } from '../store'; export const load: LayoutLoad = async ({ params, parent, depends }) => { depends(Dependencies.DOCUMENT); const { collection } = await parent(); - try { - const document = await sdk - .forProject(params.region, params.project) - .databases.getDocument(params.database, params.collection, params.document); + const document = await sdk + .forProject(params.region, params.project) + .databases.getDocument(params.database, params.collection, params.document); - /** - * Sanitize DateTime to remove UTC Timezone section. - */ - collection.attributes.forEach((attribute) => { - const { type, key, array } = attribute as unknown as Attributes; - if (type === 'datetime') { - if (array) { - document[key] = document[key].map((n: string) => { - if (!n) { - return null; - } - return new Date(n).toISOString().slice(0, 23); - }); - } else { - if (document[key]) { - document[key] = new Date(document[key]).toISOString().slice(0, 23); - } else { - document[key] = null; + /** + * Sanitize DateTime to remove UTC Timezone section. + */ + collection.attributes.forEach((attribute) => { + const { type, key, array } = attribute as unknown as Attributes; + if (type === 'datetime') { + if (array) { + document[key] = document[key].map((n: string) => { + if (!n) { + return null; } + return new Date(n).toISOString().slice(0, 23); + }); + } else { + if (document[key]) { + document[key] = new Date(document[key]).toISOString().slice(0, 23); + } else { + document[key] = null; } } - }); + } + }); + + return { + header: Header, + breadcrumbs: Breadcrumbs, + document + }; - return { - header: Header, - breadcrumbs: Breadcrumbs, - document - }; - } catch (e) { - error(e.code, e.message); - } }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts index d39742634..f9b560e93 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts @@ -2,15 +2,10 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; import { DatabaseUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(DatabaseUsageRange, params.period) ? params.period : DatabaseUsageRange.ThirtyDays; - try { - return sdk.forProject(params.region, params.project).databases.getUsage(period); - } catch (e) { - error(e.code, e.message); - } + return sdk.forProject(params.region, params.project).databases.getUsage(period); }; diff --git a/src/routes/(console)/project-[region]-[project]/functions/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts index fa4a5aa51..4cc6fe3d9 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/+layout.ts @@ -4,31 +4,21 @@ import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ depends, params }) => { depends(Dependencies.FUNCTION_INSTALLATIONS); - try { + const [runtimesList, installations, specificationsList] = await Promise.all([ + sdk.forProject(params.region, params.project).functions.listRuntimes(), + sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]), + sdk.forProject(params.region, params.project).functions.listSpecifications() + ]); - const [runtimesList, installations, specificationsList] = await Promise.all([ - sdk.forProject(params.region, params.project).functions.listRuntimes(), - sdk.forProject(params.region, params.project).vcs.listInstallations([Query.limit(100)]), - sdk.forProject(params.region, params.project).functions.listSpecifications() - ]); - - return { - header: Header, - breadcrumbs: Breadcrumbs, - runtimesList, - installations, - specificationsList - }; - } catch (e) { - error(e.code || 500, { - message: e.message, - type: e.type || 'unknown', - resource: 'functions' - }); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + runtimesList, + installations, + specificationsList + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts index 75207a4cd..4d0fb4d2c 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts @@ -3,7 +3,6 @@ import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { error } from '@sveltejs/kit'; import { Query } from '@appwrite.io/console'; import { RuleType } from '$lib/stores/sdk'; @@ -11,29 +10,25 @@ export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.FUNCTION); depends(Dependencies.DEPLOYMENTS); - try { - const func = await sdk - .forProject(params.region, params.project) - .functions.get(params.function); + const func = await sdk + .forProject(params.region, params.project) + .functions.get(params.function); - //TODO remove rule limit of 1 and display extra rules - const proxyRuleList = await sdk - .forProject(params.region, params.project) - .proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), - Query.equal('deploymentResourceId', params.function), - Query.equal('deploymentId', func.deploymentId), - Query.limit(1) - ]); + //TODO remove rule limit of 1 and display extra rules + const proxyRuleList = await sdk + .forProject(params.region, params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION), + Query.equal('deploymentResourceId', params.function), + Query.equal('deploymentId', func.deploymentId), + Query.limit(1) + ]); - return { - header: Header, - breadcrumbs: Breadcrumbs, - function: func, - proxyRuleList - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + function: func, + proxyRuleList + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts index 6b93366f8..748ada6a1 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -1,18 +1,14 @@ import { sdk } from '$lib/stores/sdk'; import { FunctionUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; import { isValueOfStringEnum } from '$lib/helpers/types'; export const load: PageLoad = async ({ params }) => { - try { - const period = isValueOfStringEnum(FunctionUsageRange, params.period) - ? params.period - : FunctionUsageRange.ThirtyDays; - return sdk - .forProject(params.region, params.project) - .functions.getUsage(params.function, period); - } catch (e) { - error(e.code, e.message); - } + const period = isValueOfStringEnum(FunctionUsageRange, params.period) + ? params.period + : FunctionUsageRange.ThirtyDays; + return sdk + .forProject(params.region, params.project) + .functions.getUsage(params.function, period); + }; diff --git a/src/routes/(console)/project-[region]-[project]/functions/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/usage/[[period]]/+page.ts index ced4841d8..ab938908c 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/usage/[[period]]/+page.ts @@ -2,15 +2,11 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; import { FunctionUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(FunctionUsageRange, params.period) ? params.period : FunctionUsageRange.ThirtyDays; - try { - return sdk.forProject(params.region, params.project).functions.listUsage(period); - } catch (e) { - error(e.code, e.message); - } + + return sdk.forProject(params.region, params.project).functions.listUsage(period); }; diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts index 7d4397fd2..ea054f8a6 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts @@ -12,7 +12,6 @@ import { import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ depends, url, route, params }) => { depends(Dependencies.MESSAGING_MESSAGES); @@ -27,8 +26,14 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); - try { - const messages = (await sdk + return { + offset, + limit, + search, + query, + page, + view, + messages: (await sdk .forProject(params.region, params.project) .messaging.listMessages( [ @@ -41,25 +46,6 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { )) as { total: number; messages: (Models.Message & { data: Record })[]; // Add typing for message.data - }; - - return { - messages, - offset, - limit, - search, - query, - page, - view, - }; - } catch (e) { - return error( - e.code || 500, - { - message: e.message, - type: e.type || 'unknown', - resource: 'messaging' } - ) - } + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts index 904ac32a1..b05e8ba2b 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts @@ -3,77 +3,73 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; import type { Models } from '@appwrite.io/console'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.MESSAGING_MESSAGE); - try { - const message = await sdk - .forProject(params.region, params.project) - .messaging.getMessage(params.message); + const message = await sdk + .forProject(params.region, params.project) + .messaging.getMessage(params.message); - const topicsById: Record = {}; - const topicsPromise = Promise.allSettled( - message.topics.map((topicId) => - sdk.forProject(params.region, params.project).messaging.getTopic(topicId) - ) - ).then((results) => { - results.forEach((result) => { - if (result.status === 'fulfilled') { - topicsById[result.value.$id] = result.value; - } + const topicsById: Record = {}; + const topicsPromise = Promise.allSettled( + message.topics.map((topicId) => + sdk.forProject(params.region, params.project).messaging.getTopic(topicId) + ) + ).then((results) => { + results.forEach((result) => { + if (result.status === 'fulfilled') { + topicsById[result.value.$id] = result.value; + } + }); + }); + + const targetsById: Record = {}; + const targetsPromise = sdk + .forProject(params.region, params.project) + .messaging.listTargets(params.message) + .then((response) => { + response.targets.forEach((target) => { + targetsById[target.$id] = target; }); }); - const targetsById: Record = {}; - const targetsPromise = sdk + await Promise.allSettled([topicsPromise, targetsPromise]); + + const usersById: Record> = {}; + const usersPromise = Object.values(targetsById).map((target) => + sdk .forProject(params.region, params.project) - .messaging.listTargets(params.message) - .then((response) => { - response.targets.forEach((target) => { - targetsById[target.$id] = target; - }); - }); + .users.get(target.userId) + .then((user) => { + usersById[user.$id] = user; + }) + ); - await Promise.allSettled([topicsPromise, targetsPromise]); + const messageRecipients: Record> = {}; + const messageRecipientsPromise = Object.values(message.users).map((userId) => + sdk + .forProject(params.region, params.project) + .users.get(userId) + .then((user) => { + messageRecipients[user.$id] = user; + }) + .catch(() => { + messageRecipients[userId] = null; + }) + ); - const usersById: Record> = {}; - const usersPromise = Object.values(targetsById).map((target) => - sdk - .forProject(params.region, params.project) - .users.get(target.userId) - .then((user) => { - usersById[user.$id] = user; - }) - ); + await Promise.allSettled([usersPromise, messageRecipientsPromise]); - const messageRecipients: Record> = {}; - const messageRecipientsPromise = Object.values(message.users).map((userId) => - sdk - .forProject(params.region, params.project) - .users.get(userId) - .then((user) => { - messageRecipients[user.$id] = user; - }) - .catch(() => { - messageRecipients[userId] = null; - }) - ); + return { + message, + topicsById, + targetsById, + usersById, + messageRecipients, + header: Header, + breadcrumbs: Breadcrumbs + }; - await Promise.allSettled([usersPromise, messageRecipientsPromise]); - - return { - message, - topicsById, - targetsById, - usersById, - messageRecipients, - header: Header, - breadcrumbs: Breadcrumbs - }; - } catch (e) { - throw error(e.code, e.message); - } }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts index be82f4724..0d9d3dca9 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts @@ -2,7 +2,6 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ depends, url, params }) => { depends(Dependencies.PROJECT_VARIABLES); @@ -10,25 +9,18 @@ export const load: PageLoad = async ({ depends, url, params }) => { const limit = PAGE_LIMIT; const offset = Number(url.searchParams.get('offset') ?? 0); - try { - const [variables, installations] = await Promise.all([ - sdk.forProject(params.region, params.project).projectApi.listVariables(), - sdk - .forProject(params.region, params.project) - .vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) - ]); + const [variables, installations] = await Promise.all([ + sdk.forProject(params.region, params.project).projectApi.listVariables(), + sdk + .forProject(params.region, params.project) + .vcs.listInstallations([Query.limit(limit), Query.offset(offset)]) + ]); + + return { + limit, + offset, + variables, + installations + }; - return { - limit, - offset, - variables, - installations - }; - } catch (e) { - error(e.code || 500, { - message: e.message, - type: e.type || 'unknown', - resource: 'project' - }); - } }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts index 940fbeef8..a38c24efb 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/+layout.ts @@ -3,18 +3,13 @@ import { sdk } from '$lib/stores/sdk'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import type { LayoutLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.WEBHOOK); - try { - return { - header: Header, - breadcrumbs: Breadcrumbs, - webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook) - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook) + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts index c32143162..c4250e613 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -2,7 +2,6 @@ import { Query, type Models } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; export const load = async ({ url, depends, route, params }) => { depends(Dependencies.SITES); @@ -27,28 +26,18 @@ export const load = async ({ url, depends, route, params }) => { } as Models.SiteList }; - try { - const siteList = await sdk + + return { + sitesLive, + offset, + limit, + search, + siteList: await sdk .forProject(params.region, params.project) .sites.list( [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search || undefined - ); - - return { - sitesLive, - offset, - limit, - search, - siteList, - view - }; - } catch (e) { - error(e.code || 500, - { - message: e.message, - type: e.type || 'unknown', - resource: 'sites' - }); - } -}; + ), + view + }; +} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts index 491697969..b05c763f8 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts @@ -2,21 +2,16 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; -import { error } from '@sveltejs/kit'; export const load = async ({ depends, params }) => { depends(Dependencies.SITE); - try { - const [site] = await Promise.all([ - sdk.forProject(params.region, params.project).sites.get(params.site) - ]); + const [site] = await Promise.all([ + sdk.forProject(params.region, params.project).sites.get(params.site) + ]); - return { - site, - header: Header, - breadcrumbs: Breadcrumbs - }; - } catch (e) { - error(e.code, e.message); - } + return { + site, + header: Header, + breadcrumbs: Breadcrumbs + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts index 282ea4dc1..f531ddd3b 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+layout.ts @@ -1,16 +1,12 @@ import { Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; export const load = async ({ depends }) => { depends(Dependencies.SITE); - try { - return { - header: Header, - breadcrumbs: Breadcrumbs - }; - } catch (e) { - error(e.code, e.message); - } + + return { + header: Header, + breadcrumbs: Breadcrumbs + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts index db813ddf3..c9f10e12f 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts @@ -2,15 +2,11 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; import { SiteUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(SiteUsageRange, params.period) ? params.period : SiteUsageRange.ThirtyDays; - try { - return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period); - } catch (e) { - error(e.code, e.message); - } + + return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period); }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts index 1aa27edd8..b38896918 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts @@ -2,15 +2,10 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; import { SiteUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(SiteUsageRange, params.period) ? params.period : SiteUsageRange.ThirtyDays; - try { - return sdk.forProject(params.region, params.project).sites.listUsage(period); - } catch (e) { - error(e.code, e.message); - } + return sdk.forProject(params.region, params.project).sites.listUsage(period); }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts index 361dd0548..43e7af97b 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts @@ -3,7 +3,6 @@ import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ url, route, params }) => { const page = getPage(url); @@ -11,27 +10,19 @@ export const load: PageLoad = async ({ url, route, params }) => { const view = getView(url, route, View.Grid); const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); - try { - const buckets = await sdk - .forProject(params.region, params.project) - .storage.listBuckets( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ); - - return { - offset, - limit, - view, - search, - buckets, - }; - } catch (e) { - error(e.code || 500, { - message: e.message, - type: e.type || 'unknown', - resource: 'storage' - } + const buckets = await sdk + .forProject(params.region, params.project) + .storage.listBuckets( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search || undefined ); - } + + return { + offset, + limit, + view, + search, + buckets, + }; + }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts index 3de7dc104..8fe99007f 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts @@ -3,20 +3,15 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; -import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.BUCKET); - try { - return { - header: Header, - breadcrumbs: Breadcrumbs, - bucket: await sdk - .forProject(params.region, params.project) - .storage.getBucket(params.bucket) - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + bucket: await sdk + .forProject(params.region, params.project) + .storage.getBucket(params.bucket) + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts index e198256ae..78eb76daf 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts @@ -3,24 +3,19 @@ import Header from './header.svelte'; import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.FILE); depends(Dependencies.FILE_TOKENS); - try { - return { - header: Header, - breadcrumbs: Breadcrumbs, - file: await sdk - .forProject(params.region, params.project) - .storage.getFile(params.bucket, params.file), - tokens: await sdk - .forProject(params.region, params.project) - .tokens.list(params.bucket, params.file) - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + file: await sdk + .forProject(params.region, params.project) + .storage.getFile(params.bucket, params.file), + tokens: await sdk + .forProject(params.region, params.project) + .tokens.list(params.bucket, params.file) + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts index e51803966..e20787e02 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts @@ -2,15 +2,11 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; import { StorageUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { - try { - const period = isValueOfStringEnum(StorageUsageRange, params.period) - ? params.period - : StorageUsageRange.ThirtyDays; - return sdk.forProject(params.region, params.project).storage.getUsage(period); - } catch (e) { - error(e.code, e.message); - } + const period = isValueOfStringEnum(StorageUsageRange, params.period) + ? params.period + : StorageUsageRange.ThirtyDays; + return sdk.forProject(params.region, params.project).storage.getUsage(period); + }; From f25bcddcaeb755f4808755977da18e1246c4233e Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 05:44:54 +0000 Subject: [PATCH 6/9] improve typings --- src/global.d.ts | 4 ++-- src/hooks.client.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/global.d.ts b/src/global.d.ts index b90c917c5..4c3895a50 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -3,12 +3,12 @@ interface Window { } namespace App { interface Error { - type: string = 'unknown', + type?: string, } interface HandleClientError { message: string; status?: number; - type: string; + type?: string; } } \ No newline at end of file diff --git a/src/hooks.client.ts b/src/hooks.client.ts index c04dece39..b3d426ffd 100644 --- a/src/hooks.client.ts +++ b/src/hooks.client.ts @@ -13,7 +13,8 @@ Sentry.init({ export const handleError: HandleClientError = ({ error, message, status }) => { console.error(error); - let type = 'unknown'; + + let type; if (error instanceof AppwriteException) { status = error.code === 0 ? undefined : error.code; message = error.message; From 555a8e3630a99f82916c625aedc24a38a38bf1fe Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 05:58:35 +0000 Subject: [PATCH 7/9] improve message --- .../(console)/project-[region]-[project]/+error.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte index 9b988b401..6c8fe7bd0 100644 --- a/src/routes/(console)/project-[region]-[project]/+error.svelte +++ b/src/routes/(console)/project-[region]-[project]/+error.svelte @@ -2,7 +2,8 @@ import { page } from '$app/state'; import { Container } from '$lib/layout'; import { Card, Typography } from '@appwrite.io/pink-svelte'; - function getResource(id: string) { + import { capitalize } from '$lib/helpers/string'; + function getResource(id: string) { id = id.replace('/(console)/project-[region]-[project]/', ''); let parts = id.split('/'); const resource = parts[0]; @@ -15,7 +16,7 @@ {#if page.error.type === 'general_resource_blocked'} {@const resource = getResource(page.route.id)} - Your {resource} is paused + Your {capitalize(resource)} is paused

We've detected unusual activity and temporarily paused your {resource}. If you believe this is a mistake or need urgent access, please contact support@appwrite.io. From 0d94f93f2b8834eaa3bad470beaeb81a943253f0 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 05:59:23 +0000 Subject: [PATCH 8/9] fix linter --- src/global.d.ts | 6 +++--- src/hooks.client.ts | 4 ++-- src/routes/(console)/project-[region]-[project]/+layout.ts | 1 - .../auth/teams/team-[team]/+layout.ts | 1 - .../auth/usage/[[period]]/+page.ts | 1 - .../databases/database-[database]/+layout.ts | 4 +--- .../collection-[collection]/document-[document]/+layout.ts | 1 - .../functions/function-[function]/+layout.ts | 4 +--- .../functions/function-[function]/usage/[[period]]/+page.ts | 1 - .../(console)/project-[region]-[project]/messaging/+page.ts | 6 +++--- .../messaging/message-[message]/+layout.ts | 1 - .../(console)/project-[region]-[project]/settings/+page.ts | 1 - .../(console)/project-[region]-[project]/sites/+page.ts | 3 +-- .../sites/site-[site]/usage/[[period]]/+page.ts | 2 +- .../(console)/project-[region]-[project]/storage/+page.ts | 3 +-- .../storage/bucket-[bucket]/+layout.ts | 4 +--- .../storage/usage/[[period]]/+page.ts | 1 - 17 files changed, 14 insertions(+), 30 deletions(-) diff --git a/src/global.d.ts b/src/global.d.ts index 4c3895a50..104ada708 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -1,9 +1,9 @@ /// -interface Window { } +interface Window {} namespace App { interface Error { - type?: string, + type?: string; } interface HandleClientError { @@ -11,4 +11,4 @@ namespace App { status?: number; type?: string; } -} \ No newline at end of file +} diff --git a/src/hooks.client.ts b/src/hooks.client.ts index b3d426ffd..4a6565025 100644 --- a/src/hooks.client.ts +++ b/src/hooks.client.ts @@ -18,12 +18,12 @@ export const handleError: HandleClientError = ({ error, message, status }) => { if (error instanceof AppwriteException) { status = error.code === 0 ? undefined : error.code; message = error.message; - type = error.type + type = error.type; } return { message, status, type - } + }; }; diff --git a/src/routes/(console)/project-[region]-[project]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts index 518d5348a..31f7331c7 100644 --- a/src/routes/(console)/project-[region]-[project]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/+layout.ts @@ -58,5 +58,4 @@ export const load: LayoutLoad = async ({ params, depends }) => { scopes, currentPlan }; - }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts index 72053f51a..6bd3c93ac 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/+layout.ts @@ -11,5 +11,4 @@ export const load: LayoutLoad = async ({ params, depends }) => { breadcrumbs: Breadcrumbs, team: await sdk.forProject(params.region, params.project).teams.get(params.team) }; - }; diff --git a/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts index 3a6d51d15..5c3b01d12 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/usage/[[period]]/+page.ts @@ -8,5 +8,4 @@ export const load: PageLoad = async ({ params }) => { ? params.period : UserUsageRange.ThirtyDays; return sdk.forProject(params.region, params.project).users.getUsage(period); - }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts index 52825a46f..03283b967 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts @@ -10,8 +10,6 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - database: await sdk - .forProject(params.region, params.project) - .databases.get(params.database) + database: await sdk.forProject(params.region, params.project).databases.get(params.database) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts index de89e5593..0c83436f4 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts @@ -41,5 +41,4 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { breadcrumbs: Breadcrumbs, document }; - }; diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts index 4d0fb4d2c..bf8d68f8c 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts @@ -10,9 +10,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.FUNCTION); depends(Dependencies.DEPLOYMENTS); - const func = await sdk - .forProject(params.region, params.project) - .functions.get(params.function); + const func = await sdk.forProject(params.region, params.project).functions.get(params.function); //TODO remove rule limit of 1 and display extra rules const proxyRuleList = await sdk diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts index 748ada6a1..a802c1c30 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -10,5 +10,4 @@ export const load: PageLoad = async ({ params }) => { return sdk .forProject(params.region, params.project) .functions.getUsage(params.function, period); - }; diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts index ea054f8a6..0436e02e7 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts @@ -44,8 +44,8 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { ], search || undefined )) as { - total: number; - messages: (Models.Message & { data: Record })[]; // Add typing for message.data - } + total: number; + messages: (Models.Message & { data: Record })[]; // Add typing for message.data + } }; }; diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts index b05e8ba2b..355a93be1 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts @@ -71,5 +71,4 @@ export const load: LayoutLoad = async ({ params, depends }) => { header: Header, breadcrumbs: Breadcrumbs }; - }; diff --git a/src/routes/(console)/project-[region]-[project]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/+page.ts index 0d9d3dca9..e6f31e223 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/settings/+page.ts @@ -22,5 +22,4 @@ export const load: PageLoad = async ({ depends, url, params }) => { variables, installations }; - }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts index c4250e613..ed74afbfc 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -26,7 +26,6 @@ export const load = async ({ url, depends, route, params }) => { } as Models.SiteList }; - return { sitesLive, offset, @@ -40,4 +39,4 @@ export const load = async ({ url, depends, route, params }) => { ), view }; -} +}; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts index c9f10e12f..f63696403 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts @@ -7,6 +7,6 @@ export const load: PageLoad = async ({ params }) => { const period = isValueOfStringEnum(SiteUsageRange, params.period) ? params.period : SiteUsageRange.ThirtyDays; - + return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period); }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/+page.ts index 43e7af97b..b68f763af 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts @@ -22,7 +22,6 @@ export const load: PageLoad = async ({ url, route, params }) => { limit, view, search, - buckets, + buckets }; - }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts index 8fe99007f..776b5506f 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts @@ -10,8 +10,6 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - bucket: await sdk - .forProject(params.region, params.project) - .storage.getBucket(params.bucket) + bucket: await sdk.forProject(params.region, params.project).storage.getBucket(params.bucket) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts index e20787e02..b54be8165 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/usage/[[period]]/+page.ts @@ -8,5 +8,4 @@ export const load: PageLoad = async ({ params }) => { ? params.period : StorageUsageRange.ThirtyDays; return sdk.forProject(params.region, params.project).storage.getUsage(period); - }; From 6ae329f7d770f060d3ceaff7f4be70d55fd27e56 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Thu, 5 Jun 2025 06:53:28 +0000 Subject: [PATCH 9/9] Improve error message with support link --- .../project-[region]-[project]/+error.svelte | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/+error.svelte b/src/routes/(console)/project-[region]-[project]/+error.svelte index 6c8fe7bd0..3f5197414 100644 --- a/src/routes/(console)/project-[region]-[project]/+error.svelte +++ b/src/routes/(console)/project-[region]-[project]/+error.svelte @@ -1,8 +1,11 @@