oui

apostrophecms · Oct 18, 2024 · 93c0e7e · 93c0e7e
1 parent 5c571ca
commit 93c0e7e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/lib/methods/import.js b/lib/methods/import.js
@@ -9,6 +9,7 @@ module.exports = self => {
       }
 
       const { file } = req.files || {};
+      const importDraftsOnly = self.apos.launder.boolean(req.body.importDraftsOnly);
       const overrideLocale = self.apos.launder.boolean(req.body.overrideLocale);
       const formatLabel = self.apos.launder.string(req.body.formatLabel);
       let exportPath = await self.getExportPathById(self.apos.launder.string(req.body.exportPathId));
@@ -59,6 +60,11 @@ module.exports = self => {
         throw self.apos.error(error.message);
       }
 
+      // if (importDraftsOnly) {
+      //   docs = docs.filter(doc => !doc.aposMode || doc.aposMode === 'draft');
+      // }
+      // console.log('🚀 ~ import ~ docs:', docs);
+
       const differentDocsLocale = self.getFirstDifferentLocale(req, docs);
       const siteHasMultipleLocales = Object.keys(self.apos.i18n.locales).length > 1;
 
@@ -491,6 +497,10 @@ module.exports = self => {
           fetchRelationships: false
         });
 
+        if (importDraftsOnly && docToInsert.aposMode !== 'draft') {
+          return docToInsert;
+        }
+
         if (self.isPage(manager)) {
           // TODO: check if this is still true
           // `convert` sets the type to `@apostrophecms/home-page`,
@@ -537,6 +547,11 @@ module.exports = self => {
             presentFieldsOnly: true,
             fetchRelationships: false
           });
+
+          if (importDraftsOnly && docToUpdate.aposMode !== 'draft') {
+            return docToUpdate;
+          }
+
           self.isPage(manager)
             ? await importPage.update({
               manager: self.apos.page,
@@ -547,7 +562,9 @@ module.exports = self => {
             : await manager.update(_req, docToUpdate);
         }
 
-        await self.setDocAsNotModified(matchingDraft);
+        if (!importDraftOnly) {
+          await self.setDocAsNotModified(matchingDraft);
+        }
       }
     },
 
@@ -647,6 +664,10 @@ module.exports = self => {
           fetchRelationships: false
         });
 
+        if (importDraftsOnly && docToInsert.aposMode !== 'draft') {
+          return docToInsert;
+        }
+
         if (self.isPage(manager)) {
           // TODO: check if this is still true
           // `convert` sets the type to `@apostrophecms/home-page`,
@@ -672,6 +693,9 @@ module.exports = self => {
           presentFieldsOnly: true,
           fetchRelationships: false
         });
+        if (importDraftsOnly && docToUpdate.aposMode !== 'draft') {
+          return docToUpdate;
+        }
         if (self.isPage(manager)) {
           await importPage.update({
             manager: self.apos.page,

diff --git a/ui/apos/components/AposImportModal.vue b/ui/apos/components/AposImportModal.vue
@@ -173,6 +173,7 @@ export default {
       }
       const formData = new FormData();
       formData.append('file', this.selectedFile);
+      formData.append('importDraftsOnly', this.checked.includes('importDraftsOnly'));
 
       apos.bus.$emit('import-export-import-started');
       apos.http.post(`${this.universalModuleAction}/${this.action}`, {