diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java index 77fbb22a0f..88df1229b8 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java @@ -139,7 +139,7 @@ public class FieldName { public static final String FORM_LOGIN = "FormLogin"; public static final String APP_MODE = "appMode"; public static final String PAGE_ORDER = "order"; - public static final String ACTION_EXECUTION_REQUEST = "actionExecutionRequest"; + public static final String ACTION_EXECUTION_REQUEST_PARAMS = "actionExecutionRequestParams"; public static final String ACTION_EXECUTION_RESULT = "actionExecutionResult"; public static final String ACTION_EXECUTION_TIME = "actionExecutionTime"; public static final String WEBSITE = "website"; @@ -148,5 +148,6 @@ public class FieldName { // this key will present in the analytics as a diff b/w server and user invoked flows public static final String IS_DATASOURCE_UPDATE_USER_INVOKED_KEY = "isDatasourceUpdateUserInvoked"; public static final String UPDATED_INSTANCE_SETTINGS = "updatedInstanceSettings"; + public static final String ACTION_EXECUTION_QUERY = "actionExecutionQuery"; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java index bd30492d22..92c185e617 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java @@ -800,7 +800,7 @@ public class NewActionServiceCEImpl extends BaseService Mono.zip( Mono.just(application), sessionUserService.getCurrentUser(), - newPageService.getNameByPageId(actionDTO.getPageId(), viewMode), + newPageService.getNameByPageId(actionDTO.getPageId(), executeActionDto.getViewMode()), pluginService.getById(action.getPluginId()) )) .flatMap(tuple -> { @@ -1126,7 +1126,7 @@ public class NewActionServiceCEImpl extends BaseService data = new HashMap<>(Map.of( "username", user.getUsername(), @@ -1183,13 +1183,16 @@ public class NewActionServiceCEImpl extends BaseService executionParams = executeActionDto.getParams().stream().map(param -> param.getValue()).collect(Collectors.toList()); final Map eventData = Map.of( FieldName.ACTION, action, FieldName.DATASOURCE, datasource, FieldName.APP_MODE, appMode, FieldName.ACTION_EXECUTION_RESULT, actionExecutionResult, FieldName.ACTION_EXECUTION_TIME, timeElapsed, - FieldName.ACTION_EXECUTION_REQUEST, request, + FieldName.ACTION_EXECUTION_REQUEST_PARAMS, executionParams, + FieldName.ACTION_EXECUTION_QUERY, actionExecutionResult.getRequest().getQuery(), FieldName.APPLICATION, application, FieldName.PLUGIN, plugin );