Merge pull request #96 from rtablada/hotfix-hash-urls

Fix Hash and other URL oddities: Use URL parsing instead of bespoke regex
universal-ember · Jul 12, 2024 · 300e34c · 300e34c
2 parents cfe2531 + dd5c760
commit 300e34c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/docs-app/tests/docs-app/errors-test.gts b/docs-app/tests/docs-app/errors-test.gts
@@ -50,6 +50,22 @@ module('Errors', function (hooks) {
 
       await settled();
       assert.dom('[data-page-error]').doesNotExist();
+
+      visit(`/Runtime/docs/api-docs.md#some-hash`);
+
+      await renderSettled();
+      assert.dom('[data-page-error]').doesNotExist();
+
+      await settled();
+      assert.dom('[data-page-error]').doesNotExist();
+
+      visit(`/Runtime/docs/api-docs.md?query-param=value`);
+
+      await renderSettled();
+      assert.dom('[data-page-error]').doesNotExist();
+
+      await settled();
+      assert.dom('[data-page-error]').doesNotExist();
     });
   });
 });
diff --git a/ui/src/services/kolay/selected.ts b/ui/src/services/kolay/selected.ts
@@ -96,7 +96,8 @@ export default class Selected extends Service {
   get path(): string | undefined {
     if (!this.router.currentURL) return firstPath;
 
-    let [path] = this.router.currentURL.split('?');
+    let url = new URL(this.router.currentURL, window.location.origin);
+    let path = url.pathname;
     let result = path && path !== '/' ? path : firstPath;
 
     return result?.replace(/\.md$/, '');