From 63b1b8d89ab77b038922589092cdb90667f997cc Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 10:04:58 +0530
Subject: [PATCH 1/8] misc: fixes.

---
 src/routes/(console)/organization-[organization]/header.svelte | 1 -
 .../functions/create-function/template-[template]/+page.svelte | 2 +-
 .../project-[region]-[project]/settings/updateName.svelte      | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index a3357fbde..d0e8b74e6 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -33,7 +33,6 @@
     $: avatars = $members.memberships?.map((m) => m.userName || m.userEmail) ?? [];
     $: organizationId = page.params.organization;
     $: path = `${base}/organization-${organizationId}`;
-    $: console.log($scopes);
     $: tabs = [
         {
             href: path,
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
index 2f1f6224e..c87e93e55 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/template-[template]/+page.svelte
@@ -86,7 +86,7 @@
             if (page.url.searchParams.has('runtime')) {
                 runtime = page.url.searchParams.get('runtime') as Runtime;
             } else {
-                runtime = matchingRuntimes[0];
+                runtime = matchingRuntimes[0] as Runtime;
             }
         }
     });
diff --git a/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
index a4ca90b67..92530acc4 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
@@ -11,6 +11,7 @@
     import { onMount } from 'svelte';
     import { project } from '../store';
     import { canWriteProjects } from '$lib/stores/roles';
+    import { getProjectEndpoint } from '$lib/helpers/project';
 
     const endpoint = sdk.forConsole.client.config.endpoint;
 
@@ -45,7 +46,7 @@
     Access Appwrite services using this project's API Endpoint and Project ID.
     <svelte:fragment slot="aside">
         <CopyInput label="Project ID" value={$project.$id} />
-        <CopyInput label="API Endpoint" value={endpoint} />
+        <CopyInput label="API Endpoint" value={getProjectEndpoint()} />
     </svelte:fragment>
     <svelte:fragment slot="actions">
         <Button

From 5d818f322b77b5b3e3c81e93b4bb297069a6a75d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 10:39:37 +0530
Subject: [PATCH 2/8] misc: fixes.

---
 .../function-[function]/(modals)/redeployModal.svelte       | 2 +-
 .../deployments/deployment-[deployment]/+page.svelte        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte
index d3f7847cc..6409b9f2b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/redeployModal.svelte
@@ -36,7 +36,7 @@
             invalidate(Dependencies.DEPLOYMENTS);
             if (redirect) {
                 goto(
-                    `${base}/project-${page.params.region}-${page.params.project}/functions/function-${$func.$id}/deployments/deployment-${deployment.$id}`
+                    `${base}/project-${page.params.region}-${page.params.project}/functions/function-${$func.$id}/deployment-${deployment.$id}`
                 );
             }
             show = false;
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
index dc50e9d1f..541b3c00e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte
@@ -29,8 +29,8 @@
     let showDelete = $state(false);
     let showCancel = $state(false);
 
-    onMount(async () => {
-        sdk.forConsole.client.subscribe(
+    onMount(() => {
+        return sdk.forConsole.client.subscribe(
             'console',
             async (response: RealtimeResponseEvent<Models.Deployment>) => {
                 if (
@@ -38,7 +38,7 @@
                         `sites.${page.params.site}.deployments.${page.params.deployment}.update`
                     )
                 ) {
-                    invalidate(Dependencies.DEPLOYMENTS);
+                    await invalidate(Dependencies.DEPLOYMENT);
                 }
             }
         );

From ab7bc70065223ec1423f6b079575511dca03cbb0 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 10:42:27 +0530
Subject: [PATCH 3/8] fix: lint.

---
 src/routes/(console)/organization-[organization]/header.svelte | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index d0e8b74e6..98d54494c 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -15,7 +15,6 @@
         canSeeTeams,
         isBilling,
         isOwner,
-        scopes
     } from '$lib/stores/roles';
     import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
     import { IconGithub, IconPlus } from '@appwrite.io/pink-icons-svelte';

From 82a3db4e7deb5f6962b2475a2da908f4d28a96ea Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 10:46:03 +0530
Subject: [PATCH 4/8] fix: lint, again.

---
 .../project-[region]-[project]/settings/updateName.svelte       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
index 92530acc4..af7f27d0d 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/updateName.svelte
@@ -13,8 +13,6 @@
     import { canWriteProjects } from '$lib/stores/roles';
     import { getProjectEndpoint } from '$lib/helpers/project';
 
-    const endpoint = sdk.forConsole.client.config.endpoint;
-
     let name: string = null;
 
     onMount(() => {

From 8eb4921d4e99766b2d0666c9e08f4003a770b3e9 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 10:46:23 +0530
Subject: [PATCH 5/8] fix: lint, again.

---
 src/routes/(console)/organization-[organization]/header.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/header.svelte b/src/routes/(console)/organization-[organization]/header.svelte
index 98d54494c..f18c3efb2 100644
--- a/src/routes/(console)/organization-[organization]/header.svelte
+++ b/src/routes/(console)/organization-[organization]/header.svelte
@@ -14,7 +14,7 @@
         canSeeProjects,
         canSeeTeams,
         isBilling,
-        isOwner,
+        isOwner
     } from '$lib/stores/roles';
     import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
     import { IconGithub, IconPlus } from '@appwrite.io/pink-icons-svelte';

From e5049ede59d36bdf2b4cbd6cb6530ffedb335757 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 11:33:00 +0530
Subject: [PATCH 6/8] fix: menu and submenu state management.

---
 src/lib/components/menu/menu.svelte    | 22 +++++++++++++++++++---
 src/lib/components/menu/store.ts       |  2 ++
 src/lib/components/menu/subMenu.svelte | 14 +++++---------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/menu/menu.svelte b/src/lib/components/menu/menu.svelte
index 6e7e3a030..8b4811e10 100644
--- a/src/lib/components/menu/menu.svelte
+++ b/src/lib/components/menu/menu.svelte
@@ -1,23 +1,39 @@
 <script lang="ts">
+    import { setContext, onMount } from 'svelte';
     import { Card } from '@appwrite.io/pink-svelte';
     import { createMenubar, melt } from '@melt-ui/svelte';
-    import { menuOpen } from '$lib/components/menu/store';
+    import { activeMenuId, menuOpen } from '$lib/components/menu/store';
 
+    const menuId = Math.random().toString(36).slice(2);
     const {
         elements: { menubar },
         builders: { createMenu }
     } = createMenubar();
 
     const {
-        elements: { trigger: trigger, menu: menu, separator: separator },
-        states: { open }
+        elements: { trigger, menu, separator },
+        states: { open },
+        builders // for submenu for same toggle state
     } = createMenu();
 
     function toggle() {
         open.update((state) => !state);
     }
 
+    open.subscribe((state) => {
+        if (state) activeMenuId.set(menuId);
+        else activeMenuId.update((current) => (current === menuId ? null : current));
+    });
+
+    onMount(() => {
+        return activeMenuId.subscribe((id) => {
+            if (id !== menuId) open.set(false);
+        });
+    });
+
     $: menuOpen.set($open);
+
+    setContext('menuBuilder', builders);
 </script>
 
 <div use:melt={$menubar}>
diff --git a/src/lib/components/menu/store.ts b/src/lib/components/menu/store.ts
index 571b30b82..a03dcb7c7 100644
--- a/src/lib/components/menu/store.ts
+++ b/src/lib/components/menu/store.ts
@@ -1,3 +1,5 @@
 import { writable } from 'svelte/store';
 
 export const menuOpen = writable(false);
+
+export const activeMenuId = writable<string | null>(null);
diff --git a/src/lib/components/menu/subMenu.svelte b/src/lib/components/menu/subMenu.svelte
index 66186bf2a..71c97cf6e 100644
--- a/src/lib/components/menu/subMenu.svelte
+++ b/src/lib/components/menu/subMenu.svelte
@@ -1,15 +1,11 @@
 <script lang="ts">
+    import { getContext } from 'svelte';
+    import { melt } from '@melt-ui/svelte';
     import { Card } from '@appwrite.io/pink-svelte';
-    import { createMenubar, melt } from '@melt-ui/svelte';
 
-    const {
-        builders: { createMenu }
-    } = createMenubar();
-
-    const {
-        elements: { separator: separator },
-        builders: { createSubmenu: createSubmenu }
-    } = createMenu();
+    // get parent builder for toggle state!
+    const builders = getContext('menuBuilder');
+    const { createSubmenu, separator } = builders;
 
     const {
         elements: { subMenu: subMenu, subTrigger: subTrigger }

From e58cea8ea1877d50b360c72d1ed8e7efafb63460 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 11:56:24 +0530
Subject: [PATCH 7/8] fix: types.

---
 src/lib/components/menu/menu.svelte    |  2 +-
 src/lib/components/menu/store.ts       | 12 ++++++++++++
 src/lib/components/menu/subMenu.svelte |  5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/menu/menu.svelte b/src/lib/components/menu/menu.svelte
index 8b4811e10..d9978953a 100644
--- a/src/lib/components/menu/menu.svelte
+++ b/src/lib/components/menu/menu.svelte
@@ -33,7 +33,7 @@
 
     $: menuOpen.set($open);
 
-    setContext('menuBuilder', builders);
+    setContext('menuBuilder', { builders, separator });
 </script>
 
 <div use:melt={$menubar}>
diff --git a/src/lib/components/menu/store.ts b/src/lib/components/menu/store.ts
index a03dcb7c7..829d2b6e6 100644
--- a/src/lib/components/menu/store.ts
+++ b/src/lib/components/menu/store.ts
@@ -1,5 +1,17 @@
 import { writable } from 'svelte/store';
+import type { createMenubar } from '@melt-ui/svelte';
 
 export const menuOpen = writable(false);
 
 export const activeMenuId = writable<string | null>(null);
+
+/**
+ * Full menu context passed to submenus —
+ * includes `builders` and shared `separator`.
+ */
+export type MenuContext = {
+    separator: ReturnType<
+        ReturnType<typeof createMenubar>['builders']['createMenu']
+    >['elements']['separator'];
+    builders: ReturnType<ReturnType<typeof createMenubar>['builders']['createMenu']>['builders'];
+};
diff --git a/src/lib/components/menu/subMenu.svelte b/src/lib/components/menu/subMenu.svelte
index 71c97cf6e..e6e8e326d 100644
--- a/src/lib/components/menu/subMenu.svelte
+++ b/src/lib/components/menu/subMenu.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
     import { getContext } from 'svelte';
     import { melt } from '@melt-ui/svelte';
+    import type { MenuContext } from './store';
     import { Card } from '@appwrite.io/pink-svelte';
 
     // get parent builder for toggle state!
-    const builders = getContext('menuBuilder');
-    const { createSubmenu, separator } = builders;
+    const { builders, separator } = getContext<MenuContext>('menuBuilder');
+    const { createSubmenu } = builders;
 
     const {
         elements: { subMenu: subMenu, subTrigger: subTrigger }

From d9f39156e0b57c55f97eb7bb056e5cc0e61a78da Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 12:15:05 +0530
Subject: [PATCH 8/8] fix: another type because IntelliJ has gone nuts!

---
 src/lib/components/menu/menu.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/menu/menu.svelte b/src/lib/components/menu/menu.svelte
index d9978953a..c74c43e87 100644
--- a/src/lib/components/menu/menu.svelte
+++ b/src/lib/components/menu/menu.svelte
@@ -31,7 +31,7 @@
         });
     });
 
-    $: menuOpen.set($open);
+    $: menuOpen.set($open as boolean);
 
     setContext('menuBuilder', { builders, separator });
 </script>