From 7bc1d187e0e9bb22f28425f04c75a79ceaa5e00e Mon Sep 17 00:00:00 2001 From: Bhaskar Singh Date: Tue, 21 Mar 2023 21:23:17 +0530 Subject: [PATCH] Wrapped the SDK call within try catch and showing the correct error on the view --- .../console/project-[project]/+error.svelte | 5 +++- .../auth/usage/[[period]]/+page.ts | 23 +++++++++++------- .../databases/usage/[[period]]/+page.ts | 24 ++++++++++++------- .../usage/[[period]]/+page.ts | 23 +++++++++++------- .../storage/usage/[[period]]/+page.ts | 23 +++++++++++------- 5 files changed, 64 insertions(+), 34 deletions(-) diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/console/project-[project]/+error.svelte index eaba0eba1..a2297503a 100644 --- a/src/routes/console/project-[project]/+error.svelte +++ b/src/routes/console/project-[project]/+error.svelte @@ -6,5 +6,8 @@ {$page.status} - {$page.error.message} + +
+

{$page.error.message}

+
diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts index fbc99f708..807ef821c 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -1,16 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const { period } = params; - const response = await sdkForProject.users.getUsage(period ?? '30d'); - return { - count: response.usersCount as unknown as Models.Metric[], - created: response.usersCreate as unknown as Models.Metric[], - read: response.usersRead as unknown as Models.Metric[], - updated: response.usersUpdate as unknown as Models.Metric[], - deleted: response.usersDelete as unknown as Models.Metric[] - }; + try { + const response = await sdkForProject.users.getUsage(period ?? '30d'); + return { + count: response.usersCount as unknown as Models.Metric[], + created: response.usersCreate as unknown as Models.Metric[], + read: response.usersRead as unknown as Models.Metric[], + updated: response.usersUpdate as unknown as Models.Metric[], + deleted: response.usersDelete as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts index 9017a1b24..a01346792 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -1,17 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); const { period } = params; - const response = await sdkForProject.databases.getUsage(period ?? '30d'); - - return { - count: response.databasesCount as unknown as Models.Metric[], - created: response.databasesCreate as unknown as Models.Metric[], - read: response.databasesRead as unknown as Models.Metric[], - updated: response.databasesUpdate as unknown as Models.Metric[], - deleted: response.databasesDelete as unknown as Models.Metric[] - }; + try { + const response = await sdkForProject.databases.getUsage(period ?? '30d'); + return { + count: response.databasesCount as unknown as Models.Metric[], + created: response.databasesCreate as unknown as Models.Metric[], + read: response.databasesRead as unknown as Models.Metric[], + updated: response.databasesUpdate as unknown as Models.Metric[], + deleted: response.databasesDelete as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts index fcba697b3..139bb7be2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -1,16 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); - const response = await sdkForProject.functions.getFunctionUsage( - params.function, - params.period ?? '30d' - ); + try { + const response = await sdkForProject.functions.getFunctionUsage( + params.function, + params.period ?? '30d' + ); - return { - count: response.executionsTotal as unknown as Models.Metric[], - errors: response.buildsFailure as unknown as Models.Metric[] - }; + return { + count: response.executionsTotal as unknown as Models.Metric[], + errors: response.buildsFailure as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } }; diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts index 245f790ea..a224ba30c 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -1,16 +1,23 @@ import type { Models } from '@aw-labs/appwrite-console'; import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; +import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params, parent }) => { await parent(); - const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); + try { + const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); - return { - count: response.bucketsCount as unknown as Models.Metric[], - created: response.bucketsCreate as unknown as Models.Metric[], - read: response.bucketsRead as unknown as Models.Metric[], - updated: response.bucketsUpdate as unknown as Models.Metric[], - deleted: response.bucketsDelete as unknown as Models.Metric[] - }; + return { + count: response.bucketsCount as unknown as Models.Metric[], + created: response.bucketsCreate as unknown as Models.Metric[], + read: response.bucketsRead as unknown as Models.Metric[], + updated: response.bucketsUpdate as unknown as Models.Metric[], + deleted: response.bucketsDelete as unknown as Models.Metric[] + }; + } catch (err) { + throw error(err.code, { + message: err.message + }) + } };