From 4e07887cd8fe18d3b889ede58b989ddee6ea60fb Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 19 Aug 2025 13:00:03 +0530
Subject: [PATCH 01/17] fix: improved backup ui

---
 .../database-[database]/backups/+page.svelte  |  6 +-
 .../backups/containerHeader.svelte            |  1 +
 .../database-[database]/backups/policy.svelte |  4 +-
 .../database-[database]/backups/store.ts      |  6 +-
 .../database-[database]/backups/table.svelte  | 80 ++++++++++---------
 5 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
index ef597992c..1c164340c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.svelte
@@ -178,7 +178,7 @@
 </script>
 
 <Container size="xxl">
-    <div class="u-flex u-gap-32 u-flex-vertical-mobile">
+    <div class="backups-page u-flex u-gap-32 u-flex-vertical-mobile">
         {#if !isDisabled}
             <div class="u-flex-vertical u-gap-16 policies-holder-card">
                 <ContainerHeader
@@ -285,4 +285,8 @@
             min-width: 330px;
         }
     }
+
+    :global(.backups-page .common-section) {
+        margin-block-start: 0 !important;
+    }
 </style>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
index 9df266290..e809f52b8 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -41,6 +41,7 @@
             <div style:height="40px;" style:padding-block-start="4px">
                 <DropList bind:show={showDropdown} width="16">
                     <Badge
+                        style="white-space: nowrap; max-width: none;"
                         variant="secondary"
                         content={`${policiesCreated}/${maxPolicies} created`}
                         on:click={() => (showDropdown = true)}>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte
index e4af56e16..e4ccd8b91 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/policy.svelte
@@ -198,7 +198,7 @@
 
                     <!-- Prev / Next section -->
                     <div class="policy-cycles u-flex u-gap-24 u-padding-block-2">
-                        <div style="width: 128px" class="u-flex-vertical policy-item-caption">
+                        <div style="width: 160px" class="u-flex-vertical policy-item-caption">
                             <Typography.Caption variant="400" color="--fgcolor-neutral-tertiary"
                                 >Previous
                             </Typography.Caption>
@@ -225,7 +225,7 @@
                             <Divider vertical />
                         </div>
 
-                        <div style="width: 128px" class="u-flex-vertical policy-item-caption">
+                        <div style="width: 140px" class="u-flex-vertical policy-item-caption">
                             <Typography.Caption variant="400" color="--fgcolor-neutral-tertiary"
                                 >Next
                             </Typography.Caption>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts
index dd4b9c133..43cc2552d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/store.ts
@@ -30,8 +30,8 @@ export const presetPolicies = writable<UserBackupPolicy[]>([
 
 export const columns = writable<Column[]>([
     { id: 'backups', title: 'Backups', type: 'string', width: { min: 180 } },
-    { id: 'size', title: 'Size', type: 'integer', width: { min: 163 } },
+    { id: 'size', title: 'Size', type: 'integer', width: { min: 100 } },
     { id: 'status', title: 'Status', type: 'enum', width: { min: 163 } },
-    { id: 'policy', title: 'Policy', type: 'string', width: { min: 163 } },
-    { id: 'actions', title: '', type: 'string', width: 48 }
+    { id: 'policy', title: 'Policy', type: 'string', width: { min: 100 } },
+    { id: 'actions', title: '', type: 'string', width: 64 }
 ]);
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
index 1603ca8f4..689afe74f 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/table.svelte
@@ -205,7 +205,7 @@
                 <!--{/if}-->
             </Table.Cell>
             <Table.Cell column="policy" {root}>
-                <div class="u-flex u-main-space-between u-cross-baseline">
+                <div class="u-flex u-cross-baseline">
                     <Tooltip maxWidth="fit-content">
                         <span>
                             {policy?.name || 'Manual'}
@@ -217,51 +217,53 @@
                     </Tooltip>
                 </div>
             </Table.Cell>
-            <Table.Cell column="action" {root}>
-                <Popover let:toggle padding="m" placement="bottom-end">
-                    <Button extraCompact on:click={toggle}>
-                        <Icon icon={IconDotsHorizontal} />
-                    </Button>
-                    <svelte:fragment slot="tooltip" let:toggle>
-                        <ActionMenu.Root width="180px" noPadding>
-                            {#if backup.status === 'completed'}
+            <Table.Cell column="actions" {root}>
+                <div class="action-cell u-flex u-main-end u-width-full-line">
+                    <Popover let:toggle padding="m" placement="bottom-end">
+                        <Button extraCompact on:click={toggle}>
+                            <Icon icon={IconDotsHorizontal} />
+                        </Button>
+                        <svelte:fragment slot="tooltip" let:toggle>
+                            <ActionMenu.Root width="180px" noPadding>
+                                {#if backup.status === 'completed'}
+                                    <ActionMenu.Item.Button
+                                        trailingIcon={IconRefresh}
+                                        on:click={(e) => {
+                                            toggle(e);
+                                            showRestore = true;
+                                            selectedBackup = backup;
+                                            showDropdown[index] = false;
+                                            trackEvent(Click.BackupRestoreClick);
+                                        }}>
+                                        Restore
+                                    </ActionMenu.Item.Button>
+                                {/if}
                                 <ActionMenu.Item.Button
-                                    trailingIcon={IconRefresh}
+                                    trailingIcon={IconDuplicate}
                                     on:click={(e) => {
                                         toggle(e);
-                                        showRestore = true;
+                                        copy(backup.$id);
+                                        showDropdown[index] = false;
+                                        trackEvent(Click.BackupCopyIdClick);
+                                    }}>
+                                    Copy ID
+                                </ActionMenu.Item.Button>
+                                <ActionMenu.Item.Button
+                                    status="danger"
+                                    trailingIcon={IconTrash}
+                                    on:click={(e) => {
+                                        toggle(e);
+                                        showDelete = true;
                                         selectedBackup = backup;
                                         showDropdown[index] = false;
-                                        trackEvent(Click.BackupRestoreClick);
+                                        trackEvent(Click.BackupDeleteClick);
                                     }}>
-                                    Restore
+                                    Delete
                                 </ActionMenu.Item.Button>
-                            {/if}
-                            <ActionMenu.Item.Button
-                                trailingIcon={IconDuplicate}
-                                on:click={(e) => {
-                                    toggle(e);
-                                    copy(backup.$id);
-                                    showDropdown[index] = false;
-                                    trackEvent(Click.BackupCopyIdClick);
-                                }}>
-                                Copy ID
-                            </ActionMenu.Item.Button>
-                            <ActionMenu.Item.Button
-                                status="danger"
-                                trailingIcon={IconTrash}
-                                on:click={(e) => {
-                                    toggle(e);
-                                    showDelete = true;
-                                    selectedBackup = backup;
-                                    showDropdown[index] = false;
-                                    trackEvent(Click.BackupDeleteClick);
-                                }}>
-                                Delete
-                            </ActionMenu.Item.Button>
-                        </ActionMenu.Root>
-                    </svelte:fragment>
-                </Popover>
+                            </ActionMenu.Root>
+                        </svelte:fragment>
+                    </Popover>
+                </div>
             </Table.Cell>
         </Table.Row.Base>
     {/each}

From 73f88720b04af8a1bd72714c22dd2a27dfec48b3 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:24:41 +0530
Subject: [PATCH 02/17] fix: for pro plans added backups created badge to a tag

---
 .../backups/containerHeader.svelte            | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
index e809f52b8..c7e0cda38 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -2,9 +2,11 @@
     import { DropList } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { IconInfo, IconPlus } from '@appwrite.io/pink-icons-svelte';
-    import { Badge, Icon, Layout, Typography } from '@appwrite.io/pink-svelte';
+    import { Badge, Icon, Layout, Tag, Typography } from '@appwrite.io/pink-svelte';
     import { goto } from '$app/navigation';
     import { upgradeURL } from '$lib/stores/billing';
+    import { BillingPlan } from '$lib/constants';
+    import { organization } from '$lib/stores/organization';
 
     export let isFlex = true;
     export let title: string;
@@ -40,13 +42,23 @@
         {#if title === 'Policies' && policiesCreated >= maxPolicies}
             <div style:height="40px;" style:padding-block-start="4px">
                 <DropList bind:show={showDropdown} width="16">
-                    <Badge
-                        style="white-space: nowrap; max-width: none;"
-                        variant="secondary"
-                        content={`${policiesCreated}/${maxPolicies} created`}
-                        on:click={() => (showDropdown = true)}>
-                        <Icon icon={IconInfo} size="s" slot="start" />
-                    </Badge>
+                    {#if $organization?.billingPlan === BillingPlan.PRO}
+                        <Tag
+                            size="s"
+                            style="white-space: nowrap; max-width: none;"
+                            on:click={() => (showDropdown = true)}>
+                            <Icon icon={IconInfo} size="s" />
+                            {policiesCreated}/{maxPolicies} created
+                        </Tag>
+                    {:else}
+                        <Badge
+                            style="white-space: nowrap; max-width: none;"
+                            variant="secondary"
+                            content={`${policiesCreated}/${maxPolicies} created`}
+                            on:click={() => (showDropdown = true)}>
+                            <Icon icon={IconInfo} size="s" slot="start" />
+                        </Badge>
+                    {/if}
                     <svelte:fragment slot="list">
                         <slot name="tooltip">
                             <span>

From 6276e2a7a8c8224df94ed07a63fba1564847665c Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:47:31 +0530
Subject: [PATCH 03/17] fix: spacing issues

---
 .../backups/containerHeader.svelte             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
index c7e0cda38..2e908e6da 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -41,7 +41,12 @@
 
         {#if title === 'Policies' && policiesCreated >= maxPolicies}
             <div style:height="40px;" style:padding-block-start="4px">
-                <DropList bind:show={showDropdown} width="16">
+                <DropList
+                    bind:show={showDropdown}
+                    width="16"
+                    noArrow
+                    placement="bottom-start"
+                    class="gap-popover policies-popover">
                     {#if $organization?.billingPlan === BillingPlan.PRO}
                         <Tag
                             size="s"
@@ -94,4 +99,15 @@
     .is-disabled {
         opacity: 0.5;
     }
+    :global(.drop.gap-popover) {
+        margin-block-start: 6px;
+    }
+    :global(.drop.policies-popover .drop-section) {
+        padding-block: var(--space-5, 12px);
+        padding-inline: var(--space-6, 16px);
+    }
+    :global(.drop.policies-popover .drop-list) {
+        padding: 0;
+        margin: 0;
+    }
 </style>

From c6351a2d64bb10f4e4b7b45caaa39ad0c937260e Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:07:22 +0530
Subject: [PATCH 04/17] fix: spacing issues added as props in droplist

---
 src/lib/components/dropList.svelte               | 14 ++++++++++++--
 .../backups/containerHeader.svelte               | 16 ++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/lib/components/dropList.svelte b/src/lib/components/dropList.svelte
index 1b6d3edb7..4ef0542e1 100644
--- a/src/lib/components/dropList.svelte
+++ b/src/lib/components/dropList.svelte
@@ -14,6 +14,10 @@
     export let wrapperFullWidth = false;
     export let position: 'relative' | 'static' = 'relative';
     export let noMaxWidthList = false;
+    export let paddingBlock: string = undefined;
+    export let paddingInline: string = undefined;
+    export let resetListPadding: boolean = false;
+    export let gap: string = undefined;
     let classes: string = '';
     export { classes as class };
 </script>
@@ -34,14 +38,20 @@
             class="drop is-no-arrow {classes}"
             class:u-max-width-100-percent={fullWidth}
             style:--drop-width-size-desktop={width ? `${width}rem` : ''}
+            style:margin-block-start={gap}
             style:position>
             {#if $$slots.list}
                 <section
                     class:u-overflow-y-auto={scrollable}
                     class:u-max-height-200={scrollable}
                     class="drop-section"
-                    style={noMaxWidthList ? 'max-inline-size: 100%' : ''}>
-                    <ul class="drop-list">
+                    style={noMaxWidthList ? 'max-inline-size: 100%' : ''}
+                    style:padding-block={paddingBlock}
+                    style:padding-inline={paddingInline}>
+                    <ul
+                        class="drop-list"
+                        style:padding={resetListPadding ? '0' : undefined}
+                        style:margin={resetListPadding ? '0' : undefined}>
                         <slot name="list" />
                     </ul>
                 </section>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
index 2e908e6da..d340d0f75 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/containerHeader.svelte
@@ -46,7 +46,10 @@
                     width="16"
                     noArrow
                     placement="bottom-start"
-                    class="gap-popover policies-popover">
+                    gap="6px"
+                    paddingBlock="var(--space-5, 12px)"
+                    paddingInline="var(--space-6, 16px)"
+                    resetListPadding>
                     {#if $organization?.billingPlan === BillingPlan.PRO}
                         <Tag
                             size="s"
@@ -99,15 +102,4 @@
     .is-disabled {
         opacity: 0.5;
     }
-    :global(.drop.gap-popover) {
-        margin-block-start: 6px;
-    }
-    :global(.drop.policies-popover .drop-section) {
-        padding-block: var(--space-5, 12px);
-        padding-inline: var(--space-6, 16px);
-    }
-    :global(.drop.policies-popover .drop-list) {
-        padding: 0;
-        margin: 0;
-    }
 </style>

From 48b1463179dcd8dd464c5d93dc2055b34d48a94d Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Sun, 7 Sep 2025 16:44:30 +0530
Subject: [PATCH 05/17] feat(ui): adopt searchable column selector with
 Select/Deselect all across console

---
 src/lib/layout/displaySettingsModal.svelte               | 2 +-
 src/lib/layout/gridHeader.svelte                         | 9 ++++++++-
 src/lib/layout/responsiveContainerHeader.svelte          | 2 +-
 .../organization-[organization]/domains/+page.svelte     | 2 +-
 .../domains/domain-[domain]/+page.svelte                 | 2 +-
 .../project-[region]-[project]/auth/+page.svelte         | 2 +-
 .../auth/user-[user]/identities/+page.svelte             | 4 ++--
 .../auth/user-[user]/targets/+page.svelte                | 2 +-
 .../project-[region]-[project]/databases/+page.svelte    | 1 +
 .../databases/database-[database]/+page.svelte           | 1 +
 .../messaging/providers/+page.svelte                     | 2 +-
 .../messaging/topics/topic-[topic]/+page.svelte          | 2 +-
 .../settings/webhooks/+page.svelte                       | 2 +-
 .../project-[region]-[project]/sites/+page.svelte        | 7 ++++++-
 .../project-[region]-[project]/storage/+page.svelte      | 1 +
 15 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/lib/layout/displaySettingsModal.svelte b/src/lib/layout/displaySettingsModal.svelte
index 77f2568e3..325901029 100644
--- a/src/lib/layout/displaySettingsModal.svelte
+++ b/src/lib/layout/displaySettingsModal.svelte
@@ -35,7 +35,7 @@
         {#if !hideColumns && $columns?.length}
             <Layout.Stack gap="xs">
                 <Typography.Text>Columns</Typography.Text>
-                <ColumnSelector {columns} {isCustomTable}>
+                <ColumnSelector ui="new" {columns} {isCustomTable}>
                     {#snippet children(toggle, selectedColumnsNumber)}
                         <Button.Button
                             size="s"
diff --git a/src/lib/layout/gridHeader.svelte b/src/lib/layout/gridHeader.svelte
index c3532f1e0..a4212e5f1 100644
--- a/src/lib/layout/gridHeader.svelte
+++ b/src/lib/layout/gridHeader.svelte
@@ -17,7 +17,14 @@
 <header class="grid-header">
     <Typography.Title size="m">{title}</Typography.Title>
     <div class="u-flex u-gap-16 u-contents-mobile">
-        <ViewSelector {view} {columns} {isCustomTable} {hideView} {hideColumns} {allowNoColumns} />
+        <ViewSelector
+            ui="new"
+            {view}
+            {columns}
+            {isCustomTable}
+            {hideView}
+            {hideColumns}
+            {allowNoColumns} />
         <div class="grid-header-col-2">
             <slot />
         </div>
diff --git a/src/lib/layout/responsiveContainerHeader.svelte b/src/lib/layout/responsiveContainerHeader.svelte
index e84caf048..0f5358a02 100644
--- a/src/lib/layout/responsiveContainerHeader.svelte
+++ b/src/lib/layout/responsiveContainerHeader.svelte
@@ -112,7 +112,7 @@
                 </Layout.Stack>
                 <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
                     {#if hasDisplaySettings}
-                        <ViewSelector {view} {columns} {hideView} {hideColumns} />
+                        <ViewSelector ui="new" {view} {columns} {hideView} {hideColumns} />
                     {/if}
                     {#if children}
                         {@render children()}
diff --git a/src/routes/(console)/organization-[organization]/domains/+page.svelte b/src/routes/(console)/organization-[organization]/domains/+page.svelte
index 4251c80e9..4e98e3d80 100644
--- a/src/routes/(console)/organization-[organization]/domains/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/+page.svelte
@@ -49,7 +49,7 @@
     <Layout.Stack direction="row" justifyContent="space-between">
         <SearchQuery placeholder="Search domains" />
         <Layout.Stack direction="row" gap="m" inline>
-            <ViewSelector view={View.Table} {columns} hideView />
+            <ViewSelector ui="new" view={View.Table} {columns} hideView />
             <Button
                 on:click={() => {
                     trackEvent(Click.DomainCreateClick, {
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte
index 39e799b87..d6ce25571 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte
@@ -84,7 +84,7 @@
                         </Tooltip>
                     </Layout.Stack>
                     <Layout.Stack direction="row" gap="s" inline>
-                        <ViewSelector view={View.Table} {columns} hideView />
+                        <ViewSelector ui="new" view={View.Table} {columns} hideView />
                         <Popover let:toggle padding="none">
                             <Button secondary on:click={toggle}>Add preset</Button>
                             <svelte:fragment slot="tooltip" let:toggle>
diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
index 1f2dc4423..b58953779 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte
@@ -59,7 +59,7 @@
             <SearchQuery placeholder="Search by name, email, phone, or ID" />
         </Layout.Stack>
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
-            <ViewSelector view={View.Table} {columns} hideView />
+            <ViewSelector ui="new" view={View.Table} {columns} hideView />
             <Button on:click={() => ($showCreateUser = true)} event="create_user" size="s">
                 <Icon size="s" icon={IconPlus} slot="start" />
                 <span class="text">Create user</span>
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte
index b87b1f3e3..7b5c83685 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte
@@ -52,13 +52,13 @@
             <div class="u-flex u-main-end u-gap-16 is-not-mobile">
                 <Filters query={data.query} {columns} />
                 <div>
-                    <ViewSelector view={View.Table} {columns} hideView />
+                    <ViewSelector ui="new" view={View.Table} {columns} hideView />
                 </div>
             </div>
         </div>
         <div class="u-flex u-gap-16 is-only-mobile u-margin-block-start-16">
             <div class="u-flex-basis-50-percent">
-                <ViewSelector view={View.Table} {columns} hideView />
+                <ViewSelector ui="new" view={View.Table} {columns} hideView />
             </div>
             <div class="u-flex-basis-50-percent">
                 <Filters query={data.query} {columns} fullWidthMobile />
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte
index 28cdbeec4..7774be57f 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte
@@ -33,7 +33,7 @@
 
             <div class="u-flex u-main-end u-gap-16 is-not-mobile">
                 <Filters query={data.query} {columns} />
-                <ViewSelector view={View.Table} {columns} hideView />
+                <ViewSelector ui="new" view={View.Table} {columns} hideView />
             </div>
         </div>
     </div>
diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
index a8ab5335a..67681bddc 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte
@@ -52,6 +52,7 @@
         </Layout.Stack>
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
             <ViewSelector
+                ui="new"
                 {columns}
                 view={data.view}
                 hideColumns={!data.databases.total}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
index 0726e2165..2bba6faf7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
@@ -26,6 +26,7 @@
 
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
             <ViewSelector
+                ui="new"
                 view={data.view}
                 columns={tableViewColumns}
                 hideColumns={!data.tables.total}
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
index 8aed8a13b..85b132238 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
@@ -29,7 +29,7 @@
         </Layout.Stack>
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
             <Filters query={data.query} {columns} analyticsSource="messaging_providers" />
-            <ViewSelector view={View.Table} {columns} hideView />
+            <ViewSelector ui="new" view={View.Table} {columns} hideView />
             {#if $canWriteProviders}
                 <CreateProviderDropdown let:toggle>
                     <Button on:click={toggle} event="create_provider">
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
index 90a5871f8..338601be6 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
@@ -92,7 +92,7 @@
         <SearchQuery placeholder="Search by type or IDs"></SearchQuery>
         <Layout.Stack direction="row" inline>
             <Filters query={data.query} {columns} analyticsSource="messaging_topics" />
-            <ViewSelector view={View.Table} {columns} hideView />
+            <ViewSelector ui="new" view={View.Table} {columns} hideView />
             <Button
                 on:click={() => {
                     showAdd = true;
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
index 2c02dc197..4ee496dec 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
@@ -27,7 +27,7 @@
 
 <Container>
     <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
-        <ViewSelector {columns} view={View.Table} hideView />
+        <ViewSelector ui="new" {columns} view={View.Table} hideView />
         {#if $canWriteWebhooks}
             <Button
                 href={`${base}/project-${page.params.region}-${page.params.project}/settings/webhooks/create`}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/+page.svelte
index caa180049..17022e7d7 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/+page.svelte
@@ -63,7 +63,12 @@
             <SearchQuery placeholder="Search by name" />
         </Layout.Stack>
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
-            <ViewSelector {columns} view={data.view} hideColumns hideView={!data.siteList.total} />
+            <ViewSelector
+                ui="new"
+                {columns}
+                view={data.view}
+                hideColumns
+                hideView={!data.siteList.total} />
             {#if $canWriteSites}
                 <Button on:mousedown={() => (show = true)} event="create_site" size="s">
                     <Icon icon={IconPlus} slot="start" size="s" />
diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte
index 7bbac81ce..d53830b6f 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte
@@ -39,6 +39,7 @@
         </Layout.Stack>
         <Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
             <ViewSelector
+                ui="new"
                 {columns}
                 view={data.view}
                 hideColumns={!data.buckets.total}

From ac301bb021683a947eba2d07981a1163d2ceac85 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Sun, 7 Sep 2025 18:04:41 +0530
Subject: [PATCH 06/17] feat: add Create more to column creation flow

---
 .../table-[table]/+layout.svelte                 | 16 ++++++++++++----
 .../table-[table]/createColumn.svelte            |  9 +++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index a0d751d08..5e7c3614c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -52,7 +52,7 @@
     import EditColumn from './columns/edit.svelte';
     import RowActivity from './rows/activity.svelte';
     import EditRowPermissions from './rows/editPermissions.svelte';
-    import { Dialog, Layout, Typography } from '@appwrite.io/pink-svelte';
+    import { Dialog, Layout, Typography, Selector } from '@appwrite.io/pink-svelte';
     import { Button, Seekbar } from '$lib/elements/forms';
     import { generateFakeRecords, generateColumns } from '$lib/helpers/faker';
     import { addNotification } from '$lib/stores/notifications';
@@ -70,6 +70,7 @@
     let createIndex: CreateIndex;
     let createColumn: CreateColumn;
     let selectedOption: Option['name'] = 'String';
+    let createMoreColumns = false;
 
     /**
      * adding a lot of fake data will trigger the realtime below
@@ -342,14 +343,21 @@
     bind:show={$showCreateColumnSheet.show}
     submit={{
         text: 'Create',
-        onClick: async () => {
-            await createColumn?.submit();
-        },
+        onClick: async () => await createColumn?.submit(),
         disabled: !selectedOption
     }}>
+    {#snippet footer()}
+        <Layout.Stack inline direction="row" alignItems="center">
+            <Selector.Switch
+                id="create-more-columns"
+                bind:checked={createMoreColumns}
+                label="Create more" />
+        </Layout.Stack>
+    {/snippet}
     <CreateColumn
         bind:selectedOption
         bind:this={createColumn}
+        bind:createMore={createMoreColumns}
         column={$showCreateColumnSheet.column}
         columns={$showCreateColumnSheet.columns}
         direction={$showCreateColumnSheet.direction}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
index 8eb595253..0c7b64c4d 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
@@ -19,6 +19,7 @@
         columnId = $bindable(null),
         columnsOrder = $bindable(null),
         selectedOption = $bindable('String'),
+        createMore = $bindable(false),
         onColumnsReorder = null
     }: {
         column?: Columns;
@@ -27,6 +28,7 @@
         columnsOrder?: string[];
         direction: ColumnDirection;
         selectedOption: Option['name'];
+        createMore?: boolean;
         onColumnsReorder?: (newOrder: string[]) => void;
     } = $props();
 
@@ -148,12 +150,19 @@
                 message: `Column ${key ?? data?.key} has been created`
             });
             trackEvent(Submit.ColumnCreate);
+
+            if (createMore) {
+                init();
+                return true; // keep sheet open
+            }
+            return false; // close sheet
         } catch (e) {
             addNotification({
                 type: 'error',
                 message: e.message
             });
             trackError(e, Submit.ColumnCreate);
+            return true; // keep open on error
         }
     }
 

From 9eaedc6d580bb6851153931d266bd3806575d6b9 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 8 Sep 2025 10:58:30 +0530
Subject: [PATCH 07/17] eeset createMoreColumns to false when sheet closes

---
 .../database-[database]/table-[table]/+layout.svelte        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index 5e7c3614c..84908b2b3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -72,6 +72,10 @@
     let selectedOption: Option['name'] = 'String';
     let createMoreColumns = false;
 
+    $: if (!$showCreateColumnSheet.show) {
+        createMoreColumns = false;
+    }
+
     /**
      * adding a lot of fake data will trigger the realtime below
      * and will keep invalidating the `Dependencies.TABLE` making a lot of API noise!
@@ -337,7 +341,7 @@
 <slot />
 
 <SideSheet
-    closeOnBlur
+    closeOnBlur={false}
     title={$showCreateColumnSheet.title}
     titleBadge={selectedOption === 'Relationship' ? 'Experimental' : undefined}
     bind:show={$showCreateColumnSheet.show}

From 13a00d0310e0b637c9ab69389de55601e7cf45c4 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 8 Sep 2025 11:07:53 +0530
Subject: [PATCH 08/17] move to end

---
 .../database-[database]/table-[table]/+layout.svelte      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
index 84908b2b3..076e08f1c 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
@@ -72,10 +72,6 @@
     let selectedOption: Option['name'] = 'String';
     let createMoreColumns = false;
 
-    $: if (!$showCreateColumnSheet.show) {
-        createMoreColumns = false;
-    }
-
     /**
      * adding a lot of fake data will trigger the realtime below
      * and will keep invalidating the `Dependencies.TABLE` making a lot of API noise!
@@ -332,6 +328,10 @@
 
         spreadsheetRenderKey.set(hash(rowIds));
     }
+
+    $: if (!$showCreateColumnSheet.show) {
+        createMoreColumns = false;
+    }
 </script>
 
 <svelte:head>

From f0444d0c09712a5cbc77515b58b2c5b699b92c58 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Mon, 8 Sep 2025 14:05:54 +0530
Subject: [PATCH 09/17] add: computed hover solid without alpha so the
 overflown text don't show on hover.

---
 package.json                |  2 +-
 pnpm-lock.yaml              | 10 +++++-----
 src/themes/dark-cloud.json  |  1 +
 src/themes/dark.json        |  1 +
 src/themes/light-cloud.json |  1 +
 src/themes/light.json       |  1 +
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 46c84699b..216b1e0bf 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@2cf27e0",
         "@appwrite.io/pink-legacy": "^1.0.3",
-        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564",
+        "@appwrite.io/pink-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed",
         "@faker-js/faker": "^9.9.0",
         "@popperjs/core": "^2.11.8",
         "@sentry/sveltekit": "^8.38.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4e44e1e73..9922899f4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -24,8 +24,8 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       '@appwrite.io/pink-svelte':
-        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564
-        version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564(svelte@5.25.3)
+        specifier: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed
+        version: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed(svelte@5.25.3)
       '@faker-js/faker':
         specifier: ^9.9.0
         version: 9.9.0
@@ -284,8 +284,8 @@ packages:
   '@appwrite.io/pink-legacy@1.0.3':
     resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
 
-  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564':
-    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564}
+  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed':
+    resolution: {tarball: https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed}
     version: 2.0.0-RC.2
     peerDependencies:
       svelte: ^4.0.0
@@ -3719,7 +3719,7 @@ snapshots:
       '@appwrite.io/pink-icons': 1.0.0
       the-new-css-reset: 1.11.3
 
-  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@40fb564(svelte@5.25.3)':
+  '@appwrite.io/pink-svelte@https://pkg.vc/-/@appwrite/@appwrite.io/pink-svelte@fb8b1ed(svelte@5.25.3)':
     dependencies:
       '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3)
       '@floating-ui/dom': 1.6.13
diff --git a/src/themes/dark-cloud.json b/src/themes/dark-cloud.json
index 84e37ca38..abebc5419 100644
--- a/src/themes/dark-cloud.json
+++ b/src/themes/dark-cloud.json
@@ -112,6 +112,7 @@
     "overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
     "overlay-on-neutral": "rgba(255, 255, 255, 20%)",
     "overlay-neutral-hover": "rgba(255, 255, 255, 4%)",
+    "overlay-neutral-hover-solid": "rgba(38, 38, 42, 100%)",
     "overlay-neutral-pressed": "rgba(255, 255, 255, 8%)",
     "overlay-neutral-selected": "rgba(255, 255, 255, 8%)",
     "overlay-scrim": "rgba(0, 0, 0, 48%)",
diff --git a/src/themes/dark.json b/src/themes/dark.json
index 26acb26e1..b21ba8659 100644
--- a/src/themes/dark.json
+++ b/src/themes/dark.json
@@ -112,6 +112,7 @@
     "overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
     "overlay-on-neutral": "rgba(255, 255, 255, 20%)",
     "overlay-neutral-hover": "rgba(255, 255, 255, 4%)",
+    "overlay-neutral-hover-solid": "rgba(38, 38, 42, 100%)",
     "overlay-neutral-pressed": "rgba(255, 255, 255, 8%)",
     "overlay-neutral-selected": "rgba(255, 255, 255, 8%)",
     "overlay-scrim": "rgba(0, 0, 0, 48%)",
diff --git a/src/themes/light-cloud.json b/src/themes/light-cloud.json
index a2ab55069..530c83c53 100644
--- a/src/themes/light-cloud.json
+++ b/src/themes/light-cloud.json
@@ -112,6 +112,7 @@
     "overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
     "overlay-on-neutral": "rgba(0, 0, 0, 6%)",
     "overlay-neutral-hover": "rgba(25, 25, 28, 3%)",
+    "overlay-neutral-hover-solid": "rgba(248, 248, 248, 100%)",
     "overlay-neutral-pressed": "rgba(25, 25, 28, 4%)",
     "overlay-neutral-selected": "rgba(25, 25, 28, 4%)",
     "overlay-scrim": "rgba(25, 25, 28, 80%)",
diff --git a/src/themes/light.json b/src/themes/light.json
index 2b3bd76ae..3cdbee82d 100644
--- a/src/themes/light.json
+++ b/src/themes/light.json
@@ -112,6 +112,7 @@
     "overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
     "overlay-on-neutral": "rgba(0, 0, 0, 6%)",
     "overlay-neutral-hover": "rgba(25, 25, 28, 3%)",
+    "overlay-neutral-hover-solid": "rgba(248, 248, 248, 100%)",
     "overlay-neutral-pressed": "rgba(25, 25, 28, 4%)",
     "overlay-neutral-selected": "rgba(25, 25, 28, 4%)",
     "overlay-scrim": "rgba(25, 25, 28, 80%)",

From 3871837a84718ebc1be5c8abe4db022d7a41fb52 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 8 Sep 2025 17:55:27 +0530
Subject: [PATCH 10/17] fix(auth/teams): initialize team id to null

---
 .../project-[region]-[project]/auth/createTeam.svelte         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
index aed8116c3..d0f61aa91 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
@@ -14,7 +14,9 @@
 
     const dispatch = createEventDispatcher();
 
-    let name: string, id: string, error: string;
+    let name: string;
+    let id: string | null = null;
+    let error: string;
     let showCustomId = false;
 
     const create = async () => {

From d78df1044699ad316bf00371004c773897fc5c5a Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:13:13 +0530
Subject: [PATCH 11/17] update to svlete 5

---
 .../auth/createTeam.svelte                    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
index d0f61aa91..0eb30a03a 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
@@ -10,14 +10,14 @@
     import { Icon, Tag } from '@appwrite.io/pink-svelte';
     import { createEventDispatcher } from 'svelte';
 
-    export let showCreate = false;
+    let { showCreate = $bindable(false) }: { showCreate: boolean } = $props();
 
     const dispatch = createEventDispatcher();
 
-    let name: string;
-    let id: string | null = null;
-    let error: string;
-    let showCustomId = false;
+    let name = $state<string>('');
+    let id = $state<string | null>(null);
+    let error = $state<string | null>(null);
+    let showCustomId = $state(false);
 
     const create = async () => {
         try {
@@ -44,10 +44,12 @@
         }
     };
 
-    $: if (!showCreate) {
-        showCustomId = false;
-        error = null;
-    }
+    $effect(() => {
+        if (!showCreate) {
+            showCustomId = false;
+            error = null;
+        }
+    });
 </script>
 
 <Modal title="Create team" {error} size="m" bind:show={showCreate} onSubmit={create}>

From 9f9ec27eece536c7e7e9c99b8721e6e9ba22a365 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:22:56 +0530
Subject: [PATCH 12/17] Update
 src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte

Co-authored-by: Darshan <itznotabug@gmail.com>
---
 .../(console)/project-[region]-[project]/auth/createTeam.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
index 0eb30a03a..02bc31bdf 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
@@ -14,7 +14,7 @@
 
     const dispatch = createEventDispatcher();
 
-    let name = $state<string>('');
+    let name = $state('');
     let id = $state<string | null>(null);
     let error = $state<string | null>(null);
     let showCustomId = $state(false);

From daee5297f3099128a8ac89e8de612de8ba79c20f Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Mon, 8 Sep 2025 18:23:35 +0530
Subject: [PATCH 13/17] Update
 src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 .../(console)/project-[region]-[project]/auth/createTeam.svelte  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
index 02bc31bdf..49cd741c4 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
@@ -47,6 +47,7 @@
     $effect(() => {
         if (!showCreate) {
             showCustomId = false;
+            id = null;
             error = null;
         }
     });

From b10ce8f9b2aadc6cfe33c928f29efb5238b66a35 Mon Sep 17 00:00:00 2001
From: Khushboo Verma <khush.vv@gmail.com>
Date: Mon, 8 Sep 2025 19:03:46 +0530
Subject: [PATCH 14/17] Add function/siteId to listDeployments query select

---
 .../functions/function-[function]/+page.ts        |  3 ++-
 .../sites/site-[site]/+page.ts                    | 15 +++++++++++++--
 .../sites/site-[site]/deployments/+page.ts        |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
index 01a7a633b..1918c61cb 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
@@ -40,7 +40,8 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
                         'totalSize',
                         'buildDuration',
                         'status',
-                        'type'
+                        'type',
+                        'functionId'
                     ]),
                     ...parsedQueries.values()
                 ]
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
index a675b8806..724afa788 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
@@ -12,7 +12,11 @@ export const load = async ({ params, depends, parent }) => {
     const [deploymentList, prodReadyDeployments, proxyRuleList] = await Promise.all([
         sdk.forProject(params.region, params.project).sites.listDeployments({
             siteId: params.site,
-            queries: [Query.limit(4), Query.orderDesc(''), Query.select(['status', 'type'])]
+            queries: [
+                Query.limit(4),
+                Query.orderDesc(''),
+                Query.select(['status', 'type', 'siteId'])
+            ]
         }),
         sdk.forProject(params.region, params.project).sites.listDeployments({
             siteId: params.site,
@@ -21,7 +25,14 @@ export const load = async ({ params, depends, parent }) => {
                 Query.equal('activate', true),
                 Query.limit(1),
                 Query.orderDesc(''),
-                Query.select(['buildDuration', 'totalSize', 'sourceSize', 'buildSize', 'type'])
+                Query.select([
+                    'buildDuration',
+                    'totalSize',
+                    'sourceSize',
+                    'buildSize',
+                    'type',
+                    'siteId'
+                ])
             ]
         }),
         sdk.forProject(params.region, params.project).proxy.listRules({
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
index 38e7807a7..86c13ee75 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
@@ -28,7 +28,8 @@ export const load = async ({ params, depends, url, route, parent }) => {
                     'totalSize',
                     'buildDuration',
                     'status',
-                    'type'
+                    'type',
+                    'siteId'
                 ]),
                 ...parsedQueries.values()
             ]

From 67c58331b94424a4e6555df8ecf6fa8cd733bc37 Mon Sep 17 00:00:00 2001
From: Khushboo Verma <khush.vv@gmail.com>
Date: Mon, 8 Sep 2025 19:13:29 +0530
Subject: [PATCH 15/17] Use resourceId

---
 .../functions/function-[function]/+page.ts                    | 2 +-
 .../project-[region]-[project]/sites/site-[site]/+page.ts     | 4 ++--
 .../sites/site-[site]/deployments/+page.ts                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
index 1918c61cb..d5b08e19f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
@@ -41,7 +41,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
                         'buildDuration',
                         'status',
                         'type',
-                        'functionId'
+                        'resourceId'
                     ]),
                     ...parsedQueries.values()
                 ]
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
index 724afa788..e442376ce 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
@@ -15,7 +15,7 @@ export const load = async ({ params, depends, parent }) => {
             queries: [
                 Query.limit(4),
                 Query.orderDesc(''),
-                Query.select(['status', 'type', 'siteId'])
+                Query.select(['status', 'type', 'resourceId'])
             ]
         }),
         sdk.forProject(params.region, params.project).sites.listDeployments({
@@ -31,7 +31,7 @@ export const load = async ({ params, depends, parent }) => {
                     'sourceSize',
                     'buildSize',
                     'type',
-                    'siteId'
+                    'resourceId'
                 ])
             ]
         }),
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
index 86c13ee75..059aefc4d 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
@@ -29,7 +29,7 @@ export const load = async ({ params, depends, url, route, parent }) => {
                     'buildDuration',
                     'status',
                     'type',
-                    'siteId'
+                    'resourceId'
                 ]),
                 ...parsedQueries.values()
             ]

From d79a2e9b87af2f6d5402dc5a102e8868b0979fcc Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 9 Sep 2025 08:32:37 +0530
Subject: [PATCH 16/17] add: gtm.

---
 src/routes/+layout.svelte |  4 ++++
 static/scripts/gtm.js     | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 static/scripts/gtm.js

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index f5bed4b86..9e4279458 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -173,6 +173,10 @@
         <link rel="preload" as="style" type="text/css" href="/console/fonts/cloud.css" />
         <link rel="stylesheet" href={`${base}/fonts/cloud.css`} />
     {/if}
+
+    <!-- Google Tag Manager -->
+    <script defer src={`${base}/scripts/gtm.js`}></script>
+    <!-- End Google Tag Manager -->
 </svelte:head>
 
 <Root theme={resolveTheme($app.themeInUse)}>
diff --git a/static/scripts/gtm.js b/static/scripts/gtm.js
new file mode 100644
index 000000000..937243f71
--- /dev/null
+++ b/static/scripts/gtm.js
@@ -0,0 +1,10 @@
+(function (w, d, s, l, i) {
+    w[l] = w[l] || [];
+    w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+    var f = d.getElementsByTagName(s)[0],
+        j = d.createElement(s),
+        dl = l != 'dataLayer' ? '&l=' + l : '';
+    j.async = true;
+    j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+    f.parentNode.insertBefore(j, f);
+})(window, document, 'script', 'dataLayer', 'GTM-WQ5WKK8');

From aa6f1bfb00a6fee0fff73cd3457fe4013345b11a Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 9 Sep 2025 08:38:47 +0530
Subject: [PATCH 17/17] add: gtm.

---
 src/lib/system.ts         | 9 +++++++++
 src/routes/+layout.svelte | 9 +++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/lib/system.ts b/src/lib/system.ts
index b9dab34d5..0e3408872 100644
--- a/src/lib/system.ts
+++ b/src/lib/system.ts
@@ -39,3 +39,12 @@ export function isMultiRegionSupported(url: URL): boolean {
         return false;
     }
 }
+
+// there can be multiple internal cloud instances.
+export function isProductionCloud(url: URL): boolean {
+    try {
+        return url.hostname === 'cloud.appwrite.io';
+    } catch {
+        return false;
+    }
+}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 9e4279458..578404583 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -6,7 +6,7 @@
     import { trackPageView } from '$lib/actions/analytics';
     import { Notifications, Progress } from '$lib/layout';
     import { app, type AppStore } from '$lib/stores/app';
-    import { isCloud } from '$lib/system';
+    import { isCloud, isProductionCloud } from '$lib/system';
     import { onMount } from 'svelte';
     import { requestedMigration } from './store';
     import { parseIfString } from '$lib/helpers/object';
@@ -174,9 +174,10 @@
         <link rel="stylesheet" href={`${base}/fonts/cloud.css`} />
     {/if}
 
-    <!-- Google Tag Manager -->
-    <script defer src={`${base}/scripts/gtm.js`}></script>
-    <!-- End Google Tag Manager -->
+    <!-- add GTM only on main instance -->
+    {#if isCloud && isProductionCloud(page.url)}
+        <script defer src={`${base}/scripts/gtm.js`}></script>
+    {/if}
 </svelte:head>
 
 <Root theme={resolveTheme($app.themeInUse)}>