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

fix: api usage.
appwrite · Mar 10, 2025 · 322c009 · 322c009
2 parents 1e071df + 954c5c8
commit 322c009
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/src/lib/commandCenter/searchers/organizations.ts b/src/lib/commandCenter/searchers/organizations.ts
@@ -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) => {

diff --git 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<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;

diff --git 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
@@ -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
@@ -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
         };
     }