chore: Split get by page id for export (#29910)

appsmithorg · Dec 28, 2023 · b12e753 · b12e753
1 parent c1491c6
commit b12e753
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java b/...appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
@@ -138,6 +138,8 @@ Mono<ImportedActionAndCollectionMapsDTO> updateActionsWithImportedCollectionIds(
 
     Flux<NewAction> findByPageIds(List<String> unpublishedPages, Optional<AclPermission> optionalPermission);
 
+    Flux<NewAction> findByPageIdsForExport(List<String> unpublishedPages, Optional<AclPermission> optionalPermission);
+
     Flux<NewAction> findAllActionsByContextIdAndContextTypeAndViewMode(
             String contextId,
             CreatorContextType contextType,

diff --git a/...mith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/...mith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
@@ -1759,6 +1759,12 @@ public Flux<NewAction> findByPageIds(List<String> unpublishedPages, Optional<Acl
         return repository.findByPageIds(unpublishedPages, optionalPermission);
     }
 
+    @Override
+    public Flux<NewAction> findByPageIdsForExport(
+            List<String> unpublishedPages, Optional<AclPermission> optionalPermission) {
+        return repository.findByPageIds(unpublishedPages, optionalPermission);
+    }
+
     @Override
     public Flux<NewAction> findAllActionsByContextIdAndContextTypeAndViewMode(
             String contextId,

diff --git a/...rc/main/java/com/appsmith/server/newactions/exports/NewActionExportableServiceCEImpl.java b/...rc/main/java/com/appsmith/server/newactions/exports/NewActionExportableServiceCEImpl.java
@@ -38,8 +38,8 @@ public NewActionExportableServiceCEImpl(NewActionService newActionService, Actio
     }
 
     // Requires datasourceIdToNameMap, pageIdToNameMap, pluginMap, collectionIdToNameMap
-    // Updates actionId to name map in exportable resources. Also directly updates required collection information in
-    // application json
+    // Updates actionId to name map in exportable resources.
+    // Also, directly updates required collection information in application json
     @Override
     public Mono<Void> getExportableEntities(
             ExportingMetaDTO exportingMetaDTO,
@@ -51,7 +51,7 @@ public Mono<Void> getExportableEntities(
                 exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
 
         Flux<NewAction> actionFlux =
-                newActionService.findByPageIds(exportingMetaDTO.getUnpublishedPages(), optionalPermission);
+                newActionService.findByPageIdsForExport(exportingMetaDTO.getUnpublishedPages(), optionalPermission);
 
         return actionFlux
                 .collectList()