Merge pull request #1734 from appwrite/fix-org-calls

fix: api usage.
This commit is contained in:
Darshan authored and GitHub committed 2025-03-10 17:12:32 +05:30
commit 322c009e73
5 files changed
+29 -11

No files matched your search

@@ -2,9 +2,13 @@ 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()))
.map((organization) => {
+3 -1
View File
@@ -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;
@@ -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
};
};
@@ -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
};
};
+6 -2
View File
@@ -28,9 +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: await sdk.forConsole.teams.list()
account,
organizations
};
}