Merge pull request #2603 from appwrite/org-filters

ItzNotABug · web-flow · commit 768c84d105b4 · 2025-11-17T18:42:34.000+05:30
diff --git a/src/lib/commandCenter/searchers/organizations.ts b/src/lib/commandCenter/searchers/organizations.ts
@@ -3,11 +3,15 @@ import { base } from '$app/paths';
 import { sdk } from '$lib/stores/sdk';
 import type { Searcher } from '../commands';
 import { isCloud } from '$lib/system';
+import { Query } from '@appwrite.io/console';
+import { resolvedProfile } from '$lib/profiles/index.svelte';
 
 export const orgSearcher = (async (query: string) => {
     const { teams } = !isCloud
         ? await sdk.forConsole.teams.list()
-        : await sdk.forConsole.billing.listOrganization();
+        : await sdk.forConsole.billing.listOrganization([
+              Query.equal('platform', resolvedProfile.organizationPlatform)
+          ]);
 
     return teams
         .filter((organization) => organization.name.toLowerCase().includes(query.toLowerCase()))
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
@@ -557,9 +557,10 @@ export async function checkForMandate(org: Organization) {
 
 export async function checkForMissingPaymentMethod() {
     const orgs = await sdk.forConsole.billing.listOrganization([
-        Query.notEqual('billingPlan', BillingPlan.FREE),
+        Query.notEqual('billingPlan', resolvedProfile.freeTier),
         Query.isNull('paymentMethodId'),
-        Query.isNull('backupPaymentMethodId')
+        Query.isNull('backupPaymentMethodId'),
+        Query.equal('platform', resolvedProfile.organizationPlatform)
     ]);
     if (orgs?.total) {
         orgMissingPaymentMethod.set(orgs.teams[0]);
@@ -592,7 +593,8 @@ export async function checkForNewDevUpgradePro(org: Organization) {
     if (now - accountCreated < 1000 * 60 * 60 * 24 * 7) return;
 
     const organizations = await sdk.forConsole.billing.listOrganization([
-        Query.notEqual('billingPlan', BillingPlan.FREE)
+        Query.notEqual('billingPlan', resolvedProfile.freeTier),
+        Query.equal('platform', resolvedProfile.organizationPlatform)
     ]);
 
     if (organizations?.total) return;
diff --git a/src/routes/(console)/account/organizations/+page.ts b/src/routes/(console)/account/organizations/+page.ts
@@ -4,13 +4,19 @@ import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
 import { isCloud } from '$lib/system';
+import { resolvedProfile } from '$lib/profiles/index.svelte';
 
 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 queries = [
+        Query.offset(offset),
+        Query.limit(limit),
+        Query.orderDesc(''),
+        Query.equal('platform', resolvedProfile.organizationPlatform)
+    ];
 
     const organizations = !isCloud
         ? await sdk.forConsole.teams.list({ queries })
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,13 +1,17 @@
 import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
+import { Query } from '@appwrite.io/console';
+import { resolvedProfile } from '$lib/profiles/index.svelte';
 
 export const load = async ({ parent, depends }) => {
     depends(Dependencies.DOMAINS);
 
     const organizations = !isCloud
         ? await sdk.forConsole.teams.list()
-        : await sdk.forConsole.billing.listOrganization();
+        : await sdk.forConsole.billing.listOrganization([
+              Query.equal('platform', resolvedProfile.organizationPlatform)
+          ]);
 
     const { domain } = await parent();
     return {
diff --git a/src/routes/(public)/functions/deploy/+page.ts b/src/routes/(public)/functions/deploy/+page.ts
@@ -2,7 +2,7 @@ import { sdk } from '$lib/stores/sdk.js';
 import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import { isCloud } from '$lib/system';
-import { ID, type Models } from '@appwrite.io/console';
+import { ID, type Models, Query } from '@appwrite.io/console';
 import type { OrganizationList } from '$lib/stores/organization';
 import { redirectTo } from '$routes/store';
 import type { PageLoad } from './$types';
@@ -66,7 +66,9 @@ export const load: PageLoad = async ({ parent, url }) => {
     // Get organizations
     let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
     if (isCloud) {
-        organizations = await sdk.forConsole.billing.listOrganization();
+        organizations = await sdk.forConsole.billing.listOrganization([
+            Query.equal('platform', resolvedProfile.organizationPlatform)
+        ]);
     } else {
         organizations = await sdk.forConsole.teams.list();
     }
@@ -90,7 +92,9 @@ export const load: PageLoad = async ({ parent, url }) => {
             }
 
             if (isCloud) {
-                organizations = await sdk.forConsole.billing.listOrganization();
+                organizations = await sdk.forConsole.billing.listOrganization([
+                    Query.equal('platform', resolvedProfile.organizationPlatform)
+                ]);
             } else {
                 organizations = await sdk.forConsole.teams.list();
             }
diff --git a/src/routes/(public)/sites/deploy/+page.ts b/src/routes/(public)/sites/deploy/+page.ts
@@ -2,7 +2,7 @@ import { sdk } from '$lib/stores/sdk.js';
 import { redirect, error } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import { isCloud } from '$lib/system';
-import { ID, type Models } from '@appwrite.io/console';
+import { ID, type Models, Query } from '@appwrite.io/console';
 import type { OrganizationList } from '$lib/stores/organization';
 import { redirectTo } from '$routes/store';
 import type { PageLoad } from './$types';
@@ -83,7 +83,9 @@ export const load: PageLoad = async ({ parent, url }) => {
     let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
 
     if (isCloud) {
-        organizations = await sdk.forConsole.billing.listOrganization();
+        organizations = await sdk.forConsole.billing.listOrganization([
+            Query.equal('platform', resolvedProfile.organizationPlatform)
+        ]);
     } else {
         organizations = await sdk.forConsole.teams.list();
     }
@@ -107,7 +109,9 @@ export const load: PageLoad = async ({ parent, url }) => {
 
             // Refetch organizations after creation
             if (isCloud) {
-                organizations = await sdk.forConsole.billing.listOrganization();
+                organizations = await sdk.forConsole.billing.listOrganization([
+                    Query.equal('platform', resolvedProfile.organizationPlatform)
+                ]);
             } else {
                 organizations = await sdk.forConsole.teams.list();
             }
diff --git a/src/routes/(public)/template-[template]/+page.ts b/src/routes/(public)/template-[template]/+page.ts
@@ -1,11 +1,12 @@
 import { BillingPlan } from '$lib/constants.js';
 import { sdk } from '$lib/stores/sdk.js';
-import { ID, type Models } from '@appwrite.io/console';
+import { ID, type Models, Query } from '@appwrite.io/console';
 import { isCloud } from '$lib/system.js';
 import { error, redirect } from '@sveltejs/kit';
 import type { OrganizationList } from '$lib/stores/organization.js';
 import { redirectTo } from '$routes/store.js';
 import { base } from '$app/paths';
+import { resolvedProfile } from '$lib/profiles/index.svelte';
 
 export const load = async ({ parent, url, params }) => {
     const { account } = await parent();
@@ -39,7 +40,11 @@ export const load = async ({ parent, url, params }) => {
 
     let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
     if (isCloud) {
-        organizations = account?.$id ? await sdk.forConsole.billing.listOrganization() : undefined;
+        organizations = account?.$id
+            ? await sdk.forConsole.billing.listOrganization([
+                  Query.equal('platform', resolvedProfile.organizationPlatform)
+              ])
+            : undefined;
     } else {
         organizations = account?.$id ? await sdk.forConsole.teams.list() : undefined;
     }
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -8,9 +8,10 @@ import type { LayoutLoad } from './$types';
 import { redirectTo } from './store';
 import { base, resolve } from '$app/paths';
 import type { Account } from '$lib/stores/user';
-import type { AppwriteException } from '@appwrite.io/console';
+import { type AppwriteException, Query } from '@appwrite.io/console';
 import { isCloud, VARS } from '$lib/system';
 import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
+import { resolvedProfile } from '$lib/profiles/index.svelte';
 
 export const ssr = false;
 
@@ -42,7 +43,9 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
             account: account,
             organizations: !isCloud
                 ? await sdk.forConsole.teams.list()
-                : await sdk.forConsole.billing.listOrganization()
+                : await sdk.forConsole.billing.listOrganization([
+                      Query.equal('platform', resolvedProfile.organizationPlatform)
+                  ])
         };
     }
 
