diff --git a/src/global.d.ts b/src/global.d.ts index db6b03f38..104ada708 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -1,2 +1,14 @@ /// interface Window {} + +namespace App { + interface Error { + type?: string; + } + + interface HandleClientError { + message: string; + status?: number; + type?: string; + } +} diff --git a/src/hooks.client.ts b/src/hooks.client.ts index 5419792a0..4a6565025 100644 --- a/src/hooks.client.ts +++ b/src/hooks.client.ts @@ -13,13 +13,17 @@ Sentry.init({ export const handleError: HandleClientError = ({ error, message, status }) => { console.error(error); + + let type; 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 9ef91393f..3f5197414 100644 --- a/src/routes/(console)/project-[region]-[project]/+error.svelte +++ b/src/routes/(console)/project-[region]-[project]/+error.svelte @@ -1,13 +1,44 @@ - - {'status' in page.error - ? page.error.status || 'Invalid Argument' - : 'Invalid Argument'} -

{page.error.message}

+ {#if page.error.type === 'general_resource_blocked'} + {@const resource = getResource(page.route.id)} + + 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 + {#if $currentPlan?.premiumSupport} + { + wizard.start(SupportWizard); + }}>support. + {:else} + support@appwrite.io. + {/if} +

+
+ {: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]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts index d9a79cbc1..31f7331c7 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,46 @@ 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..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 @@ -3,17 +3,12 @@ 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..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 @@ -2,15 +2,10 @@ 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 6abcffdc5..35841ef15 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -28,7 +28,6 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => search, currentPlan ); - return { offset, limit, 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..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 @@ -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,9 @@ 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..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 @@ -3,47 +3,42 @@ 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 - }; - } catch (e) { - error(e.code, e.message); - } + return { + header: Header, + breadcrumbs: Breadcrumbs, + document + }; }; 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/function-[function]/+layout.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+layout.ts index 75207a4cd..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 @@ -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,23 @@ 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..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 @@ -1,18 +1,13 @@ 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/message-[message]/+layout.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/+layout.ts index 904ac32a1..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 @@ -3,77 +3,72 @@ 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; - }) - ); - - await Promise.allSettled([usersPromise, messageRecipientsPromise]); - - return { - message, - topicsById, - targetsById, - usersById, - messageRecipients, - header: Header, - breadcrumbs: Breadcrumbs - }; - } catch (e) { - throw error(e.code, e.message); - } + return { + message, + topicsById, + targetsById, + usersById, + messageRecipients, + header: Header, + breadcrumbs: Breadcrumbs + }; }; 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 b76ee678e..ed74afbfc 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -26,19 +26,17 @@ 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 - ); - return { sitesLive, offset, limit, search, - siteList, + siteList: await sdk + .forProject(params.region, params.project) + .sites.list( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search || undefined + ), 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..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 @@ -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 61cb3d856..b68f763af 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.ts @@ -10,17 +10,18 @@ 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); + 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: await sdk - .forProject(params.region, params.project) - .storage.listBuckets( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ) + 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..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 @@ -3,20 +3,13 @@ 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..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 @@ -2,15 +2,10 @@ 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); };