@sapui5/sap.fe.core 1.101.0 → 1.103.0

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

@@ -1,18 +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 type Context from "sap/ui/model/odata/v4/Context";
 
 const Constants = FELibrary.Constants,
 	InvocationGrouping = FELibrary.InvocationGrouping;
@@ -25,22 +26,22 @@ const Action = (MessageBox as any).Action;
  * @static
  * @name sap.fe.core.actions.operations.callBoundAction
  * @memberof sap.fe.core.actions.operations
- * @param {string} sActionName The name of the action to be called
- * @param {sap.ui.model.odata.v4.Context} contexts Either one context or an array with contexts for which the action is to be be called
- * @param {sap.ui.model.odata.v4.Model} oModel OData Model
- * @param {object} oAppComponent The AppComponent
- * @param {map} [mParameters] Optional, can contain the following attributes:
- * @param {map} [mParameters.actionParameters] A map of parameters to be sent for every action call
- * @param {map} [mParameters.mBindingParameters] A map of binding parameters that would be part of $select and $expand coming from side effects for bound actions
- * @param {Array} [mParameters.additionalSideEffect] Array of property paths to be requested in addition to actual target properties of the side effect
- * @param {boolean} [mParameters.showActionParameterDialog] If set and if parameters exist the user retrieves a dialog to fill in parameters, if actionParameters are passed they are shown to the user
- * @param {string} [mParameters.label] A human-readable label for the action
- * @param {string} [mParameters.invocationGrouping] Mode how actions are to be called: Changeset to put all action calls into one changeset, Isolated to put them into separate changesets, defaults to Isolated
- * @param {Function} [mParameters.onSubmitted] Function which is called once the actions are submitted with an array of promises
- * @param {map} [mParameters.defaultParameters] Can contain default parameters from FLP user defaults
- * @param {sap.ui.core.Element} [mParameters.parentControl] If specified the dialogs are added as dependent of the parent control
- * @param {boolean} [mParameters.bGetBoundContext] If specified the action promise returns the bound context
- * @returns {Promise} Promise resolves with an array of response objects (TODO: to be changed)
+ * @param sActionName The name of the action to be called
+ * @param contexts Either one context or an array with contexts for which the action is to be be called
+ * @param oModel OData Model
+ * @param oAppComponent The AppComponent
+ * @param  [mParameters] Optional, can contain the following attributes:
+ * @param  [mParameters.actionParameters] A map of parameters to be sent for every action call
+ * @param  [mParameters.mBindingParameters] A map of binding parameters that would be part of $select and $expand coming from side effects for bound actions
+ * @param [mParameters.additionalSideEffect] Array of property paths to be requested in addition to actual target properties of the side effect
+ * @param [mParameters.showActionParameterDialog] If set and if parameters exist the user retrieves a dialog to fill in parameters, if actionParameters are passed they are shown to the user
+ * @param [mParameters.label] A human-readable label for the action
+ * @param [mParameters.invocationGrouping] Mode how actions are to be called: Changeset to put all action calls into one changeset, Isolated to put them into separate changesets, defaults to Isolated
+ * @param [mParameters.onSubmitted] Function which is called once the actions are submitted with an array of promises
+ * @param  [mParameters.defaultParameters] Can contain default parameters from FLP user defaults
+ * @param [mParameters.parentControl] If specified the dialogs are added as dependent of the parent control
+ * @param [mParameters.bGetBoundContext] If specified the action promise returns the bound context
+ * @returns Promise resolves with an array of response objects (TODO: to be changed)
  * @private
  * @ui5-restricted
  */
@@ -57,8 +58,8 @@ function callBoundAction(sActionName: string, contexts: any, oModel: any, oAppCo
 		contexts = [contexts];
 	}
 	const oMetaModel = oModel.getMetaModel(),
-		sActionPath = oMetaModel.getMetaPath(contexts[0].getPath()) + "/" + sActionName,
-		oBoundAction = oMetaModel.createBindingContext(sActionPath + "/@$ui5.overload/0");
+		sActionPath = `${oMetaModel.getMetaPath(contexts[0].getPath())}/${sActionName}`,
+		oBoundAction = oMetaModel.createBindingContext(`${sActionPath}/@$ui5.overload/0`);
 	mParameters.aContexts = contexts;
 	mParameters.isCriticalAction = getIsActionCritical(oMetaModel, sActionPath, contexts, oBoundAction);
 	return callAction(sActionName, oModel, oBoundAction, oAppComponent, mParameters);
@@ -70,16 +71,16 @@ function callBoundAction(sActionName: string, contexts: any, oModel: any, oAppCo
  * @static
  * @name sap.fe.core.actions.operations.callActionImport
  * @memberof sap.fe.core.actions.operations
- * @param {string} sActionName The name of the action import to be called
- * @param {sap.ui.model.odata.v4.ODataModel} oModel An instance of an OData v4 model
- * @param {object} oAppComponent The AppComponent
- * @param {map} [mParameters] Optional, can contain the following attributes:
- * @param {map} [mParameters.actionParameters] A map of parameters to be sent with the action import
- * @param {string} [mParameters.label] A human-readable label for the action
- * @param {boolean} [mParameters.showActionParameterDialog] If set and if parameters exist the user retrieves a dialog to fill in parameters, if actionParameters are passed they are shown to the user
- * @param {Function} [mParameters.onSubmitted] Function which is called once the actions are submitted with an array of promises
- * @param {map} [mParameters.defaultParameters] Can contain default parameters from FLP user defaults
- * @returns {Promise} Promise resolves with an array of response objects (TODO: to be changed)
+ * @param sActionName The name of the action import to be called
+ * @param oModel An instance of an OData v4 model
+ * @param oAppComponent The AppComponent
+ * @param [mParameters] Optional, can contain the following attributes:
+ * @param [mParameters.actionParameters] A map of parameters to be sent with the action import
+ * @param [mParameters.label] A human-readable label for the action
+ * @param [mParameters.showActionParameterDialog] If set and if parameters exist the user retrieves a dialog to fill in parameters, if actionParameters are passed they are shown to the user
+ * @param [mParameters.onSubmitted] Function which is called once the actions are submitted with an array of promises
+ * @param [mParameters.defaultParameters] Can contain default parameters from FLP user defaults
+ * @returns Promise resolves with an array of response objects (TODO: to be changed)
  * @private
  * @ui5-restricted
  */
@@ -88,9 +89,9 @@ function callActionImport(sActionName: string, oModel: any, oAppComponent: objec
 		return Promise.reject("Action expects a model/context for execution");
 	}
 	const oMetaModel = oModel.getMetaModel(),
-		sActionPath = oModel.bindContext("/" + sActionName).getPath(),
-		oActionImport = oMetaModel.createBindingContext("/" + oMetaModel.createBindingContext(sActionPath).getObject("$Action") + "/0");
-	mParameters.isCriticalAction = getIsActionCritical(oMetaModel, sActionPath + "/@$ui5.overload");
+		sActionPath = oModel.bindContext(`/${sActionName}`).getPath(),
+		oActionImport = oMetaModel.createBindingContext(`/${oMetaModel.createBindingContext(sActionPath).getObject("$Action")}/0`);
+	mParameters.isCriticalAction = getIsActionCritical(oMetaModel, `${sActionPath}/@$ui5.overload`);
 	return callAction(sActionName, oModel, oActionImport, oAppComponent, mParameters);
 }
 function callBoundFunction(sFunctionName: string, context: any, oModel: any) {
@@ -98,7 +99,7 @@ function callBoundFunction(sFunctionName: string, context: any, oModel: any) {
 		return Promise.reject("Bound functions always requires a context");
 	}
 	const oMetaModel = oModel.getMetaModel(),
-		sFunctionPath = oMetaModel.getMetaPath(context.getPath()) + "/" + sFunctionName,
+		sFunctionPath = `${oMetaModel.getMetaPath(context.getPath())}/${sFunctionName}`,
 		oBoundFunction = oMetaModel.createBindingContext(sFunctionPath);
 	return _executeFunction(sFunctionName, oModel, oBoundFunction, context);
 }
@@ -109,9 +110,9 @@ function callBoundFunction(sFunctionName: string, context: any, oModel: any) {
  * @static
  * @name sap.fe.core.actions.operations.callFunctionImport
  * @memberof sap.fe.core.actions.operations
- * @param {string} sFunctionName The name of the function to be called
- * @param {sap.ui.model.odata.v4.ODataModel} oModel An instance of an OData v4 model
- * @returns {Promise} Promise resolves
+ * @param sFunctionName The name of the function to be called
+ * @param oModel An instance of an OData v4 model
+ * @returns Promise resolves
  * @private
  */
 function callFunctionImport(sFunctionName: string, oModel: any) {
@@ -119,32 +120,30 @@ function callFunctionImport(sFunctionName: string, oModel: any) {
 		return Promise.resolve();
 	}
 	const oMetaModel = oModel.getMetaModel(),
-		sFunctionPath = oModel.bindContext("/" + sFunctionName).getPath(),
-		oFunctionImport = oMetaModel.createBindingContext(
-			"/" + oMetaModel.createBindingContext(sFunctionPath).getObject("$Function") + "/0"
-		);
+		sFunctionPath = oModel.bindContext(`/${sFunctionName}`).getPath(),
+		oFunctionImport = oMetaModel.createBindingContext(`/${oMetaModel.createBindingContext(sFunctionPath).getObject("$Function")}/0`);
 	return _executeFunction(sFunctionName, oModel, oFunctionImport);
 }
 function _executeFunction(sFunctionName: any, oModel: any, oFunction: any, context?: any) {
 	let sGroupId;
 	if (!oFunction || !oFunction.getObject()) {
-		return Promise.reject(new Error("Function " + sFunctionName + " not found"));
+		return Promise.reject(new Error(`Function ${sFunctionName} not found`));
 	}
 	if (context) {
-		oFunction = oModel.bindContext(sFunctionName + "(...)", context);
+		oFunction = oModel.bindContext(`${sFunctionName}(...)`, context);
 		sGroupId = "functionGroup";
 	} else {
-		oFunction = oModel.bindContext("/" + sFunctionName + "(...)");
+		oFunction = oModel.bindContext(`/${sFunctionName}(...)`);
 		sGroupId = "functionImport";
 	}
 	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;
@@ -158,15 +157,17 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 		let sMetaPath;
 		let sMessagesPath: any;
 		let iMessageSideEffect;
+		let bIsSameEntity;
+		let oReturnType;
+		const actionDefinition = oAction.getObject();
 		if (!oAction || !oAction.getObject()) {
-			return reject(new Error("Action " + sActionName + " not found"));
-		}
-		if (bShowActionParameterDialog || aActionParameters.length > 0) {
-			aActionParameters = prepareActionParameters(oAction, aActionParameters);
-			if (!aActionParameters || aActionParameters.length === 0) {
-				bShowActionParameterDialog = false;
-			}
+			return reject(new Error(`Action ${sActionName} not found`));
 		}
+
+		aActionParameters = getActionParameters(oAction);
+
+		bShowActionParameterDialog = _showActionParameterDialog(bShowActionParameterDialog, aActionParameters);
+
 		if (bShowActionParameterDialog) {
 			fnDialog = showActionParameterDialog;
 		} else if (bIsCriticalAction) {
@@ -186,28 +187,39 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 			if (mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions) {
 				oMetaModel = oModel.getMetaModel();
 				sMetaPath = oMetaModel.getMetaPath(aContexts[0].getPath());
-				sMessagesPath = oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path");
+				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 (
-							oAction.getObject("$ReturnType/$Type/" + sMessagesPath) &&
+							oAction.getObject(`$ReturnType/$Type/${sMessagesPath}`) &&
 							(!mParameters.mBindingParameters.$select ||
 								mParameters.mBindingParameters.$select.split(",").indexOf(sMessagesPath) === -1)
 						) {
 							mParameters.mBindingParameters.$select = mParameters.mBindingParameters.$select
-								? mParameters.mBindingParameters.$select + "," + sMessagesPath
+								? `${mParameters.mBindingParameters.$select},${sMessagesPath}`
 								: sMessagesPath;
+							// Add side effects at entity level because $select stops these being returned by the action
+							// Only if no other side effects were added for Messages
+							if (iMessageSideEffect === -1) {
+								mParameters.additionalSideEffect.pathExpressions.push("*");
+							}
 
-							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);
 							}
@@ -224,6 +236,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;
@@ -244,10 +261,33 @@ 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 &&
+					actionDefinition.$IsBound
+				) {
+					//check for skipping static actions
+					const isStatic = (actionDefinition.$Parameter || []).some((aParameter: any) => {
+						return (
+							actionDefinition.$EntitySetPath &&
+							actionDefinition.$EntitySetPath === aParameter.$Name &&
+							aParameter.$isCollection
+						);
+					});
+					if (!isStatic) {
+						CommonUtils.setActionEnablement(
+							mActionExecutionParameters.internalModelContext,
+							JSON.parse(mActionExecutionParameters.operationAvailableMap),
+							mActionExecutionParameters.aContexts
+						);
+					}
+				}
 				resolve(oOperationResult);
 			})
-			.catch(function(oOperationResult: any) {
+			.catch(function (oOperationResult: any) {
 				reject(oOperationResult);
 			});
 	});
@@ -267,7 +307,7 @@ function confirmCriticalAction(
 		let boundActionName = sActionName ? sActionName : null;
 		boundActionName =
 			boundActionName.indexOf(".") >= 0 ? boundActionName.split(".")[boundActionName.split(".").length - 1] : boundActionName;
-		const suffixResourceKey = boundActionName && entitySetName ? entitySetName + "|" + boundActionName : "";
+		const suffixResourceKey = boundActionName && entitySetName ? `${entitySetName}|${boundActionName}` : "";
 		const oResourceBundle = oParentControl.getController().oResourceBundle;
 		const sConfirmationText = CommonUtils.getTranslatedText(
 			"C_OPERATIONS_ACTION_CONFIRM_MESSAGE",
@@ -277,19 +317,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);
 								});
 						});
@@ -319,7 +359,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: {}
@@ -327,56 +367,55 @@ 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 _validateMessages = function (actionParameters: any, invalidFields: any, bClearTarget?: boolean) {
 			const oMessageManager = Core.getMessageManager();
 			const aMessages = oMessageManager.getMessageModel().getData();
 
-			aFieldInvalid = aFieldInvalid || [];
+			invalidFields = invalidFields || [];
 
 			if (!aMessages.length) {
-				aFieldInvalid = [];
+				invalidFields = [];
 			}
-			aActionParameters.forEach(function(oActionParameters: any) {
+			actionParameters.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 &&
-						(oMessage.getControlId().includes("APD_::" + sParameter) ||
-							(oMessage.getControlId().includes("APD_::" + sParameter + "inner") &&
-								aFieldInvalid.indexOf("APD_::" + sParam) < 0))
+						(oMessage.getControlId().includes(`APD_::${sParameter}`) ||
+							(oMessage.getControlId().includes(`APD_::${sParameter}inner`) && invalidFields.indexOf(`APD_::${sParam}`) < 0))
 					) {
 						if (bClearTarget) {
 							oMessageManager.removeMessages(oMessage);
 						} else {
-							aFieldInvalid.push("APD_::" + sParam);
+							invalidFields.push(`APD_::${sParam}`);
 						}
 					}
 					// Handle messages related to input with invalid token
-					if (oMessage.target.includes("APD_::" + sParameter)) {
-						aFieldInvalid.push("APD_::" + sParam);
+					if (oMessage.target.includes(`APD_::${sParameter}`)) {
+						invalidFields.push(`APD_::${sParam}`);
 						oMessage.target = bClearTarget ? "" : oMessage.target;
 						if (bClearTarget) {
 							oMessageManager.removeMessages(oMessage);
@@ -384,16 +423,16 @@ function showActionParameterDialog(
 					}
 				});
 			});
-			return aFieldInvalid;
+			return invalidFields;
 		};
 		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();
 					});
 				}
@@ -420,21 +459,21 @@ function showActionParameterDialog(
 				}
 			)
 		)
-			.then(function(oFragment: any) {
+			.then(function (createdFragment: 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: createdFragment, 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();
@@ -442,9 +481,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++) {
@@ -471,11 +510,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();
@@ -486,7 +525,7 @@ function showActionParameterDialog(
 														if (aActionParameters[i].$isCollection) {
 															const aMVFContent = oDialog
 																	.getModel("mvfview")
-																	.getProperty("/" + aActionParameters[i].$Name),
+																	.getProperty(`/${aActionParameters[i].$Name}`),
 																aKeyValues = [];
 															for (const j in aMVFContent) {
 																aKeyValues.push(aMVFContent[j].Key);
@@ -500,68 +539,144 @@ 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
+															) {
+																let errorTargetsInAPD = false;
+
+																messages.forEach(function (message: any) {
+																	if (
+																		message.getTarget().indexOf(mParameters.actionName) !== -1 &&
+																		message
+																			.getTarget()
+																			.indexOf(mParameters.aActionParameters[0].$Name) !== -1 &&
+																		errorTargetsInAPD === false
+																	) {
+																		errorTargetsInAPD = true;
+																	}
+																});
+																if (!errorTargetsInAPD) {
+																	oDialog.close();
+																	oDialog.destroy();
+																}
+															}
 															throw oError;
 														});
 												})
-												.catch(function() {
+												.catch(function () {
 													const oMessageManager = Core.getMessageManager();
+													const messages = oMessageManager.getMessageModel().getData();
+													const subtitleColumn = CommonUtils.getMessageColumn(mParameters.control);
+													let errorContext;
+													let errorTargetsInAPD = 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 &&
+															errorTargetsInAPD === false
+														) {
+															errorTargetsInAPD = true;
+														}
+													});
+													if (oDialog.isOpen()) {
+														if (!mParameters.bGrouped) {
+															//isolated
+															if (aContexts.length > 1 || !errorTargetsInAPD) {
+																// does not matter if error is in APD or not, if there are multiple contexts selected or if the error is not the APD, we close it.
+																oDialog.close();
+																oDialog.destroy();
+															}
+														} else if (mParameters.bGrouped && !errorTargetsInAPD) {
+															//changeset
+															oDialog.close();
+															oDialog.destroy();
+														}
+													}
+
+													const showErrorInAPD = oDialog.isOpen() && errorTargetsInAPD;
+													let bShowMessageBox = false;
+													if (
+														messages.length === 1 &&
+														messages[0].getTarget() !== undefined &&
+														messages[0].getTarget() !== ""
+													) {
+														bShowMessageBox = true;
+													}
+
 													const bHasEtagMessage = messageHandling.modifyETagMessagesOnly(
 														oMessageManager,
-														oResourceBundle
+														oResourceBundle,
+														undefined
 													);
 
 													messageHandler.showMessages({
 														bHasEtagMessage: bHasEtagMessage,
 														context: mParameters.aContexts[0],
-														isActionParameterDialogOpen: true,
-														messagePageNavigationCallback: function() {
+														isActionParameterDialogOpen: oDialog.isOpen(),
+														messagePageNavigationCallback: function () {
 															oDialog.close();
-														}
+														},
+														showErrorInAPD: showErrorInAPD,
+														bShowMessageBox: bShowMessageBox
 													});
-													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(
-											sActionPath + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction"
+											`${sActionPath}@com.sap.vocabularies.Common.v1.DefaultValuesFunction`
 										);
 									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) {
+										// eslint-disable-next-line promise/param-names
+										return new Promise((inResolve) => {
 											// Case 1: There is a ParameterDefaultValue annotation
 											if (vParamDefaultValue !== undefined) {
 												if (aContexts.length > 0 && vParamDefaultValue.$Path) {
@@ -570,7 +685,7 @@ function showActionParameterDialog(
 														oOperationBinding.getModel()
 													);
 													oPromise
-														.then(function(oValue: any) {
+														.then(function (oValue: any) {
 															if (oValue === null) {
 																return oOperationBinding
 																	.getParameterContext()
@@ -578,17 +693,17 @@ 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;
-																if (sPathForContext.indexOf(sBindingParameter + "/") === 0) {
-																	sPathForContext = sPathForContext.replace(sBindingParameter + "/", "");
+																if (sPathForContext.indexOf(`${sBindingParameter}/`) === 0) {
+																	sPathForContext = sPathForContext.replace(`${sBindingParameter}/`, "");
 																}
 																for (let i = 1; i < aContexts.length; i++) {
 																	if (aContexts[i].getProperty(sPathForContext) !== vParamValue) {
 																		// if the values from the contexts are not all the same, do not prefill
-																		resolve({
+																		inResolve({
 																			paramName: sParamName,
 																			value: undefined,
 																			bNoPossibleValue: true
@@ -596,16 +711,16 @@ function showActionParameterDialog(
 																	}
 																}
 															}
-															resolve({ paramName: sParamName, value: vParamValue });
+															inResolve({ 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",
 																sParamName,
 																mParameters.actionName
 															);
-															resolve({
+															inResolve({
 																paramName: sParamName,
 																value: undefined,
 																bLatePropertyError: true
@@ -613,26 +728,25 @@ function showActionParameterDialog(
 														});
 												} else {
 													// Case 1.2: ParameterDefaultValue defines a fixed string value (i.e. vParamDefaultValue = 'someString')
-													resolve({ paramName: sParamName, value: vParamDefaultValue });
+													inResolve({ paramName: sParamName, value: vParamDefaultValue });
 												}
-											} else {
+											} else if (oParameterModel && (oParameterModel as any).oData[sParamName]) {
 												// Case 2: There is no ParameterDefaultValue annotation (=> look into the FLP User Defaults)
-												if (oParameterModel && (oParameterModel as any).oData[sParamName]) {
-													resolve({
-														paramName: sParamName,
-														value: (oParameterModel as any).oData[sParamName]
-													});
-												} else {
-													resolve({ paramName: sParamName, value: undefined });
-												}
+
+												inResolve({
+													paramName: sParamName,
+													value: (oParameterModel as any).oData[sParamName]
+												});
+											} else {
+												inResolve({ paramName: sParamName, value: undefined });
 											}
 										});
 									};
 
-									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 + "@",
+											sActionParameterAnnotationTarget = `${sActionPath}/${sParamName}@`,
 											oParameterAnnotations = oMetaModel.getObject(sActionParameterAnnotationTarget),
 											oParameterDefaultValue =
 												oParameterAnnotations &&
@@ -678,9 +792,9 @@ function showActionParameterDialog(
 									}
 
 									Promise.all([aPrefillParamPromises, aExecFunctionPromises, oExecFunctionFromManifestPromise])
-										.then(function(aPromises: [any[], any[], any]) {
-											const aCurrentParamDefaultValue: any = aPromises[0];
-											const aFunctionParams = aPromises[1];
+										.then(function (aPromises: [any[], any[], any]) {
+											const currentParamDefaultValue: any = aPromises[0];
+											const functionParams = aPromises[1];
 											const oFunctionParamsFromManifest = aPromises[2];
 											let sDialogParamName;
 											for (const i in aActionParameters) {
@@ -693,25 +807,22 @@ function showActionParameterDialog(
 														aActionParameters[i].$Name,
 														oFunctionParamsFromManifest[sDialogParamName]
 													);
-												} else if (
-													aCurrentParamDefaultValue[i] &&
-													aCurrentParamDefaultValue[i].value !== undefined
-												) {
+												} else if (currentParamDefaultValue[i] && currentParamDefaultValue[i].value !== undefined) {
 													oOperationBinding.setParameter(
 														aActionParameters[i].$Name,
-														aCurrentParamDefaultValue[i].value
+														currentParamDefaultValue[i].value
 													);
 													// if the default value had not been previously determined due to different contexts, we do nothing else
-												} else if (sBoundFunctionName && !aCurrentParamDefaultValue[i].bNoPossibleValue) {
+												} else if (sBoundFunctionName && !currentParamDefaultValue[i].bNoPossibleValue) {
 													if (aContexts.length > 1) {
 														// we check if the function retrieves the same param value for all the contexts:
 														let j = 0;
 														while (j < aContexts.length - 1) {
 															if (
-																aFunctionParams[j] &&
-																aFunctionParams[j + 1] &&
-																aFunctionParams[j].getObject(sDialogParamName) ===
-																	aFunctionParams[j + 1].getObject(sDialogParamName)
+																functionParams[j] &&
+																functionParams[j + 1] &&
+																functionParams[j].getObject(sDialogParamName) ===
+																	functionParams[j + 1].getObject(sDialogParamName)
 															) {
 																j++;
 															} else {
@@ -722,22 +833,20 @@ function showActionParameterDialog(
 														if (j === aContexts.length - 1) {
 															oOperationBinding.setParameter(
 																aActionParameters[i].$Name,
-																aFunctionParams[j].getObject(sDialogParamName)
+																functionParams[j].getObject(sDialogParamName)
 															);
 														}
-													} else {
+													} else if (functionParams[0] && functionParams[0].getObject(sDialogParamName)) {
 														//Only one context, then the default param values are to be verified from the function:
 
-														if (aFunctionParams[0] && aFunctionParams[0].getObject(sDialogParamName)) {
-															oOperationBinding.setParameter(
-																aActionParameters[i].$Name,
-																aFunctionParams[0].getObject(sDialogParamName)
-															);
-														}
+														oOperationBinding.setParameter(
+															aActionParameters[i].$Name,
+															functionParams[0].getObject(sDialogParamName)
+														);
 													}
 												}
 											}
-											const bErrorFound = aCurrentParamDefaultValue.some(function(oValue: any) {
+											const bErrorFound = currentParamDefaultValue.some(function (oValue: any) {
 												if (oValue.bLatePropertyError) {
 													return oValue.bLatePropertyError;
 												}
@@ -751,7 +860,9 @@ function showActionParameterDialog(
 												MessageBox.warning(sText, { contentWidth: "25em" } as any);
 											}
 										})
-										.catch();
+										.catch(function (oError: any) {
+											Log.error("Error while retrieving the parameter", oError);
+										});
 								};
 
 								if (oActionContext.getObject("$IsBound") && aContexts.length > 0) {
@@ -759,20 +870,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();
 							}
 						});
@@ -790,10 +901,10 @@ function showActionParameterDialog(
 						const oMVFModel = new JSONModel({});
 						oDialog.setModel(oMVFModel, "mvfview");
 
-						let sActionPath = sActionName + "(...)";
+						let sActionPath = `${sActionName}(...)`;
 						aContexts = mParameters.aContexts || [];
 						if (!aContexts.length) {
-							sActionPath = "/" + sActionPath;
+							sActionPath = `/${sActionPath}`;
 						}
 						oDialog.bindElement({
 							path: sActionPath
@@ -813,17 +924,6 @@ function showActionParameterDialog(
 			.catch(reject);
 	});
 }
-function prepareActionParameters(oAction: any, aPredefinedParameters: any) {
-	// check if parameters exist at all
-	const aParameters = getActionParameters(oAction);
-	aPredefinedParameters = aPredefinedParameters || [];
-
-	if (aPredefinedParameters.length > 0) {
-		// TODO: merge the predefined once with the real existing one
-	}
-
-	return aParameters;
-}
 function getActionParameters(oAction: any) {
 	const aParameters = oAction.getObject("$Parameter") || [];
 	if (aParameters && aParameters.length) {
@@ -835,7 +935,7 @@ function getActionParameters(oAction: any) {
 	return aParameters;
 }
 function getIsActionCritical(oMetaModel: any, sPath: any, contexts?: any, oBoundAction?: any) {
-	const vActionCritical = oMetaModel.getObject(sPath + "@com.sap.vocabularies.Common.v1.IsActionCritical");
+	const vActionCritical = oMetaModel.getObject(`${sPath}@com.sap.vocabularies.Common.v1.IsActionCritical`);
 	let sCriticalPath = vActionCritical && vActionCritical.$Path;
 	if (!sCriticalPath) {
 		// the static value scenario for isActionCritical
@@ -847,7 +947,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);
@@ -862,10 +962,24 @@ function getIsActionCritical(oMetaModel: any, sPath: any, contexts?: any, oBound
 }
 
 function executeDependingOnSelectedContexts(oAction: any, mParameters: any, bGetBoundContext: boolean, sGroupId: string) {
-	let oActionPromise;
-	if (mParameters.internalModelContext && mParameters.internalModelContext.getObject().numberOfSelectedContexts > 1) {
+	let oActionPromise,
+		bEnableStrictHandling = true;
+	if (bGetBoundContext) {
+		const sPath = oAction.getBoundContext().getPath();
+		const sMetaPath = oAction.getModel().getMetaModel().getMetaPath(sPath);
+		const oProperty = oAction.getModel().getMetaModel().getObject(sMetaPath);
+		if (oProperty && oProperty[0]?.$kind !== "Action") {
+			//do not enable the strict handling if its not an action
+			bEnableStrictHandling = false;
+		}
+	}
+
+	if (
+		(mParameters.internalModelContext && mParameters.internalModelContext.getObject().numberOfSelectedContexts > 1) ||
+		!bEnableStrictHandling
+	) {
 		oActionPromise = bGetBoundContext
-			? oAction.execute(sGroupId).then(function() {
+			? oAction.execute(sGroupId).then(function () {
 					return oAction.getBoundContext();
 			  })
 			: oAction.execute(sGroupId);
@@ -877,7 +991,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(
@@ -899,18 +1013,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" };
 			}
 		);
@@ -944,7 +1061,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;
@@ -953,16 +1070,16 @@ 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 (actionContext: any, index: any, oSideEffect: any) {
 				setActionParameterDefaultValue();
 				// For invocation grouping "isolated" need batch group per action call
-				sGroupId = !bGrouped ? "$auto." + index : oAction.getUpdateGroupId();
-				oActionPromise = executeDependingOnSelectedContexts(oAction, mParameters, bGetBoundContext, sGroupId);
+				sGroupId = !bGrouped ? `$auto.${index}` : actionContext.getUpdateGroupId();
+				oActionPromise = executeDependingOnSelectedContexts(actionContext, mParameters, bGetBoundContext, sGroupId);
 				aActionPromises.push(oActionPromise);
 				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);
 						}
@@ -973,7 +1090,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,
@@ -982,25 +1099,26 @@ 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 (actionContext: any, index: any, oSideEffect: any) {
+				// eslint-disable-next-line promise/param-names
+				return new Promise<void>((actionResolve) => {
 					let oLocalPromise;
 					const aLocalPromise = [];
 					setActionParameterDefaultValue();
 					// For invocation grouping "isolated" need batch group per action call
-					sGroupId = "apiMode" + index;
-					oActionPromise = executeDependingOnSelectedContexts(oAction, mParameters, bGetBoundContext, sGroupId);
+					sGroupId = `apiMode${index}`;
+					oActionPromise = executeDependingOnSelectedContexts(actionContext, mParameters, bGetBoundContext, sGroupId);
 					aActionPromises.push(oActionPromise);
 					aLocalPromise.push(oActionPromise);
 					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);
@@ -1013,7 +1131,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,
@@ -1022,23 +1140,22 @@ 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() {
-							return resolve();
+						.then(function () {
+							return actionResolve();
 						})
-						.catch(function() {
-							return resolve();
+						.catch(function () {
+							return actionResolve();
 						});
 				});
-				return oPromise;
 			};
 
-			function fnExecuteSequentially(aContexts: any) {
+			function fnExecuteSequentially(contextsToExecute: any) {
 				// One action and its side effects are completed before the next action is executed
 				(
 					fnOnSubmitted ||
@@ -1046,9 +1163,9 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 						/**/
 					}
 				)(aActionPromises);
-				function processOneAction(context: any, i: any) {
-					oAction = oModel.bindContext(sActionName + "(...)", context, mBindingParameters);
-					return fnExecuteSingleAction(oAction, i, {
+				function processOneAction(context: any, actionIndex: any) {
+					oAction = oModel.bindContext(`${sActionName}(...)`, context, mBindingParameters);
+					return fnExecuteSingleAction(oAction, actionIndex, {
 						context: context,
 						pathExpressions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions,
 						triggerActions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.triggerActions
@@ -1057,26 +1174,29 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 
 				let oActionAndSideEffectPromise = Promise.resolve();
 				let j = 0;
-				aContexts.forEach(function(context: any) {
+				contextsToExecute.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();
+					.catch(function (oError: any) {
+						Log.error(oError);
+					});
 			}
 
-			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++) {
-					oAction = oModel.bindContext(sActionName + "(...)", aContexts[i], mBindingParameters);
+					oAction = oModel.bindContext(`${sActionName}(...)`, aContexts[i], mBindingParameters);
 					fnExecuteAction(oAction, aContexts.length <= 1 ? null : i, {
 						context: aContexts[i],
 						pathExpressions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions,
@@ -1094,7 +1214,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;
@@ -1132,7 +1252,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 					})
 					.catch(reject);
 			}
-		}).finally(function() {
+		}).finally(function () {
 			(
 				fnOnResponse ||
 				function noop() {
@@ -1141,7 +1261,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 			)();
 		});
 	} else {
-		oAction = oModel.bindContext("/" + sActionName + "(...)");
+		oAction = oModel.bindContext(`/${sActionName}(...)`);
 		setActionParameterDefaultValue();
 		const sGroupId = "actionImport";
 		const oActionPromise = oAction.execute(
@@ -1157,7 +1277,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 				/**/
 			}
 		)(oActionPromise);
-		return oActionPromise.finally(function() {
+		return oActionPromise.finally(function () {
 			(
 				fnOnResponse ||
 				function noop() {
@@ -1170,7 +1290,21 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 function _getPath(oActionContext: any, sActionName: any) {
 	let sPath = oActionContext.getPath();
 	sPath = oActionContext.getObject("$IsBound") ? sPath.split("@$ui5.overload")[0] : sPath.split("/0")[0];
-	return sPath.split("/" + sActionName)[0];
+	return sPath.split(`/${sActionName}`)[0];
+}
+
+function _showActionParameterDialog(showDialog: boolean, actionParameters: Record<string, any>[]): boolean {
+	if (showDialog || actionParameters.length > 0) {
+		if (
+			!actionParameters ||
+			actionParameters.length === 0 ||
+			(actionParameters.length === 1 && actionParameters[0].$Name === "ResultIsActiveEntity")
+		) {
+			showDialog = false;
+		}
+	}
+
+	return showDialog;
 }
 
 /**
@@ -1187,7 +1321,8 @@ const operations = {
 	callActionImport: callActionImport,
 	callBoundFunction: callBoundFunction,
 	callFunctionImport: callFunctionImport,
-	executeDependingOnSelectedContexts: executeDependingOnSelectedContexts
+	executeDependingOnSelectedContexts: executeDependingOnSelectedContexts,
+	showActionParameterDialog: _showActionParameterDialog
 };
 
 export default operations;