Skip to content

Commit

Permalink
fix: api usage.
Browse files Browse the repository at this point in the history
  • Loading branch information
ItzNotABug committed Mar 10, 2025
1 parent 1e071df commit 46d8226
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 11 deletions.
8 changes: 6 additions & 2 deletions src/lib/commandCenter/searchers/organizations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion src/routes/(console)/+layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ export const load: LayoutLoad = async ({ params, fetch, depends, parent }) => {
}, new Map<Tier, Plan>());
}

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;
Expand Down
13 changes: 8 additions & 5 deletions src/routes/(console)/account/organizations/+page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
};
Original file line number Diff line number Diff line change
@@ -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
};
};
4 changes: 3 additions & 1 deletion src/routes/+layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};
}

Expand Down

0 comments on commit 46d8226

Please sign in to comment.