Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: Modified import export flow to use valid names for actions (#11879)

Browse Source 
* fix: Modified import export flow to use valid names for actions

* Added test
This commit is contained in:
Nidhi 2022-03-16 20:50:29 +05:30 committed by Adeoluwa Ayangade
parent d0fdabaccd
commit c3554f79b5
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
View File

@ -333,7 +333,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
actionDTO.setCollectionId(collectionIdToNameMap.get(actionDTO.getCollectionId()));
}
final String updatedActionId = actionDTO.getPageId() + "_" + actionDTO.getName();
final String updatedActionId = actionDTO.getPageId() + "_" + actionDTO.getValidName();
actionIdToNameMap.put(newAction.getId(), updatedActionId);
newAction.setId(updatedActionId);
}
@ -347,7 +347,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
}
if (!actionIdToNameMap.containsValue(newAction.getId())) {
final String updatedActionId = actionDTO.getPageId() + "_" + actionDTO.getName();
final String updatedActionId = actionDTO.getPageId() + "_" + actionDTO.getValidName();
actionIdToNameMap.put(newAction.getId(), updatedActionId);
newAction.setId(updatedActionId);
}
@ -733,7 +733,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
.then(applicationService.save(importedApplication));
})
)
.flatMap(savedAPP -> importThemes(savedAPP, importedDoc))
.flatMap(savedApp -> importThemes(savedApp, importedDoc))
.flatMap(savedApp -> {
importedApplication.setId(savedApp.getId());
if (savedApp.getGitApplicationMetadata() != null) {
@ -1146,7 +1146,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
// If pageId is missing in the actionDTO create a fallback pageId
final String fallbackParentPageId = unpublishedAction.getPageId();
if (unpublishedAction.getName() != null) {
if (unpublishedAction.getValidName() != null) {
if (invisibleActionFieldsMap != null) {
unpublishedAction.setUserSetOnLoad(invisibleActionFieldsMap.get(newAction.getId()).getUnpublishedUserSetOnLoad());
}
@ -1155,7 +1155,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
sanitizeDatasourceInActionDTO(unpublishedAction, datasourceMap, pluginMap, organizationId, false);
}
if (publishedAction != null && publishedAction.getName() != null) {
if (publishedAction != null && publishedAction.getValidName() != null) {
if (invisibleActionFieldsMap != null) {
publishedAction.setUserSetOnLoad(invisibleActionFieldsMap.get(newAction.getId()).getPublishedUserSetOnLoad());
}
@ -1229,7 +1229,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
if (newAction.getUnpublishedAction() != null) {
ActionDTO unpublishedAction = newAction.getUnpublishedAction();
actionIdMap.put(
actionIdMap.get(unpublishedAction.getName() + unpublishedAction.getPageId()),
actionIdMap.get(unpublishedAction.getValidName() + unpublishedAction.getPageId()),
newAction.getId()
);
@ -1242,7 +1242,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
if (newAction.getPublishedAction() != null) {
ActionDTO publishedAction = newAction.getPublishedAction();
actionIdMap.put(
actionIdMap.get(publishedAction.getName() + publishedAction.getPageId()),
actionIdMap.get(publishedAction.getValidName() + publishedAction.getPageId()),
newAction.getId()
);
@ -1492,7 +1492,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
if (parentPage == null) {
return null;
}
actionIdMap.put(action.getName() + parentPage.getId(), action.getId());
actionIdMap.put(action.getValidName() + parentPage.getId(), action.getId());
action.setPageId(parentPage.getId());
// Update defaultResources in actionDTO

3
app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
View File

@ -544,6 +544,9 @@ public class ImportExportApplicationServiceTests {
assertThat(unpublishedAction.getPageId()).isEqualTo(defaultPage.getUnpublishedPage().getName());
assertThat(unpublishedAction.getDatasource().getPluginId()).isEqualTo(installedPlugin.getPackageName());
NewAction testAction1 = actionList.stream().filter(action -> action.getUnpublishedAction().getName().equals("testAction1")).findFirst().get();
assertThat(testAction1.getId()).isEqualTo("Page1_testCollection1.testAction1");
assertThat(actionCollectionList.isEmpty()).isFalse();
assertThat(actionCollectionList).hasSize(1);
final ActionCollection actionCollection = actionCollectionList.get(0);