chore: set datasourceId in executeActionDTO during execution

Zeral-Zhang · Nov 21, 2024 · 458b5c0 · 458b5c0
1 parent 89f9b59
commit 458b5c0
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/...-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java b/...-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
@@ -252,17 +252,24 @@ private Mono<ExecuteActionDTO> populateExecuteActionDTO(ExecuteActionDTO execute
         Mono<ExecuteActionDTO> systemInfoPopulatedExecuteActionDTOMono =
                 actionExecutionSolutionHelper.populateExecuteActionDTOWithSystemInfo(executeActionDTO);
 
-        return systemInfoPopulatedExecuteActionDTOMono.flatMap(
-                populatedExecuteActionDTO -> Mono.zip(instanceIdMono, defaultTenantIdMono)
-                        .map(tuple -> {
-                            String instanceId = tuple.getT1();
-                            String tenantId = tuple.getT2();
-                            populatedExecuteActionDTO.setActionId(newAction.getId());
-                            populatedExecuteActionDTO.setWorkspaceId(newAction.getWorkspaceId());
-                            populatedExecuteActionDTO.setInstanceId(instanceId);
-                            populatedExecuteActionDTO.setTenantId(tenantId);
-                            return populatedExecuteActionDTO;
-                        }));
+        return systemInfoPopulatedExecuteActionDTOMono.flatMap(populatedExecuteActionDTO -> Mono.zip(
+                        instanceIdMono, defaultTenantIdMono)
+                .map(tuple -> {
+                    String instanceId = tuple.getT1();
+                    String tenantId = tuple.getT2();
+                    populatedExecuteActionDTO.setActionId(newAction.getId());
+                    populatedExecuteActionDTO.setWorkspaceId(newAction.getWorkspaceId());
+                    if (TRUE.equals(executeActionDTO.getViewMode())) {
+                        populatedExecuteActionDTO.setDatasourceId(
+                                newAction.getPublishedAction().getDatasource().getId());
+                    } else {
+                        populatedExecuteActionDTO.setDatasourceId(
+                                newAction.getUnpublishedAction().getDatasource().getId());
+                    }
+                    populatedExecuteActionDTO.setInstanceId(instanceId);
+                    populatedExecuteActionDTO.setTenantId(tenantId);
+                    return populatedExecuteActionDTO;
+                }));
     }
 
     /**