From 7bc1d187e0e9bb22f28425f04c75a79ceaa5e00e Mon Sep 17 00:00:00 2001 From: Bhaskar Singh Date: Tue, 21 Mar 2023 21:23:17 +0530 Subject: [PATCH 1/3] 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 + }) + } }; From ca17d04269bbe1c1b01cd937543f44eeef837350 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 23 Mar 2023 16:33:56 +0100 Subject: [PATCH 2/3] Apply suggestions from code review --- src/routes/console/project-[project]/+error.svelte | 4 +--- .../project-[project]/auth/usage/[[period]]/+page.ts | 4 +--- .../project-[project]/databases/usage/[[period]]/+page.ts | 4 +--- .../function-[function]/usage/[[period]]/+page.ts | 7 ++----- .../project-[project]/storage/usage/[[period]]/+page.ts | 7 ++----- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/console/project-[project]/+error.svelte index a2297503a..0b310cfd5 100644 --- a/src/routes/console/project-[project]/+error.svelte +++ b/src/routes/console/project-[project]/+error.svelte @@ -7,7 +7,5 @@ {$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 08fc0fd6e..b922f44f6 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -15,8 +15,6 @@ export const load: PageLoad = async ({ params }) => { deleted: response.usersDelete as unknown as Models.Metric[] }; } catch (err) { - throw error(err.code, { - message: err.message - }) + throw error(err.code, 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 d2e344000..b439881ff 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -15,8 +15,6 @@ export const load: PageLoad = async ({ params }) => { deleted: response.databasesDelete as unknown as Models.Metric[] }; } catch (err) { - throw error(err.code, { - message: err.message - }) + throw error(err.code, 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 16799c7e6..e1cd0ea88 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 @@ -3,8 +3,7 @@ import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; import { error } from '@sveltejs/kit'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { try { const response = await sdkForProject.functions.getFunctionUsage( params.function, @@ -16,8 +15,6 @@ export const load: PageLoad = async ({ params, parent }) => { errors: response.buildsFailure as unknown as Models.Metric[] }; } catch (err) { - throw error(err.code, { - message: err.message - }) + throw error(err.code, 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 642886057..18c05a43f 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -3,8 +3,7 @@ import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; import { error } from '@sveltejs/kit'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { try { const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); @@ -16,8 +15,6 @@ export const load: PageLoad = async ({ params, parent }) => { deleted: response.bucketsDelete as unknown as Models.Metric[] }; } catch (err) { - throw error(err.code, { - message: err.message - }) + throw error(err.code, err.message); } }; From b99830b8336e6630d7aab88d1d45ed23c1a4eae8 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 23 Mar 2023 16:38:46 +0100 Subject: [PATCH 3/3] Apply suggestions from code review --- src/routes/console/project-[project]/+error.svelte | 1 - .../console/project-[project]/auth/usage/[[period]]/+page.ts | 2 +- .../project-[project]/databases/usage/[[period]]/+page.ts | 2 +- .../functions/function-[function]/usage/[[period]]/+page.ts | 2 +- .../console/project-[project]/storage/usage/[[period]]/+page.ts | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/console/project-[project]/+error.svelte index 0b310cfd5..0dfcff9d1 100644 --- a/src/routes/console/project-[project]/+error.svelte +++ b/src/routes/console/project-[project]/+error.svelte @@ -6,6 +6,5 @@ {$page.status} -

{$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 b922f44f6..063aa0ba2 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -6,7 +6,7 @@ import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const { period } = params; try { - const response = await sdkForProject.users.getUsage(period ?? '30d'); + const response = await sdk.forProject.users.getUsage(period ?? '30d'); return { count: response.usersCount as unknown as Models.Metric[], created: response.usersCreate as unknown as Models.Metric[], 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 b439881ff..c7378bbe4 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -6,7 +6,7 @@ import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { const { period } = params; try { - const response = await sdkForProject.databases.getUsage(period ?? '30d'); + const response = await sdk.forProject.databases.getUsage(period ?? '30d'); return { count: response.databasesCount as unknown as Models.Metric[], created: response.databasesCreate as unknown as Models.Metric[], 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 e1cd0ea88..7503147ae 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 @@ -5,7 +5,7 @@ import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { try { - const response = await sdkForProject.functions.getFunctionUsage( + const response = await sdk.forProject.functions.getFunctionUsage( params.function, params.period ?? '30d' ); 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 18c05a43f..eefcaf323 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -5,7 +5,7 @@ import { error } from '@sveltejs/kit'; export const load: PageLoad = async ({ params }) => { try { - const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); + const response = await sdk.forProject.storage.getUsage(params.period ?? '30d'); return { count: response.bucketsCount as unknown as Models.Metric[],