Merge pull request #2194 from appwrite/fix-SER-228-fix-project-limit-warnings

fix: correct project limit warnings for multi-organization users

Author: Meldiron

src/lib/components/billing/alerts/selectProjectCloud.svelte

@@ -24,7 +24,9 @@
     let error = $state<string | null>(null);
 
     onMount(() => {
-        projects = page.data.allProjects?.projects || [];
+        const currentOrgId = page.data.organization?.$id;
+        projects =
+            page.data.currentOrgId === currentOrgId ? page.data.allProjects?.projects || [] : [];
     });
 
     let projectsToArchive = $derived(
@@ -71,7 +73,8 @@
 
 <Modal bind:show={showSelectProject} title={'Manage projects'} onSubmit={updateSelected}>
     <svelte:fragment slot="description">
-        Choose which two projects to keep. Projects over the limit will be blocked after this date.
+        Choose which {$currentPlan?.projects || 2} projects to keep. Projects over the limit will be
+        blocked after this date.
     </svelte:fragment>
     {#if error}
         <Alert.Inline status="error" title="Error">{error}</Alert.Inline>

src/lib/layout/createProject.svelte

@@ -47,7 +47,9 @@
         <Typography.Title size="l">Create your project</Typography.Title>
     {/if}
     {#if projectsLimited}
-        <Alert.Inline status="warning" title="You've reached your limit of 2 projects">
+        <Alert.Inline
+            status="warning"
+            title={`You've reached your limit of ${$currentPlan?.projects || 2} projects`}>
             Extra projects are available on paid plans for an additional fee
             <svelte:fragment slot="actions">
                 <Button

src/lib/stores/billing.ts

@@ -317,15 +317,18 @@ export function calculateTrialDay(org: Organization) {
     return days;
 }
 
-export async function checkForProjectsLimit(org: Organization, projects: number) {
+export async function checkForProjectsLimit(org: Organization, orgProjectCount?: number) {
     if (!isCloud) return;
-    if (!org || !projects) return;
+    if (!org) return;
     const plan = await sdk.forConsole.billing.getOrganizationPlan(org.$id);
     if (!plan) return;
     if (plan.$id !== BillingPlan.FREE) return;
     if (org.projects?.length > 0) return;
 
-    if (plan.projects > 0 && projects > plan.projects) {
+    const projectCount = orgProjectCount;
+    if (projectCount === undefined) return;
+
+    if (plan.projects > 0 && projectCount > plan.projects) {
         headerAlert.add({
             id: 'projectsLimitReached',
             component: ProjectsLimit,

src/routes/(console)/+layout.svelte

@@ -297,7 +297,11 @@
         if (currentOrganizationId === org.$id) return;
         if (isCloud) {
             currentOrganizationId = org.$id;
-            checkForProjectsLimit(org, data.allProjects?.projects?.length || 0);
+            const orgProjectCount =
+                data.allProjects && data.currentOrgId === org.$id
+                    ? data.allProjects.projects.length
+                    : undefined;
+            checkForProjectsLimit(org, orgProjectCount);
             checkForEnterpriseTrial(org);
             await checkForUsageLimit(org);
             checkForMarkedForDeletion(org);

src/routes/(console)/organization-[organization]/+page.svelte

@@ -167,7 +167,7 @@
         </DropList>
     </div>
 
-    {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > 2 && $canWriteProjects}
+    {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > $currentPlan.projects && $canWriteProjects}
         <Alert.Inline
             title={`${data.projects.total - data.organization.projects.length} projects will be archived on ${toLocaleDate(billingProjectsLimitDate)}`}>
             <Typography.Text>