@sapui5/sap.fe.core 1.100.0 → 1.102.0

package/src/sap/fe/core/{actions → controllerextensions/editFlow}/operations.ts

@@ -1,17 +1,19 @@
-import MessageBox from "sap/m/MessageBox";
-import Dialog from "sap/m/Dialog";
-import JSONModel from "sap/ui/model/json/JSONModel";
-import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
-import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
-import Fragment from "sap/ui/core/Fragment";
-import messageHandling from "sap/fe/core/actions/messageHandling";
-import BusyLocker from "sap/fe/core/BusyLocker";
-import CommonUtils from "sap/fe/core/CommonUtils";
 import Log from "sap/base/Log";
-import FELibrary from "sap/fe/core/library";
+import CommonUtils from "sap/fe/core/CommonUtils";
+import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
+import messageHandling from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
 import FPMHelper from "sap/fe/core/helpers/FPMHelper";
-import Button from "sap/m/Button";
 import { generate } from "sap/fe/core/helpers/StableIdHelper";
+import FELibrary from "sap/fe/core/library";
+import Button from "sap/m/Button";
+import Dialog from "sap/m/Dialog";
+import MessageBox from "sap/m/MessageBox";
+import Core from "sap/ui/core/Core";
+import Fragment from "sap/ui/core/Fragment";
+import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
+import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
+import JSONModel from "sap/ui/model/json/JSONModel";
+import Context from "sap/ui/model/odata/v4/Context";
 
 const Constants = FELibrary.Constants,
 	InvocationGrouping = FELibrary.InvocationGrouping;
@@ -138,12 +140,12 @@ function _executeFunction(sFunctionName: any, oModel: any, oFunction: any, conte
 	}
 	const oFunctionPromise = oFunction.execute(sGroupId);
 	oModel.submitBatch(sGroupId);
-	return oFunctionPromise.then(function() {
+	return oFunctionPromise.then(function () {
 		return oFunction.getBoundContext();
 	});
 }
 function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent: any, mParameters: any) {
-	return new Promise(function(resolve: (value: any) => void, reject: (reason?: any) => void) {
+	return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 		let aActionParameters = mParameters.actionParameters || [];
 		let mActionExecutionParameters: any = {};
 		let fnDialog;
@@ -157,6 +159,9 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 		let sMetaPath;
 		let sMessagesPath: any;
 		let iMessageSideEffect;
+		let bIsSameEntity;
+		let oReturnType;
+		let bStaticAction;
 		if (!oAction || !oAction.getObject()) {
 			return reject(new Error("Action " + sActionName + " not found"));
 		}
@@ -188,13 +193,19 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 				sMessagesPath = oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path");
 
 				if (sMessagesPath) {
-					iMessageSideEffect = mParameters.additionalSideEffect.pathExpressions.findIndex(function(exp: any) {
-						return exp.$PropertyPath === sMessagesPath;
+					iMessageSideEffect = mParameters.additionalSideEffect.pathExpressions.findIndex(function (exp: any) {
+						return typeof exp === "string" && exp === sMessagesPath;
 					});
 
-					if (iMessageSideEffect > -1) {
+					// Add SAP_Messages by default if not annotated by side effects, action does not return a collection and
+					// the return type is the same as the bound type
+					oReturnType = oAction.getObject("$ReturnType");
+					bIsSameEntity =
+						oReturnType && !oReturnType.$isCollection && oAction.getModel().getObject(sMetaPath).$Type === oReturnType.$Type;
+
+					if (iMessageSideEffect > -1 || bIsSameEntity) {
 						// the message path is annotated as side effect. As there's no binding for it and the model does currently not allow
-						// to add it at a later point of time we have to take care it's part of the $select of the POST, therefore moving it
+						// to add it at a later point of time we have to take care it's part of the $select of the POST, therefore moving it.
 						mParameters.mBindingParameters = mParameters.mBindingParameters || {};
 
 						if (
@@ -206,7 +217,7 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 								? mParameters.mBindingParameters.$select + "," + sMessagesPath
 								: sMessagesPath;
 
-							if (mParameters.additionalSideEffect.triggerActions.length === 0) {
+							if (mParameters.additionalSideEffect.triggerActions.length === 0 && iMessageSideEffect > -1) {
 								// no trigger action therefore no need to request messages again
 								mParameters.additionalSideEffect.pathExpressions.splice(iMessageSideEffect, 1);
 							}
@@ -223,6 +234,11 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 			mActionExecutionParameters.internalModelContext = mParameters.internalModelContext;
 			mActionExecutionParameters.operationAvailableMap = mParameters.operationAvailableMap;
 			mActionExecutionParameters.bObjectPage = mParameters.bObjectPage;
+			if (mParameters.controlId) {
+				mActionExecutionParameters.control = mParameters.parentControl.byId(mParameters.controlId);
+			} else {
+				mActionExecutionParameters.control = mParameters.parentControl;
+			}
 		}
 		if (bIsCreateAction) {
 			mActionExecutionParameters.bIsCreateAction = bIsCreateAction;
@@ -243,10 +259,28 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 			oActionPromise = _executeAction(oAppComponent, mActionExecutionParameters);
 		}
 		return oActionPromise
-			.then(function(oOperationResult: any) {
+			.then(function (oOperationResult: any) {
+				if (
+					mActionExecutionParameters.internalModelContext &&
+					mActionExecutionParameters.operationAvailableMap &&
+					mActionExecutionParameters.aContexts &&
+					mActionExecutionParameters.aContexts.length
+				) {
+					const selectedContext = mActionExecutionParameters.aContexts.filter((oContext: Context) => {
+						const binding = oContext.getBinding();
+						return !binding.isA("sap.ui.model.odata.v4.ODataListBinding");
+					});
+					if (selectedContext && selectedContext.length) {
+						CommonUtils.setActionEnablement(
+							mActionExecutionParameters.internalModelContext,
+							JSON.parse(mActionExecutionParameters.operationAvailableMap),
+							mActionExecutionParameters.aContexts
+						);
+					}
+				}
 				resolve(oOperationResult);
 			})
-			.catch(function(oOperationResult: any) {
+			.catch(function (oOperationResult: any) {
 				reject(oOperationResult);
 			});
 	});
@@ -276,19 +310,19 @@ function confirmCriticalAction(
 		);
 
 		MessageBox.confirm(sConfirmationText, {
-			onClose: function(sAction: any) {
+			onClose: function (sAction: any) {
 				if (sAction === Action.OK) {
 					return _executeAction(oAppComponent, mParameters)
-						.then(function(oOperation: any) {
+						.then(function (oOperation: any) {
 							resolve(oOperation);
 						})
-						.catch(function(oError: any) {
+						.catch(function (oError: any) {
 							messageHandler
 								.showMessageDialog()
-								.then(function() {
+								.then(function () {
 									reject(oError);
 								})
-								.catch(function() {
+								.catch(function () {
 									reject(oError);
 								});
 						});
@@ -318,7 +352,7 @@ function showActionParameterDialog(
 			: oActionContext.getPath().split("/0")[0],
 		actionNameContext = metaModel.createBindingContext(sActionNamePath),
 		sFragmentName = "sap/fe/core/controls/ActionParameterDialog";
-	return new Promise(function(resolve: (value: any) => void, reject: (reason?: any) => void) {
+	return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 		const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
 		const oParameterModel = new JSONModel({
 			$displayMode: {}
@@ -326,30 +360,30 @@ function showActionParameterDialog(
 		let aFieldInvalid: any[] = [];
 		let aFormElements: any[] = [];
 		const mFieldValueMap: any = {};
-		const validateRequiredProperties = function() {
+		const validateRequiredProperties = function () {
 			return Promise.all(
 				aFormElements
-					.filter(function(oFormElement: any) {
+					.filter(function (oFormElement: any) {
 						const oField = oFormElement.getFields()[0];
 						return oField.getRequired() && oField.getValueState() !== "Error";
 					})
-					.map(function(oFormElement: any) {
+					.map(function (oFormElement: any) {
 						const value = oFormElement.getFields()[0].isA("sap.ui.mdc.MultiValueField")
 							? oFormElement.getFields()[0].getItems()
 							: oFormElement.getFields()[0].getValue();
-						if (value === undefined || value === null || value === "") {
+						if (value === undefined || value === null || value === "" || (Array.isArray(value) && !value.length)) {
 							return oFormElement.getLabel().getText();
 						}
 					})
-			).then(function(aResults: any[]) {
-				aResults = aResults.filter(function(result: any) {
+			).then(function (aResults: any[]) {
+				aResults = aResults.filter(function (result: any) {
 					return result !== undefined;
 				});
 				return aResults;
 			});
 		};
-		const _validateMessages = function(aActionParameters: any, aFieldInvalid: any, bClearTarget?: boolean) {
-			const oMessageManager = sap.ui.getCore().getMessageManager();
+		const _validateMessages = function (aActionParameters: any, aFieldInvalid: any, bClearTarget?: boolean) {
+			const oMessageManager = Core.getMessageManager();
 			const aMessages = oMessageManager.getMessageModel().getData();
 
 			aFieldInvalid = aFieldInvalid || [];
@@ -357,9 +391,9 @@ function showActionParameterDialog(
 			if (!aMessages.length) {
 				aFieldInvalid = [];
 			}
-			aActionParameters.forEach(function(oActionParameters: any) {
+			aActionParameters.forEach(function (oActionParameters: any) {
 				const sParameter = oActionParameters.$Name;
-				aMessages.forEach(function(oMessage: any) {
+				aMessages.forEach(function (oMessage: any) {
 					const sParam = sParameter.replace("-inner", "");
 					if (
 						oMessage.controlIds.length > 0 &&
@@ -386,13 +420,13 @@ function showActionParameterDialog(
 			return aFieldInvalid;
 		};
 		const oController = {
-			handleChange: function(oEvent: any) {
+			handleChange: function (oEvent: any) {
 				messageHandler.removeTransitionMessages();
 				const oField = oEvent.getSource();
 				const sFieldId = oEvent.getParameter("id");
 				const oFieldPromise = oEvent.getParameter("promise");
 				if (oFieldPromise) {
-					mFieldValueMap[sFieldId] = oFieldPromise.then(function() {
+					mFieldValueMap[sFieldId] = oFieldPromise.then(function () {
 						return oField.getValue();
 					});
 				}
@@ -419,21 +453,21 @@ function showActionParameterDialog(
 				}
 			)
 		)
-			.then(function(oFragment: any) {
+			.then(function (oFragment: any) {
 				// TODO: move the dialog into the fragment and move the handlers to the oController
 				let aContexts: any[];
 				const aFunctionParams: any[] = [];
 				let oOperationBinding: any;
-				return CommonUtils.setUserDefaults(oAppComponent, aActionParameters, oParameterModel, true).then(function() {
+				return CommonUtils.setUserDefaults(oAppComponent, aActionParameters, oParameterModel, true).then(function () {
 					// TODO: move the dialog into the fragment and move the handlers to the oController
-					return Fragment.load({ definition: oFragment, controller: oController }).then(function(oDialogContent: any) {
+					return Fragment.load({ definition: oFragment, controller: oController }).then(function (oDialogContent: any) {
 						const oResourceBundle = oParentControl.getController().oResourceBundle;
 						const oDialog = new Dialog(undefined, {
 							title:
 								sActionLabel ||
 								CommonUtils.getTranslatedText("C_OPERATIONS_ACTION_PARAMETER_DIALOG_TITLE", oResourceBundle),
 							content: [oDialogContent],
-							escapeHandler: function() {
+							escapeHandler: function () {
 								oDialog.close();
 								messageHandler.removeTransitionMessages();
 								reject();
@@ -441,9 +475,9 @@ function showActionParameterDialog(
 							beginButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Ok"]), {
 								text: sActionLabel || CommonUtils.getTranslatedText("C_COMMON_DIALOG_OK", oResourceBundle),
 								type: "Emphasized",
-								press: function() {
+								press: function () {
 									validateRequiredProperties()
-										.then(function(aEmptyMandatoryFields: any[]) {
+										.then(function (aEmptyMandatoryFields: any[]) {
 											if (aEmptyMandatoryFields.length) {
 												const oMessages = [];
 												for (let i = 0; i < aEmptyMandatoryFields.length; i++) {
@@ -470,11 +504,11 @@ function showActionParameterDialog(
 											}
 											BusyLocker.lock(oDialog);
 											return Promise.all(
-												Object.keys(mFieldValueMap).map(function(sKey: string) {
+												Object.keys(mFieldValueMap).map(function (sKey: string) {
 													return mFieldValueMap[sKey];
 												})
 											)
-												.then(function() {
+												.then(function () {
 													// TODO: due to using the search and value helps on the action dialog transient messages could appear
 													// we need an UX design for those to show them to the user - for now remove them before continuing
 													messageHandler.removeTransitionMessages();
@@ -499,16 +533,49 @@ function showActionParameterDialog(
 													}
 													mParameters.label = sActionLabel;
 													return _executeAction(oAppComponent, mParameters)
-														.then(function(oOperation: any) {
+														.then(function (oOperation: any) {
 															oDialog.close();
 															resolve(oOperation);
 														})
-														.catch(function(oError: any) {
+														.catch(function (oError: any) {
+															let messages = messageHandling.getMessages();
+															messages = messages.concat(messageHandling.getMessages(true, true));
+															if (
+																!mParameters.bGrouped &&
+																!(!mParameters.control.isA("sap.ui.mdc.Table") && aContexts.length === 1) &&
+																messages.length
+															) {
+																oDialog.close();
+															}
 															throw oError;
 														});
 												})
-												.catch(function() {
-													const oMessageManager = sap.ui.getCore().getMessageManager();
+												.catch(function () {
+													const oMessageManager = Core.getMessageManager();
+													let messages = oMessageManager.getMessageModel().getData();
+													const subtitleColumn = CommonUtils.getMessageColumn(mParameters.control);
+													let errorContext = undefined;
+													let errorTargetsInAPM = false;
+													messages.forEach(function (message: any) {
+														const messageTargets = message.getTargets();
+														if (messageTargets && messageTargets.length === 1 && messageTargets[0].length) {
+															errorContext = aContexts.find(function (oContext: any) {
+																return message.getTarget().indexOf(oContext.getPath()) !== -1;
+															});
+															message.additionalText = errorContext
+																? errorContext.getObject()[subtitleColumn]
+																: undefined;
+														}
+
+														if (
+															message.getTarget().indexOf(mParameters.actionName) !== -1 &&
+															message.getTarget().indexOf(mParameters.aActionParameters[0].$Name) !== -1 &&
+															errorTargetsInAPM === false
+														) {
+															errorTargetsInAPM = true;
+														}
+													});
+
 													const bHasEtagMessage = messageHandling.modifyETagMessagesOnly(
 														oMessageManager,
 														oResourceBundle
@@ -517,39 +584,40 @@ function showActionParameterDialog(
 													messageHandler.showMessages({
 														bHasEtagMessage: bHasEtagMessage,
 														context: mParameters.aContexts[0],
-														isActionParameterDialogOpen: true,
-														messagePageNavigationCallback: function() {
+														isActionParameterDialogOpen: oDialog.isOpen(),
+														messagePageNavigationCallback: function () {
 															oDialog.close();
-														}
+														},
+														errorTargetsInAPM: errorTargetsInAPM
 													});
-													if (oDialog && bHasEtagMessage) {
+													if (oDialog && bHasEtagMessage && oDialog.isOpen()) {
 														oDialog.close(); //close the action parameter dialog after refresh of the context after etag mismatch
 													}
 												})
-												.finally(function() {
+												.finally(function () {
 													BusyLocker.unlock(oDialog);
 												});
 										})
-										.catch(function() {
+										.catch(function () {
 											return messageHandler.showMessageDialog();
 										});
 								}
 							}),
 							endButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Cancel"]), {
 								text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
-								press: function() {
+								press: function () {
 									_validateMessages(aActionParameters, aFieldInvalid, true);
 									oDialog.close();
 									messageHandler.removeTransitionMessages();
 									reject(Constants.CancelActionDialog);
 								}
 							}),
-							beforeOpen: function(oEvent: any) {
+							beforeOpen: function (oEvent: any) {
 								// clone event for actionWrapper as oEvent.oSource gets lost during processing of beforeOpen event handler
 								const oCloneEvent = Object.assign({}, oEvent);
 
 								messageHandler.removeTransitionMessages();
-								const getDefaultValuesFunction = function() {
+								const getDefaultValuesFunction = function () {
 									const oMetaModel = oDialog.getModel().getMetaModel(),
 										sActionPath = oActionContext.sPath && oActionContext.sPath.split("/@")[0],
 										sDefaultValuesFunction = oMetaModel.getObject(
@@ -557,10 +625,10 @@ function showActionParameterDialog(
 										);
 									return sDefaultValuesFunction;
 								};
-								const fnSetDefaultsAndOpenDialog = function(sBindingParameter?: any) {
+								const fnSetDefaultsAndOpenDialog = function (sBindingParameter?: any) {
 									const sBoundFunctionName = getDefaultValuesFunction();
-									const prefillParameter = function(sParamName: any, vParamDefaultValue: any) {
-										return new Promise(resolve => {
+									const prefillParameter = function (sParamName: any, vParamDefaultValue: any) {
+										return new Promise((resolve) => {
 											// Case 1: There is a ParameterDefaultValue annotation
 											if (vParamDefaultValue !== undefined) {
 												if (aContexts.length > 0 && vParamDefaultValue.$Path) {
@@ -569,7 +637,7 @@ function showActionParameterDialog(
 														oOperationBinding.getModel()
 													);
 													oPromise
-														.then(function(oValue: any) {
+														.then(function (oValue: any) {
 															if (oValue === null) {
 																return oOperationBinding
 																	.getParameterContext()
@@ -577,7 +645,7 @@ function showActionParameterDialog(
 															}
 															return oValue;
 														})
-														.then(function(vParamValue: any) {
+														.then(function (vParamValue: any) {
 															if (aContexts.length > 1) {
 																// For multi select, need to loop over aContexts (as contexts cannot be retrieved via binding parameter of the operation binding)
 																let sPathForContext = vParamDefaultValue.$Path;
@@ -597,7 +665,7 @@ function showActionParameterDialog(
 															}
 															resolve({ paramName: sParamName, value: vParamValue });
 														})
-														.catch(function() {
+														.catch(function () {
 															// Simply clear parameter default if an error has occurred
 															Log.error(
 																"Error while reading default action parameter",
@@ -628,7 +696,7 @@ function showActionParameterDialog(
 										});
 									};
 
-									const getParameterDefaultValue = function(sParamName: any) {
+									const getParameterDefaultValue = function (sParamName: any) {
 										const oMetaModel = oDialog.getModel().getMetaModel(),
 											sActionPath = oActionContext.sPath && oActionContext.sPath.split("/@")[0],
 											sActionParameterAnnotationTarget = sActionPath + "/" + sParamName + "@",
@@ -677,7 +745,7 @@ function showActionParameterDialog(
 									}
 
 									Promise.all([aPrefillParamPromises, aExecFunctionPromises, oExecFunctionFromManifestPromise])
-										.then(function(aPromises: [any[], any[], any]) {
+										.then(function (aPromises: [any[], any[], any]) {
 											const aCurrentParamDefaultValue: any = aPromises[0];
 											const aFunctionParams = aPromises[1];
 											const oFunctionParamsFromManifest = aPromises[2];
@@ -736,7 +804,7 @@ function showActionParameterDialog(
 													}
 												}
 											}
-											const bErrorFound = aCurrentParamDefaultValue.some(function(oValue: any) {
+											const bErrorFound = aCurrentParamDefaultValue.some(function (oValue: any) {
 												if (oValue.bLatePropertyError) {
 													return oValue.bLatePropertyError;
 												}
@@ -758,20 +826,20 @@ function showActionParameterDialog(
 										sBindingParameter = aParameters[0] && aParameters[0].$Name;
 									aContexts[0]
 										.requestObject()
-										.then(function(oContextObject: any) {
+										.then(function (oContextObject: any) {
 											if (oContextObject) {
 												oOperationBinding.setParameter(sBindingParameter, oContextObject);
 											}
 											fnSetDefaultsAndOpenDialog(sBindingParameter);
 										})
-										.catch(function(oError: any) {
+										.catch(function (oError: any) {
 											Log.error("Error while retrieving the parameter", oError);
 										});
 								} else {
 									fnSetDefaultsAndOpenDialog();
 								}
 							},
-							afterClose: function() {
+							afterClose: function () {
 								oDialog.destroy();
 							}
 						});
@@ -846,7 +914,7 @@ function getIsActionCritical(oMetaModel: any, sPath: any, contexts?: any, oBound
 			aBindingParams && aBindingParams.length && typeof aBindingParams === "object" && sCriticalPath && contexts && contexts.length;
 	if (bCondition) {
 		//in case binding patameters are there in path need to remove eg: - _it/isVerified => need to remove _it and the path should be isVerified
-		aBindingParams.filter(function(oParams: any) {
+		aBindingParams.filter(function (oParams: any) {
 			const index = aPaths && aPaths.indexOf(oParams.$Name);
 			if (index > -1) {
 				aPaths.splice(index, 1);
@@ -864,7 +932,7 @@ function executeDependingOnSelectedContexts(oAction: any, mParameters: any, bGet
 	let oActionPromise;
 	if (mParameters.internalModelContext && mParameters.internalModelContext.getObject().numberOfSelectedContexts > 1) {
 		oActionPromise = bGetBoundContext
-			? oAction.execute(sGroupId).then(function() {
+			? oAction.execute(sGroupId).then(function () {
 					return oAction.getBoundContext();
 			  })
 			: oAction.execute(sGroupId);
@@ -876,7 +944,7 @@ function executeDependingOnSelectedContexts(oAction: any, mParameters: any, bGet
 						undefined,
 						CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, mParameters.label, mParameters.model)
 					)
-					.then(function() {
+					.then(function () {
 						return oAction.getBoundContext();
 					})
 			: oAction.execute(
@@ -898,18 +966,21 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 	const fnOnResponse = mParameters.fnOnResponse;
 	const bIsCreateAction = mParameters.bIsCreateAction;
 	let oAction: any;
+	// let contextIndex = 0;
+	// let aMessages: any[] = [];
 
 	function fnDifferentiate(promise: any) {
 		return promise.then(
-			function(response: any) {
-				const aMessages = messageHandling.getMessages();
+			function (response: any) {
+				let aMessages = messageHandling.getMessages();
+				aMessages = aMessages.concat(messageHandling.getMessages(true, true));
 				// Action Dialog must remain open if there are response error-messages, because in the java stack the dialog would be closed immediately.
 				if (aMessages.length > iExistingMessages && aMessages[aMessages.length - 1].type === "Error") {
 					return { response: response, status: "rejected" };
 				}
 				return { response: response, status: "resolved" };
 			},
-			function(response: any) {
+			function (response: any) {
 				return { response: response, status: "rejected" };
 			}
 		);
@@ -943,7 +1014,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 	}
 
 	if (aContexts.length) {
-		return new Promise(function(resolve: (value: any) => void, reject: (reason?: any) => void) {
+		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 			const mBindingParameters = mParameters.mBindingParameters;
 			const bGrouped = mParameters.bGrouped;
 			const bReturnAsArray = mParameters.bReturnAsArray;
@@ -952,7 +1023,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 			let oActionPromise;
 			let i;
 			let sGroupId: string;
-			const fnExecuteAction = function(oAction: any, index: any, oSideEffect: any) {
+			const fnExecuteAction = function (oAction: any, index: any, oSideEffect: any) {
 				setActionParameterDefaultValue();
 				// For invocation grouping "isolated" need batch group per action call
 				sGroupId = !bGrouped ? "$auto." + index : oAction.getUpdateGroupId();
@@ -961,7 +1032,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 				const oSideEffectsService = oAppComponent.getSideEffectsService();
 				// trigger actions from side effects
 				if (oSideEffect && oSideEffect.triggerActions && oSideEffect.triggerActions.length) {
-					oSideEffect.triggerActions.forEach(function(sTriggerAction: any) {
+					oSideEffect.triggerActions.forEach(function (sTriggerAction: any) {
 						if (sTriggerAction) {
 							oSideEffectsService.executeAction(sTriggerAction, oSideEffect.context, sGroupId);
 						}
@@ -972,7 +1043,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 				if (oSideEffect && oSideEffect.pathExpressions && oSideEffect.pathExpressions.length > 0) {
 					oSideEffectsService
 						.requestSideEffects(oSideEffect.pathExpressions, oSideEffect.context, sGroupId)
-						.then(function() {
+						.then(function () {
 							if (mParameters.operationAvailableMap && mParameters.internalModelContext) {
 								CommonUtils.setActionEnablement(
 									mParameters.internalModelContext,
@@ -981,13 +1052,13 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 								);
 							}
 						})
-						.catch(function(oError: any) {
+						.catch(function (oError: any) {
 							Log.error("Error while requesting side effects", oError);
 						});
 				}
 			};
-			const fnExecuteSingleAction = function(oAction: any, index: any, oSideEffect: any) {
-				const oPromise = new Promise<void>(resolve => {
+			const fnExecuteSingleAction = function (oAction: any, index: any, oSideEffect: any) {
+				const oPromise = new Promise<void>((resolve) => {
 					let oLocalPromise;
 					const aLocalPromise = [];
 					setActionParameterDefaultValue();
@@ -999,7 +1070,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 					const oSideEffectsService = oAppComponent.getSideEffectsService();
 					// trigger actions from side effects
 					if (oSideEffect && oSideEffect.triggerActions && oSideEffect.triggerActions.length) {
-						oSideEffect.triggerActions.forEach(function(sTriggerAction: any) {
+						oSideEffect.triggerActions.forEach(function (sTriggerAction: any) {
 							if (sTriggerAction) {
 								oLocalPromise = oSideEffectsService.executeAction(sTriggerAction, oSideEffect.context, sGroupId);
 								aLocalPromise.push(oLocalPromise);
@@ -1012,7 +1083,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 						oLocalPromise = oSideEffectsService.requestSideEffects(oSideEffect.pathExpressions, oSideEffect.context, sGroupId);
 						aLocalPromise.push(oLocalPromise);
 						oLocalPromise
-							.then(function() {
+							.then(function () {
 								if (mParameters.operationAvailableMap && mParameters.internalModelContext) {
 									CommonUtils.setActionEnablement(
 										mParameters.internalModelContext,
@@ -1021,16 +1092,16 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 									);
 								}
 							})
-							.catch(function(oError: any) {
+							.catch(function (oError: any) {
 								Log.error("Error while requesting side effects", oError);
 							});
 					}
 					oModel.submitBatch(sGroupId);
 					Promise.all(aLocalPromise)
-						.then(function() {
+						.then(function () {
 							return resolve();
 						})
-						.catch(function() {
+						.catch(function () {
 							return resolve();
 						});
 				});
@@ -1056,22 +1127,23 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 
 				let oActionAndSideEffectPromise = Promise.resolve();
 				let j = 0;
-				aContexts.forEach(function(context: any) {
+				aContexts.forEach(function (context: any) {
 					const id = ++j;
-					oActionAndSideEffectPromise = oActionAndSideEffectPromise.then(function() {
+					oActionAndSideEffectPromise = oActionAndSideEffectPromise.then(function () {
 						return processOneAction(context, id);
 					});
 				});
 				oActionAndSideEffectPromise
-					.then(function() {
+					.then(function () {
 						fnHandleResults();
 					})
 					.catch();
 			}
 
-			if (mParameters.bObjectPage && !bGrouped) {
-				// For invocation grouping "isolated" called from ObjectPage, ensure that each action and matching side effects
+			if (!bGrouped) {
+				// For invocation grouping "isolated", ensure that each action and matching side effects
 				// are processed before the next set is submitted. Workaround until JSON batch is available.
+				// Allow also for List Report.
 				fnExecuteSequentially(aContexts);
 			} else {
 				for (i = 0; i < aContexts.length; i++) {
@@ -1093,7 +1165,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 
 			function fnHandleResults() {
 				Promise.all(aActionPromises.map(fnDifferentiate))
-					.then(function(results: any[]) {
+					.then(function (results: any[]) {
 						const aRejectedItems = [];
 						const aResolvedItems = [];
 						let iResultCount;
@@ -1131,7 +1203,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 					})
 					.catch(reject);
 			}
-		}).finally(function() {
+		}).finally(function () {
 			(
 				fnOnResponse ||
 				function noop() {
@@ -1156,7 +1228,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 				/**/
 			}
 		)(oActionPromise);
-		return oActionPromise.finally(function() {
+		return oActionPromise.finally(function () {
 			(
 				fnOnResponse ||
 				function noop() {