From 8bae940df52a9f490cc4f92fe778184b405d682d Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Tue, 5 Nov 2024 12:07:05 -0600
Subject: [PATCH 1/2] refine global event store

---
 src/lib/helpers/store.js                 | 11 ++++++++++-
 src/routes/VerticalLayout/Sidebar.svelte | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/lib/helpers/store.js b/src/lib/helpers/store.js
index 7b2677e..328cbb4 100644
--- a/src/lib/helpers/store.js
+++ b/src/lib/helpers/store.js
@@ -9,7 +9,16 @@ const conversationSearchOptionKey = "conversation_search_option";
 const conversationUserMessageKey = "conversation_user_messages";
 
 /** @type {Writable<import('$commonTypes').GlobalEvent>} */
-export const globalEventStore = writable({ name: "", payload: {} });
+const createGlobalEventStore = () => {
+    const { subscribe, set } = writable({ name: "", payload: {} });
+    return {
+        subscribe,
+        set,
+        reset: () => set({})
+    };
+}
+
+export const globalEventStore = createGlobalEventStore();
 
 
 /** @type {Writable<import('$userTypes').UserModel>} */
diff --git a/src/routes/VerticalLayout/Sidebar.svelte b/src/routes/VerticalLayout/Sidebar.svelte
index 479127f..66d83c1 100644
--- a/src/routes/VerticalLayout/Sidebar.svelte
+++ b/src/routes/VerticalLayout/Sidebar.svelte
@@ -8,6 +8,7 @@
 	import { page } from '$app/stores';
 	import { browser } from '$app/environment';
 	import { _ } from 'svelte-i18n';
+	import { globalEventStore } from '$lib/helpers/store';
 
 	/** @type {import('$pluginTypes').PluginMenuDefModel[]} */
 	export let menu;
@@ -199,6 +200,14 @@
 		const path = $page.url.pathname;
 		return path?.startsWith('/') ? path.substring(1) : path;
 	};
+
+	/** @param {string} link */
+	const goToPage = (link) => {
+		if (!link) return;
+
+		globalEventStore.reset();
+		window.open(link, '_self');
+	}
 </script>
 
 <div class="vertical-menu">
@@ -225,19 +234,19 @@
 											</Link>
 											<ul class="sub-menu mm-collapse">
 												{#each subMenu.childItems as childItem}
-													<li><Link href={childItem.link}>{$_(childItem.label)}</Link></li>
+													<li><Link on:click={() => goToPage(childItem.link)}>{$_(childItem.label)}</Link></li>
 												{/each}
 											</ul>
 										</li>
 									{:else}
-										<li><Link href={subMenu.link}>{$_(subMenu.label)}</Link></li>
+										<li><Link on:click={() => goToPage(subMenu.link)}>{$_(subMenu.label)}</Link></li>
 									{/if}
 								{/each}
 							</ul>
 						</li>
 					{:else}
 						<li>
-							<Link href={item.link} class="waves-effect">
+							<Link class="waves-effect" on:click={() => goToPage(item.link)} >
 								<i class={item.icon} /> <span>{$_(item.label)}</span>
 							</Link>
 						</li>

From e9852aa70d3153bab755799d2fdd7bd336f3130f Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Tue, 5 Nov 2024 12:10:50 -0600
Subject: [PATCH 2/2] minor change

---
 src/routes/VerticalLayout/Sidebar.svelte | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/routes/VerticalLayout/Sidebar.svelte b/src/routes/VerticalLayout/Sidebar.svelte
index 66d83c1..5084b90 100644
--- a/src/routes/VerticalLayout/Sidebar.svelte
+++ b/src/routes/VerticalLayout/Sidebar.svelte
@@ -203,10 +203,7 @@
 
 	/** @param {string} link */
 	const goToPage = (link) => {
-		if (!link) return;
-
 		globalEventStore.reset();
-		window.open(link, '_self');
 	}
 </script>
 
@@ -234,19 +231,19 @@
 											</Link>
 											<ul class="sub-menu mm-collapse">
 												{#each subMenu.childItems as childItem}
-													<li><Link on:click={() => goToPage(childItem.link)}>{$_(childItem.label)}</Link></li>
+													<li><Link href={childItem.link} on:click={() => goToPage(childItem.link)}>{$_(childItem.label)}</Link></li>
 												{/each}
 											</ul>
 										</li>
 									{:else}
-										<li><Link on:click={() => goToPage(subMenu.link)}>{$_(subMenu.label)}</Link></li>
+										<li><Link href={subMenu.link} on:click={() => goToPage(subMenu.link)}>{$_(subMenu.label)}</Link></li>
 									{/if}
 								{/each}
 							</ul>
 						</li>
 					{:else}
 						<li>
-							<Link class="waves-effect" on:click={() => goToPage(item.link)} >
+							<Link class="waves-effect" href={item.link} on:click={() => goToPage(item.link)} >
 								<i class={item.icon} /> <span>{$_(item.label)}</span>
 							</Link>
 						</li>