From 35aa7b55a2bf3668c6c1f4574c6a67aec1461ca6 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Mon, 14 Nov 2022 15:29:53 +0100 Subject: [PATCH] fix: error handling --- src/routes/console/+error.svelte | 12 ++++++++++++ .../console/organization-[organization]/+layout.ts | 5 +++-- .../project-[project]/auth/teams/[[page]]/+page.ts | 2 +- .../teams/team-[team]/activity/[[page]]/+page.ts | 2 +- .../auth/teams/team-[team]/members/[[page]]/+page.ts | 2 +- .../activity/[[page]]/+page.ts | 2 +- .../document-[document]/activity/[[page]]/+page.ts | 2 +- 7 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 src/routes/console/+error.svelte diff --git a/src/routes/console/+error.svelte b/src/routes/console/+error.svelte new file mode 100644 index 000000000..9a50e9be7 --- /dev/null +++ b/src/routes/console/+error.svelte @@ -0,0 +1,12 @@ + + + + {$page.status} + {$page.error.message} + + diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts index 73e344c0c..5c8fd269d 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -13,10 +13,11 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - organization: sdkForConsole.teams.get(params.organization), - members: sdkForConsole.teams.listMemberships(params.organization) + organization: await sdkForConsole.teams.get(params.organization), + members: await sdkForConsole.teams.listMemberships(params.organization) }; } catch (e) { + globalThis.localStorage.removeItem('organization'); throw error(e.code, e.message); } }; diff --git a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts index 18f5288e1..dfd5d40df 100644 --- a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts @@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, parent, url }) => { offset, search, page, - teams: sdkForProject.teams.list( + teams: await sdkForProject.teams.list( [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search ) diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts index 7a37ebc80..a3a5fa8d0 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: sdkForProject.teams.listLogs(params.team, [ + logs: await sdkForProject.teams.listLogs(params.team, [ Query.limit(PAGE_LIMIT), Query.offset(offset) ]) diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts index 2aa0f1ac3..38c6fd930 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts @@ -15,7 +15,7 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => { return { offset, search, - memberships: sdkForProject.teams.listMemberships( + memberships: await sdkForProject.teams.listMemberships( teamId, [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts index bfb63d8c6..8269c058b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: sdkForProject.databases.listCollectionLogs(params.database, params.collection, [ + logs: await sdkForProject.databases.listCollectionLogs(params.database, params.collection, [ Query.limit(PAGE_LIMIT), Query.offset(offset) ]) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts index aa93b9396..a6606dde6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: sdkForProject.databases.listDocumentLogs( + logs: await sdkForProject.databases.listDocumentLogs( params.database, params.collection, params.document,