From 46d8226589246b02117cb46cfc075d631576a7ed Mon Sep 17 00:00:00 2001 From: Darshan Date: Mon, 10 Mar 2025 16:52:40 +0530 Subject: [PATCH 1/3] fix: api usage. --- src/lib/commandCenter/searchers/organizations.ts | 8 ++++++-- src/routes/(console)/+layout.ts | 4 +++- src/routes/(console)/account/organizations/+page.ts | 13 ++++++++----- .../domains/domain-[domain]/settings/+page.ts | 9 +++++++-- src/routes/+layout.ts | 4 +++- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/lib/commandCenter/searchers/organizations.ts b/src/lib/commandCenter/searchers/organizations.ts index 98302e96f..fd82801c5 100644 --- a/src/lib/commandCenter/searchers/organizations.ts +++ b/src/lib/commandCenter/searchers/organizations.ts @@ -2,11 +2,15 @@ import { goto } from '$app/navigation'; import { base } from '$app/paths'; import { sdk } from '$lib/stores/sdk'; import type { Searcher } from '../commands'; +import { isCloud } from '$lib/system'; export const orgSearcher = (async (query: string) => { - const { teams } = await sdk.forConsole.teams.list(); + const { teams } = !isCloud + ? await sdk.forConsole.teams.list() + : await sdk.forConsole.billing.listOrganization(); + return teams - .filter((organization) => organization.name.toLowerCase().includes(query.toLowerCase())) + .filter((organization) => organization.name.toLowerCase().includes(query?.toLowerCase())) .map((organization) => { return { label: organization.name, diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index d4d311286..447f41d90 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -34,7 +34,9 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => { }, new Map()); } - const organizations = await sdk.forConsole.teams.list(); + const organizations = !isCloud + ? await sdk.forConsole.teams.list() + : await sdk.forConsole.billing.listOrganization(); let projects = []; let currentOrgId = params.organization ? params.organization : prefs.organization; diff --git a/src/routes/(console)/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts index 0b89b1d30..c1734a28c 100644 --- a/src/routes/(console)/account/organizations/+page.ts +++ b/src/routes/(console)/account/organizations/+page.ts @@ -3,19 +3,22 @@ import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; +import { isCloud } from '$lib/system'; export const load: PageLoad = async ({ url, route }) => { const page = getPage(url); const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); + const queries = [Query.offset(offset), Query.limit(limit), Query.orderDesc('')]; + + const organizations = !isCloud + ? await sdk.forConsole.teams.list(queries) + : await sdk.forConsole.billing.listOrganization(queries); + return { offset, limit, - organizations: await sdk.forConsole.teams.list([ - Query.offset(offset), - Query.limit(limit), - Query.orderDesc('') - ]) + organizations }; }; diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts index 54b6037ea..af454f6d5 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts @@ -1,12 +1,17 @@ import { Dependencies } from '$lib/constants'; -import type { OrganizationList } from '$lib/stores/organization.js'; import { sdk } from '$lib/stores/sdk'; +import { isCloud } from '$lib/system'; export const load = async ({ parent, depends }) => { depends(Dependencies.DOMAINS); + + const organizations = !isCloud + ? await sdk.forConsole.teams.list() + : await sdk.forConsole.billing.listOrganization(); + const { domain } = await parent(); return { domain, - organizations: (await sdk.forConsole.teams.list()) as OrganizationList + organizations }; }; diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 20db1d4af..78d86d2e4 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -30,7 +30,9 @@ export const load: LayoutLoad = async ({ depends, url, route }) => { if (account) { return { account: account, - organizations: await sdk.forConsole.teams.list() + organizations: !isCloud + ? await sdk.forConsole.teams.list() + : await sdk.forConsole.billing.listOrganization() }; } From ca00ec6fee79921df3b53387184b3c7996d8cb27 Mon Sep 17 00:00:00 2001 From: Darshan Date: Mon, 10 Mar 2025 16:53:54 +0530 Subject: [PATCH 2/3] fix: remove null check. --- src/lib/commandCenter/searchers/organizations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/commandCenter/searchers/organizations.ts b/src/lib/commandCenter/searchers/organizations.ts index fd82801c5..1d959e992 100644 --- a/src/lib/commandCenter/searchers/organizations.ts +++ b/src/lib/commandCenter/searchers/organizations.ts @@ -10,7 +10,7 @@ export const orgSearcher = (async (query: string) => { : await sdk.forConsole.billing.listOrganization(); return teams - .filter((organization) => organization.name.toLowerCase().includes(query?.toLowerCase())) + .filter((organization) => organization.name.toLowerCase().includes(query.toLowerCase())) .map((organization) => { return { label: organization.name, From 954c5c8df442d5f43cee75d118ec26dcb896a2a9 Mon Sep 17 00:00:00 2001 From: Darshan Date: Mon, 10 Mar 2025 16:56:18 +0530 Subject: [PATCH 3/3] misc: update. --- src/routes/+layout.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 78d86d2e4..6e42a690e 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -28,11 +28,13 @@ export const load: LayoutLoad = async ({ depends, url, route }) => { } if (account) { + const organizations = !isCloud + ? await sdk.forConsole.teams.list() + : await sdk.forConsole.billing.listOrganization(); + return { - account: account, - organizations: !isCloud - ? await sdk.forConsole.teams.list() - : await sdk.forConsole.billing.listOrganization() + account, + organizations }; }