From 0729ab3211bbd7acdc99cee00fee56d40926946d Mon Sep 17 00:00:00 2001
From: Abhijeet <41686026+abhvsn@users.noreply.github.com>
Date: Tue, 28 Sep 2021 16:03:56 +0530
Subject: [PATCH] fix: Display result in tabular format for action response in
 imported app for SQL datasource (#7889)

* Added pluginId to nested datasource object within actionDTO

* Added check in TC for plugin id
---
 .../server/solutions/ImportExportApplicationService.java   | 7 +++++--
 .../solutions/ImportExportApplicationServiceTests.java     | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
index 020b34a6e7..a28473ea22 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ImportExportApplicationService.java
@@ -723,10 +723,13 @@ public class ImportExportApplicationService {
                 //Mapping ds name in id field
                 ds.setId(datasourceMap.get(ds.getId()));
                 ds.setOrganizationId(null);
-                ds.setPluginId(null);
+                if (ds.getPluginId() != null) {
+                    ds.setPluginId(pluginMap.get(ds.getPluginId()));
+                }
                 return ds.getId();
             } 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.setPluginId(pluginMap.get(ds.getPluginId()));
                 return "";
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
index 0da293aebf..ad52f36718 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java
@@ -384,8 +384,9 @@ public class ImportExportApplicationServiceTests {
                     assertThat(validAction.getOrganizationId()).isNull();
                     assertThat(validAction.getPolicies()).isNull();
                     assertThat(validAction.getId()).isNotNull();
-                    assertThat(validAction.getUnpublishedAction().getPageId())
-                            .isEqualTo(defaultPage.getUnpublishedPage().getName());
+                    ActionDTO unpublishedAction = validAction.getUnpublishedAction();
+                    assertThat(unpublishedAction.getPageId()).isEqualTo(defaultPage.getUnpublishedPage().getName());
+                    assertThat(unpublishedAction.getDatasource().getPluginId()).isEqualTo(installedPlugin.getPackageName());
 
                     assertThat(datasourceList).hasSize(1);
                     Datasource datasource = datasourceList.get(0);