@sapui5/sap.fe.core 1.127.2 → 1.129.0

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

@@ -1,61 +1,49 @@
-import type { ActionImport, Action as EdmAction, ActionParameter as EdmActionParameter, PrimitiveType } from "@sap-ux/vocabularies-types";
+import type {
+	ActionImport,
+	ActionParameter,
+	Action as EdmAction,
+	ActionParameter as EdmActionParameter,
+	PrimitiveType
+} from "@sap-ux/vocabularies-types";
 import Log from "sap/base/Log";
-import type { ActionParameterInfo } from "sap/fe/core/ActionRuntime";
 import ActionRuntime from "sap/fe/core/ActionRuntime";
 import type { FEView } from "sap/fe/core/BaseController";
-import CommonUtils from "sap/fe/core/CommonUtils";
 import type ResourceModel from "sap/fe/core/ResourceModel";
-import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
+import { getCoreUIFactory } from "sap/fe/core/UIProvider";
 import type { BindContextParameters } from "sap/fe/core/controllerextensions/editFlow/draft";
-import UiModelConstants from "sap/fe/core/controllerextensions/editFlow/editFlowConstants";
 import type { ShowMessageParameters } from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
 import messageHandling from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
 import { convertTypes, type MetaModelAction } from "sap/fe/core/converters/MetaModelConverter";
 import DeleteHelper from "sap/fe/core/helpers/DeleteHelper";
-import FPMHelper from "sap/fe/core/helpers/FPMHelper";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import { getResourceModel } from "sap/fe/core/helpers/ResourceModelHelper";
-import { generate } from "sap/fe/core/helpers/StableIdHelper";
 import FELibrary from "sap/fe/core/library";
 import type { ActionSideEffectsType } from "sap/fe/core/services/SideEffectsServiceFactory";
-import type ListReportExtensionAPI from "sap/fe/templates/ListReport/ExtensionAPI";
-import type ObjectPageExtensionAPI from "sap/fe/templates/ObjectPage/ExtensionAPI";
-import Button from "sap/m/Button";
-import type { Dialog$BeforeOpenEvent } from "sap/m/Dialog";
-import Dialog from "sap/m/Dialog";
+import type Dialog from "sap/m/Dialog";
 import MessageBox from "sap/m/MessageBox";
-import type Event from "sap/ui/base/Event";
 import type Control from "sap/ui/core/Control";
-import Element from "sap/ui/core/Element";
-import Fragment from "sap/ui/core/Fragment";
 import Library from "sap/ui/core/Lib";
 import Messaging from "sap/ui/core/Messaging";
-import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import Message from "sap/ui/core/message/Message";
 import MessageType from "sap/ui/core/message/MessageType";
 import type View from "sap/ui/core/mvc/View";
-import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
-import type Field from "sap/ui/mdc/Field";
-import type MultiValueField from "sap/ui/mdc/MultiValueField";
 import type Table from "sap/ui/mdc/Table";
 import type MultiValueFieldItem from "sap/ui/mdc/field/MultiValueFieldItem";
 import type Context from "sap/ui/model/Context";
-import JSONModel from "sap/ui/model/json/JSONModel";
 import type { default as ODataV4Context } from "sap/ui/model/odata/v4/Context";
 import type ODataContextBinding from "sap/ui/model/odata/v4/ODataContextBinding";
 import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import type AppComponent from "../../../AppComponent";
 import operationsHelper, { type StrictHandlingParameters, type StrictHandlingUtilities } from "../../../operationsHelper";
 import type MessageHandler from "../../MessageHandler";
-
 const Constants = FELibrary.Constants,
 	InvocationGrouping = FELibrary.InvocationGrouping;
 const Action = MessageBox.Action;
 
 export type ActionResponse = undefined | ODataV4Context | PromiseSettledResult<undefined | ODataV4Context>[];
 
-type ShowActionDialogParameters = {
+export type ShowActionDialogParameters = {
 	appComponent: AppComponent;
 	fnOnSubmitted: Function;
 	fnOnResponse: Function;
@@ -67,7 +55,7 @@ type ShowActionDialogParameters = {
 	defaultValuesExtensionFunction?: string;
 	label?: string;
 	selectedItems: ODataV4Context[];
-	aContexts?: ODataV4Context[];
+	aContexts: ODataV4Context[];
 	mBindingParameters?: BindContextParameters;
 	additionalSideEffect?: ActionSideEffectsType;
 	bGrouped?: boolean;
@@ -85,7 +73,7 @@ type ShowActionDialogParameters = {
 	internalOperationsPromiseResolve?: Function;
 };
 
-type CallActionParameters = {
+export type CallActionParameters = {
 	parameterValues?: Record<string, string | boolean | number | MultiValueFieldItem[]>[];
 	label?: string;
 	invocationGrouping?: string;
@@ -118,9 +106,10 @@ type CallActionParameters = {
 	groupId?: string;
 };
 
+type BaseTypeParameter = string | number | boolean;
+
 /**
  * Calls a bound action for one or multiple contexts.
- *
  * @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
@@ -137,7 +126,6 @@ type CallActionParameters = {
  * @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
  * @param [mParameters.ignoreETag] If specified, the action is called without ETag handling
- * @param [strictHandlingUtilities] Optional, utility flags and messages for strictHandling
  * @returns Promise resolves with an array of response objects (TODO: to be changed)
  */
 async function callBoundAction(
@@ -201,7 +189,6 @@ async function callBoundAction(
 }
 /**
  * Calls an action import.
- *
  * @param actionName The name of the action import to be called
  * @param model An instance of an OData V4 model
  * @param appComponent The AppComponent
@@ -212,7 +199,6 @@ async function callBoundAction(
  * @param [parameters.onSubmitted] Function which is called once the actions are submitted with an array of promises
  * @param [parameters.defaultParameters] Can contain default parameters from FLP user defaults
  * @param [parameters.ignoreETag] If specified, the action is called without ETag handling
- * @param [strictHandlingUtilities] Optional, utility flags and messages for strictHandling
  * @returns Promise resolves with an array of response objects (TODO: to be changed)
  */
 async function callActionImport(
@@ -268,7 +254,6 @@ async function callBoundFunction(sFunctionName: string, context: Context, oModel
 
 /**
  * Calls a function import.
- *
  * @param sFunctionName The name of the function to be called
  * @param oModel An instance of an OData v4 model
  * @returns Promise resolves
@@ -296,6 +281,34 @@ async function _executeFunction(
 	return functionToCall.getBoundContext();
 }
 
+async function checkParameterTypeAndReturnConvertedValue(
+	parameter: ActionParameter,
+	value?: BaseTypeParameter | null
+): Promise<BaseTypeParameter | undefined | null> {
+	if (value === undefined || value === null) {
+		return value;
+	}
+	const BaseType = (await import("sap/ui/mdc/enums/BaseType")).default;
+	const TypeMap = (await import("sap/ui/mdc/odata/v4/TypeMap")).default;
+	const parameterType = (
+		parameter as {
+			name: string;
+			type?: string;
+		}
+	).type
+		? TypeMap.getBaseType(
+				(
+					parameter as {
+						name: string;
+						type: string;
+					}
+				).type
+		  )
+		: BaseType.String;
+	const typeInstance = TypeMap.getDataTypeInstance(parameterType);
+	return typeInstance.parseValue(value, "string");
+}
+
 async function callAction(
 	convertedAction: EdmAction,
 	oModel: ODataModel,
@@ -303,13 +316,14 @@ async function callAction(
 	oAppComponent: AppComponent,
 	mParameters: CallActionParameters
 ): Promise<ActionResponse> {
-	let strictHandlingUtilities = {
+	let strictHandlingUtilities: StrictHandlingUtilities = {
 		is412Executed: false,
 		strictHandlingTransitionFails: [],
 		strictHandlingPromises: [],
 		strictHandlingWarningMessages: [],
 		delaySuccessMessages: [],
-		processedMessageIds: new Set<string>()
+		processedMessageIds: new Set<string>(),
+		strictResponseErrorExists: false
 	};
 	const sActionName = convertedAction.isBound
 		? convertedAction.fullyQualifiedName.replace(/\(.*\)$/g, "") // remove the part related to the overlay
@@ -319,23 +333,6 @@ async function callAction(
 		resolve: (value: ActionResponse) => void,
 		reject: (reason?: Error | ActionResponse) => void
 	) {
-		let fnDialog:
-			| ((
-					sActionName: string,
-					oAppComponent: AppComponent,
-					sActionLabel: string | undefined,
-					mActionExecutionParameters: ShowActionDialogParameters,
-					aActionParameters: EdmActionParameter[],
-					aParameterValues: Record<string, unknown>[] | undefined,
-					oAction: Context,
-					parentControl: View,
-					entitySetName: string | undefined,
-					messageHandler: MessageHandler,
-					strictHandlingUtilities: StrictHandlingUtilities,
-					view: View | null,
-					ignoreETag?: boolean
-			  ) => Promise<undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[]>)
-			| null = null;
 		const sActionLabel = mParameters.label;
 		let bSkipParameterDialog = mParameters.skipParameterDialog;
 		const aContexts = mParameters.aContexts;
@@ -383,13 +380,6 @@ async function callAction(
 
 		// Depending on the previously determined data, either set a dialog or leave it empty which
 		// will lead to direct execution of the action without a dialog
-		if (bActionNeedsParameterDialog) {
-			if (!(bSkipParameterDialog && bValuesProvidedForAllMandatoryParameters)) {
-				fnDialog = showActionParameterDialog;
-			}
-		} else if (bIsCriticalAction) {
-			fnDialog = confirmCriticalAction;
-		}
 
 		const mActionExecutionParameters: ShowActionDialogParameters = {
 			defaultParametersValues: {},
@@ -397,6 +387,7 @@ async function callAction(
 			fnOnSubmitted: mParameters.onSubmitted,
 			fnOnResponse: mParameters.onResponse,
 			actionName: sActionName,
+			aContexts: [],
 			model: oModel,
 			aActionParameters: actionParameters,
 			bGetBoundContext: mParameters.bGetBoundContext,
@@ -463,7 +454,7 @@ async function callAction(
 				}
 			}
 
-			mActionExecutionParameters.aContexts = aContexts;
+			mActionExecutionParameters.aContexts = aContexts ?? [];
 			mActionExecutionParameters.mBindingParameters = mParameters.mBindingParameters;
 			mActionExecutionParameters.additionalSideEffect = mParameters.additionalSideEffect;
 			mActionExecutionParameters.bGrouped = mParameters.invocationGrouping === InvocationGrouping.ChangeSet;
@@ -486,9 +477,34 @@ async function callAction(
 			mActionExecutionParameters.bIsCreateAction = bIsCreateAction;
 		}
 		mActionExecutionParameters.isStatic = convertedAction.isBound && !!convertedAction.parameters[0]?.isCollection;
-		if (fnDialog) {
-			try {
-				const operationResult = await fnDialog(
+
+		let operationResult;
+		let executionWitDialog = false;
+		try {
+			if (bActionNeedsParameterDialog) {
+				if (!(bSkipParameterDialog && bValuesProvidedForAllMandatoryParameters)) {
+					executionWitDialog = true;
+					const parameterDialog = getCoreUIFactory().newParameterDialog(
+						convertedAction,
+						oAction as ODataV4Context,
+						mActionExecutionParameters,
+						aParameterValues,
+						mParameters.entitySetName,
+						mParameters.view as FEView | null,
+						mParameters.messageHandler,
+						strictHandlingUtilities,
+						{
+							actionToBeExecuted: _executeAction,
+							beforeShowingMessage: actionParameterShowMessageCallback
+						},
+						mParameters.ignoreETag
+					);
+					await parameterDialog.createDialog();
+					operationResult = await parameterDialog.openDialog(mParameters.parentControl);
+				}
+			} else if (bIsCriticalAction) {
+				executionWitDialog = true;
+				operationResult = await confirmCriticalAction(
 					sActionName,
 					oAppComponent,
 					sActionLabel,
@@ -503,121 +519,133 @@ async function callAction(
 					mParameters.view,
 					mParameters.ignoreETag
 				);
-				afterActionResolution(mParameters, mActionExecutionParameters, actionDefinition);
-				resolve(operationResult);
-				return;
-			} catch (e) {
-				reject(e as Error | ActionResponse);
 			}
-		} else {
-			// Take over all provided parameter values and call the action.
-			// This shall only happen if values are provided for all the parameters, otherwise the parameter dialog shall be shown which is ensured earlier
+		} catch (e) {
+			reject(e as Error | ActionResponse);
+		}
+		if (executionWitDialog) {
+			afterActionResolution(mParameters, mActionExecutionParameters, actionDefinition);
+			resolve(operationResult);
+			return;
+		}
 
-			if (aParameterValues) {
-				for (const i in mActionExecutionParameters.aActionParameters) {
-					mActionExecutionParameters.defaultParametersValues[mActionExecutionParameters.aActionParameters[i].name] =
-						aParameterValues?.find((element) => element.name === mActionExecutionParameters.aActionParameters[i].name)?.value;
-				}
-			} else {
-				for (const i in mActionExecutionParameters.aActionParameters) {
-					mActionExecutionParameters.defaultParametersValues[mActionExecutionParameters.aActionParameters[i].name] =
-						(oStartupParameters[mActionExecutionParameters.aActionParameters[i].name]?.[0] as string | boolean | number) ||
-						mActionExecutionParameters.aActionParameters[i].annotations?.UI?.ParameterDefaultValue?.valueOf();
-				}
+		// Take over all provided parameter values and call the action.
+		// This shall only happen if values are provided for all the parameters, otherwise the parameter dialog shall be shown which is ensured earlier
+
+		if (aParameterValues) {
+			for (const i in mActionExecutionParameters.aActionParameters) {
+				mActionExecutionParameters.defaultParametersValues[mActionExecutionParameters.aActionParameters[i].name] =
+					aParameterValues?.find((element) => element.name === mActionExecutionParameters.aActionParameters[i].name)?.value;
 			}
-			let oOperationResult: undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[];
-			try {
-				oOperationResult = await _executeAction(
-					oAppComponent,
-					mActionExecutionParameters,
-					mParameters.parentControl,
-					mParameters.messageHandler,
-					strictHandlingUtilities,
-					mParameters.ignoreETag
-				);
+		} else {
+			let actionParameter, parameterValueNotConverted;
+			for (const i in mActionExecutionParameters.aActionParameters) {
+				actionParameter = mActionExecutionParameters.aActionParameters[i];
+				parameterValueNotConverted =
+					(oStartupParameters[actionParameter.name]?.[0] as BaseTypeParameter) ||
+					actionParameter.annotations?.UI?.ParameterDefaultValue?.valueOf();
+				mActionExecutionParameters.defaultParametersValues[actionParameter.name] =
+					parameterValueNotConverted === undefined
+						? parameterValueNotConverted
+						: await checkParameterTypeAndReturnConvertedValue(actionParameter, parameterValueNotConverted);
+			}
+		}
+		let oOperationResult: undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[];
+		try {
+			oOperationResult = await _executeAction(
+				oAppComponent,
+				mActionExecutionParameters,
+				mParameters.parentControl,
+				mParameters.messageHandler,
+				strictHandlingUtilities,
+				mParameters.ignoreETag
+			);
 
-				const messages = Messaging.getMessageModel().getData();
-				if (strictHandlingUtilities.is412Executed && strictHandlingUtilities.strictHandlingTransitionFails.length) {
-					strictHandlingUtilities.delaySuccessMessages = strictHandlingUtilities.delaySuccessMessages.concat(messages);
+			const messages = Messaging.getMessageModel().getData();
+			if (
+				strictHandlingUtilities &&
+				strictHandlingUtilities.is412Executed &&
+				strictHandlingUtilities.strictHandlingTransitionFails.length
+			) {
+				strictHandlingUtilities.delaySuccessMessages = strictHandlingUtilities.delaySuccessMessages.concat(messages);
+			}
+			afterActionResolution(mParameters, mActionExecutionParameters, actionDefinition);
+			resolve(oOperationResult);
+		} catch {
+			reject(oOperationResult as Error | ActionResponse);
+		} finally {
+			if (
+				strictHandlingUtilities &&
+				strictHandlingUtilities.is412Executed &&
+				strictHandlingUtilities.strictHandlingTransitionFails.length &&
+				mParameters.aContexts!.length > 1
+			) {
+				try {
+					const strictHandlingFails = strictHandlingUtilities.strictHandlingTransitionFails;
+					const aFailedContexts = [] as ODataV4Context[];
+					strictHandlingFails.forEach(function (fail: { oAction: ODataContextBinding; groupId: string }): void {
+						aFailedContexts.push(fail.oAction.getContext() as ODataV4Context);
+					});
+					mActionExecutionParameters.aContexts = aFailedContexts;
+					const oFailedOperationResult = await _executeAction(
+						oAppComponent,
+						mActionExecutionParameters,
+						mParameters.parentControl,
+						mParameters.messageHandler,
+						strictHandlingUtilities,
+						mParameters.ignoreETag
+					);
+					strictHandlingUtilities.strictHandlingTransitionFails = [];
+					Messaging.addMessages(strictHandlingUtilities.delaySuccessMessages);
+					afterActionResolution(mParameters, mActionExecutionParameters, actionDefinition);
+					resolve(oFailedOperationResult);
+				} catch (oFailedOperationResult) {
+					reject(
+						oFailedOperationResult as Error | ODataV4Context | undefined | PromiseSettledResult<ODataV4Context | undefined>[]
+					);
 				}
-				afterActionResolution(mParameters, mActionExecutionParameters, actionDefinition);
-				resolve(oOperationResult);
-			} catch {
-				reject(oOperationResult as Error | ActionResponse);
-			} finally {
-				if (
-					strictHandlingUtilities.is412Executed &&
-					strictHandlingUtilities.strictHandlingTransitionFails.length &&
-					mParameters.aContexts!.length > 1
-				) {
-					try {
-						const strictHandlingFails = strictHandlingUtilities.strictHandlingTransitionFails;
-						const aFailedContexts = [] as ODataV4Context[];
-						strictHandlingFails.forEach(function (fail: { oAction: ODataContextBinding; groupId: string }): void {
-							aFailedContexts.push(fail.oAction.getContext() as ODataV4Context);
-						});
-						mActionExecutionParameters.aContexts = aFailedContexts;
-						const oFailedOperationResult = await _executeAction(
-							oAppComponent,
+			}
+			let showGenericErrorMessageForChangeSet = false;
+			if (
+				(mParameters.bGrouped && strictHandlingUtilities && strictHandlingUtilities.strictHandlingPromises.length) ||
+				(mParameters.bGrouped && messageHandling.hasTransitionErrorsOrWarnings())
+			) {
+				showGenericErrorMessageForChangeSet = true;
+			}
+			let isActionSuccessful = false;
+			if (Array.isArray(oOperationResult)) {
+				isActionSuccessful = oOperationResult?.every((res) => res.status === "fulfilled");
+			}
+			mParameters?.messageHandler
+				?.showMessageDialog({
+					control: mActionExecutionParameters?.control,
+					onBeforeShowMessage: function (aMessages: Message[], showMessageParametersIn: ShowMessageParameters) {
+						return actionParameterShowMessageCallback(
 							mActionExecutionParameters,
-							mParameters.parentControl,
-							mParameters.messageHandler,
-							strictHandlingUtilities,
-							mParameters.ignoreETag
-						);
-						strictHandlingUtilities.strictHandlingTransitionFails = [];
-						Messaging.addMessages(strictHandlingUtilities.delaySuccessMessages);
-						afterActionResolution(mParameters, mActionExecutionParameters, actionDefinition);
-						resolve(oFailedOperationResult);
-					} catch (oFailedOperationResult) {
-						reject(
-							oFailedOperationResult as
-								| Error
-								| ODataV4Context
-								| undefined
-								| PromiseSettledResult<ODataV4Context | undefined>[]
+							aContexts!,
+							undefined,
+							aMessages,
+							showMessageParametersIn,
+							showGenericErrorMessageForChangeSet,
+							isActionSuccessful
 						);
-					}
-				}
-				let showGenericErrorMessageForChangeSet = false;
-				if (
-					(mParameters.bGrouped && strictHandlingUtilities.strictHandlingPromises.length) ||
-					(mParameters.bGrouped && messageHandling.hasTransitionErrorsOrWarnings())
-				) {
-					showGenericErrorMessageForChangeSet = true;
-				}
-				let isActionSuccessful = false;
-				if (Array.isArray(oOperationResult)) {
-					isActionSuccessful = oOperationResult?.every((res) => res.status === "fulfilled");
-				}
-				mParameters?.messageHandler
-					?.showMessageDialog({
-						control: mActionExecutionParameters?.control,
-						onBeforeShowMessage: function (aMessages: Message[], showMessageParametersIn: ShowMessageParameters) {
-							return actionParameterShowMessageCallback(
-								mActionExecutionParameters,
-								aContexts!,
-								undefined,
-								aMessages,
-								showMessageParametersIn,
-								showGenericErrorMessageForChangeSet,
-								isActionSuccessful
-							);
-						},
-						aSelectedContexts: mParameters.aContexts,
-						sActionName: sActionLabel
-					})
-					.then(() => {
-						mParameters.messageHandler.clearStrictWarningMessages();
-						return;
-					});
+					},
+					aSelectedContexts: mParameters.aContexts,
+					sActionName: sActionLabel
+				})
+				.then(() => {
+					mParameters.messageHandler.clearStrictWarningMessages();
+					return;
+				});
+			if (strictHandlingUtilities) {
 				strictHandlingUtilities = {
 					is412Executed: false,
 					strictHandlingTransitionFails: [],
 					strictHandlingPromises: [],
 					strictHandlingWarningMessages: [],
 					delaySuccessMessages: [],
-					processedMessageIds: new Set()
+					processedMessageIds: new Set(),
+					strictResponseErrorExists: false
 				};
 			}
 		}
@@ -677,100 +705,6 @@ async function confirmCriticalAction(
 	});
 }
 
-async function executeAPMAction(
-	oAppComponent: AppComponent,
-	mParameters: ShowActionDialogParameters,
-	oParentControl: View,
-	messageHandler: MessageHandler,
-	aContexts: ODataV4Context[],
-	oDialog: Dialog,
-	after412: boolean,
-	strictHandlingUtilities: StrictHandlingUtilities,
-	ignoreETag?: boolean
-): Promise<undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[]> {
-	const aResult = await _executeAction(oAppComponent, mParameters, oParentControl, messageHandler, strictHandlingUtilities, ignoreETag);
-	// If some entries were successful, and others have failed, the overall process is still successful. However, this was treated as rejection
-	// before, and this currently is still kept, as long as dialog handling is mixed with backend process handling.
-	// TODO: Refactor to only reject in case of overall process error.
-	// For the time being: map to old logic to reject if at least one entry has failed
-	// This check is only done for bound actions => aContexts not empty
-	if (mParameters.aContexts && mParameters.aContexts.length > 0) {
-		if (
-			(aResult as PromiseSettledResult<ODataV4Context | undefined>[])?.some(
-				(oSingleResult: PromiseSettledResult<ODataV4Context | undefined>) => oSingleResult.status === "rejected"
-			)
-		) {
-			throw aResult;
-		}
-	}
-
-	const messages = Messaging.getMessageModel().getData();
-	if (strictHandlingUtilities.is412Executed && strictHandlingUtilities.strictHandlingTransitionFails.length) {
-		if (!after412) {
-			strictHandlingUtilities.delaySuccessMessages = strictHandlingUtilities.delaySuccessMessages.concat(messages);
-		} else {
-			Messaging.addMessages(strictHandlingUtilities.delaySuccessMessages);
-			let showGenericErrorMessageForChangeSet = false;
-			if (
-				(mParameters.bGrouped && strictHandlingUtilities.strictHandlingPromises.length) ||
-				(mParameters.bGrouped && messageHandling.hasTransitionErrorsOrWarnings())
-			) {
-				showGenericErrorMessageForChangeSet = true;
-			}
-			if (messages.length) {
-				// BOUND TRANSITION AS PART OF SAP_MESSAGE
-				oDialog.attachEventOnce("afterClose", function () {
-					messageHandler.showMessageDialog({
-						onBeforeShowMessage: function (aMessages: Message[], showMessageParametersIn: ShowMessageParameters) {
-							return actionParameterShowMessageCallback(
-								mParameters,
-								aContexts,
-								oDialog,
-								aMessages,
-								showMessageParametersIn,
-								showGenericErrorMessageForChangeSet
-							);
-						},
-						control: mParameters.control,
-						aSelectedContexts: mParameters.aContexts,
-						sActionName: mParameters.label
-					});
-				});
-			}
-		}
-	} else if (messages.length) {
-		// BOUND TRANSITION AS PART OF SAP_MESSAGE
-		let showGenericErrorMessageForChangeSet = false;
-		if (
-			(mParameters.bGrouped && strictHandlingUtilities.strictHandlingPromises.length) ||
-			(mParameters.bGrouped && messageHandling.hasTransitionErrorsOrWarnings())
-		) {
-			showGenericErrorMessageForChangeSet = true;
-		}
-		oDialog.attachEventOnce("afterClose", function () {
-			messageHandler.showMessageDialog({
-				isActionParameterDialogOpen: mParameters?.oDialog?.isOpen(),
-				forceShowUIElement: mParameters?.oDialog?.isOpen() ?? false,
-				onBeforeShowMessage: function (aMessages: Message[], showMessageParametersIn: ShowMessageParameters) {
-					return actionParameterShowMessageCallback(
-						mParameters,
-						aContexts,
-						oDialog,
-						aMessages,
-						showMessageParametersIn,
-						showGenericErrorMessageForChangeSet
-					);
-				},
-				control: mParameters.control,
-				aSelectedContexts: mParameters.aContexts,
-				sActionName: mParameters.label
-			});
-		});
-	}
-
-	return aResult;
-}
-
 function afterActionResolution(
 	mParameters: CallActionParameters,
 	mActionExecutionParameters: ShowActionDialogParameters,
@@ -811,6 +745,54 @@ function afterActionResolution(
 	}
 }
 
+/**
+ * Filters an array of messages based on various conditions and returns an object containing the filtered messages and other properties.
+ * @param messages The messages to filter.
+ * @param errorTargetsInAPD Indicates whether error targets are in APD.
+ * @param contexts An array of contexts.
+ * @param unboundMessages An array of unbound messages.
+ * @param control A control object.
+ * @param isAPDOPen Indicates whether APD is open.
+ * @param showMessageDialog Indicates whether to show the message dialog.
+ * @returns An object containing a boolean indicating whether the result contains a bound transition, an array of messages to show, and a boolean indicating whether to show the message in a dialog.
+ */
+function filterAPDandContextMessages(
+	messages: Message[],
+	errorTargetsInAPD?: boolean,
+	contexts?: Context[],
+	unboundMessages?: Message[],
+	control?: Control,
+	isAPDOPen?: boolean,
+	showMessageDialog?: boolean
+): { containsBoundTransistion: boolean | undefined; messagesToShow: Message[]; showMessageInDialog?: boolean } {
+	if (isAPDOPen && errorTargetsInAPD) {
+		/* When APD is open, we need to remove the messages which are related to the objectpage context */
+		messageHandling.removeContextMessagesfromModel(messages, contexts);
+	}
+
+	// Filter out messages which are not related to the action parameter dialog in the edit mode and display mode
+	let containsBoundTransistion;
+	if (!control?.getModel("ui")!.getProperty("/isEditable")) {
+		if (isAPDOPen && errorTargetsInAPD) {
+			if (unboundMessages?.length === 0) {
+				containsBoundTransistion = false;
+				showMessageDialog = false;
+			}
+			messages = messageHandling.removeMessagesForActionParameterDialog(messages);
+		}
+	} else {
+		if (unboundMessages?.length === 0) {
+			containsBoundTransistion = false;
+		}
+		messages = messageHandling.removeMessagesForActionParameterDialog(messages);
+	}
+	return {
+		messagesToShow: messages,
+		containsBoundTransistion: containsBoundTransistion,
+		showMessageInDialog: showMessageDialog
+	};
+}
+
 function actionParameterShowMessageCallback(
 	mParameters: ShowActionDialogParameters,
 	aContexts: ODataV4Context[],
@@ -841,10 +823,8 @@ function actionParameterShowMessageCallback(
 	});
 
 	const errorTargetsInAPD = APDmessages.length ? true : false;
-	let hasChangeSetModifiedMessage = false;
 	//If Action is successful with warnings, dont show the generic error message for changeset in dialog
 	if (showGenericErrorMessageForChangeSet && !errorTargetsInAPD && !isActionSuccessful) {
-		hasChangeSetModifiedMessage = true;
 		let sMessage = oResourceBundle.getText("C_COMMON_DIALOG_CANCEL_ERROR_MESSAGES_TEXT");
 		let sDescriptionText = oResourceBundle.getText("C_COMMON_DIALOG_CANCEL_ERROR_MESSAGES_DETAIL_TEXT");
 		const messageModel = Messaging.getMessageModel();
@@ -932,40 +912,24 @@ function actionParameterShowMessageCallback(
 			oDialog.destroy();
 		}
 	}
-	let filteredMessages: Message[] = [];
+	const filteredMessages: Message[] = [];
 	const bIsAPDOpen = oDialog && oDialog.isOpen();
-	if (!hasChangeSetModifiedMessage) {
-		if (
-			messages.length === 1 &&
-			messages[0].getTargets &&
-			messages[0].getTargets()?.[0] !== undefined &&
-			messages[0].getTargets()?.[0] !== "" &&
-			messages[0].getType() === "Error"
-		) {
-			if ((oControl && oControl.getModel("ui")!.getProperty("/isEditable") === false) || !oControl) {
-				// OP edit or LR
-				showMessageBox = !errorTargetsInAPD;
-				showMessageDialog = false;
-			} else if (oControl && oControl.getModel("ui")!.getProperty("/isEditable") === true) {
-				showMessageBox = false;
-				showMessageDialog = false;
-			}
-		} else if (oControl) {
-			if (oControl.getModel("ui")!.getProperty("/isEditable") === false) {
-				if (bIsAPDOpen && errorTargetsInAPD) {
-					showMessageDialog = false;
-				}
-			} else if (oControl.getModel("ui")!.getProperty("/isEditable") === true) {
-				if (!bIsAPDOpen && errorTargetsInAPD) {
-					showMessageDialog = true;
-					filteredMessages = unboundMessages.concat(APDmessages);
-				} else if (!bIsAPDOpen && unboundMessages.length === 0) {
-					// error targets in APD => there is atleast one bound message. If there are unbound messages, dialog must be shown.
-					// for draft entity, we already closed the APD
-					showMessageDialog = false;
-				}
-			}
-		}
+
+	const { messagesToShow, containsBoundTransistion, showMessageInDialog } = filterAPDandContextMessages(
+		messages,
+		errorTargetsInAPD,
+		aContexts,
+		unboundMessages,
+		oControl,
+		bIsAPDOpen
+	);
+	messages = messagesToShow;
+	showMessageDialog = showMessageInDialog ?? showMessageDialog;
+
+	if (!bIsAPDOpen && errorTargetsInAPD && !mParameters.bGrouped) {
+		// If APD is not open and there are messages related to APD, then show in the message dialog. since
+		showMessageDialog = true;
+		messages = messages.concat(APDmessages);
 	}
 
 	let fnGetMessageSubtitle;
@@ -977,724 +941,11 @@ function actionParameterShowMessageCallback(
 		showMessageDialog: showMessageDialog,
 		filteredMessages: filteredMessages.length ? filteredMessages : messages,
 		fnGetMessageSubtitle: fnGetMessageSubtitle,
-		showChangeSetErrorDialog: mParameters.bGrouped
+		showChangeSetErrorDialog: mParameters.bGrouped,
+		containsBoundTransistion: containsBoundTransistion
 	};
 }
 
-/*
- * Currently, this method is responsible for showing the dialog and executing the action. The promise returned is pending while waiting for user input, as well as while the
- * back-end request is running. The promise is rejected when the user cancels the dialog and also when the back-end request fails.
- * TODO: Refactoring: Separate dialog handling from backend processing. Dialog handling should return a Promise resolving to parameters to be provided to backend. If dialog is
- * cancelled, that promise can be rejected. Method responsible for backend processing need to deal with multiple contexts - i.e. it should either return an array of Promises or
- * a Promise resolving to an array. In the latter case, that Promise should be resolved also when some or even all contexts failed in backend - the overall process still was
- * successful.
- *
- */
-
-async function showActionParameterDialog(
-	sActionName: string,
-	oAppComponent: AppComponent,
-	sActionLabel: string | undefined,
-	mParameters: ShowActionDialogParameters,
-	aActionParameters: EdmActionParameter[],
-	aParameterValues: Record<string, unknown>[] | undefined,
-	oActionContext: Context,
-	oParentControl: View,
-	entitySetName: string | undefined,
-	messageHandler: MessageHandler,
-	strictHandlingUtilities: StrictHandlingUtilities,
-	view: View | null,
-	ignoreETag?: boolean
-): Promise<undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[]> {
-	const sPath = _getPath(oActionContext, sActionName),
-		metaModel = oActionContext.getModel(),
-		entitySetContext = metaModel.createBindingContext(sPath),
-		sActionNamePath = oActionContext.getObject("$IsBound")
-			? 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<undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[]>(async function (resolve, reject) {
-		let actionParameterInfos: ActionParameterInfo[]; // to be filled after fragment (for action parameter dialog) is loaded. Actually only needed during dialog processing, i.e. could be moved into the controller and directly initialized there, but only after moving all handlers (esp. press handler for action button) to controller.
-
-		const _removeMessagesForActionParamter = (parameter?: EdmActionParameter): void => {
-			if (parameter) {
-				const allMessages = Messaging.getMessageModel().getData();
-				const controlId = generate(["APD_", parameter.name]);
-				// also remove messages assigned to inner controls, but avoid removing messages for different paramters (with name being substring of another parameter name)
-				const relevantMessages = allMessages.filter((msg: Message) =>
-					msg.getControlIds().some((id: string) => controlId.split("-").includes(id))
-				);
-				Messaging.removeMessages(relevantMessages);
-			}
-		};
-
-		const oController = {
-			handleChange: async function (oEvent: Event<{ promise: Promise<string> }>): Promise<void> {
-				const field = oEvent.getSource();
-				const actionParameterInfo = actionParameterInfos.find(
-					(actionParameterInfo) => actionParameterInfo.field === field
-				) as ActionParameterInfo;
-				// field value is being changed, thus existing messages related to that field are not valid anymore
-				_removeMessagesForActionParamter(actionParameterInfo.parameter);
-				// adapt info. Promise is resolved to value or rejected with exception containing message
-				actionParameterInfo.validationPromise = oEvent.getParameter("promise");
-				try {
-					actionParameterInfo.value = await actionParameterInfo.validationPromise;
-					actionParameterInfo.hasError = false;
-				} catch (error) {
-					delete actionParameterInfo.value;
-					actionParameterInfo.hasError = true;
-					ActionRuntime._addMessageForActionParameter([
-						{
-							actionParameterInfo: actionParameterInfo,
-							message: (error as { message: string }).message
-						}
-					]);
-				}
-			}
-		};
-
-		const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
-		const oParameterModel = new JSONModel({
-			$displayMode: {}
-		});
-
-		try {
-			const createdFragment = await XMLPreprocessor.process(
-				oFragment,
-				{ name: sFragmentName },
-				{
-					bindingContexts: {
-						action: oActionContext,
-						actionName: actionNameContext,
-						entitySet: entitySetContext
-					},
-					models: {
-						action: oActionContext.getModel(),
-						actionName: actionNameContext?.getModel(),
-						entitySet: entitySetContext?.getModel(),
-						metaModel: entitySetContext?.getModel()
-					}
-				}
-			);
-			// TODO: move the dialog into the fragment and move the handlers to the oController
-			const aContexts: ODataV4Context[] = mParameters.aContexts || [];
-			const aFunctionParams: Promise<ODataV4Context>[] = [];
-
-			await CommonUtils.setUserDefaults(oAppComponent, aActionParameters, oParameterModel, true);
-			const oDialogContent = (await Fragment.load({
-				definition: createdFragment as unknown as string,
-				controller: oController
-			})) as Control;
-
-			actionParameterInfos = aActionParameters.map((actionParameter) => {
-				const field = Element.getElementById(generate(["APD_", actionParameter.name])) as Field | MultiValueField;
-				const isMultiValue = field.isA("sap.ui.mdc.MultiValueField");
-				return {
-					parameter: actionParameter,
-					field: field,
-					isMultiValue: isMultiValue,
-					hasError: false
-				};
-			});
-
-			const resourceModel = getResourceModel(oParentControl);
-			let actionResult: {
-				dialogCancelled: boolean;
-				result: undefined | ODataV4Context | PromiseSettledResult<ODataV4Context | undefined>[];
-			} = {
-				dialogCancelled: true, // to be set to false in case of successful action exection
-				result: undefined
-			};
-
-			let buttonLock = false;
-
-			const oDialog = new Dialog(generate(["fe", "APD_", sActionName]), {
-				title: sActionLabel || resourceModel.getText("C_OPERATIONS_ACTION_PARAMETER_DIALOG_TITLE"),
-				content: [oDialogContent],
-				escapeHandler: function (): void {
-					// escape handler is meant to possibly suppress or postpone closing the dialog on escape (by calling "reject" on the provided object, or "resolve" only when
-					// done with all tasks to happen before dialog can be closed). It's not intended to explicetly close the dialog here (that happens automatically when no
-					// escapeHandler is provided or the resolve-callback is called) or for own wrap up tasks (like removing validition messages - this should happen in the
-					// afterClose).
-					// TODO: Move wrap up tasks to afterClose, and remove this method completely. Take care to also adapt end button press handler accordingly.
-					// Currently only still needed to differentiate closing dialog after successful execution (uses resolve) from user cancellation (using reject)
-					oDialog.close();
-					//		reject(Constants.CancelActionDialog);
-				},
-				beginButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Ok"]), {
-					text: bIsCreateAction
-						? resourceModel.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON")
-						: _getActionParameterActionName(resourceModel, sActionLabel, sActionName, entitySetName),
-					type: "Emphasized",
-					press: async function (): Promise<unknown> {
-						try {
-							// prevent multiple press events. The BusyLocker is not fast enough. (BCP: 2370130210)
-							// buttonLock is set once and reset in
-							// - after validation error
-							// - in case of action error message is canceled
-							// - in afterClose event
-
-							if (buttonLock === true) {
-								return;
-							}
-							buttonLock = true;
-
-							if (!(await ActionRuntime.validateProperties(actionParameterInfos, resourceModel))) {
-								buttonLock = false;
-								return;
-							}
-
-							BusyLocker.lock(oDialog);
-
-							let failedContexts: ODataV4Context[] = [];
-
-							try {
-								// 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;
-								let allNullParameters = true;
-								const oParameterContext = oOperationBinding && oOperationBinding.getParameterContext();
-								for (const i in aActionParameters) {
-									if (aActionParameters[i].isCollection) {
-										const aMVFContent = (oDialog.getModel("mvfview") as JSONModel).getProperty(
-												`/${aActionParameters[i].name}`
-											),
-											aKeyValues = [];
-										for (const j in aMVFContent) {
-											aKeyValues.push(aMVFContent[j].Key);
-										}
-										vParameterValue = aKeyValues;
-									} else {
-										vParameterValue = oParameterContext?.getProperty(aActionParameters[i].name);
-									}
-									mParameters.defaultParametersValues[aActionParameters[i].name] = vParameterValue;
-									if (vParameterValue !== null && vParameterValue !== undefined) {
-										allNullParameters = false;
-									}
-									vParameterValue = undefined;
-								}
-								if (!allNullParameters) {
-									oAppComponent.getModel("ui").setProperty(UiModelConstants.DocumentModified, true);
-								}
-								// avoid overriding incoming parameters
-								const innerParameters = Object.assign({}, mParameters);
-								innerParameters.label = sActionLabel;
-								try {
-									const aResult = await executeAPMAction(
-										oAppComponent,
-										innerParameters,
-										oParentControl,
-										messageHandler,
-										aContexts,
-										oDialog,
-										false,
-										strictHandlingUtilities,
-										ignoreETag
-									);
-									actionResult = {
-										dialogCancelled: false,
-										result: aResult
-									};
-									oDialog.close();
-									// resolve(aResult);
-								} catch (oError: unknown) {
-									const messages = Messaging.getMessageModel().getData();
-									if (
-										strictHandlingUtilities.is412Executed &&
-										strictHandlingUtilities.strictHandlingTransitionFails.length
-									) {
-										strictHandlingUtilities.delaySuccessMessages =
-											strictHandlingUtilities.delaySuccessMessages.concat(messages);
-									}
-									throw oError;
-								} finally {
-									if (
-										strictHandlingUtilities.is412Executed &&
-										strictHandlingUtilities.strictHandlingTransitionFails.length
-									) {
-										try {
-											failedContexts = strictHandlingUtilities.strictHandlingTransitionFails.map(
-												(fail) => fail.oAction.getContext() as ODataV4Context
-											);
-											innerParameters.aContexts = failedContexts;
-											const aResult = await executeAPMAction(
-												oAppComponent,
-												innerParameters,
-												oParentControl,
-												messageHandler,
-												aContexts,
-												oDialog,
-												true,
-												strictHandlingUtilities,
-												ignoreETag
-											);
-
-											strictHandlingUtilities.strictHandlingTransitionFails = [];
-											actionResult = {
-												dialogCancelled: false,
-												result: aResult
-											};
-											// resolve(aResult);
-										} catch {
-											if (
-												strictHandlingUtilities.is412Executed &&
-												strictHandlingUtilities.strictHandlingTransitionFails.length
-											) {
-												Messaging.addMessages(strictHandlingUtilities.delaySuccessMessages);
-											}
-											let showGenericErrorMessageForChangeSet = false;
-											if (
-												(mParameters.bGrouped && strictHandlingUtilities.strictHandlingPromises.length) ||
-												(mParameters.bGrouped && messageHandling.hasTransitionErrorsOrWarnings())
-											) {
-												showGenericErrorMessageForChangeSet = true;
-											}
-											await messageHandler.showMessageDialog({
-												isActionParameterDialogOpen: oDialog.isOpen(),
-												forceShowUIElement: oDialog.isOpen(),
-												onBeforeShowMessage: function (
-													aMessages: Message[],
-													showMessageParametersIn: ShowMessageParameters
-												) {
-													return actionParameterShowMessageCallback(
-														innerParameters,
-														aContexts,
-														oDialog,
-														aMessages,
-														showMessageParametersIn,
-														showGenericErrorMessageForChangeSet
-													);
-												},
-												aSelectedContexts: undefined, // not used at all
-												sActionName: sActionLabel
-											});
-										}
-									}
-									if (BusyLocker.isLocked(oDialog)) {
-										BusyLocker.unlock(oDialog);
-									}
-								}
-							} catch (oError: unknown) {
-								let showMessageDialog: boolean | undefined = true;
-								let showGenericErrorMessageForChangeSet = false;
-								if (
-									(mParameters.bGrouped && strictHandlingUtilities.strictHandlingPromises.length) ||
-									(mParameters.bGrouped && messageHandling.hasTransitionErrorsOrWarnings())
-								) {
-									showGenericErrorMessageForChangeSet = true;
-								}
-								await messageHandler.showMessages({
-									context: failedContexts[0], // only used in case of failed context to reset in messageHandling showMessagesInUI
-									isActionParameterDialogOpen: oDialog.isOpen(),
-									forceShowUIElement: oDialog.isOpen(),
-									messagePageNavigationCallback: function () {
-										oDialog.close();
-									},
-									onBeforeShowMessage: function (aMessages: Message[], showMessageParametersIn: ShowMessageParameters) {
-										// Why is this implemented as callback? Apparently, all needed information is available beforehand
-										// TODO: refactor accordingly
-										const showMessageParameters = actionParameterShowMessageCallback(
-											mParameters,
-											aContexts,
-											oDialog,
-											aMessages,
-											showMessageParametersIn,
-											showGenericErrorMessageForChangeSet
-										);
-										showMessageDialog = showMessageParameters.showMessageDialog;
-										return showMessageParameters;
-									},
-									aSelectedContexts: undefined, // not used at all!
-									sActionName: sActionLabel,
-									control: mParameters.control
-								});
-								buttonLock = false; //needed if the action fails with an error popup and this one is canceld (Journey: 412WarningHandling)
-								// In case of backend validation error(s?), message shall not be shown in message dialog but next to the field on parameter dialog, which should
-								// stay open in this case => in this case, we must not resolve or reject the promise controlling the parameter dialog.
-								// In all other cases (e.g. other backend errors or user cancellation), the promise controlling the parameter dialog needs to be rejected to allow
-								// callers to react. (Example: If creation in backend after navigation to transient context fails, back navigation needs to be triggered)
-								// TODO: Refactor to separate dialog handling from backend request instead of taking decision based on message handling
-								if (showMessageDialog) {
-									if (oDialog.isOpen()) {
-										// do nothing, do not reject promise here
-										// We do not close the APM dialog if user enters a wrong value in of the fields that results in an error from the backend.
-										// The user can close the message dialog and the APM dialog would still be open on which he could enter a new value and trigger the action again.
-										// Earlier we were rejecting the promise on error here, and the call stack was destroyed as the promise was rejected and returned to EditFlow invoke action.
-										// But since the APM dialog was still open, a new promise was resolved in case the user retried the action and the object was created, but the navigation to object page was not taking place.
-									} else {
-										reject(oError);
-									}
-								}
-							}
-						} finally {
-							messageHandler.clearStrictWarningMessages();
-							strictHandlingUtilities = {
-								is412Executed: false,
-								strictHandlingTransitionFails: [],
-								strictHandlingPromises: [],
-								strictHandlingWarningMessages: [],
-								delaySuccessMessages: [],
-								processedMessageIds: new Set()
-							};
-							if (BusyLocker.isLocked(oDialog)) {
-								BusyLocker.unlock(oDialog);
-							}
-						}
-					}
-				}),
-				endButton: new Button(generate(["fe", "APD_", sActionName, "Action", "Cancel"]), {
-					text: resourceModel.getText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL"),
-					press: function (): void {
-						// TODO: cancel button should just close the dialog (similar to using escape). All wrap up tasks should be moved to afterClose.
-						oDialog.close();
-						// reject(Constants.CancelActionDialog);
-					}
-				}),
-				// TODO: beforeOpen is just an event, i.e. not waiting for the Promise to be resolved. Check if tasks of this function need to be done before opening the dialog
-				// - if yes, they need to be moved outside.
-				// Assumption: Sometimes dialog can be seen without any fields for a short time - maybe this is caused by this asynchronity
-				beforeOpen: async function (oEvent: Dialog$BeforeOpenEvent): Promise<void> {
-					// clone event for actionWrapper as oEvent.oSource gets lost during processing of beforeOpen event handler
-					const oCloneEvent = Object.assign({}, oEvent);
-					const hasVisibleParameter = actionParameterInfos.some((info) => info.field.getVisible());
-					messageHandler.removeTransitionMessages();
-					const getDefaultValuesFunction = function (): string {
-						const oMetaModel = (oDialog.getModel() as ODataModel).getMetaModel(),
-							sActionPath = oActionContext.getPath() && oActionContext.getPath().split("/@")[0],
-							sDefaultValuesFunction = oMetaModel.getObject(
-								`${sActionPath}@com.sap.vocabularies.Common.v1.DefaultValuesFunction`
-							);
-						return sDefaultValuesFunction;
-					};
-					const fnSetDefaultsAndOpenDialog = async function (sBindingParameter?: string): Promise<void> {
-						const sBoundFunctionName = getDefaultValuesFunction();
-						const parameterModelData = oParameterModel.getData();
-						const prefillParameter = async function (
-							sParamName: string,
-							vParamDefaultValue?: string | { $Path?: string }
-						): Promise<{ paramName: string; value: unknown; bLatePropertyError?: boolean; bNoPossibleValue?: boolean }> {
-							// Case 1: There is a ParameterDefaultValue annotation
-							if (vParamDefaultValue !== undefined) {
-								if (aContexts.length > 0 && typeof vParamDefaultValue === "object" && 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
-													return {
-														paramName: sParamName,
-														value: undefined,
-														bNoPossibleValue: true
-													};
-												}
-											}
-										}
-										return { paramName: sParamName, value: vParamValue };
-									} catch (oError) {
-										Log.error("Error while reading default action parameter", sParamName, mParameters.actionName);
-										return {
-											paramName: sParamName,
-											value: undefined,
-											bLatePropertyError: true
-										};
-									}
-								} else {
-									// Case 1.2: ParameterDefaultValue defines a fixed string value (i.e. vParamDefaultValue = 'someString')
-									return { paramName: sParamName, value: vParamDefaultValue };
-								}
-							} else if (parameterModelData.hasOwnProperty(sParamName)) {
-								// Case 2: There is no ParameterDefaultValue annotation (=> look into the FLP User Defaults)
-
-								return {
-									paramName: sParamName,
-									value: parameterModelData[sParamName]
-								};
-							} else {
-								return { paramName: sParamName, value: undefined };
-							}
-						};
-
-						const getParameterDefaultValue = function (sParamName: string): string | { $Path: string } {
-							const oMetaModel = (oDialog.getModel() as ODataModel).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 as string | { $Path: string };
-						};
-
-						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(operations.callBoundFunction(sBoundFunctionName, aContexts[i], mParameters.model));
-								}
-							}
-						}
-
-						const aPrefillParamPromises = Promise.all(aCurrentParamDefaultValue);
-						let aExecFunctionPromises: Promise<ODataV4Context[]> = 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
-							});
-						}
-
-						try {
-							const aPromises = await Promise.all([
-								aPrefillParamPromises,
-								aExecFunctionPromises,
-								oExecFunctionFromManifestPromise
-							]);
-							const currentParamDefaultValue = aPromises[0];
-							const functionParams = aPromises[1];
-							const oFunctionParamsFromManifest: Record<string, unknown> = aPromises[2] as Record<string, unknown>;
-							let sDialogParamName: string;
-
-							// Fill the dialog with the earlier determined parameter values from the different sources
-							for (const i in aActionParameters) {
-								if (aActionParameters[i].name !== "ResultIsActiveEntity") {
-									sDialogParamName = aActionParameters[i].name;
-									// Parameter values provided in the call of invokeAction overrule other sources
-									const vParameterProvidedValue = aParameterValues?.find(
-										(element) => element.name === aActionParameters[i].name
-									)?.value;
-									if (vParameterProvidedValue) {
-										oOperationBinding.setParameter(aActionParameters[i].name, vParameterProvidedValue);
-									} else 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 && functionParams[j].getObject(sDialogParamName) !== undefined) {
-												oOperationBinding.setParameter(
-													aActionParameters[i].name,
-													functionParams[j].getObject(sDialogParamName)
-												);
-											}
-										} else if (functionParams[0] && functionParams[0].getObject(sDialogParamName) !== undefined) {
-											//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) {
-								if (oValue.bLatePropertyError) {
-									return oValue.bLatePropertyError;
-								}
-							});
-
-							const refresh = resourceModel.getText("C_COMMON_SAPFE_REFRESH");
-							const close = function (action: string): void {
-								if (action === refresh) {
-									const extensionAPI = (view as FEView)?.getController().getExtensionAPI();
-									(extensionAPI as ListReportExtensionAPI | ObjectPageExtensionAPI).refresh();
-								}
-							};
-
-							// If at least one Default Property is a Late Property and an eTag error was raised.
-							if (bErrorFound) {
-								const sText = resourceModel.getText("C_APP_COMPONENT_SAPFE_ETAG_LATE_PROPERTY");
-								MessageBox.warning(sText, {
-									actions: [refresh, MessageBox.Action.OK],
-									emphasizedAction: refresh,
-									onClose: function (action: string) {
-										close(action);
-									},
-									contentWidth: "25em"
-								} as object);
-							} else if (!hasVisibleParameter) {
-								// We execute the action if all parameters are hidden, otherwise all mandatory parameters without values are shown in the dialog
-								const beginButton = oDialog.getBeginButton();
-								beginButton.firePress();
-							}
-						} catch (oError: unknown) {
-							Log.error("Error while retrieving the parameter", oError as string);
-							// Remove messages relating to the function for default values as they aren't helpful for a user
-							messageHandler.removeTransitionMessages();
-						}
-					};
-					const fnAsyncBeforeOpen = async function (): Promise<void> {
-						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);
-								}
-								await fnSetDefaultsAndOpenDialog(sBindingParameter);
-							} catch (oError: unknown) {
-								Log.error("Error while retrieving the parameter", oError as string);
-							}
-						} else {
-							await fnSetDefaultsAndOpenDialog();
-						}
-					};
-
-					await fnAsyncBeforeOpen();
-
-					// adding defaulted values only here after they are not set to the fields
-					for (const actionParameterInfo of actionParameterInfos) {
-						const value = actionParameterInfo.isMultiValue
-							? (actionParameterInfo.field as MultiValueField).getItems()
-							: (actionParameterInfo.field as Field).getValue();
-						actionParameterInfo.value = value;
-						actionParameterInfo.validationPromise = Promise.resolve(value);
-					}
-				},
-				afterClose: function (): void {
-					// when the dialog is cancelled, messages need to be removed in case the same action should be executed again
-					aActionParameters.forEach(_removeMessagesForActionParamter);
-					oDialog.destroy();
-					buttonLock = false; //needed here, not in the press events finally clause. In case the UI is sluggish, begin button could be pressed again.
-					if (actionResult.dialogCancelled) {
-						reject(Constants.CancelActionDialog);
-					} else {
-						resolve(actionResult.result);
-					}
-				}
-			});
-			mParameters.oDialog = oDialog;
-			oDialog.setModel(mParameters.model);
-			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");
-
-			/* Event needed for removing messages of valid changed field */
-			for (const actionParameterInfo of actionParameterInfos) {
-				if (actionParameterInfo.isMultiValue) {
-					actionParameterInfo?.field?.getBinding("items")?.attachChange(() => {
-						_removeMessagesForActionParamter(actionParameterInfo.parameter);
-					});
-				} else {
-					actionParameterInfo?.field?.getBinding("value")?.attachChange(() => {
-						_removeMessagesForActionParamter(actionParameterInfo.parameter);
-					});
-				}
-			}
-
-			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
-			}
-			const oOperationBinding = oDialog.getObjectBinding() as ODataContextBinding;
-			oDialog.open();
-		} catch (oError: unknown) {
-			reject(oError);
-		}
-	});
-}
-
-function _getActionParameterActionName(
-	resourceModel: ResourceModel,
-	sActionLabel: string | undefined,
-	sActionName: string,
-	sEntitySetName: string | undefined
-): string {
-	let boundActionName: string = sActionName;
-	const aActionName = boundActionName.split(".");
-	boundActionName = boundActionName.includes(".") ? aActionName[aActionName.length - 1] : boundActionName;
-	const suffixResourceKey = boundActionName && sEntitySetName ? `${sEntitySetName}|${boundActionName}` : "";
-	const sKey = "ACTION_PARAMETER_DIALOG_ACTION_NAME";
-	const bResourceKeyExists = resourceModel.checkIfResourceKeyExists(`${sKey}|${suffixResourceKey}`);
-	if (sActionLabel) {
-		if (bResourceKeyExists) {
-			return resourceModel.getText(sKey, undefined, suffixResourceKey);
-		} else if (resourceModel.checkIfResourceKeyExists(`${sKey}|${sEntitySetName}`)) {
-			return resourceModel.getText(sKey, undefined, `${sEntitySetName}`);
-		} else if (resourceModel.checkIfResourceKeyExists(`${sKey}`)) {
-			return resourceModel.getText(sKey);
-		} else {
-			return sActionLabel;
-		}
-	} else {
-		return resourceModel.getText("C_COMMON_DIALOG_OK");
-	}
-}
-
 async function executeDependingOnSelectedContexts(
 	oAction: ODataContextBinding,
 	mParameters: ShowActionDialogParameters,
@@ -1773,7 +1024,6 @@ async function executeDependingOnSelectedContexts(
 }
 /**
  * Updates the strictHandling utilities with the failed and successful transition messages.
- *
  * @param action Action executed
  * @param groupId GroupId of the batch
  * @param strictHandlingUtilities Utility flags and messages for strictHandling
@@ -1835,7 +1085,7 @@ function createinternalOperationsPromiseForActionExecution(): {
 async function _executeAction(
 	oAppComponent: AppComponent,
 	mParameters: ShowActionDialogParameters,
-	oParentControl: View,
+	oParentControl: Control,
 	messageHandler: MessageHandler,
 	strictHandlingUtilities: StrictHandlingUtilities,
 	ignoreETag?: boolean
@@ -1994,7 +1244,10 @@ async function _executeAction(
 				await Promise.allSettled(aChangeSetLocalPromises);
 				if (strictHandlingUtilities.strictHandlingPromises.length) {
 					try {
-						if (!messageHandling.hasTransitionErrorsOrWarnings()) {
+						if (
+							!messageHandling.hasTransitionErrorsOrWarnings() &&
+							strictHandlingUtilities.strictHandlingWarningMessages.length
+						) {
 							await operationsHelper.renderMessageView(
 								mParameters,
 								resourceModel,
@@ -2055,14 +1308,20 @@ async function _executeAction(
 				}, Promise.resolve());
 
 				if (strictHandlingUtilities.strictHandlingPromises.length) {
-					await operationsHelper.renderMessageView(
-						mParameters,
-						resourceModel,
-						messageHandler,
-						strictHandlingUtilities.strictHandlingWarningMessages,
-						strictHandlingUtilities,
-						aContexts.length > 1
-					);
+					if (strictHandlingUtilities.strictHandlingWarningMessages.length) {
+						await operationsHelper.renderMessageView(
+							mParameters,
+							resourceModel,
+							messageHandler,
+							strictHandlingUtilities.strictHandlingWarningMessages,
+							strictHandlingUtilities,
+							aContexts.length > 1
+						);
+					} else {
+						strictHandlingUtilities.strictHandlingPromises.forEach(function (shPromise) {
+							shPromise.resolve(false);
+						});
+					}
 				}
 				fnHandleResults();
 			}
@@ -2151,11 +1410,6 @@ async function _executeAction(
 			});
 	}
 }
-function _getPath(oActionContext: Context, sActionName: string): string {
-	let sPath = oActionContext.getPath();
-	sPath = oActionContext.getObject("$IsBound") ? sPath.split("@$ui5.overload")[0] : sPath.split("/0")[0];
-	return sPath.split(`/${sActionName}`)[0];
-}
 
 function _valuesProvidedForAllMandatoryParameters(
 	isCreateAction: boolean,
@@ -2249,7 +1503,6 @@ async function fnRequestSideEffects(
 
 /**
  * Static functions to call OData actions (bound/import) and functions (bound/import)
- *
  * @namespace
  * @experimental This module is only for experimental use! <br/><b>This is only a POC and maybe deleted</b>
  * @since 1.56.0
@@ -2262,10 +1515,10 @@ const operations = {
 	executeDependingOnSelectedContexts: executeDependingOnSelectedContexts,
 	createinternalOperationsPromiseForActionExecution: createinternalOperationsPromiseForActionExecution,
 	valuesProvidedForAllMandatoryParameters: _valuesProvidedForAllMandatoryParameters,
-	getActionParameterActionName: _getActionParameterActionName,
 	actionParameterShowMessageCallback: actionParameterShowMessageCallback,
 	afterActionResolution: afterActionResolution,
-	fnRequestSideEffects: fnRequestSideEffects
+	fnRequestSideEffects: fnRequestSideEffects,
+	checkParameterTypeAndReturnConvertedValue: checkParameterTypeAndReturnConvertedValue
 };
 
 export default operations;