remove replaceDocIds

apostrophecms · Sep 4, 2024 · 09844b2 · 09844b2
1 parent 5c7e539
commit 09844b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/lib/methods/import.js b/lib/methods/import.js
@@ -751,8 +751,6 @@ module.exports = self => {
       const overrideLocale = self.apos.launder.boolean(req.body.overrideLocale);
       const exportPath = await self.getExportPathById(self.apos.launder.string(req.body.exportPathId));
       const docIds = self.apos.launder.strings(req.body.docIds);
-      // Import aposDocId/Existing aposDocId pairs
-      const replaceAposDocIds = req.body.replaceDocIds?.map(arr => self.apos.launder.strings(arr)) ?? [];
       const duplicatedDocs = req.body.duplicatedDocs?.map(duplicatedDoc => {
         return {
           aposDocId: self.apos.launder.string(duplicatedDoc.aposDocId),
@@ -822,20 +820,21 @@ module.exports = self => {
             }
           }
 
-          const [ , replaceAposDocId ] = replaceAposDocIds
-            .find(([ importId ]) => importId === doc.aposDocId) ?? [];
+          const existingAposDocId = duplicatedDocs
+            .filter(({ aposDocId }) => aposDocId === doc.aposDocId)
+            .map(({ replaceId }) => replaceId);
           await self.insertOrUpdateDoc(req, {
             doc,
             method: 'update',
             failedIds,
-            existingAposDocId: replaceAposDocId,
+            existingAposDocId,
             duplicatedDocs
           });
 
-          if (replaceAposDocId) {
+          if (existingAposDocId) {
             replaceDocIdPairs.push([
               doc._id,
-              `${replaceAposDocId}:${doc.aposLocale}`
+              `${existingAposDocId}:${doc.aposLocale}`
             ]);
           }
 

diff --git a/test/import-page.js b/test/import-page.js
@@ -773,14 +773,10 @@ describe('@apostrophecms/import-export:import-page', function () {
       notificationId,
       formatLabel
     } = await apos.modules['@apostrophecms/import-export'].import(importReq);
-    const replaceDocIds = duplicatedDocs
-      .filter(({ replaceId }) => replaceId)
-      .map(({ aposDocId, replaceId }) => ([ aposDocId, replaceId ]));
     const importDuplicateReq = apos.task.getReq({
       body: {
         docIds: duplicatedDocs.map(({ aposDocId }) => aposDocId),
         duplicatedDocs,
-        replaceDocIds,
         importedAttachments,
         exportPathId,
         jobId,

diff --git a/ui/apos/components/AposDuplicateImportModal.vue b/ui/apos/components/AposDuplicateImportModal.vue
@@ -179,13 +179,6 @@ export default {
       return this.checked.length
         ? 'var(--a-white)'
         : 'transparent';
-    },
-    replaceDocIds() {
-      return this.checked.map(
-        aposDocId => this.duplicatedDocs.find(doc => doc.replaceId && doc.aposDocId === aposDocId)
-      )
-        .filter(Boolean)
-        .map(({ aposDocId, replaceId }) => [ aposDocId, replaceId ]);
     }
   },
 
@@ -227,7 +220,6 @@ export default {
         body: {
           docIds: this.checked,
           duplicatedDocs: this.duplicatedDocs,
-          replaceDocIds: this.replaceDocIds,
           importedAttachments: this.importedAttachments,
           exportPathId: this.exportPathId,
           jobId: this.jobId,