From bef7a0b356264dc7ec813388b305e1fd0690a40c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 8 Oct 2024 17:10:00 +0200 Subject: [PATCH 1/2] fix: selfhosted roles --- src/routes/(console)/organization-[organization]/+layout.ts | 6 +++--- src/routes/(console)/project-[project]/+layout.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts index 2bdce13f2..68d8c308e 100644 --- a/src/routes/(console)/organization-[organization]/+layout.ts +++ b/src/routes/(console)/organization-[organization]/+layout.ts @@ -17,8 +17,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.ORGANIZATION); depends(Dependencies.MEMBERS); depends(Dependencies.PAYMENT_METHODS); - let roles = isCloud ? [] : defaultScopes; - let scopes = isCloud ? [] : defaultRoles; + let roles = isCloud ? [] : defaultRoles; + let scopes = isCloud ? [] : defaultScopes; try { if (isCloud) { @@ -48,7 +48,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { sdk.forConsole.teams.listMemberships(params.organization), preferences.loadTeamPrefs(params.organization) ]); - + console.log(scopes); return { header: Header, breadcrumbs: Breadcrumbs, diff --git a/src/routes/(console)/project-[project]/+layout.ts b/src/routes/(console)/project-[project]/+layout.ts index dfb5d8eac..3b3d45c1b 100644 --- a/src/routes/(console)/project-[project]/+layout.ts +++ b/src/routes/(console)/project-[project]/+layout.ts @@ -17,8 +17,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { const newPrefs = { ...prefs, organization: project.teamId }; sdk.forConsole.account.updatePrefs(newPrefs); preferences.loadTeamPrefs(project.teamId); - let roles = isCloud ? [] : defaultScopes; - let scopes = isCloud ? [] : defaultRoles; + let roles = isCloud ? [] : defaultRoles; + let scopes = isCloud ? [] : defaultScopes; if (isCloud) { const res = await sdk.forConsole.billing.getRoles(project.teamId); roles = res.roles; @@ -27,7 +27,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { await failedInvoice.load(project.teamId); } } - + console.log(roles); return { project, organization: await (sdk.forConsole.teams.get(project.teamId) as Promise), From 08a4b278aae850faa0031ca378ceeb6594f39160 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 8 Oct 2024 17:10:58 +0200 Subject: [PATCH 2/2] chore: run formatter --- src/routes/(console)/organization-[organization]/+layout.ts | 2 +- src/routes/(console)/project-[project]/+layout.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts index 68d8c308e..ccc1c0a93 100644 --- a/src/routes/(console)/organization-[organization]/+layout.ts +++ b/src/routes/(console)/organization-[organization]/+layout.ts @@ -48,7 +48,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { sdk.forConsole.teams.listMemberships(params.organization), preferences.loadTeamPrefs(params.organization) ]); - console.log(scopes); + return { header: Header, breadcrumbs: Breadcrumbs, diff --git a/src/routes/(console)/project-[project]/+layout.ts b/src/routes/(console)/project-[project]/+layout.ts index 3b3d45c1b..ec6ce1eb2 100644 --- a/src/routes/(console)/project-[project]/+layout.ts +++ b/src/routes/(console)/project-[project]/+layout.ts @@ -27,7 +27,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { await failedInvoice.load(project.teamId); } } - console.log(roles); + return { project, organization: await (sdk.forConsole.teams.get(project.teamId) as Promise),