@sapui5/sap.fe.core 1.102.0 → 1.103.0

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

@@ -13,7 +13,7 @@ import Fragment from "sap/ui/core/Fragment";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import JSONModel from "sap/ui/model/json/JSONModel";
-import Context from "sap/ui/model/odata/v4/Context";
+// import type Context from "sap/ui/model/odata/v4/Context";
 
 const Constants = FELibrary.Constants,
 	InvocationGrouping = FELibrary.InvocationGrouping;
@@ -26,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
  */
@@ -58,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);
@@ -71,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
  */
@@ -89,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) {
@@ -99,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);
 }
@@ -110,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) {
@@ -120,22 +120,20 @@ 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);
@@ -161,16 +159,15 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 		let iMessageSideEffect;
 		let bIsSameEntity;
 		let oReturnType;
-		let bStaticAction;
+		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) {
@@ -190,7 +187,7 @@ 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) {
@@ -209,13 +206,18 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 						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 && iMessageSideEffect > -1) {
 								// no trigger action therefore no need to request messages again
@@ -264,13 +266,18 @@ function callAction(sActionName: any, oModel: any, oAction: any, oAppComponent:
 					mActionExecutionParameters.internalModelContext &&
 					mActionExecutionParameters.operationAvailableMap &&
 					mActionExecutionParameters.aContexts &&
-					mActionExecutionParameters.aContexts.length
+					mActionExecutionParameters.aContexts.length &&
+					actionDefinition.$IsBound
 				) {
-					const selectedContext = mActionExecutionParameters.aContexts.filter((oContext: Context) => {
-						const binding = oContext.getBinding();
-						return !binding.isA("sap.ui.model.odata.v4.ODataListBinding");
+					//check for skipping static actions
+					const isStatic = (actionDefinition.$Parameter || []).some((aParameter: any) => {
+						return (
+							actionDefinition.$EntitySetPath &&
+							actionDefinition.$EntitySetPath === aParameter.$Name &&
+							aParameter.$isCollection
+						);
 					});
-					if (selectedContext && selectedContext.length) {
+					if (!isStatic) {
 						CommonUtils.setActionEnablement(
 							mActionExecutionParameters.internalModelContext,
 							JSON.parse(mActionExecutionParameters.operationAvailableMap),
@@ -300,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",
@@ -382,34 +389,33 @@ function showActionParameterDialog(
 				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) {
 					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);
@@ -417,7 +423,7 @@ function showActionParameterDialog(
 					}
 				});
 			});
-			return aFieldInvalid;
+			return invalidFields;
 		};
 		const oController = {
 			handleChange: function (oEvent: any) {
@@ -453,14 +459,14 @@ 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 () {
 					// 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:
@@ -519,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);
@@ -545,17 +551,33 @@ function showActionParameterDialog(
 																!(!mParameters.control.isA("sap.ui.mdc.Table") && aContexts.length === 1) &&
 																messages.length
 															) {
-																oDialog.close();
+																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();
-													let messages = oMessageManager.getMessageModel().getData();
+													const messages = oMessageManager.getMessageModel().getData();
 													const subtitleColumn = CommonUtils.getMessageColumn(mParameters.control);
-													let errorContext = undefined;
-													let errorTargetsInAPM = false;
+													let errorContext;
+													let errorTargetsInAPD = false;
 													messages.forEach(function (message: any) {
 														const messageTargets = message.getTargets();
 														if (messageTargets && messageTargets.length === 1 && messageTargets[0].length) {
@@ -566,19 +588,43 @@ function showActionParameterDialog(
 																? errorContext.getObject()[subtitleColumn]
 																: undefined;
 														}
-
 														if (
 															message.getTarget().indexOf(mParameters.actionName) !== -1 &&
 															message.getTarget().indexOf(mParameters.aActionParameters[0].$Name) !== -1 &&
-															errorTargetsInAPM === false
+															errorTargetsInAPD === false
 														) {
-															errorTargetsInAPM = true;
+															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({
@@ -588,7 +634,8 @@ function showActionParameterDialog(
 														messagePageNavigationCallback: function () {
 															oDialog.close();
 														},
-														errorTargetsInAPM: errorTargetsInAPM
+														showErrorInAPD: showErrorInAPD,
+														bShowMessageBox: bShowMessageBox
 													});
 													if (oDialog && bHasEtagMessage && oDialog.isOpen()) {
 														oDialog.close(); //close the action parameter dialog after refresh of the context after etag mismatch
@@ -621,14 +668,15 @@ function showActionParameterDialog(
 									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 sBoundFunctionName = getDefaultValuesFunction();
 									const prefillParameter = function (sParamName: any, vParamDefaultValue: any) {
-										return new Promise((resolve) => {
+										// 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) {
@@ -649,13 +697,13 @@ function showActionParameterDialog(
 															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
@@ -663,7 +711,7 @@ function showActionParameterDialog(
 																	}
 																}
 															}
-															resolve({ paramName: sParamName, value: vParamValue });
+															inResolve({ paramName: sParamName, value: vParamValue });
 														})
 														.catch(function () {
 															// Simply clear parameter default if an error has occurred
@@ -672,7 +720,7 @@ function showActionParameterDialog(
 																sParamName,
 																mParameters.actionName
 															);
-															resolve({
+															inResolve({
 																paramName: sParamName,
 																value: undefined,
 																bLatePropertyError: true
@@ -680,18 +728,17 @@ 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 });
 											}
 										});
 									};
@@ -699,7 +746,7 @@ function showActionParameterDialog(
 									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 &&
@@ -746,8 +793,8 @@ function showActionParameterDialog(
 
 									Promise.all([aPrefillParamPromises, aExecFunctionPromises, oExecFunctionFromManifestPromise])
 										.then(function (aPromises: [any[], any[], any]) {
-											const aCurrentParamDefaultValue: any = aPromises[0];
-											const aFunctionParams = aPromises[1];
+											const currentParamDefaultValue: any = aPromises[0];
+											const functionParams = aPromises[1];
 											const oFunctionParamsFromManifest = aPromises[2];
 											let sDialogParamName;
 											for (const i in aActionParameters) {
@@ -760,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 {
@@ -789,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;
 												}
@@ -818,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) {
@@ -857,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
@@ -880,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) {
@@ -902,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
@@ -929,8 +962,22 @@ 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 () {
 					return oAction.getBoundContext();
@@ -1023,11 +1070,11 @@ 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
@@ -1057,14 +1104,15 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 						});
 				}
 			};
-			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();
@@ -1099,16 +1147,15 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 					oModel.submitBatch(sGroupId);
 					Promise.all(aLocalPromise)
 						.then(function () {
-							return resolve();
+							return actionResolve();
 						})
 						.catch(function () {
-							return resolve();
+							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 ||
@@ -1116,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
@@ -1127,7 +1174,7 @@ 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 () {
 						return processOneAction(context, id);
@@ -1137,7 +1184,9 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 					.then(function () {
 						fnHandleResults();
 					})
-					.catch();
+					.catch(function (oError: any) {
+						Log.error(oError);
+					});
 			}
 
 			if (!bGrouped) {
@@ -1147,7 +1196,7 @@ function _executeAction(oAppComponent: any, mParameters: any) {
 				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,
@@ -1212,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(
@@ -1241,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;
 }
 
 /**
@@ -1258,7 +1321,8 @@ const operations = {
 	callActionImport: callActionImport,
 	callBoundFunction: callBoundFunction,
 	callFunctionImport: callFunctionImport,
-	executeDependingOnSelectedContexts: executeDependingOnSelectedContexts
+	executeDependingOnSelectedContexts: executeDependingOnSelectedContexts,
+	showActionParameterDialog: _showActionParameterDialog
 };
 
 export default operations;