Merge pull request #4729 from quarto-dev/bug/url-param-error

[Confluence] Error publishing to site URL with param #4723

Author: Allen Manning

src/publish/confluence/confluence-helper.ts

@@ -123,7 +123,14 @@ export const tokenFilterOut = (
 };
 
 export const confluenceParentFromString = (url: string): ConfluenceParent => {
-  const match = url.match(
+  let toMatch = url;
+  const urlNoParamsList = url?.split("?");
+
+  if (urlNoParamsList.length === 2) {
+    toMatch = urlNoParamsList[0] ?? url;
+  }
+
+  const match = toMatch.match(
     /^https.*?wiki\/spaces\/(?:(~?\w+)|(~?\w+)\/overview|(~?\w+)\/pages\/(\d+).*)$/
   );
   if (match) {

tests/unit/confluence.test.ts

@@ -310,6 +310,17 @@ const runConfluenceParentFromString = () => {
     assertEquals(expected, result);
   });
 
+  test("confluenceParentFromString_valid_spaces_pages_with_homepage", async () => {
+    const url =
+      "https://allenmanning.atlassian.net/wiki/spaces/~557058634d59d0949841909bb13093ab41d0c5/overview?homepageId=65617";
+    const result = confluenceParentFromString(url);
+    const expected: ConfluenceParent = {
+      space: "~557058634d59d0949841909bb13093ab41d0c5",
+      parent: undefined,
+    };
+    assertEquals(expected, result);
+  });
+
   test("confluenceParentFromString_valid_noParent", async () => {
     const url = "https://test.atlassian.net/wiki/spaces/QUARTOCONF";
     const result = confluenceParentFromString(url);