Merge pull request #953 from ArmDeveloperEcosystem/copy-link-url

Copy link url

Author: chrismoroney

themes/arm-design-system-hugo-theme/layouts/partials/package-display/table.html

@@ -13,7 +13,13 @@
         <tbody id="sw-tablebody">
             {{ $id_index := 0}}
             {{ $os := .context.Params.os }}
-            {{ $dashboard_page_path := .context.RelPermalink | strings.TrimRight "/" }}
+            {{ $dashboard_page_path := .context.RelPermalink }}
+            {{ if eq .context.Site.BaseURL "/" }}
+                {{ $base_path := (.context.Site.Params.dashboard_base_path | default "/ecosystem-dashboard") | strings.TrimRight "/" }}
+                {{ if ne $base_path "" }}
+                    {{ $dashboard_page_path = printf "%s/%s" $base_path ($dashboard_page_path | strings.TrimLeft "/") }}
+                {{ end }}
+            {{ end }}
             {{ range .packages }}
 
                 {{ $id_index = add $id_index 1 }}

themes/arm-design-system-hugo-theme/static/js/eco-dashboard/search.js

@@ -59,11 +59,26 @@ function normalizePackageName(input) {
 }
 
 function getDashboardPath(dashboardPath) {
-    if (dashboardPath) {
-        return dashboardPath.replace(/\/$/, '') || '/';
+    let normalizedPath = dashboardPath;
+
+    if (!normalizedPath) {
+        normalizedPath = window.location.pathname;
+    }
+
+    if (!normalizedPath) {
+        return '/';
+    }
+
+    normalizedPath = normalizedPath.trim();
+    if (!normalizedPath.startsWith('/')) {
+        normalizedPath = '/' + normalizedPath;
+    }
+
+    if (!normalizedPath.endsWith('/')) {
+        normalizedPath = normalizedPath + '/';
     }
 
-    return window.location.pathname.replace(/\/$/, '') || '/';
+    return normalizedPath;
 }
 
 function buildPackageDashboardUrl(packageSlug, dashboardPath) {