From 41e8f1124588f4eac328fe78d0fae2d3772b3422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Tue, 19 Dec 2023 20:38:53 +0100 Subject: [PATCH 1/2] Fix error page on usage --- .../usage/[[invoice]]/+page.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts index 176d456fe1..d80e5d919c 100644 --- a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts +++ b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts @@ -41,12 +41,16 @@ export const load: PageLoad = async ({ params, parent }) => { sdk.forConsole.billing.listUsage(params.organization, startDate, endDate) ]); - const projectNames = await sdk.forConsole.projects.list([ - Query.equal( + const queries: string[] = []; + + if(usage.projects.length > 0) { + queries.push(Query.equal( '$id', usage.projects.map((p) => p.projectId) - ) - ]); + )); + } + + const projectNames = await sdk.forConsole.projects.list(queries); return { organizationUsage: usage, From 19209dd2d32b0c39438232a23026074bf99af2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Tue, 19 Dec 2023 20:44:14 +0100 Subject: [PATCH 2/2] Fix linter --- .../usage/[[invoice]]/+page.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts index d80e5d919c..8f5203de96 100644 --- a/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts +++ b/src/routes/console/organization-[organization]/usage/[[invoice]]/+page.ts @@ -43,11 +43,13 @@ export const load: PageLoad = async ({ params, parent }) => { const queries: string[] = []; - if(usage.projects.length > 0) { - queries.push(Query.equal( - '$id', - usage.projects.map((p) => p.projectId) - )); + if (usage.projects.length > 0) { + queries.push( + Query.equal( + '$id', + usage.projects.map((p) => p.projectId) + ) + ); } const projectNames = await sdk.forConsole.projects.list(queries);