Merge pull request #447 from iceljc/main

compare clean path

Author: iceljc

src/lib/common/embedding/EmbeddingPage.svelte

@@ -2,6 +2,7 @@
     import { onMount } from 'svelte';
     import { page } from '$app/stores';
     import { getUserStore, globalMenuStore } from '$lib/helpers/store';
+    import { getCleanUrl } from '$lib/helpers/utils/common';
 
     let {
         htmlTagId = 'embedding-page',
@@ -25,12 +26,12 @@
 
     onMount(() => {
         const menuUnsubscribe = globalMenuStore.subscribe((/** @type {import('$pluginTypes').PluginMenuDefModel[]} */ menu) => {
-            const url = getPathUrl();
-            let found = menu.find(x => x.link === url);
+            const url = getCleanPath(getPathUrl());
+            let found = menu.find(x => getCleanPath(x.link) === url);
             label = found?.label || '';
             if (!found?.embeddingInfo) {
-                const subFound = menu.find(x => !!x.subMenu?.find(y => y.link === url));
-                found = subFound?.subMenu?.find(x => x.link === url);
+                const subFound = menu.find(x => !!x.subMenu?.find(y => getCleanPath(y.link) === url));
+                found = subFound?.subMenu?.find(x => getCleanPath(x.link) === url);
                 label = found?.label || '';
             }
             embed(found?.embeddingInfo || null);
@@ -77,9 +78,13 @@
         }
     }
 
+    /** @param {string} url */
+    const getCleanPath = (url) => {
+        return getCleanUrl((url || '').split('?')[0]);
+    };
+
     const getPathUrl = () => {
-        const path = $page.url.pathname;
-        return path?.startsWith('/') ? path.substring(1) : path;
+        return $page.url.pathname || '';
     };
 </script>