Merge pull request #4067 from quarto-dev/bug/delete-page-update

Confluence: Bug/delete page update of manually orphaned folder

Author: Allen Manning

src/publish/confluence/confluence-helper.ts

@@ -18,6 +18,7 @@ import {
   ContentAncestor,
   ContentBody,
   ContentBodyRepresentation,
+  ContentChange,
   ContentChangeType,
   ContentCreate,
   ContentDelete,
@@ -338,7 +339,6 @@ export const buildSpaceChanges = (
 
       let existingSiteParent = null;
 
-      //TODO update with deno paths after tests are in place
       const parentsList = pathList.slice(0, pathList.length - 1);
 
       parentsList.forEach((parentFileName, index) => {
@@ -438,18 +438,39 @@ export const buildSpaceChanges = (
     existingSite
   );
 
-  // TODO prompt as a sanity check and limiter to prevent any major run-away deletes
   const deleteChanges: ContentDelete[] = pagesToDelete.map(
     (toDelete: SitePage) => {
       return { contentChangeType: ContentChangeType.delete, id: toDelete.id };
     }
   );
 
-  const spaceChanges: ConfluenceSpaceChange[] = fileMetadataList.reduce(
+  let spaceChanges: ConfluenceSpaceChange[] = fileMetadataList.reduce(
     spaceChangesCallback,
     deleteChanges
   );
 
+  const activeAncestorIds = spaceChanges.reduce(
+    (accumulator: any, change: any) => {
+      if (change?.ancestors?.length) {
+        const idList = change.ancestors.map(
+          (ancestor: ContentAncestor) => ancestor?.id ?? ""
+        );
+
+        return [...accumulator, ...idList];
+      }
+
+      return accumulator;
+    },
+    []
+  );
+
+  spaceChanges = spaceChanges.filter((change: ConfluenceSpaceChange) => {
+    if (isContentDelete(change) && activeAncestorIds.includes(change.id)) {
+      return false;
+    }
+    return true;
+  });
+
   return spaceChanges;
 };
 

tests/unit/confluence.test.ts

@@ -1404,6 +1404,49 @@ const runSpaceCreatesWithNesting = () => {
     assertEquals(expected, actual);
   });
 
+  test(suiteLabel("one_nested_file_add_back_empty_parent"), async () => {
+    const fileMetadataList: SiteFileMetadata[] = [fakeNestedFile];
+    const existingSite: SitePage[] = [
+      {
+        id: "fake-parent-id",
+        title: "Fake-parent",
+        metadata: { fileName: "fake-parent" },
+      },
+    ];
+    const expected: ConfluenceSpaceChange[] = [
+      {
+        contentChangeType: ContentChangeType.create,
+        ancestors: [
+          {
+            id: "fake-parent-id",
+          },
+        ],
+        body: {
+          storage: {
+            representation: "storage",
+            value: "fake-value",
+          },
+        },
+        fileName: "fake-parent/fake-file-name",
+        space: {
+          key: "fake-space-key",
+          id: "fake-space-id",
+          homepage: buildFakeContent(),
+        },
+        status: "current",
+        title: "fake-title",
+        type: "page",
+      },
+    ];
+    const actual: ConfluenceSpaceChange[] = buildSpaceChanges(
+      fileMetadataList,
+      FAKE_PARENT,
+      fakeSpace,
+      existingSite
+    );
+    assertEquals(expected, actual);
+  });
+
   test(suiteLabel("one_multi_nested_file"), async () => {
     const fileMetadataList: SiteFileMetadata[] = [fakeMultiNestedFile];
     const expected: ConfluenceSpaceChange[] = [
@@ -2390,7 +2433,7 @@ const runSpaceUpdatesWithNesting = () => {
     assertEquals(expected, actual);
   });
 
-  otest(suiteLabel("one_multi-nested_file_update_win"), async () => {
+  test(suiteLabel("one_multi-nested_file_update_win"), async () => {
     const fileMetadataList: SiteFileMetadata[] = [fakeMultiNestedFileWin];
 
     const existingSite = [
@@ -3758,5 +3801,5 @@ if (RUN_ALL_TESTS) {
   runUpdateImagePathsForContentBody();
   runCapFirstLetter();
 } else {
-  runSpaceUpdatesWithNesting();
+  runSpaceCreatesWithNesting();
 }