@sapui5/sap.fe.core 1.103.0 → 1.106.0

package/src/sap/fe/core/controllerextensions/editFlow/operations.ts

@@ -1,4 +1,6 @@
+import ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
+import ActionRuntime from "sap/fe/core/ActionRuntime";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
 import messageHandling from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
@@ -8,12 +10,12 @@ 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 type Control from "sap/ui/core/Control";
 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;
@@ -181,7 +183,8 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 			aActionParameters: aActionParameters,
 			bGetBoundContext: mParameters.bGetBoundContext,
 			defaultValuesExtensionFunction: mParameters.defaultValuesExtensionFunction,
-			label: mParameters.label
+			label: mParameters.label,
+			selectedItems: mParameters.selectedItems
 		};
 		if (oAction.getObject("$IsBound")) {
 			if (mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions) {
@@ -235,6 +238,7 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 			mActionExecutionParameters.bReturnAsArray = mParameters.bReturnAsArray;
 			mActionExecutionParameters.internalModelContext = mParameters.internalModelContext;
 			mActionExecutionParameters.operationAvailableMap = mParameters.operationAvailableMap;
+			mActionExecutionParameters.isCreateAction = bIsCreateAction;
 			mActionExecutionParameters.bObjectPage = mParameters.bObjectPage;
 			if (mParameters.controlId) {
 				mActionExecutionParameters.control = mParameters.parentControl.byId(mParameters.controlId);
@@ -258,7 +262,7 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 				mParameters.messageHandler
 			);
 		} else {
-			oActionPromise = _executeAction(oAppComponent, mActionExecutionParameters);
+			oActionPromise = _executeAction(oAppComponent, mActionExecutionParameters, mParameters.parentControl);
 		}
 		return oActionPromise
 			.then(function (oOperationResult: any) {
@@ -278,10 +282,11 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 						);
 					});
 					if (!isStatic) {
-						CommonUtils.setActionEnablement(
+						ActionRuntime.setActionEnablement(
 							mActionExecutionParameters.internalModelContext,
 							JSON.parse(mActionExecutionParameters.operationAvailableMap),
-							mActionExecutionParameters.aContexts
+							mParameters.selectedItems,
+							"table"
 						);
 					}
 				}
@@ -317,22 +322,19 @@ function confirmCriticalAction(
 		);
 
 		MessageBox.confirm(sConfirmationText, {
-			onClose: function (sAction: any) {
+			onClose: async function (sAction: any) {
 				if (sAction === Action.OK) {
-					return _executeAction(oAppComponent, mParameters)
-						.then(function (oOperation: any) {
-							resolve(oOperation);
-						})
-						.catch(function (oError: any) {
-							messageHandler
-								.showMessageDialog()
-								.then(function () {
-									reject(oError);
-								})
-								.catch(function () {
-									reject(oError);
-								});
-						});
+					try {
+						const oOperation = await _executeAction(oAppComponent, mParameters, oParentControl);
+						resolve(oOperation);
+					} catch (oError: any) {
+						try {
+							await messageHandler.showMessageDialog();
+							reject(oError);
+						} catch (e) {
+							reject(oError);
+						}
+					}
 				} else {
 					resolve();
 				}
@@ -358,8 +360,9 @@ function showActionParameterDialog(
 			? oActionContext.getPath().split("/@$ui5.overload/0")[0]
 			: oActionContext.getPath().split("/0")[0],
 		actionNameContext = metaModel.createBindingContext(sActionNamePath),
+		bIsCreateAction = mParameters.isCreateAction,
 		sFragmentName = "sap/fe/core/controls/ActionParameterDialog";
-	return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
+	return new Promise(async function (resolve, reject) {
 		const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
 		const oParameterModel = new JSONModel({
 			$displayMode: {}
@@ -367,8 +370,8 @@ function showActionParameterDialog(
 		let aFieldInvalid: any[] = [];
 		let aFormElements: any[] = [];
 		const mFieldValueMap: any = {};
-		const validateRequiredProperties = function () {
-			return Promise.all(
+		const validateRequiredProperties = async function () {
+			const aResults = await Promise.all(
 				aFormElements
 					.filter(function (oFormElement: any) {
 						const oField = oFormElement.getFields()[0];
@@ -382,11 +385,9 @@ function showActionParameterDialog(
 							return oFormElement.getLabel().getText();
 						}
 					})
-			).then(function (aResults: any[]) {
-				aResults = aResults.filter(function (result: any) {
-					return result !== undefined;
-				});
-				return aResults;
+			);
+			return aResults.filter(function (result: any) {
+				return result !== undefined;
 			});
 		};
 		const _validateMessages = function (actionParameters: any, invalidFields: any, bClearTarget?: boolean) {
@@ -440,8 +441,8 @@ function showActionParameterDialog(
 			}
 		};
 
-		return Promise.resolve(
-			XMLPreprocessor.process(
+		try {
+			const createdFragment = await XMLPreprocessor.process(
 				oFragment,
 				{ name: sFragmentName },
 				{
@@ -457,471 +458,434 @@ function showActionParameterDialog(
 						metaModel: entitySetContext.getModel()
 					}
 				}
-			)
-		)
-			.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 () {
-					// TODO: move the dialog into the fragment and move the handlers to the oController
-					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 () {
-								oDialog.close();
-								messageHandler.removeTransitionMessages();
-								reject();
-							},
-							beginButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Ok"]), {
-								text: sActionLabel || CommonUtils.getTranslatedText("C_COMMON_DIALOG_OK", oResourceBundle),
-								type: "Emphasized",
-								press: function () {
-									validateRequiredProperties()
-										.then(function (aEmptyMandatoryFields: any[]) {
-											if (aEmptyMandatoryFields.length) {
-												const oMessages = [];
-												for (let i = 0; i < aEmptyMandatoryFields.length; i++) {
-													oMessages.push({
-														text: CommonUtils.getTranslatedText(
-															"C_OPERATIONS_ACTION_PARAMETER_DIALOG_MISSING_MANDATORY_MSG",
-															oResourceBundle,
-															aEmptyMandatoryFields[i]
-														),
-														code: 200,
-														type: "Error"
-													});
-												}
-												messageHandler.showMessageDialog({
-													customMessages: oMessages
-												});
-												return;
-											}
-
-											aFieldInvalid = _validateMessages(aActionParameters, aFieldInvalid);
-
-											if (aFieldInvalid.length > 0) {
-												return messageHandling.showUnboundMessages();
-											}
-											BusyLocker.lock(oDialog);
-											return Promise.all(
-												Object.keys(mFieldValueMap).map(function (sKey: string) {
-													return mFieldValueMap[sKey];
-												})
-											)
-												.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();
-													// move parameter values from Dialog (SimpleForm) to mParameters.actionParameters so that they are available in the operation bindings for all contexts
-													let vParameterValue;
-													const oParameterContext = oOperationBinding && oOperationBinding.getParameterContext();
-													for (const i in aActionParameters) {
-														if (aActionParameters[i].$isCollection) {
-															const aMVFContent = oDialog
-																	.getModel("mvfview")
-																	.getProperty(`/${aActionParameters[i].$Name}`),
-																aKeyValues = [];
-															for (const j in aMVFContent) {
-																aKeyValues.push(aMVFContent[j].Key);
-															}
-															vParameterValue = aKeyValues;
-														} else {
-															vParameterValue = oParameterContext.getProperty(aActionParameters[i].$Name);
-														}
-														aActionParameters[i].value = vParameterValue;
-														vParameterValue = undefined;
-													}
-													mParameters.label = sActionLabel;
-													return _executeAction(oAppComponent, mParameters)
-														.then(function (oOperation: any) {
-															oDialog.close();
-															resolve(oOperation);
-														})
-														.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 () {
-													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();
-														}
-													}
+			);
+			// TODO: move the dialog into the fragment and move the handlers to the oController
+			const aContexts: any[] = mParameters.aContexts || [];
+			const aFunctionParams: any[] = [];
+			// eslint-disable-next-line prefer-const
+			let oOperationBinding: any;
+			await CommonUtils.setUserDefaults(oAppComponent, aActionParameters, oParameterModel, true);
+			const oDialogContent = (await Fragment.load({ definition: createdFragment, controller: oController })) as Control;
+			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 () {
+					oDialog.close();
+					messageHandler.removeTransitionMessages();
+					reject(Constants.CancelActionDialog);
+				},
+				beginButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Ok"]), {
+					text: bIsCreateAction
+						? CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON", oResourceBundle)
+						: _getActionParameterActionName(oResourceBundle, sActionLabel, sActionName, entitySetName),
+					type: "Emphasized",
+					press: async function () {
+						try {
+							const aEmptyMandatoryFields = await validateRequiredProperties();
+							if (aEmptyMandatoryFields.length) {
+								const oMessages = [];
+								for (let i = 0; i < aEmptyMandatoryFields.length; i++) {
+									oMessages.push({
+										text: CommonUtils.getTranslatedText(
+											"C_OPERATIONS_ACTION_PARAMETER_DIALOG_MISSING_MANDATORY_MSG",
+											oResourceBundle,
+											aEmptyMandatoryFields[i]
+										),
+										code: 200,
+										type: "Error"
+									});
+								}
+								messageHandler.showMessageDialog({
+									customMessages: oMessages
+								});
+								return;
+							}
 
-													const showErrorInAPD = oDialog.isOpen() && errorTargetsInAPD;
-													let bShowMessageBox = false;
-													if (
-														messages.length === 1 &&
-														messages[0].getTarget() !== undefined &&
-														messages[0].getTarget() !== ""
-													) {
-														bShowMessageBox = true;
-													}
+							aFieldInvalid = _validateMessages(aActionParameters, aFieldInvalid);
 
-													const bHasEtagMessage = messageHandling.modifyETagMessagesOnly(
-														oMessageManager,
-														oResourceBundle,
-														undefined
-													);
+							if (aFieldInvalid.length > 0) {
+								await messageHandling.showUnboundMessages();
+								return;
+							}
+							BusyLocker.lock(oDialog);
 
-													messageHandler.showMessages({
-														bHasEtagMessage: bHasEtagMessage,
-														context: mParameters.aContexts[0],
-														isActionParameterDialogOpen: oDialog.isOpen(),
-														messagePageNavigationCallback: function () {
-															oDialog.close();
-														},
-														showErrorInAPD: showErrorInAPD,
-														bShowMessageBox: bShowMessageBox
-													});
-													if (oDialog && bHasEtagMessage && oDialog.isOpen()) {
-														oDialog.close(); //close the action parameter dialog after refresh of the context after etag mismatch
-													}
-												})
-												.finally(function () {
-													BusyLocker.unlock(oDialog);
-												});
-										})
-										.catch(function () {
-											return messageHandler.showMessageDialog();
-										});
+							try {
+								await Promise.all(
+									Object.keys(mFieldValueMap).map(function (sKey: string) {
+										return mFieldValueMap[sKey];
+									})
+								);
+								// 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();
+								// move parameter values from Dialog (SimpleForm) to mParameters.actionParameters so that they are available in the operation bindings for all contexts
+								let vParameterValue;
+								const oParameterContext = oOperationBinding && oOperationBinding.getParameterContext();
+								for (const i in aActionParameters) {
+									if (aActionParameters[i].$isCollection) {
+										const aMVFContent = oDialog.getModel("mvfview").getProperty(`/${aActionParameters[i].$Name}`),
+											aKeyValues = [];
+										for (const j in aMVFContent) {
+											aKeyValues.push(aMVFContent[j].Key);
+										}
+										vParameterValue = aKeyValues;
+									} else {
+										vParameterValue = oParameterContext.getProperty(aActionParameters[i].$Name);
+									}
+									aActionParameters[i].value = vParameterValue;
+									vParameterValue = undefined;
 								}
-							}),
-							endButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Cancel"]), {
-								text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
-								press: function () {
-									_validateMessages(aActionParameters, aFieldInvalid, true);
+								mParameters.label = sActionLabel;
+								try {
+									const oOperation = await _executeAction(oAppComponent, mParameters, oParentControl);
 									oDialog.close();
-									messageHandler.removeTransitionMessages();
-									reject(Constants.CancelActionDialog);
-								}
-							}),
-							beforeOpen: function (oEvent: any) {
-								// clone event for actionWrapper as oEvent.oSource gets lost during processing of beforeOpen event handler
-								const oCloneEvent = Object.assign({}, oEvent);
+									resolve(oOperation);
+								} catch (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;
 
-								messageHandler.removeTransitionMessages();
-								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`
-										);
-									return sDefaultValuesFunction;
-								};
-								const fnSetDefaultsAndOpenDialog = function (sBindingParameter?: any) {
-									const sBoundFunctionName = getDefaultValuesFunction();
-									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) {
-													const oPromise = CommonUtils.requestSingletonProperty(
-														vParamDefaultValue.$Path,
-														oOperationBinding.getModel()
-													);
-													oPromise
-														.then(function (oValue: any) {
-															if (oValue === null) {
-																return oOperationBinding
-																	.getParameterContext()
-																	.requestProperty(vParamDefaultValue.$Path);
-															}
-															return oValue;
-														})
-														.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}/`, "");
-																}
-																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
-																		inResolve({
-																			paramName: sParamName,
-																			value: undefined,
-																			bNoPossibleValue: true
-																		});
-																	}
-																}
-															}
-															inResolve({ paramName: sParamName, value: vParamValue });
-														})
-														.catch(function () {
-															// Simply clear parameter default if an error has occurred
-															Log.error(
-																"Error while reading default action parameter",
-																sParamName,
-																mParameters.actionName
-															);
-															inResolve({
-																paramName: sParamName,
-																value: undefined,
-																bLatePropertyError: true
-															});
-														});
-												} else {
-													// Case 1.2: ParameterDefaultValue defines a fixed string value (i.e. vParamDefaultValue = 'someString')
-													inResolve({ paramName: sParamName, value: vParamDefaultValue });
-												}
-											} else if (oParameterModel && (oParameterModel as any).oData[sParamName]) {
-												// Case 2: There is no ParameterDefaultValue annotation (=> look into the FLP User Defaults)
-
-												inResolve({
-													paramName: sParamName,
-													value: (oParameterModel as any).oData[sParamName]
-												});
-											} else {
-												inResolve({ paramName: sParamName, value: undefined });
+										messages.forEach(function (message: any) {
+											if (
+												message.getTarget().indexOf(mParameters.actionName) !== -1 &&
+												message.getTarget().indexOf(mParameters.aActionParameters[0].$Name) !== -1 &&
+												errorTargetsInAPD === false
+											) {
+												errorTargetsInAPD = true;
 											}
 										});
-									};
-
-									const getParameterDefaultValue = function (sParamName: any) {
-										const oMetaModel = oDialog.getModel().getMetaModel(),
-											sActionPath = oActionContext.sPath && oActionContext.sPath.split("/@")[0],
-											sActionParameterAnnotationTarget = `${sActionPath}/${sParamName}@`,
-											oParameterAnnotations = oMetaModel.getObject(sActionParameterAnnotationTarget),
-											oParameterDefaultValue =
-												oParameterAnnotations &&
-												oParameterAnnotations["@com.sap.vocabularies.UI.v1.ParameterDefaultValue"]; // either { $Path: 'somePath' } or 'someString'
-										return oParameterDefaultValue;
-									};
-
-									const aCurrentParamDefaultValue = [];
-									let sParamName, vParameterDefaultValue;
-									for (const i in aActionParameters) {
-										sParamName = aActionParameters[i].$Name;
-										vParameterDefaultValue = getParameterDefaultValue(sParamName);
-										aCurrentParamDefaultValue.push(prefillParameter(sParamName, vParameterDefaultValue));
-									}
-
-									if (oActionContext.getObject("$IsBound") && aContexts.length > 0) {
-										if (sBoundFunctionName && sBoundFunctionName.length > 0 && typeof sBoundFunctionName === "string") {
-											for (const i in aContexts) {
-												aFunctionParams.push(
-													callBoundFunction(sBoundFunctionName, aContexts[i], mParameters.model)
-												);
-											}
+										if (!errorTargetsInAPD) {
+											oDialog.close();
+											oDialog.destroy();
 										}
 									}
-
-									const aPrefillParamPromises = Promise.all(aCurrentParamDefaultValue);
-									let aExecFunctionPromises: Promise<any[]> = Promise.resolve([]);
-									let oExecFunctionFromManifestPromise;
-									if (aFunctionParams && aFunctionParams.length > 0) {
-										aExecFunctionPromises = Promise.all(aFunctionParams);
-									}
-									if (mParameters.defaultValuesExtensionFunction) {
-										const sModule = mParameters.defaultValuesExtensionFunction
-												.substring(0, mParameters.defaultValuesExtensionFunction.lastIndexOf(".") || -1)
-												.replace(/\./gi, "/"),
-											sFunctionName = mParameters.defaultValuesExtensionFunction.substring(
-												mParameters.defaultValuesExtensionFunction.lastIndexOf(".") + 1,
-												mParameters.defaultValuesExtensionFunction.length
-											);
-										oExecFunctionFromManifestPromise = FPMHelper.actionWrapper(oCloneEvent, sModule, sFunctionName, {
-											"contexts": aContexts
+									throw oError;
+								}
+							} catch (oError: any) {
+								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();
 									}
+								}
 
-									Promise.all([aPrefillParamPromises, aExecFunctionPromises, oExecFunctionFromManifestPromise])
-										.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) {
-												sDialogParamName = aActionParameters[i].$Name;
-												if (
-													oFunctionParamsFromManifest &&
-													oFunctionParamsFromManifest.hasOwnProperty(sDialogParamName)
-												) {
-													oOperationBinding.setParameter(
-														aActionParameters[i].$Name,
-														oFunctionParamsFromManifest[sDialogParamName]
-													);
-												} else if (currentParamDefaultValue[i] && currentParamDefaultValue[i].value !== undefined) {
-													oOperationBinding.setParameter(
-														aActionParameters[i].$Name,
-														currentParamDefaultValue[i].value
-													);
-													// if the default value had not been previously determined due to different contexts, we do nothing else
-												} 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 (
-																functionParams[j] &&
-																functionParams[j + 1] &&
-																functionParams[j].getObject(sDialogParamName) ===
-																	functionParams[j + 1].getObject(sDialogParamName)
-															) {
-																j++;
-															} else {
-																break;
-															}
-														}
-														//param values are all the same:
-														if (j === aContexts.length - 1) {
-															oOperationBinding.setParameter(
-																aActionParameters[i].$Name,
-																functionParams[j].getObject(sDialogParamName)
-															);
-														}
-													} else if (functionParams[0] && functionParams[0].getObject(sDialogParamName)) {
-														//Only one context, then the default param values are to be verified from the function:
+								const showErrorInAPD = oDialog.isOpen() && errorTargetsInAPD;
+								let bShowMessageBox = false;
+								if (messages.length === 1 && messages[0].getTarget() !== undefined && messages[0].getTarget() !== "") {
+									bShowMessageBox = true;
+								}
 
-														oOperationBinding.setParameter(
-															aActionParameters[i].$Name,
-															functionParams[0].getObject(sDialogParamName)
-														);
+								const bHasEtagMessage = messageHandling.modifyETagMessagesOnly(oMessageManager, oResourceBundle, undefined);
+
+								messageHandler.showMessages({
+									bHasEtagMessage: bHasEtagMessage,
+									context: mParameters.aContexts[0],
+									isActionParameterDialogOpen: oDialog.isOpen(),
+									messagePageNavigationCallback: function () {
+										oDialog.close();
+									},
+									showErrorInAPD: showErrorInAPD,
+									bShowMessageBox: bShowMessageBox
+								});
+								if (oDialog && bHasEtagMessage && oDialog.isOpen()) {
+									oDialog.close(); //close the action parameter dialog after refresh of the context after etag mismatch
+								}
+							} finally {
+								BusyLocker.unlock(oDialog);
+							}
+						} catch (oError: any) {
+							messageHandler.showMessageDialog();
+						}
+					}
+				}),
+				endButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Cancel"]), {
+					text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
+					press: function () {
+						_validateMessages(aActionParameters, aFieldInvalid, true);
+						oDialog.close();
+						messageHandler.removeTransitionMessages();
+						reject(Constants.CancelActionDialog);
+					}
+				}),
+				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 oMetaModel = oDialog.getModel().getMetaModel(),
+							sActionPath = oActionContext.sPath && oActionContext.sPath.split("/@")[0],
+							sDefaultValuesFunction = oMetaModel.getObject(
+								`${sActionPath}@com.sap.vocabularies.Common.v1.DefaultValuesFunction`
+							);
+						return sDefaultValuesFunction;
+					};
+					const fnSetDefaultsAndOpenDialog = async function (sBindingParameter?: any) {
+						const sBoundFunctionName = getDefaultValuesFunction();
+						const prefillParameter = function (sParamName: any, vParamDefaultValue: any) {
+							// eslint-disable-next-line promise/param-names
+							return new Promise(async function (inResolve) {
+								// Case 1: There is a ParameterDefaultValue annotation
+								if (vParamDefaultValue !== undefined) {
+									if (aContexts.length > 0 && vParamDefaultValue.$Path) {
+										try {
+											let vParamValue = await CommonUtils.requestSingletonProperty(
+												vParamDefaultValue.$Path,
+												oOperationBinding.getModel()
+											);
+											if (vParamValue === null) {
+												vParamValue = await oOperationBinding
+													.getParameterContext()
+													.requestProperty(vParamDefaultValue.$Path);
+											}
+											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}/`, "");
+												}
+												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
+														inResolve({
+															paramName: sParamName,
+															value: undefined,
+															bNoPossibleValue: true
+														});
 													}
 												}
 											}
-											const bErrorFound = currentParamDefaultValue.some(function (oValue: any) {
-												if (oValue.bLatePropertyError) {
-													return oValue.bLatePropertyError;
-												}
+											inResolve({ paramName: sParamName, value: vParamValue });
+										} catch (oError) {
+											Log.error("Error while reading default action parameter", sParamName, mParameters.actionName);
+											inResolve({
+												paramName: sParamName,
+												value: undefined,
+												bLatePropertyError: true
 											});
-											// If at least one Default Property is a Late Property and an eTag error was raised.
-											if (bErrorFound) {
-												const sText = CommonUtils.getTranslatedText(
-													"C_APP_COMPONENT_SAPFE_ETAG_LATE_PROPERTY",
-													oResourceBundle
-												);
-												MessageBox.warning(sText, { contentWidth: "25em" } as any);
-											}
-										})
-										.catch(function (oError: any) {
-											Log.error("Error while retrieving the parameter", oError);
-										});
-								};
+										}
+									} else {
+										// Case 1.2: ParameterDefaultValue defines a fixed string value (i.e. vParamDefaultValue = 'someString')
+										inResolve({ paramName: sParamName, value: vParamDefaultValue });
+									}
+								} else if (oParameterModel && (oParameterModel as any).oData[sParamName]) {
+									// Case 2: There is no ParameterDefaultValue annotation (=> look into the FLP User Defaults)
 
-								if (oActionContext.getObject("$IsBound") && aContexts.length > 0) {
-									const aParameters = oActionContext.getObject("$Parameter"),
-										sBindingParameter = aParameters[0] && aParameters[0].$Name;
-									aContexts[0]
-										.requestObject()
-										.then(function (oContextObject: any) {
-											if (oContextObject) {
-												oOperationBinding.setParameter(sBindingParameter, oContextObject);
-											}
-											fnSetDefaultsAndOpenDialog(sBindingParameter);
-										})
-										.catch(function (oError: any) {
-											Log.error("Error while retrieving the parameter", oError);
-										});
+									inResolve({
+										paramName: sParamName,
+										value: (oParameterModel as any).oData[sParamName]
+									});
 								} else {
-									fnSetDefaultsAndOpenDialog();
+									inResolve({ paramName: sParamName, value: undefined });
+								}
+							});
+						};
+
+						const getParameterDefaultValue = function (sParamName: any) {
+							const oMetaModel = oDialog.getModel().getMetaModel(),
+								sActionParameterAnnotationPath = CommonUtils.getParameterPath(oActionContext.getPath(), sParamName) + "@",
+								oParameterAnnotations = oMetaModel.getObject(sActionParameterAnnotationPath),
+								oParameterDefaultValue =
+									oParameterAnnotations && oParameterAnnotations["@com.sap.vocabularies.UI.v1.ParameterDefaultValue"]; // either { $Path: 'somePath' } or 'someString'
+							return oParameterDefaultValue;
+						};
+
+						const aCurrentParamDefaultValue = [];
+						let sParamName, vParameterDefaultValue;
+						for (const i in aActionParameters) {
+							sParamName = aActionParameters[i].$Name;
+							vParameterDefaultValue = getParameterDefaultValue(sParamName);
+							aCurrentParamDefaultValue.push(prefillParameter(sParamName, vParameterDefaultValue));
+						}
+
+						if (oActionContext.getObject("$IsBound") && aContexts.length > 0) {
+							if (sBoundFunctionName && sBoundFunctionName.length > 0 && typeof sBoundFunctionName === "string") {
+								for (const i in aContexts) {
+									aFunctionParams.push(callBoundFunction(sBoundFunctionName, aContexts[i], mParameters.model));
 								}
-							},
-							afterClose: function () {
-								oDialog.destroy();
 							}
-						});
-						aFormElements = oDialogContent
-							.getAggregation("form")
-							.getAggregation("formContainers")[0]
-							.getAggregation("formElements");
-						oDialog.setModel(oActionContext.getModel().oModel);
-						oDialog.setModel(oParameterModel, "paramsModel");
-						oDialog.bindElement({
-							path: "/",
-							model: "paramsModel"
-						});
-						// empty model to add elements dynamically depending on number of MVF fields defined on the dialog
-						const oMVFModel = new JSONModel({});
-						oDialog.setModel(oMVFModel, "mvfview");
+						}
 
-						let sActionPath = `${sActionName}(...)`;
-						aContexts = mParameters.aContexts || [];
-						if (!aContexts.length) {
-							sActionPath = `/${sActionPath}`;
+						const aPrefillParamPromises = Promise.all(aCurrentParamDefaultValue);
+						let aExecFunctionPromises: Promise<any[]> = Promise.resolve([]);
+						let oExecFunctionFromManifestPromise;
+						if (aFunctionParams && aFunctionParams.length > 0) {
+							aExecFunctionPromises = Promise.all(aFunctionParams);
 						}
-						oDialog.bindElement({
-							path: sActionPath
-						});
-						if (oParentControl) {
-							// if there is a parent control specified add the dialog as dependent
-							oParentControl.addDependent(oDialog);
+						if (mParameters.defaultValuesExtensionFunction) {
+							const sModule = mParameters.defaultValuesExtensionFunction
+									.substring(0, mParameters.defaultValuesExtensionFunction.lastIndexOf(".") || -1)
+									.replace(/\./gi, "/"),
+								sFunctionName = mParameters.defaultValuesExtensionFunction.substring(
+									mParameters.defaultValuesExtensionFunction.lastIndexOf(".") + 1,
+									mParameters.defaultValuesExtensionFunction.length
+								);
+							oExecFunctionFromManifestPromise = FPMHelper.actionWrapper(oCloneEvent, sModule, sFunctionName, {
+								"contexts": aContexts
+							});
 						}
-						if (aContexts.length > 0) {
-							oDialog.setBindingContext(aContexts[0]); // use context of first selected line item
+
+						try {
+							const aPromises = await Promise.all([
+								aPrefillParamPromises,
+								aExecFunctionPromises,
+								oExecFunctionFromManifestPromise
+							]);
+							const currentParamDefaultValue: any = aPromises[0];
+							const functionParams = aPromises[1];
+							const oFunctionParamsFromManifest = aPromises[2];
+							let sDialogParamName;
+							for (const i in aActionParameters) {
+								sDialogParamName = aActionParameters[i].$Name;
+								if (oFunctionParamsFromManifest && oFunctionParamsFromManifest.hasOwnProperty(sDialogParamName)) {
+									oOperationBinding.setParameter(
+										aActionParameters[i].$Name,
+										oFunctionParamsFromManifest[sDialogParamName]
+									);
+								} else if (currentParamDefaultValue[i] && currentParamDefaultValue[i].value !== undefined) {
+									oOperationBinding.setParameter(aActionParameters[i].$Name, currentParamDefaultValue[i].value);
+									// if the default value had not been previously determined due to different contexts, we do nothing else
+								} 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 (
+												functionParams[j] &&
+												functionParams[j + 1] &&
+												functionParams[j].getObject(sDialogParamName) ===
+													functionParams[j + 1].getObject(sDialogParamName)
+											) {
+												j++;
+											} else {
+												break;
+											}
+										}
+										//param values are all the same:
+										if (j === aContexts.length - 1) {
+											oOperationBinding.setParameter(
+												aActionParameters[i].$Name,
+												functionParams[j].getObject(sDialogParamName)
+											);
+										}
+									} else if (functionParams[0] && functionParams[0].getObject(sDialogParamName)) {
+										//Only one context, then the default param values are to be verified from the function:
+
+										oOperationBinding.setParameter(
+											aActionParameters[i].$Name,
+											functionParams[0].getObject(sDialogParamName)
+										);
+									}
+								}
+							}
+							const bErrorFound = currentParamDefaultValue.some(function (oValue: any) {
+								if (oValue.bLatePropertyError) {
+									return oValue.bLatePropertyError;
+								}
+							});
+							// If at least one Default Property is a Late Property and an eTag error was raised.
+							if (bErrorFound) {
+								const sText = CommonUtils.getTranslatedText("C_APP_COMPONENT_SAPFE_ETAG_LATE_PROPERTY", oResourceBundle);
+								MessageBox.warning(sText, { contentWidth: "25em" } as any);
+							}
+						} catch (oError: any) {
+							Log.error("Error while retrieving the parameter", oError);
 						}
-						oOperationBinding = oDialog.getObjectBinding();
-						oDialog.open();
-					});
-				});
-			})
-			.catch(reject);
+					};
+					const fnAsyncBeforeOpen = async function () {
+						if (oActionContext.getObject("$IsBound") && aContexts.length > 0) {
+							const aParameters = oActionContext.getObject("$Parameter");
+							const sBindingParameter = aParameters[0] && aParameters[0].$Name;
+
+							try {
+								const oContextObject = await aContexts[0].requestObject();
+								if (oContextObject) {
+									oOperationBinding.setParameter(sBindingParameter, oContextObject);
+								}
+								fnSetDefaultsAndOpenDialog(sBindingParameter);
+							} catch (oError: any) {
+								Log.error("Error while retrieving the parameter", oError);
+							}
+						} else {
+							fnSetDefaultsAndOpenDialog();
+						}
+					};
+
+					fnAsyncBeforeOpen();
+				},
+				afterClose: function () {
+					oDialog.destroy();
+				}
+			});
+
+			aFormElements = (oDialogContent as any)
+				.getAggregation("form")
+				.getAggregation("formContainers")[0]
+				.getAggregation("formElements");
+			oDialog.setModel(oActionContext.getModel().oModel);
+			oDialog.setModel(oParameterModel, "paramsModel");
+			oDialog.bindElement({
+				path: "/",
+				model: "paramsModel"
+			});
+			// empty model to add elements dynamically depending on number of MVF fields defined on the dialog
+			const oMVFModel = new JSONModel({});
+			oDialog.setModel(oMVFModel, "mvfview");
+
+			let sActionPath = `${sActionName}(...)`;
+			if (!aContexts.length) {
+				sActionPath = `/${sActionPath}`;
+			}
+			oDialog.bindElement({
+				path: sActionPath
+			});
+			if (oParentControl) {
+				// if there is a parent control specified add the dialog as dependent
+				oParentControl.addDependent(oDialog);
+			}
+			if (aContexts.length > 0) {
+				oDialog.setBindingContext(aContexts[0]); // use context of first selected line item
+			}
+			oOperationBinding = oDialog.getObjectBinding();
+			oDialog.open();
+		} catch (oError: any) {
+			reject(oError);
+		}
 	});
 }
 function getActionParameters(oAction: any) {
@@ -961,7 +925,39 @@ function getIsActionCritical(oMetaModel: any, sPath: any, contexts?: any, oBound
 	}
 }
 
-function executeDependingOnSelectedContexts(oAction: any, mParameters: any, bGetBoundContext: boolean, sGroupId: string) {
+function _getActionParameterActionName(oResourceBundle: ResourceBundle, sActionLabel: string, sActionName: string, sEntitySetName: string) {
+	let boundActionName: any = sActionName ? sActionName : null;
+	const aActionName = boundActionName.split(".");
+	boundActionName = boundActionName.indexOf(".") >= 0 ? aActionName[aActionName.length - 1] : boundActionName;
+	const suffixResourceKey = boundActionName && sEntitySetName ? `${sEntitySetName}|${boundActionName}` : "";
+	const sKey = "ACTION_PARAMETER_DIALOG_ACTION_NAME";
+	const bResourceKeyExists =
+		oResourceBundle && CommonUtils.checkIfResourceKeyExists((oResourceBundle as any).aCustomBundles, `${sKey}|${suffixResourceKey}`);
+	if (sActionLabel) {
+		if (bResourceKeyExists) {
+			return CommonUtils.getTranslatedText(sKey, oResourceBundle, null, suffixResourceKey);
+		} else if (
+			oResourceBundle &&
+			CommonUtils.checkIfResourceKeyExists((oResourceBundle as any).aCustomBundles, `${sKey}|${sEntitySetName}`)
+		) {
+			return CommonUtils.getTranslatedText(sKey, oResourceBundle, null, `${sEntitySetName}`);
+		} else if (oResourceBundle && CommonUtils.checkIfResourceKeyExists((oResourceBundle as any).aCustomBundles, `${sKey}`)) {
+			return CommonUtils.getTranslatedText(sKey, oResourceBundle);
+		} else {
+			return sActionLabel;
+		}
+	} else {
+		return CommonUtils.getTranslatedText("C_COMMON_DIALOG_OK", oResourceBundle);
+	}
+}
+
+function executeDependingOnSelectedContexts(
+	oAction: any,
+	mParameters: any,
+	bGetBoundContext: boolean,
+	sGroupId: string,
+	oResourceBundle: any
+) {
 	let oActionPromise,
 		bEnableStrictHandling = true;
 	if (bGetBoundContext) {
@@ -989,7 +985,7 @@ function executeDependingOnSelectedContexts(oAction: any, mParameters: any, bGet
 					.execute(
 						sGroupId,
 						undefined,
-						CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, mParameters.label, mParameters.model)
+						CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, mParameters, oResourceBundle)
 					)
 					.then(function () {
 						return oAction.getBoundContext();
@@ -997,13 +993,13 @@ function executeDependingOnSelectedContexts(oAction: any, mParameters: any, bGet
 			: oAction.execute(
 					sGroupId,
 					undefined,
-					CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, mParameters.label, mParameters.model)
+					CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, mParameters, oResourceBundle)
 			  );
 	}
 
 	return oActionPromise;
 }
-function _executeAction(oAppComponent: any, mParameters: any) {
+function _executeAction(oAppComponent: any, mParameters: any, oParentControl?: any) {
 	const aContexts = mParameters.aContexts || [];
 	const oModel = mParameters.model;
 	const iExistingMessages = messageHandling.getMessages().length || 0;
@@ -1012,6 +1008,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 	const fnOnSubmitted = mParameters.fnOnSubmitted;
 	const fnOnResponse = mParameters.fnOnResponse;
 	const bIsCreateAction = mParameters.bIsCreateAction;
+	const oResourceBundle = oParentControl && oParentControl.isA("sap.ui.core.mvc.View") && oParentControl.getController().oResourceBundle;
 	let oAction: any;
 	// let contextIndex = 0;
 	// let aMessages: any[] = [];
@@ -1074,76 +1071,42 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 				setActionParameterDefaultValue();
 				// For invocation grouping "isolated" need batch group per action call
 				sGroupId = !bGrouped ? `$auto.${index}` : actionContext.getUpdateGroupId();
-				oActionPromise = executeDependingOnSelectedContexts(actionContext, mParameters, bGetBoundContext, sGroupId);
+				mParameters.requestSideEffects = fnRequestSideEffects.bind(operations, oAppComponent, oSideEffect, mParameters);
+				oActionPromise = executeDependingOnSelectedContexts(
+					actionContext,
+					mParameters,
+					bGetBoundContext,
+					sGroupId,
+					oResourceBundle
+				);
 				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) {
-						if (sTriggerAction) {
-							oSideEffectsService.executeAction(sTriggerAction, oSideEffect.context, sGroupId);
-						}
-					});
-				}
-				// request side effects for this action
-				// as we move the messages request to POST $select we need to be prepared for an empty array
-				if (oSideEffect && oSideEffect.pathExpressions && oSideEffect.pathExpressions.length > 0) {
-					oSideEffectsService
-						.requestSideEffects(oSideEffect.pathExpressions, oSideEffect.context, sGroupId)
-						.then(function () {
-							if (mParameters.operationAvailableMap && mParameters.internalModelContext) {
-								CommonUtils.setActionEnablement(
-									mParameters.internalModelContext,
-									JSON.parse(mParameters.operationAvailableMap),
-									mParameters.aContexts
-								);
-							}
-						})
-						.catch(function (oError: any) {
-							Log.error("Error while requesting side effects", oError);
-						});
-				}
+				fnRequestSideEffects(oAppComponent, oSideEffect, mParameters, sGroupId);
 			};
 			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 = [];
+					const aLocalPromise: any = [];
 					setActionParameterDefaultValue();
 					// For invocation grouping "isolated" need batch group per action call
 					sGroupId = `apiMode${index}`;
-					oActionPromise = executeDependingOnSelectedContexts(actionContext, mParameters, bGetBoundContext, sGroupId);
+					mParameters.requestSideEffects = fnRequestSideEffects.bind(
+						operations,
+						oAppComponent,
+						oSideEffect,
+						mParameters,
+						sGroupId,
+						aLocalPromise
+					);
+					oActionPromise = executeDependingOnSelectedContexts(
+						actionContext,
+						mParameters,
+						bGetBoundContext,
+						sGroupId,
+						oResourceBundle
+					);
 					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) {
-							if (sTriggerAction) {
-								oLocalPromise = oSideEffectsService.executeAction(sTriggerAction, oSideEffect.context, sGroupId);
-								aLocalPromise.push(oLocalPromise);
-							}
-						});
-					}
-					// request side effects for this action
-					// as we move the messages request to POST $select we need to be prepared for an empty array
-					if (oSideEffect && oSideEffect.pathExpressions && oSideEffect.pathExpressions.length > 0) {
-						oLocalPromise = oSideEffectsService.requestSideEffects(oSideEffect.pathExpressions, oSideEffect.context, sGroupId);
-						aLocalPromise.push(oLocalPromise);
-						oLocalPromise
-							.then(function () {
-								if (mParameters.operationAvailableMap && mParameters.internalModelContext) {
-									CommonUtils.setActionEnablement(
-										mParameters.internalModelContext,
-										JSON.parse(mParameters.operationAvailableMap),
-										mParameters.aContexts
-									);
-								}
-							})
-							.catch(function (oError: any) {
-								Log.error("Error while requesting side effects", oError);
-							});
-					}
+					fnRequestSideEffects(oAppComponent, oSideEffect, mParameters, sGroupId, aLocalPromise);
 					oModel.submitBatch(sGroupId);
 					Promise.all(aLocalPromise)
 						.then(function () {
@@ -1267,7 +1230,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 		const oActionPromise = oAction.execute(
 			sGroupId,
 			undefined,
-			CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, mParameters.label, oModel)
+			CommonUtils.fnOnStrictHandlingFailed.bind(operations, sGroupId, { label: mParameters.label, model: oModel }, oResourceBundle)
 		);
 		oModel.submitBatch(sGroupId);
 		// trigger onSubmitted "event"
@@ -1307,6 +1270,44 @@ function _showActionParameterDialog(showDialog: boolean, actionParameters: Recor
 	return showDialog;
 }
 
+function fnRequestSideEffects(oAppComponent: any, oSideEffect: any, mParameters: any, sGroupId: any, aLocalPromise?: any) {
+	const oSideEffectsService = oAppComponent.getSideEffectsService();
+	let oLocalPromise;
+	// trigger actions from side effects
+	if (oSideEffect && oSideEffect.triggerActions && oSideEffect.triggerActions.length) {
+		oSideEffect.triggerActions.forEach(function (sTriggerAction: any) {
+			if (sTriggerAction) {
+				oLocalPromise = oSideEffectsService.executeAction(sTriggerAction, oSideEffect.context, sGroupId);
+				if (aLocalPromise) {
+					aLocalPromise.push(oLocalPromise);
+				}
+			}
+		});
+	}
+	// request side effects for this action
+	// as we move the messages request to POST $select we need to be prepared for an empty array
+	if (oSideEffect && oSideEffect.pathExpressions && oSideEffect.pathExpressions.length > 0) {
+		oLocalPromise = oSideEffectsService.requestSideEffects(oSideEffect.pathExpressions, oSideEffect.context, sGroupId);
+		if (aLocalPromise) {
+			aLocalPromise.push(oLocalPromise);
+		}
+		oLocalPromise
+			.then(function () {
+				if (mParameters.operationAvailableMap && mParameters.internalModelContext) {
+					ActionRuntime.setActionEnablement(
+						mParameters.internalModelContext,
+						JSON.parse(mParameters.operationAvailableMap),
+						mParameters.selectedItems,
+						"table"
+					);
+				}
+			})
+			.catch(function (oError: any) {
+				Log.error("Error while requesting side effects", oError);
+			});
+	}
+}
+
 /**
  * Static functions to call OData actions (bound/import) and functions (bound/import)
  *
@@ -1322,7 +1323,8 @@ const operations = {
 	callBoundFunction: callBoundFunction,
 	callFunctionImport: callFunctionImport,
 	executeDependingOnSelectedContexts: executeDependingOnSelectedContexts,
-	showActionParameterDialog: _showActionParameterDialog
+	showActionParameterDialog: _showActionParameterDialog,
+	getActionParameterActionName: _getActionParameterActionName
 };
 
 export default operations;