prefix routes to avoid conflicts with the old pieces import and expor…

…t modules
apostrophecms · Dec 5, 2023 · 787dd05 · 787dd05
1 parent 529b066
commit 787dd05
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## UNRELEASED
+
+### Changes
+
+* Prefix routes to avoid conflicts with the old [`@apostrophecms/piece-type-importer`](https://github.com/apostrophecms/piece-type-importer) and [`@apostrophecms/piece-type-exporter`](https://github.com/apostrophecms/piece-type-exporter) modules.
+
 ## 1.2.0 (2023-11-29)
 
 ### Adds

diff --git a/modules/@apostrophecms/import-export-doc-type/index.js b/modules/@apostrophecms/import-export-doc-type/index.js
@@ -5,12 +5,12 @@ module.exports = {
 
   init(self) {
     const operation = {
-      action: 'export',
+      action: 'import-export-export',
       context: 'update',
       label: 'aposImportExport:export',
       modal: 'AposExportModal',
       props: {
-        action: 'export'
+        action: 'import-export-export'
       }
     };
 

diff --git a/modules/@apostrophecms/import-export-page/index.js b/modules/@apostrophecms/import-export-page/index.js
@@ -10,7 +10,7 @@ module.exports = {
 
     return {
       add: {
-        import: {
+        'import-export-import': {
           label: 'aposImportExport:import',
           modalOptions: {
             modal: 'AposImportModal'
@@ -24,16 +24,16 @@ module.exports = {
     return {
       post: {
         ...self.options.importExport?.import !== false && {
-          import: [
+          importExportImport: [
             multiparty(),
             async (req) => {
               return self.apos.modules['@apostrophecms/import-export'].import(req, self.__meta.name);
             }
           ]
         },
         ...self.options.importExport?.export !== false && {
-          export(req) {
-          // Add the page label to req.body for notifications.
+          importExportExport(req) {
+            // Add the page label to req.body for notifications.
             req.body.type = req.t('apostrophe:page');
 
             return self.apos.modules['@apostrophecms/import-export'].export(req, self);

diff --git a/modules/@apostrophecms/import-export-piece-type/index.js b/modules/@apostrophecms/import-export-piece-type/index.js
@@ -10,7 +10,7 @@ module.exports = {
 
     return {
       add: {
-        import: {
+        'import-export-import': {
           label: 'aposImportExport:import',
           modalOptions: {
             modal: 'AposImportModal'
@@ -26,7 +26,7 @@ module.exports = {
 
     return {
       add: {
-        'export-batch': {
+        'import-export-export-batch': {
           label: 'aposImportExport:export',
           messages: {
             progress: 'aposImportExport:exporting',
@@ -40,7 +40,7 @@ module.exports = {
       group: {
         more: {
           icon: 'dots-vertical-icon',
-          operations: [ 'export-batch' ]
+          operations: [ 'import-export-export-batch' ]
         }
       }
     };
@@ -49,7 +49,7 @@ module.exports = {
     return {
       post: {
         ...self.options.importExport?.import !== false && {
-          import: [
+          importExportImport: [
             multiparty(),
             async (req) => {
               return self.apos.modules['@apostrophecms/import-export'].import(req, self.__meta.name);
@@ -58,7 +58,7 @@ module.exports = {
         },
 
         ...self.options.importExport?.export !== false && {
-          export(req) {
+          importExportExport(req) {
           // Add the piece type label to req.body for notifications.
             req.body.type = req.t(self.options.label);
 
@@ -68,7 +68,7 @@ module.exports = {
           // in order to make the job work with the progress notification.
           // The other 'export' routes that are used by context operations on each doc
           // are also POST for consistency.
-          exportBatch(req) {
+          importExportExportBatch(req) {
           // Add the piece type label to req.body for notifications.
           // Should be done before calling the job's `run` method.
             req.body.type = req.body._ids.length === 1

diff --git a/ui/apos/apps/index.js b/ui/apos/apps/index.js
@@ -33,7 +33,7 @@ export default () => {
       try {
         const moduleAction = apos.modules[event.moduleName].action;
 
-        await apos.http.post(`${moduleAction}/import`, {
+        await apos.http.post(`${moduleAction}/import-export-import`, {
           body: {
             overrideLocale: true,
             exportPath: event.exportPath