fix bug where titles arent uniqified on update

Author: Al Manning

src/publish/confluence/confluence-helper.ts

@@ -503,9 +503,6 @@ export const updateLinks = (
   server: string,
   parent: ConfluenceParent
 ): ConfluenceSpaceChange[] => {
-  console.log("updateLinks");
-  console.log("fileMetadataTable", fileMetadataTable);
-
   const root = `${server}`;
   const url = `${ensureTrailingSlash(server)}wiki/spaces/${
     parent.space
@@ -514,12 +511,7 @@ export const updateLinks = (
   const changeMapper = (
     changeToProcess: ConfluenceSpaceChange
   ): ConfluenceSpaceChange => {
-    console.log("changeToProcess", changeToProcess);
-
     const replacer = (match: string): string => {
-      console.log("replacer");
-      console.log("match", match);
-
       let documentFileName = "";
       if (
         isContentUpdate(changeToProcess) ||
@@ -529,26 +521,23 @@ export const updateLinks = (
       }
 
       const docFileNamePathList = documentFileName.split("/");
-      console.log("docFileNamePathList", docFileNamePathList);
 
       let updated: string = match;
       const linkFileNameMatch = FILE_FINDER.exec(match);
-      console.log("linkFileNameMatch", linkFileNameMatch);
+
       const linkFileName = linkFileNameMatch ? linkFileNameMatch[0] ?? "" : "";
-      console.log("fileName", linkFileName);
+
       const fileNamePathList = linkFileName.split("/");
-      console.log("fileNamePathList", fileNamePathList);
 
       const linkFullFileName = `${linkFileName}.qmd`;
-      console.log("linkFullFileName", linkFullFileName);
 
       let siteFilePath = linkFullFileName;
       const isAbsolute = siteFilePath.startsWith("/");
       if (!isAbsolute && docFileNamePathList.length > 1) {
         const relativePath = docFileNamePathList
           .slice(0, docFileNamePathList.length - 1)
           .join("/");
-        console.log("relativePath", relativePath);
+
         if (siteFilePath.startsWith("./")) {
           siteFilePath = siteFilePath.replace("./", `${relativePath}/`);
         } else {
@@ -560,36 +549,31 @@ export const updateLinks = (
         siteFilePath = siteFilePath.slice(1); //remove '/'
       }
 
-      console.log("siteFilePath", siteFilePath);
-
       const sitePage: SitePage | null = fileMetadataTable[siteFilePath] ?? null;
 
-      console.log("sitePage", sitePage);
-
       if (sitePage) {
         updated = match.replace('href="', `href="${url}`);
         const pagePath: string = `${url}${sitePage.id}/${encodeURI(
           sitePage.title ?? ""
         )}`;
 
         updated = updated.replace(linkFullFileName, pagePath);
-        console.log("updated", updated);
       } else {
-        console.warn("no site page found");
+        console.warn(`Link not found for ${siteFilePath}`);
       }
 
       return updated;
     };
 
     if (isContentUpdate(changeToProcess) || isContentCreate(changeToProcess)) {
       const valueToProcess = changeToProcess?.body?.storage?.value;
-      console.log("valueToProcess", valueToProcess);
+
       if (valueToProcess) {
         const replacedLinks: string = valueToProcess.replaceAll(
           LINK_FINDER,
           replacer
         );
-        console.log("replacedLinks", replacedLinks);
+
         changeToProcess.body.storage.value = replacedLinks;
       }
     }

src/publish/confluence/confluence.ts

@@ -350,7 +350,7 @@ async function publish(
     publishFiles: PublishFiles,
     id: string,
     body: ContentBody,
-    titleParam: string = title,
+    titleToUpdate: string = title,
     fileName: string = ""
   ): Promise<Content> => {
     const previousPage = await client.getContent(id);
@@ -360,14 +360,16 @@ async function publish(
       publishFiles.files
     );
 
+    const uniqueTitle = await uniquifyTitle(titleToUpdate);
+
     trace("attachmentsToUpload", attachmentsToUpload, LogPrefix.ATTACHMENT);
 
     const updatedBody: ContentBody = updateImagePaths(body);
     const toUpdate: ContentUpdate = {
       contentChangeType: ContentChangeType.update,
       id,
       version: getNextVersion(previousPage),
-      title: `${titleParam}`,
+      title: uniqueTitle,
       type: PAGE_TYPE,
       status: ContentStatusEnum.current,
       ancestors: null,
@@ -638,8 +640,6 @@ async function publish(
 
     trace("changelist", changeList);
 
-    console.log("changeList", changeList);
-
     let pathsToId: Record<string, string> = {}; // build from existing site
 
     const doChange = async (change: ConfluenceSpaceChange) => {

tests/unit/confluence.test.ts

@@ -2767,7 +2767,6 @@ const runUpdateLinks = () => {
     parent = FAKE_PARENT
   ) => {
     const result = updateLinks(fileMetadataTable, changes, server, parent);
-    console.log("result", result);
     assertEquals(expected, result);
   };