From af9dda07cbdff4b6ec2b775fe7bde955ae5d7bf8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:01:17 +0000
Subject: [PATCH 1/4] Initial plan


From 93550daa4c60ffc95101909da685ccbf1927f38a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:14:31 +0000
Subject: [PATCH 2/4] Clarify behavior for archived projects based on plan tier

- Check if plan order is less than Pro (order < 1 = FREE plan)
- Update text description: FREE plan shows "are archived", Pro+ shows "will be archived"
- Make project cards non-clickable for FREE plan
- Remove "Read only" tag from all archived projects
- Update action menu for FREE plan: Replace "Unarchive/Migrate" with "Restore access" link to billing
- Keep "Unarchive/Migrate" options for Pro+ plans
- Fix CardContainer and PaginationWithLimit to use activeProjects.length instead of data.projects.total

Co-authored-by: stnguyen90 <1477010+stnguyen90@users.noreply.github.com>
---
 src/lib/components/archiveProject.svelte      | 87 ++++++++-----------
 .../organization-[organization]/+page.svelte  |  4 +-
 2 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/lib/components/archiveProject.svelte b/src/lib/components/archiveProject.svelte
index c7896c9912..8d26e4c20c 100644
--- a/src/lib/components/archiveProject.svelte
+++ b/src/lib/components/archiveProject.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
     import { Button, InputText } from '$lib/elements/forms';
-    import { DropList, GridItem1, CardContainer, Modal } from '$lib/components';
+    import { GridItem1, CardContainer, Modal } from '$lib/components';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import {
         Badge,
         Icon,
         Typography,
-        Tag,
         Accordion,
         ActionMenu,
         Popover,
@@ -20,7 +19,6 @@
         IconFlutter,
         IconReact,
         IconUnity,
-        IconInfo,
         IconDotsHorizontal,
         IconInboxIn,
         IconSwitchHorizontal,
@@ -36,6 +34,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
+    import { billingURL } from '$lib/stores/billing';
 
     import { isSmallViewport } from '$lib/stores/viewport';
     import { isCloud } from '$lib/system';
@@ -52,8 +51,9 @@
 
     let { projectsToArchive, organization, currentPlan }: Props = $props();
 
-    // Track Read-only info droplist per archived project
-    let readOnlyInfoOpen = $state<Record<string, boolean>>({});
+    // Check if current plan order is less than Pro (order < 1 means FREE plan)
+    let isPlanBelowPro = $derived(currentPlan?.order < 1);
+
     let showUnarchiveModal = $state(false);
     let projectToUnarchive = $state<Models.Project | null>(null);
     let showDeleteModal = $state(false);
@@ -198,8 +198,12 @@
     <div class="archive-projects-margin-top">
         <Accordion title="Archived projects" badge={`${projectsToArchive.length}`}>
             <Typography.Text tag="p" size="s">
-                These projects have been archived and are read-only. You can view and migrate their
-                data.
+                {#if isPlanBelowPro}
+                    These projects are archived and require a plan upgrade to restore access.
+                {:else}
+                    These projects will be archived and are read-only. You can view and migrate
+                    their data.
+                {/if}
             </Typography.Text>
 
             <div class="archive-projects-margin">
@@ -209,43 +213,16 @@
                             project.platforms.map((platform) => getPlatformInfo(platform.type))
                         )}
                         {@const formatted = formatName(project.name)}
-                        <GridItem1>
+                        <GridItem1
+                            href={!isPlanBelowPro
+                                ? `${base}/project-${project.region}-${project.$id}/overview/platforms`
+                                : undefined}>
                             <svelte:fragment slot="eyebrow">
                                 {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
                             </svelte:fragment>
                             <svelte:fragment slot="title">{formatted}</svelte:fragment>
                             <svelte:fragment slot="status">
                                 <div class="status-container">
-                                    <DropList
-                                        bind:show={readOnlyInfoOpen[project.$id]}
-                                        placement="bottom-start"
-                                        noArrow>
-                                        <Tag
-                                            size="s"
-                                            style="white-space: nowrap;"
-                                            on:click={(e) => {
-                                                e.preventDefault();
-                                                e.stopPropagation();
-                                                readOnlyInfoOpen = {
-                                                    ...readOnlyInfoOpen,
-                                                    [project.$id]: !readOnlyInfoOpen[project.$id]
-                                                };
-                                            }}>
-                                            <Icon icon={IconInfo} size="s" />
-                                            <span>Read only</span>
-                                        </Tag>
-                                        <svelte:fragment slot="list">
-                                            <li
-                                                class="drop-list-item u-width-250"
-                                                style="padding: var(--space-5, 12px) var(--space-6, 16px)">
-                                                <span class="u-block u-mb-8">
-                                                    Archived projects are read-only. You can view
-                                                    and migrate their data, but they no longer
-                                                    accept edits or requests.
-                                                </span>
-                                            </li>
-                                        </svelte:fragment>
-                                    </DropList>
                                     <Popover let:toggle padding="none" placement="bottom-end">
                                         <Button
                                             text
@@ -260,23 +237,35 @@
                                             <Icon icon={IconDotsHorizontal} size="s" />
                                         </Button>
                                         <ActionMenu.Root slot="tooltip">
-                                            <ActionMenu.Item.Button
-                                                leadingIcon={IconInboxIn}
-                                                disabled={isUnarchiveDisabled()}
-                                                on:click={() => handleUnarchiveProject(project)}
-                                                >Unarchive project</ActionMenu.Item.Button>
-                                            <ActionMenu.Item.Button
-                                                leadingIcon={IconSwitchHorizontal}
-                                                on:click={() => handleMigrateProject(project)}
-                                                >Migrate project</ActionMenu.Item.Button>
+                                            {#if isPlanBelowPro}
+                                                <ActionMenu.Item.Anchor
+                                                    leadingIcon={IconInboxIn}
+                                                    href={$billingURL}>
+                                                    Restore access
+                                                </ActionMenu.Item.Anchor>
+                                            {:else}
+                                                <ActionMenu.Item.Button
+                                                    leadingIcon={IconInboxIn}
+                                                    disabled={isUnarchiveDisabled()}
+                                                    on:click={() =>
+                                                        handleUnarchiveProject(project)}>
+                                                    Unarchive project
+                                                </ActionMenu.Item.Button>
+                                                <ActionMenu.Item.Button
+                                                    leadingIcon={IconSwitchHorizontal}
+                                                    on:click={() => handleMigrateProject(project)}>
+                                                    Migrate project
+                                                </ActionMenu.Item.Button>
+                                            {/if}
                                             <div class="action-menu-divider">
                                                 <Divider />
                                             </div>
                                             <ActionMenu.Item.Button
                                                 status="danger"
                                                 leadingIcon={IconTrash}
-                                                on:click={() => handleDeleteProject(project)}
-                                                >Delete project</ActionMenu.Item.Button>
+                                                on:click={() => handleDeleteProject(project)}>
+                                                Delete project
+                                            </ActionMenu.Item.Button>
                                         </ActionMenu.Root>
                                     </Popover>
                                 </div>
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 947d507d1f..7e20073bcd 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -224,7 +224,7 @@
     {#if activeProjects.length > 0}
         <CardContainer
             disableEmpty={!$canWriteProjects}
-            total={data.projects.total}
+            total={activeProjects.length}
             offset={data.offset}
             on:click={handleCreateProject}>
             {#each activeProjects as project}
@@ -309,7 +309,7 @@
         name="Projects"
         limit={data.limit}
         offset={data.offset}
-        total={data.projects.total} />
+        total={activeProjects.length} />
 
     <!-- Archived Projects Section -->
     <ArchiveProject

From 08939e8fa3144829b4b34bda20cc12cc31549696 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:18:53 +0000
Subject: [PATCH 3/4] Fix: Use consistent logic for plan tier checking

- Replace BillingPlan.FREE check with isPlanBelowPro in isUnarchiveDisabled function
- Remove unused BillingPlan import
- Ensure consistent logic throughout the component

Co-authored-by: stnguyen90 <1477010+stnguyen90@users.noreply.github.com>
---
 src/lib/components/archiveProject.svelte | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/components/archiveProject.svelte b/src/lib/components/archiveProject.svelte
index 8d26e4c20c..29403fe114 100644
--- a/src/lib/components/archiveProject.svelte
+++ b/src/lib/components/archiveProject.svelte
@@ -27,7 +27,6 @@
     import { getPlatformInfo } from '$lib/helpers/platform';
     import { Status, type Models } from '@appwrite.io/console';
     import type { ComponentType } from 'svelte';
-    import { BillingPlan } from '$lib/constants';
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { sdk } from '$lib/stores/sdk';
@@ -97,7 +96,7 @@
     function isUnarchiveDisabled(): boolean {
         if (!organization || !currentPlan) return true;
 
-        if (organization.billingPlan === BillingPlan.FREE) {
+        if (isPlanBelowPro) {
             const currentProjectCount = organization.projects?.length || 0;
             const projectLimit = currentPlan.projects || 0;
 

From 6c8b052a6ff6ad33bc26966b5da7c7d4e27f7e9c Mon Sep 17 00:00:00 2001
From: Steven Nguyen <stnguyen90@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:06:37 -0800
Subject: [PATCH 4/4] chore: clarify archived project access

Orgs pending a downgrade at the end of their billing cycle will still have access.

Orgs that have already downgraded will not have access to the project and can only delete it.
---
 src/lib/components/archiveProject.svelte | 48 +++++++++---------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/lib/components/archiveProject.svelte b/src/lib/components/archiveProject.svelte
index 29403fe114..8a9797ca09 100644
--- a/src/lib/components/archiveProject.svelte
+++ b/src/lib/components/archiveProject.svelte
@@ -33,7 +33,6 @@
     import { addNotification } from '$lib/stores/notifications';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
-    import { billingURL } from '$lib/stores/billing';
 
     import { isSmallViewport } from '$lib/stores/viewport';
     import { isCloud } from '$lib/system';
@@ -195,13 +194,14 @@
 
 {#if projectsToArchive.length > 0}
     <div class="archive-projects-margin-top">
-        <Accordion title="Archived projects" badge={`${projectsToArchive.length}`}>
+        <Accordion
+            title={isPlanBelowPro ? 'Archived projects' : 'Pending archive'}
+            badge={`${projectsToArchive.length}`}>
             <Typography.Text tag="p" size="s">
                 {#if isPlanBelowPro}
                     These projects are archived and require a plan upgrade to restore access.
                 {:else}
-                    These projects will be archived and are read-only. You can view and migrate
-                    their data.
+                    These projects will be archived at the end of your billing cycle.
                 {/if}
             </Typography.Text>
 
@@ -212,10 +212,7 @@
                             project.platforms.map((platform) => getPlatformInfo(platform.type))
                         )}
                         {@const formatted = formatName(project.name)}
-                        <GridItem1
-                            href={!isPlanBelowPro
-                                ? `${base}/project-${project.region}-${project.$id}/overview/platforms`
-                                : undefined}>
+                        <GridItem1>
                             <svelte:fragment slot="eyebrow">
                                 {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
                             </svelte:fragment>
@@ -236,35 +233,24 @@
                                             <Icon icon={IconDotsHorizontal} size="s" />
                                         </Button>
                                         <ActionMenu.Root slot="tooltip">
-                                            {#if isPlanBelowPro}
-                                                <ActionMenu.Item.Anchor
-                                                    leadingIcon={IconInboxIn}
-                                                    href={$billingURL}>
-                                                    Restore access
-                                                </ActionMenu.Item.Anchor>
-                                            {:else}
-                                                <ActionMenu.Item.Button
-                                                    leadingIcon={IconInboxIn}
-                                                    disabled={isUnarchiveDisabled()}
-                                                    on:click={() =>
-                                                        handleUnarchiveProject(project)}>
-                                                    Unarchive project
-                                                </ActionMenu.Item.Button>
-                                                <ActionMenu.Item.Button
-                                                    leadingIcon={IconSwitchHorizontal}
-                                                    on:click={() => handleMigrateProject(project)}>
-                                                    Migrate project
-                                                </ActionMenu.Item.Button>
-                                            {/if}
+                                            <ActionMenu.Item.Button
+                                                leadingIcon={IconInboxIn}
+                                                disabled={isUnarchiveDisabled()}
+                                                on:click={() => handleUnarchiveProject(project)}
+                                                >Unarchive project</ActionMenu.Item.Button>
+                                            <ActionMenu.Item.Button
+                                                leadingIcon={IconSwitchHorizontal}
+                                                disabled={isUnarchiveDisabled()}
+                                                on:click={() => handleMigrateProject(project)}
+                                                >Migrate project</ActionMenu.Item.Button>
                                             <div class="action-menu-divider">
                                                 <Divider />
                                             </div>
                                             <ActionMenu.Item.Button
                                                 status="danger"
                                                 leadingIcon={IconTrash}
-                                                on:click={() => handleDeleteProject(project)}>
-                                                Delete project
-                                            </ActionMenu.Item.Button>
+                                                on:click={() => handleDeleteProject(project)}
+                                                >Delete project</ActionMenu.Item.Button>
                                         </ActionMenu.Root>
                                     </Popover>
                                 </div>