Merge pull request #2650 from appwrite/fix-filtering

Author: ItzNotABug

package.json

@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@acef319",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@406d8be",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@6916470",
         "@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

@@ -24,7 +24,7 @@ import type {
 } from '$lib/sdk/billing';
 import { isCloud } from '$lib/system';
 import { activeHeaderAlert, orgMissingPaymentMethod } from '$routes/(console)/store';
-import { AppwriteException, Query } from '@appwrite.io/console';
+import { AppwriteException, Query, Platform } from '@appwrite.io/console';
 import { derived, get, writable } from 'svelte/store';
 import { headerAlert } from './headerAlert';
 import { addNotification, notifications } from './notifications';
@@ -558,7 +558,7 @@ export async function checkForMissingPaymentMethod() {
         Query.notEqual('billingPlan', BillingPlan.FREE),
         Query.isNull('paymentMethodId'),
         Query.isNull('backupPaymentMethodId'),
-        Query.equal('platform', 'appwrite')
+        Query.equal('platform', Platform.Appwrite)
     ]);
     if (orgs?.total) {
         orgMissingPaymentMethod.set(orgs.teams[0]);

src/lib/stores/billing.ts

@@ -1,4 +1,4 @@
-import { Query } from '@appwrite.io/console';
+import { Query, Platform } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT } from '$lib/constants';
@@ -14,7 +14,7 @@ export const load: PageLoad = async ({ url, route }) => {
         Query.offset(offset),
         Query.limit(limit),
         Query.orderDesc(''),
-        Query.equal('platform', 'appwrite')
+        Query.equal('platform', Platform.Appwrite)
     ];
 
     const organizations = !isCloud

src/routes/(console)/account/organizations/+page.ts

@@ -1,14 +1,16 @@
 import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
-import { Query } from '@appwrite.io/console';
+import { Query, Platform } from '@appwrite.io/console';
 
 export const load = async ({ parent, depends }) => {
     depends(Dependencies.DOMAINS);
 
     const organizations = !isCloud
         ? await sdk.forConsole.teams.list()
-        : await sdk.forConsole.billing.listOrganization([Query.equal('platform', 'appwrite')]);
+        : await sdk.forConsole.billing.listOrganization([
+              Query.equal('platform', Platform.Appwrite)
+          ]);
 
     const { domain } = await parent();
     return {

src/routes/(console)/organization-[organization]/domains/domain-[domain]/settings/+page.ts

@@ -23,27 +23,29 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
         (org) => org.$id === project.teamId
     );
 
-    const includedInBasePlans = plansInfo.has(organization.billingPlan);
+    // organization can be null if not in the filtered list!
+    const includedInBasePlans = plansInfo.has(organization?.billingPlan);
 
-    const [org, regionalConsoleVariables, rolesResult, organizationPlan] = await Promise.all([
+    const [org, regionalConsoleVariables, rolesResult] = await Promise.all([
         !organization
             ? (sdk.forConsole.teams.get({ teamId: project.teamId }) as Promise<Organization>)
             : organization,
         sdk.forConsoleIn(project.region).console.variables(),
         isCloud ? sdk.forConsole.billing.getRoles(project.teamId) : null,
 
-        // fetch if not available in `plansInfo`
-        includedInBasePlans
-            ? plansInfo.get(organization.billingPlan)
-            : isCloud
-              ? sdk.forConsole.billing.getOrganizationPlan(organization.$id)
-              : null,
-
         loadAvailableRegions(project.teamId)
     ]);
 
     if (!organization) organization = org;
 
+    // fetch if not available in `plansInfo`.
+    // out of promise.all because we filter orgs based on platform now!
+    const organizationPlan = includedInBasePlans
+        ? plansInfo.get(organization?.billingPlan)
+        : isCloud
+          ? await sdk.forConsole.billing.getOrganizationPlan(organization?.$id)
+          : null;
+
     const roles = rolesResult?.roles ?? defaultRoles;
     const scopes = rolesResult?.scopes ?? defaultScopes;
 

src/routes/(console)/project-[region]-[project]/+layout.ts

@@ -3,7 +3,7 @@ import { redirect } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import { isCloud } from '$lib/system';
 import { BillingPlan } from '$lib/constants';
-import { ID, type Models, Query } from '@appwrite.io/console';
+import { ID, type Models, Query, Platform } from '@appwrite.io/console';
 import type { OrganizationList } from '$lib/stores/organization';
 import { redirectTo } from '$routes/store';
 import type { PageLoad } from './$types';
@@ -67,7 +67,7 @@ export const load: PageLoad = async ({ parent, url }) => {
     let organizations: Models.TeamList<Record<string, unknown>> | OrganizationList | undefined;
     if (isCloud) {
         organizations = await sdk.forConsole.billing.listOrganization([
-            Query.equal('platform', 'appwrite')
+            Query.equal('platform', Platform.Appwrite)
         ]);
     } else {
         organizations = await sdk.forConsole.teams.list();
@@ -91,7 +91,7 @@ export const load: PageLoad = async ({ parent, url }) => {
 
             if (isCloud) {
                 organizations = await sdk.forConsole.billing.listOrganization([
-                    Query.equal('platform', 'appwrite')
+                    Query.equal('platform', Platform.Appwrite)
                 ]);
             } else {
                 organizations = await sdk.forConsole.teams.list();

src/routes/(public)/functions/deploy/+page.ts

@@ -3,7 +3,7 @@ import { redirect, error } from '@sveltejs/kit';
 import { base } from '$app/paths';
 import { isCloud } from '$lib/system';
 import { BillingPlan } from '$lib/constants';
-import { ID, type Models, Query } from '@appwrite.io/console';
+import { ID, type Models, Query, Platform } from '@appwrite.io/console';
 import type { OrganizationList } from '$lib/stores/organization';
 import { redirectTo } from '$routes/store';
 import type { PageLoad } from './$types';
@@ -84,7 +84,7 @@ export const load: PageLoad = async ({ parent, url }) => {
 
     if (isCloud) {
         organizations = await sdk.forConsole.billing.listOrganization([
-            Query.equal('platform', 'appwrite')
+            Query.equal('platform', Platform.Appwrite)
         ]);
     } else {
         organizations = await sdk.forConsole.teams.list();
@@ -109,7 +109,7 @@ export const load: PageLoad = async ({ parent, url }) => {
             // Refetch organizations after creation
             if (isCloud) {
                 organizations = await sdk.forConsole.billing.listOrganization([
-                    Query.equal('platform', 'appwrite')
+                    Query.equal('platform', Platform.Appwrite)
                 ]);
             } else {
                 organizations = await sdk.forConsole.teams.list();

src/routes/(public)/sites/deploy/+page.ts

@@ -1,6 +1,6 @@
 import { BillingPlan } from '$lib/constants.js';
 import { sdk } from '$lib/stores/sdk.js';
-import { ID, type Models, Query } from '@appwrite.io/console';
+import { ID, type Models, Query, Platform } from '@appwrite.io/console';
 import { isCloud } from '$lib/system.js';
 import { error, redirect } from '@sveltejs/kit';
 import type { OrganizationList } from '$lib/stores/organization.js';
@@ -40,7 +40,9 @@ 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([Query.equal('platform', 'appwrite')])
+            ? await sdk.forConsole.billing.listOrganization([
+                  Query.equal('platform', Platform.Appwrite)
+              ])
             : undefined;
     } else {
         organizations = account?.$id ? await sdk.forConsole.teams.list() : undefined;

src/routes/(public)/template-[template]/+page.ts

@@ -8,7 +8,7 @@ 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, Query } from '@appwrite.io/console';
+import { type AppwriteException, Query, Platform } from '@appwrite.io/console';
 import { isCloud, VARS } from '$lib/system';
 import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 
@@ -43,7 +43,7 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
             organizations: !isCloud
                 ? await sdk.forConsole.teams.list()
                 : await sdk.forConsole.billing.listOrganization([
-                      Query.equal('platform', 'appwrite')
+                      Query.equal('platform', Platform.Appwrite)
                   ])
         };
     }