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

fix: Display result in tabular format for action response in imported app for SQL datasource (#7889)

Browse Source 
* Added pluginId to nested datasource object within actionDTO

* Added check in TC for plugin id
This commit is contained in:
Abhijeet 2021-09-28 16:03:56 +05:30 committed by GitHub
parent 5c3e4ba715
commit 0729ab3211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
View File

@ -723,10 +723,13 @@ public class ImportExportApplicationService {
//Mapping ds name in id field //Mapping ds name in id field
ds.setId(datasourceMap.get(ds.getId())); ds.setId(datasourceMap.get(ds.getId()));
ds.setOrganizationId(null); ds.setOrganizationId(null);
ds.setPluginId(null); if (ds.getPluginId() != null) {
ds.setPluginId(pluginMap.get(ds.getPluginId()));
}
return ds.getId(); return ds.getId();
} else { } else {
// This means we don't have regular datasource it can be simple REST_API // This means we don't have regular datasource it can be simple REST_API and will also be used when
// importing the action to populate the data
ds.setOrganizationId(organizationId); ds.setOrganizationId(organizationId);
ds.setPluginId(pluginMap.get(ds.getPluginId())); ds.setPluginId(pluginMap.get(ds.getPluginId()));
return ""; return "";

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

@ -384,8 +384,9 @@ public class ImportExportApplicationServiceTests {
assertThat(validAction.getOrganizationId()).isNull(); assertThat(validAction.getOrganizationId()).isNull();
assertThat(validAction.getPolicies()).isNull(); assertThat(validAction.getPolicies()).isNull();
assertThat(validAction.getId()).isNotNull(); assertThat(validAction.getId()).isNotNull();
assertThat(validAction.getUnpublishedAction().getPageId()) ActionDTO unpublishedAction = validAction.getUnpublishedAction();
.isEqualTo(defaultPage.getUnpublishedPage().getName()); assertThat(unpublishedAction.getPageId()).isEqualTo(defaultPage.getUnpublishedPage().getName());
assertThat(unpublishedAction.getDatasource().getPluginId()).isEqualTo(installedPlugin.getPackageName());
assertThat(datasourceList).hasSize(1); assertThat(datasourceList).hasSize(1);
Datasource datasource = datasourceList.get(0); Datasource datasource = datasourceList.get(0);