@sapui5/sap.fe.core 1.127.2 → 1.129.0

package/src/sap/fe/core/controllerextensions/messageHandler/messageHandling.ts

@@ -4,6 +4,7 @@ import type { CustomMessage } from "sap/fe/core/controllerextensions/MessageHand
 import { getResourceModel } from "sap/fe/core/helpers/ResourceModelHelper";
 import type FieldAPI from "sap/fe/macros/field/FieldAPI";
 import type TableAPI from "sap/fe/macros/table/TableAPI";
+import type { TableColumnProperties } from "sap/fe/macros/table/TableAPI";
 import type TableDelegate from "sap/fe/macros/table/delegates/TableDelegate";
 import Bar from "sap/m/Bar";
 import Button from "sap/m/Button";
@@ -23,8 +24,8 @@ import IconPool from "sap/ui/core/IconPool";
 import Library from "sap/ui/core/Lib";
 import Messaging from "sap/ui/core/Messaging";
 import DateFormat from "sap/ui/core/format/DateFormat";
-import CoreLib from "sap/ui/core/library";
 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 type MDCTable from "sap/ui/mdc/Table";
 import type Column from "sap/ui/mdc/table/Column";
@@ -45,7 +46,6 @@ import type ObjectPageSubSection from "sap/uxap/ObjectPageSubSection";
 import type { AnnotationTableColumn, CustomBasedTableColumn, TableColumn } from "../../converters/controls/Common/Table";
 
 const ButtonType = MLib.ButtonType;
-const MessageType = CoreLib.MessageType;
 let aResolveFunctions: ((param1: void | Dialog) => void)[] = [];
 let dialogControl: Dialog;
 let oBackButton: Button;
@@ -75,11 +75,21 @@ type ColumnInfoType = {
 	sColumnIndicator: string;
 };
 
+export type SupportedUIElement = "Dialog" | "Box" | "Toast" | "None";
+
+// FE related technical information to be stored with the message.
+// Like, this would be used to store pre-text with the message when it is the only message to be shown in UI.
+type FEMessageTechnicalDetails = object & {
+	fe?: {
+		changeSetPreTextForSingleError?: string;
+		singleErrorPreText?: string;
+	};
+};
+
 export type MessageUIDecisions = {
-	uiElementToUse: "Dialog" | "Box" | "Toast" | "None";
+	uiElementToUse: SupportedUIElement;
 	messagesToShow: Message[];
 	containsBoundTransition: boolean;
-	showChangeSetErrorDialog: boolean;
 	contextNeedsEtagRefresh?: ODataV4Context;
 };
 
@@ -94,7 +104,8 @@ export type messageHandlingType = {
 		control?: Control,
 		actionName?: string | undefined,
 		onBeforeShowMessage?: (messages: Message[], showMessageParameters: ShowMessageParameters) => ShowMessageParameters,
-		viewType?: string
+		viewType?: string,
+		showStateMessages?: boolean
 	) => MessageUIDecisions;
 	showMessagesInUI: (uiDecision: MessageUIDecisions) => Promise<void>;
 	removeUnboundTransitionMessages: () => void;
@@ -153,19 +164,13 @@ export type messageHandlingType = {
 	) => string | null | undefined;
 	determineColumnInfo: (oColFromTableSettings: TableColumn | undefined, resourceModel: ResourceModel) => ColumnInfoType;
 	fetchColumnInfo: (oMessage: MessageWithHeader, oTable: MDCTable) => TableColumn | undefined;
-	getTableFirstColBindingContextForTextAnnotation: (
-		oTable: MDCTable,
-		oTableRowContext: ODataV4Context | undefined,
-		sTableFirstColProperty: string
+	getTableColBindingContextForTextAnnotation: (
+		table: MDCTable,
+		tableRowContext: ODataV4Context | undefined,
+		tableColProperty: TableColumnProperties
 	) => Context | null | undefined;
 	getMessageRank: (obj: MessageWithHeader) => number;
 	fnCallbackSetGroupName: (aMessage: MessageWithHeader, sActionName: string | undefined, bIsGeneralGroupName?: boolean) => void;
-	getTableFirstColValue: (
-		sTableFirstColProperty: string,
-		oTableRowContext: Context,
-		sTextAnnotationPath: string,
-		sTextArrangement: string
-	) => string;
 	setGroupNameOPDisplayMode: (aModelData: MessageWithHeader, sActionName: string | undefined, control: View) => void;
 	updateMessageObjectGroupName: (
 		messagesToShow: MessageWithHeader[],
@@ -177,10 +182,29 @@ export type messageHandlingType = {
 	isControlInTable: (oTable: MDCTable, sControlId: string) => UI5Element[] | boolean;
 	isControlPartOfCreationRow: (oControl: UI5Element | undefined) => boolean;
 	removeMessageShownInMessageStrip: (transientMessages: Message[], context: Context) => Message[];
-	getFiltersForMessages: (showBoundTransition: boolean) => Filter[];
+	getFiltersForMessages: (showBoundTransition: boolean, showStateMessages?: boolean) => Filter[];
 	showMessageToast: (message: Message) => Promise<void>;
 	showMessageDialogControl: (uiDecisions: MessageUIDecisions, runToTest?: boolean) => Promise<void | Dialog>;
 	showMessageBoxControl: (uiDecisions: MessageUIDecisions) => Promise<void>;
+	getMessagesForContext: (context: ODataV4Context) => Message[];
+	isMessageOutOfParameterDialog: (aControlIds: string[]) => boolean;
+	removeContextMessagesfromModel: (messages?: Message[], context?: Context[]) => void;
+	removeMessagesForActionParameterDialog: (Messages: Message[]) => Message[];
+	setGroupNameOPTableDisplayMode(
+		subsection: ObjectPageSubSection,
+		mdcTable: MDCTable,
+		message: MessageWithHeader,
+		viewContext: Context | null | undefined,
+		groupNameIsGeneral: boolean,
+		actionName?: string
+	): boolean;
+	updateAddtionalTextForMessageInOPTable(mdcTable: MDCTable, message: MessageWithHeader, targetTableInfo: TargetTableInfoType): void;
+	updateHeaderNameForMessageInOPTable(
+		subsection: ObjectPageSubSection,
+		mdcTable: MDCTable,
+		message: MessageWithHeader,
+		targetTableInfo: TargetTableInfoType
+	): void;
 };
 
 function fnFormatTechnicalDetails(): string {
@@ -241,11 +265,10 @@ function fnFormatDescription(): string {
 }
 /**
  * Calculates the highest priority message type(Error/Warning/Success/Information) from the available messages.
- *
  * @param [aMessages] Messages list
  * @returns Highest priority message from the available messages
  */
-function fnGetHighestMessagePriority(aMessages: MessageItem[]): CoreLib.MessageType {
+function fnGetHighestMessagePriority(aMessages: MessageItem[]): MessageType {
 	let sMessagePriority = MessageType.None;
 	const iLength = aMessages.length;
 	const oMessageCount = { Error: 0, Warning: 0, Success: 0, Information: 0 };
@@ -342,7 +365,6 @@ function getRetryAfterMessage(oMessage: Message, bMessageDialog?: boolean): stri
 
 /**
  * Checks if there are any warning or error messages(bound and unbound)..
- *
  * @returns Boolean indicating existence of messages
  */
 function hasTransitionErrorsOrWarnings(): boolean {
@@ -427,6 +449,7 @@ export type ShowMessageParameters = {
 	showChangeSetErrorDialog?: boolean;
 	filteredMessages?: Message[];
 	fnGetMessageSubtitle?: Function;
+	containsBoundTransistion?: boolean;
 };
 
 function isNonTechnicalMessage(message: Message): boolean {
@@ -444,41 +467,40 @@ function isNonTechnicalMessage(message: Message): boolean {
 
 /**
  * Get transition messages for creating the UI decision to show messages.
- *
  * @param showBoundTransition Should bound transition messages be shown.
- * @param context Binding context of the page.
+ * @param _context Binding context of the page.
  * @returns Transition messages relevant to show in UI.
  */
-function getTransitionMessagesForUIDecision(this: messageHandlingType, showBoundTransition: boolean, context: ODataV4Context): Message[] {
+function getTransitionMessagesForUIDecision(this: messageHandlingType, showBoundTransition: boolean, _context: ODataV4Context): Message[] {
 	let transitionMessages = this.getMessages();
 	if (showBoundTransition) {
 		//bound Transistion Messages
-		transitionMessages = transitionMessages.concat(getMessages(true, true));
+		transitionMessages = transitionMessages.concat(this.getMessages(true, true));
 	}
 	return transitionMessages;
 }
 
 /**
  * Execute 'onBeforeShowMessages' callback to let the caller influence the UI decision to show messages.
- *
  * @param transitionMessages Transition messages.
  * @param onBeforeShowMessage Callback.
- * @returns Infromation to change UI decision based on onBeforeShowMessages callback implementation.
+ * @returns ShowMessageParameters Infromation to change UI decision based on onBeforeShowMessages callback implementation.
  */
 function executeOnBeforeShowMessages(
 	transitionMessages: MessageWithHeader[],
 	onBeforeShowMessage?: (messages: Message[], showMessageParameters: ShowMessageParameters) => ShowMessageParameters
 ): {
-	uiElementToUse: MessageUIDecisions["uiElementToUse"];
+	uiElementToUse: SupportedUIElement;
 	messagesToShow: MessageWithHeader[];
 	fnGetMessageSubtitle?: Function;
 	showChangeSetErrorDialog?: boolean;
+	containsBoundTransition?: boolean;
 } {
 	let messagesToShow = [...transitionMessages];
-	let uiElementToUse: MessageUIDecisions["uiElementToUse"] =
+	let uiElementToUse: SupportedUIElement =
 		transitionMessages.length === 1 && transitionMessages[0].getCode() === "503" ? "Box" : "Dialog";
 	let fnGetMsgSubtitle: Function | undefined;
-	let changeSetErrorDialog: boolean | undefined;
+	let showBoundMessages: boolean | undefined;
 
 	if (onBeforeShowMessage) {
 		// The callback onBeforeShowMessage alters the UIElement to use in a different format(showMessageDialog and showMessageBox).
@@ -486,10 +508,14 @@ function executeOnBeforeShowMessages(
 			showMessageDialog: uiElementToUse === "Dialog",
 			showMessageBox: uiElementToUse === "Box"
 		};
-		const { showMessageBox, showMessageDialog, showChangeSetErrorDialog, filteredMessages, fnGetMessageSubtitle } = onBeforeShowMessage(
-			transitionMessages,
-			showMessageParameters
-		);
+		const {
+			showMessageBox,
+			showMessageDialog,
+			showChangeSetErrorDialog,
+			filteredMessages,
+			fnGetMessageSubtitle,
+			containsBoundTransistion
+		} = onBeforeShowMessage(transitionMessages, showMessageParameters);
 		if (showMessageBox === true) {
 			uiElementToUse = "Box";
 		} else if (showMessageDialog === true) {
@@ -497,10 +523,10 @@ function executeOnBeforeShowMessages(
 		} else {
 			uiElementToUse = "None";
 		}
+		showBoundMessages = containsBoundTransistion;
 		fnGetMsgSubtitle = fnGetMessageSubtitle;
-		changeSetErrorDialog = showChangeSetErrorDialog ?? false;
-		if (uiElementToUse === "Dialog" || changeSetErrorDialog) {
-			messagesToShow = filteredMessages ? filteredMessages : messagesToShow;
+		if (showChangeSetErrorDialog || containsBoundTransistion === false) {
+			messagesToShow = filteredMessages ?? [];
 		}
 	}
 
@@ -508,7 +534,7 @@ function executeOnBeforeShowMessages(
 		uiElementToUse,
 		messagesToShow,
 		fnGetMessageSubtitle: fnGetMsgSubtitle,
-		showChangeSetErrorDialog: changeSetErrorDialog
+		containsBoundTransition: showBoundMessages
 	};
 }
 
@@ -519,7 +545,6 @@ function executeOnBeforeShowMessages(
  * It would also hold information for after process like..
  * 1. refresh context due to etag mismatch.
  * 2. do we show bound messages and hence clear them after we show the UI element.
- *
  * @param customMessages Custom messages to add to message model and show.
  * @param context Binding context of the page.
  * @param showBoundTransition Should bound transition messages be shown.
@@ -528,6 +553,7 @@ function executeOnBeforeShowMessages(
  * @param actionName Name of the action whose process requested for messages to be shown.
  * @param onBeforeShowMessage Callback to influence UI decision before creating final UI decision.
  * @param viewType View type, list report or object page.
+ * @param showStateMessages Should state messages be shown.
  * @returns UI decisions used to show messages.
  */
 function getUIDecisions(
@@ -539,7 +565,8 @@ function getUIDecisions(
 	control?: Control,
 	actionName?: string | undefined,
 	onBeforeShowMessage?: (messages: Message[], showMessageParameters: ShowMessageParameters) => ShowMessageParameters,
-	viewType?: string
+	viewType?: string,
+	showStateMessages = false
 ): MessageUIDecisions {
 	// Add Custom messages
 	// TODO: Will these messages be part of transitionMessages?
@@ -551,22 +578,33 @@ function getUIDecisions(
 	const transitionMessages = getTransitionMessagesForUIDecision.call(this, showBoundTransition, context);
 
 	// UI representation of the Dialog
-	let uiElementToUse: MessageUIDecisions["uiElementToUse"] = "Dialog";
 	const uiDecisionIntermittent = executeOnBeforeShowMessages.call(this, transitionMessages, onBeforeShowMessage);
-	let { messagesToShow } = uiDecisionIntermittent;
-	uiElementToUse = uiDecisionIntermittent.uiElementToUse;
+	let { messagesToShow, uiElementToUse = "Dialog" } = uiDecisionIntermittent;
 	// Get Filters for Unbound Messages
-	const filters = getFiltersForMessages(showBoundTransition);
+	showBoundTransition = uiDecisionIntermittent.containsBoundTransition ?? showBoundTransition;
+	const filters = getFiltersForMessages(showBoundTransition, showStateMessages);
 	messagesToShow = getMessagesToShow(filters, messagesToShow ?? []);
 	// handle context bound messages, If there is a single message of which is bounded to the context then remove that from the dialog
 	messagesToShow = removeMessageShownInMessageStrip(messagesToShow, context);
-	if (messagesToShow.length > 0) {
-		if (messagesToShow.length === 1 && messagesToShow[0].getType() === MessageType.Success) {
-			uiElementToUse = "Toast";
-		}
-		if (uiElementToUse === "Dialog") {
-			messageHandling.updateMessageObjectGroupName(messagesToShow, control, actionName, viewType);
+	({ messagesToShow, uiElementToUse } = processMessagesFromChangesetFailure({ messagesToShow, uiElementToUse }));
+	// Modify ETag Messages
+	const hasEtagMessage = this.modifyETagMessagesOnly(Library.getResourceBundleFor("sap.fe.core")!, concurrentEditFlag);
+
+	if (messagesToShow.length > 0 && uiElementToUse !== "None") {
+		if (messagesToShow.length === 1) {
+			const messageToShow = messagesToShow[0];
+			if (messageToShow.getType() === MessageType.Success) {
+				uiElementToUse = "Toast";
+			} else if (hasEtagMessage || messageToShow.getDescription()?.length || messageToShow.getDescriptionUrl()?.length) {
+				uiElementToUse = "Dialog";
+			} else {
+				// We would show single message in message box only when:
+				// 1. It is not an Etag message.
+				// 2. There is no message description or description url available for long text.
+				uiElementToUse = "Box";
+			}
 		}
+		messageHandling.updateMessageObjectGroupName(messagesToShow, control, actionName, viewType);
 		const fnGetMessageSubtitle = uiDecisionIntermittent.fnGetMessageSubtitle;
 		if (fnGetMessageSubtitle) {
 			messagesToShow.forEach(function (oMessage: Message) {
@@ -575,21 +613,16 @@ function getUIDecisions(
 		}
 	}
 
-	// Modify ETag Messages
-	const hasEtagMessage = this.modifyETagMessagesOnly(Library.getResourceBundleFor("sap.fe.core")!, concurrentEditFlag);
-
 	return {
 		messagesToShow,
 		uiElementToUse,
 		contextNeedsEtagRefresh: hasEtagMessage ? context : undefined,
-		containsBoundTransition: showBoundTransition,
-		showChangeSetErrorDialog: uiDecisionIntermittent.showChangeSetErrorDialog ?? false
+		containsBoundTransition: showBoundTransition
 	};
 }
 
 /**
  * Show messages in the decided UI Element.
- *
  * @param uiDecisions UI Decision to be used to show the messages.
  * @returns Promise that resolves or rejects based on user interaction with the UI element.
  */
@@ -614,38 +647,18 @@ async function showMessagesInUI(uiDecisions: MessageUIDecisions): Promise<void>
 
 /**
  * Get model filters for getting the relevant messages.
- *
  * @param showBoundTransition Should bound transition messages be shown.
+ * @param showStateMessages Should state messages be shown.
  * @returns Model filters
  */
-function getFiltersForMessages(showBoundTransition: boolean): Filter[] {
-	const filters = [new Filter({ path: "persistent", operator: FilterOperator.NE, value1: false })];
+function getFiltersForMessages(showBoundTransition: boolean, showStateMessages = false): Filter[] {
+	const filters = showStateMessages ? [] : [new Filter({ path: "persistent", operator: FilterOperator.NE, value1: false })];
 	const isNonTechnicalMessageFilter = new Filter({ path: "", test: isNonTechnicalMessage });
-	if (showBoundTransition) {
-		// we only want to show bound transition messages not bound state messages hence add a filter for the same
-		filters.push(new Filter({ path: "persistent", operator: FilterOperator.EQ, value1: true }));
+	if (showStateMessages || showBoundTransition) {
 		const fnCheckControlIdInDialog = function (aControlIds: string[]): boolean {
-			let index = Infinity,
-				oControl = UI5Element.getElementById(aControlIds[0]) as ManagedObject | null;
-			const errorFieldControl = UI5Element.getElementById(aControlIds[0]) as Control;
-			while (oControl) {
-				const fieldRankinDialog =
-					oControl instanceof Dialog
-						? (errorFieldControl.getParent() as Control).findElements(true).indexOf(errorFieldControl)
-						: Infinity;
-				if (oControl instanceof Dialog) {
-					if (index > fieldRankinDialog) {
-						index = fieldRankinDialog;
-						// Set the focus to the dialog's control
-						errorFieldControl.focus();
-					}
-					// messages with target inside sap.m.Dialog should not bring up the message dialog
-					return false;
-				}
-				oControl = oControl.getParent();
-			}
-			return true;
+			return messageHandling.isMessageOutOfParameterDialog(aControlIds);
 		};
+		// Add the filter for state messages or bound transition messages
 		filters.push(
 			new Filter({
 				path: "controlIds",
@@ -653,6 +666,11 @@ function getFiltersForMessages(showBoundTransition: boolean): Filter[] {
 				caseSensitive: true
 			})
 		);
+	}
+
+	if (showBoundTransition) {
+		// we only want to show bound transition messages not bound state messages hence add a filter for the same
+		filters.push(new Filter({ path: "persistent", operator: FilterOperator.EQ, value1: true }));
 		filters.push(isNonTechnicalMessageFilter);
 	} else {
 		// only unbound messages have to be shown so add filter accordingly
@@ -672,9 +690,51 @@ function getFiltersForMessages(showBoundTransition: boolean): Filter[] {
 	return filters;
 }
 
+function processMessagesFromChangesetFailure({
+	messagesToShow,
+	uiElementToUse
+}: Pick<MessageUIDecisions, "uiElementToUse" | "messagesToShow">): Pick<MessageUIDecisions, "uiElementToUse" | "messagesToShow"> {
+	let retMessages = [...messagesToShow];
+	if (messagesToShow.length === 2) {
+		// There are 2 message:
+		// 1. Generic error changeset message added by FE.
+		// 2. Main error message from the interaction.
+		// We remove the generic message, show only an enhanced 'Main error message' with a generic messsage pre-text in the message box.
+		const genericMsgs: Message[] = [];
+		const nonGenericMsgs: Message[] = [];
+		messagesToShow.forEach((message) => {
+			if (message.getCode() === "FE_CUSTOM_MESSAGE_CHANGESET_ALL_FAILED") {
+				genericMsgs.push(message);
+			} else {
+				nonGenericMsgs.push(message);
+			}
+		});
+		if (genericMsgs.length === 1) {
+			const { fe: feTechnicalDetails } = (genericMsgs[0].getTechnicalDetails() || {}) as FEMessageTechnicalDetails;
+			if (feTechnicalDetails?.changeSetPreTextForSingleError) {
+				const preText = feTechnicalDetails?.changeSetPreTextForSingleError;
+				if (preText) {
+					const techDetailsForNonGenericMessage: FEMessageTechnicalDetails = {
+						fe: {
+							singleErrorPreText: preText
+						}
+					};
+					const existingTechDetails = nonGenericMsgs[0].getTechnicalDetails() ?? {};
+					// combine existing technical details if any, with the change set information we want to add.
+					nonGenericMsgs[0].setTechnicalDetails({ ...existingTechDetails, ...techDetailsForNonGenericMessage });
+					retMessages = nonGenericMsgs;
+				}
+			}
+		}
+	}
+	return {
+		messagesToShow: retMessages,
+		uiElementToUse: retMessages.length === 1 && uiElementToUse !== "None" ? "Box" : uiElementToUse
+	};
+}
+
 /**
  * Add the custom messages to message model.
- *
  * @param customMessages Custom messages to add.
  */
 function addCustomMessages(customMessages: CustomMessage[]): void {
@@ -815,38 +875,74 @@ async function showMessageDialogControl(uiDecision: MessageUIDecisions, runToTes
 
 async function showMessageBoxControl(uiDecision: MessageUIDecisions): Promise<void> {
 	return new Promise(function (resolve) {
-		const { messagesToShow, showChangeSetErrorDialog, containsBoundTransition } = uiDecision;
+		const { messagesToShow } = uiDecision;
 		const messageToShow = messagesToShow[0];
 		const messageTechnicalDetails = messageToShow.getTechnicalDetails() as MessageTechnicalDetails | undefined;
-		if (messageTechnicalDetails || showChangeSetErrorDialog) {
+		const retryAfterMessage = messageHandling.getRetryAfterMessage(messageToShow, true);
+		// If it is a retry message, then it needs to have technical details to show it.
+		const showMessageBox = retryAfterMessage ? messageTechnicalDetails : true;
+		if (showMessageBox) {
 			let formattedTextString = "<html><body>";
-			const retryAfterMessage = getRetryAfterMessage(messageToShow, true);
+
+			// Adding pre-text for the messages
 			if (retryAfterMessage) {
-				formattedTextString = `<h6>${retryAfterMessage}</h6><br>`;
+				formattedTextString = `${formattedTextString}<h6>${retryAfterMessage}</h6><br/>`;
+			} else {
+				const singleErrorPreText = (messageTechnicalDetails as FEMessageTechnicalDetails)?.fe?.singleErrorPreText;
+				if (singleErrorPreText) {
+					const messageHeader = (messageToShow as MessageWithHeader)?.["headerName"]
+						? `${(messageToShow as MessageWithHeader)?.["headerName"]}:`
+						: "";
+					formattedTextString = `${formattedTextString}${singleErrorPreText}<br/><br/>${messageHeader} `;
+				}
 			}
+
+			// Adding the main error message.
 			if (messageToShow.getCode() !== "503" && messageToShow.getAdditionalText() !== undefined) {
 				formattedTextString = `${
 					formattedTextString + messageToShow.getAdditionalText()
-				}: ${messageToShow.getMessage()}</html></body>`;
+				}: ${messageToShow.getMessage()}</body></html>`;
 			} else {
-				formattedTextString = `${formattedTextString + messageToShow.getMessage()}</html></body>`;
+				formattedTextString = `${formattedTextString + messageToShow.getMessage()}</body></html>`;
 			}
 			const formattedText = new FormattedText({
 				htmlText: formattedTextString
 			});
-			MessageBox.error(formattedText as unknown as string, {
-				onClose: function () {
-					if (containsBoundTransition) {
-						removeBoundTransitionMessages();
-					}
-					removeUnboundTransitionMessages();
-					resolve(undefined);
-				}
-			});
+
+			const closeMessageBox = function (): void {
+				Messaging.removeMessages(messageToShow);
+				resolve(undefined);
+			};
+			showMessageBoxPerType(
+				formattedText as unknown as string,
+				{
+					onClose: closeMessageBox
+				},
+				messageToShow
+			);
 		}
 	});
 }
 
+function showMessageBoxPerType(formattedText: string, close: { onClose: Function }, message: Message): void {
+	switch (message.getType()) {
+		case MessageType.Error:
+			MessageBox.error(formattedText, close);
+			break;
+		case MessageType.Warning:
+			MessageBox.warning(formattedText, close);
+			break;
+		case MessageType.Success:
+			MessageBox.success(formattedText, close);
+			break;
+		case MessageType.Information:
+			MessageBox.information(formattedText, close);
+			break;
+		default:
+			MessageBox.show(formattedText, close);
+	}
+}
+
 function removeMessageShownInMessageStrip(transitionMessages: Message[], context: Context): Message[] {
 	const boundContextMessages: Message[] = [];
 	transitionMessages?.forEach((message: Message) => {
@@ -863,7 +959,6 @@ function removeMessageShownInMessageStrip(transitionMessages: Message[], context
 }
 /**
  * This function sets the group name for all messages in a dialog.
- *
  * @param aModelDataArray Messages array
  * @param control
  * @param sActionName
@@ -897,7 +992,6 @@ function updateMessageObjectGroupName(
 
 /**
  * This function will set the group name of Message Object for LR table.
- *
  * @param oElem
  * @param aModelData
  * @param sActionName
@@ -930,9 +1024,93 @@ function setGroupNameLRTable(oElem: Control | undefined, aModelData: MessageWith
 	}
 }
 
+function updateAddtionalTextForMessageInOPTable(
+	mdcTable: MDCTable,
+	message: MessageWithHeader,
+	targetTableInfo: TargetTableInfoType
+): void {
+	const identifierColumn = (mdcTable.getParent() as TableAPI).getIdentifierColumn() as string;
+	if (identifierColumn) {
+		const allRowContexts = mdcTable.getRowBinding().getContexts();
+		allRowContexts.forEach((rowContext: Context) => {
+			if (message.target?.includes(rowContext.getPath())) {
+				const rowIdentifier = identifierColumn ? rowContext.getObject()[identifierColumn] : undefined;
+				const columnNameSuffix = targetTableInfo.sTableTargetColName ? `, ${targetTableInfo.sTableTargetColName}` : "";
+				message["additionalText"] = `${rowIdentifier}${columnNameSuffix}`;
+			}
+		});
+	} else {
+		message["additionalText"] = `${targetTableInfo.sTableTargetColName}`;
+	}
+}
+
+function updateHeaderNameForMessageInOPTable(
+	subsection: ObjectPageSubSection,
+	mdcTable: MDCTable,
+	message: MessageWithHeader,
+	targetTableInfo: TargetTableInfoType
+): void {
+	let headerName = mdcTable.getHeaderVisible() && targetTableInfo.tableHeader;
+	if (!headerName) {
+		headerName = subsection.getTitle();
+	} else {
+		const oResourceBundle = Library.getResourceBundleFor("sap.fe.core")!;
+		headerName = `${oResourceBundle.getText("T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR")}: ${headerName}`;
+	}
+	message["headerName"] = headerName;
+}
+
+/**
+ * This function sets the group name of the message object on the object page in display mode.
+ * @param subsection Subsection
+ * @param mdcTable  MDC table
+ * @param message Message
+ * @param viewContext View's binding context
+ * @param groupNameIsGeneral Is present group name 'General'
+ * @param actionName Action name
+ * @returns If group name is 'General'
+ */
+function setGroupNameOPTableDisplayMode(
+	subsection: ObjectPageSubSection,
+	mdcTable: MDCTable,
+	message: MessageWithHeader,
+	viewContext: Context | null | undefined,
+	groupNameIsGeneral: boolean,
+	actionName?: string
+): boolean {
+	const oRowBinding = mdcTable.getRowBinding(),
+		setSectionNameInGroup = true;
+	let childTableElement: UI5Element | undefined;
+
+	mdcTable.findElements(true).forEach((oElement) => {
+		if (oElement.isA<Table>("sap.m.Table") || oElement.isA<UITable>("sap.ui.table.Table")) {
+			childTableElement = oElement;
+		}
+	});
+	if (oRowBinding) {
+		const sElemeBindingPath = `${viewContext?.getPath()}/${mdcTable.getRowBinding()?.getPath()}`;
+		if (message.target?.indexOf(sElemeBindingPath) === 0) {
+			const obj = messageHandling.getTableColumnDataAndSetSubtile(
+				message,
+				mdcTable,
+				childTableElement,
+				oRowBinding,
+				actionName,
+				setSectionNameInGroup,
+				fnCallbackSetGroupName
+			);
+			const { oTargetTableInfo } = obj;
+
+			messageHandling.updateAddtionalTextForMessageInOPTable(mdcTable, message, oTargetTableInfo);
+			messageHandling.updateHeaderNameForMessageInOPTable(subsection, mdcTable, message, oTargetTableInfo);
+			groupNameIsGeneral = false;
+		}
+	}
+	return groupNameIsGeneral;
+}
+
 /**
  * This function will set the group name of Message Object in OP Display mode.
- *
  * @param aModelData Message Object
  * @param sActionName  Action name
  * @param control
@@ -947,57 +1125,14 @@ function setGroupNameOPDisplayMode(aModelData: MessageWithHeader, sActionName: s
 			subSections.forEach(function (oSubSection: ObjectPageSubSection) {
 				oSubSection.findElements(true).forEach(function (oElem) {
 					if (oElem.isA<MDCTable>("sap.ui.mdc.Table")) {
-						const oRowBinding = oElem.getRowBinding(),
-							setSectionNameInGroup = true;
-						let childTableElement: UI5Element | undefined;
-
-						oElem.findElements(true).forEach((oElement) => {
-							if (oElement.isA<Table>("sap.m.Table") || oElement.isA<UITable>("sap.ui.table.Table")) {
-								childTableElement = oElement;
-							}
-						});
-						if (oRowBinding) {
-							const sElemeBindingPath = `${oViewContext?.getPath()}/${oElem.getRowBinding()?.getPath()}`;
-							if (aModelData.target?.indexOf(sElemeBindingPath) === 0) {
-								const obj = messageHandling.getTableColumnDataAndSetSubtile(
-									aModelData,
-									oElem,
-									childTableElement,
-									oRowBinding,
-									sActionName,
-									setSectionNameInGroup,
-									fnCallbackSetGroupName
-								);
-								const { oTargetTableInfo } = obj;
-
-								if (setSectionNameInGroup) {
-									const identifierColumn = (oElem.getParent() as TableAPI).getIdentifierColumn() as string;
-									if (identifierColumn) {
-										const allRowContexts = oElem.getRowBinding().getContexts();
-										allRowContexts.forEach((rowContext: Context) => {
-											if (aModelData.target?.includes(rowContext.getPath())) {
-												const rowIdentifier = identifierColumn
-													? rowContext.getObject()[identifierColumn]
-													: undefined;
-												aModelData["additionalText"] = `${rowIdentifier}, ${oTargetTableInfo.sTableTargetColName}`;
-											}
-										});
-									} else {
-										aModelData["additionalText"] = `${oTargetTableInfo.sTableTargetColName}`;
-									}
-
-									let headerName = oElem.getHeaderVisible() && oTargetTableInfo.tableHeader;
-									if (!headerName) {
-										headerName = oSubSection.getTitle();
-									} else {
-										const oResourceBundle = Library.getResourceBundleFor("sap.fe.core")!;
-										headerName = `${oResourceBundle.getText("T_MESSAGE_GROUP_TITLE_TABLE_DENOMINATOR")}: ${headerName}`;
-									}
-									aModelData["headerName"] = headerName;
-									bIsGeneralGroupName = false;
-								}
-							}
-						}
+						bIsGeneralGroupName = setGroupNameOPTableDisplayMode(
+							oSubSection,
+							oElem,
+							aModelData,
+							oViewContext,
+							bIsGeneralGroupName,
+							sActionName
+						);
 					}
 				});
 			});
@@ -1023,23 +1158,23 @@ function getLastActionTextAndActionName(sActionName: string | undefined): string
 /**
  * This function will give rank based on Message Group/Header name, which will be used for Sorting messages in Message dialog
  * Last Action should be shown at top, next Row Id and last General.
- *
  * @param obj
  * @returns Rank of message
  */
 function getMessageRank(obj: MessageWithHeader): number {
-	if (obj.headerName?.toString().includes("Last Action")) {
+	if (obj.getCode() === "FE_CUSTOM_MESSAGE_CHANGESET_ALL_FAILED") {
 		return 1;
+	} else if (obj.headerName?.toString().includes("Last Action")) {
+		return 2;
 	} else if (obj.headerName?.toString().includes("General")) {
-		return 3;
+		return 4;
 	} else {
-		return 2;
+		return 3;
 	}
 }
 
 /**
  * This function will set the group name which can either General or Last Action.
- *
  * @param aMessage
  * @param sActionName
  * @param bIsGeneralGroupName
@@ -1054,7 +1189,6 @@ const fnCallbackSetGroupName = (aMessage: MessageWithHeader, sActionName: string
 
 /**
  * This function will get the table row/column info and set subtitle.
- *
  * @param aMessage
  * @param oTable
  * @param oElement
@@ -1110,185 +1244,131 @@ function getTableColumnDataAndSetSubtile(
 
 /**
  * This function will create the subtitle based on Table Row/Column data.
- *
  * @param message
- * @param oTableRowBindingContexts
- * @param oTableRowContext
- * @param sTableTargetColName
- * @param oTable
- * @param bIsCreationRow
- * @param oTargetedControl
+ * @param tableRowBindingContexts
+ * @param tableRowContext
+ * @param tableTargetColName
+ * @param table
+ * @param isCreationRow
+ * @param targetedControl
  * @returns Message subtitle.
  */
 function getMessageSubtitle(
 	message: MessageWithHeader,
-	oTableRowBindingContexts: Context[],
-	oTableRowContext: ODataV4Context | undefined,
-	sTableTargetColName: string | undefined,
-	oTable: MDCTable,
-	bIsCreationRow: boolean | undefined,
-	oTargetedControl?: Control
+	tableRowBindingContexts: Context[],
+	tableRowContext: ODataV4Context | undefined,
+	tableTargetColName: string | undefined,
+	table: MDCTable,
+	isCreationRow: boolean | undefined,
+	targetedControl?: Control
 ): string | null | undefined {
-	let sMessageSubtitle;
-	let sRowSubtitleValue;
-	const resourceModel = getResourceModel(oTable);
-	const sTableFirstColProperty = (oTable.getParent() as TableAPI).getIdentifierColumn() as string;
-	const oColFromTableSettings = messageHandling.fetchColumnInfo(message, oTable);
-	if (bIsCreationRow || oTableRowContext?.isInactive()) {
-		sMessageSubtitle = resourceModel.getText("T_MESSAGE_ITEM_SUBTITLE", [
+	let messageSubtitle;
+	let rowSubtitleValue;
+	const resourceModel = getResourceModel(table);
+	const tableColProperty = (table.getParent() as TableAPI)?.getTableColumnVisibilityInfo();
+	const colFromTableSettings = messageHandling.fetchColumnInfo(message, table);
+	if (isCreationRow || tableRowContext?.isInactive()) {
+		messageSubtitle = resourceModel.getText("T_MESSAGE_ITEM_SUBTITLE", [
 			resourceModel.getText("T_MESSAGE_ITEM_SUBTITLE_CREATION_ROW_INDICATOR"),
-			sTableTargetColName ? sTableTargetColName : (oColFromTableSettings as AnnotationTableColumn).label
+			tableTargetColName ? tableTargetColName : (colFromTableSettings as AnnotationTableColumn).label
 		]);
 	} else {
-		const oTableFirstColBindingContextTextAnnotation = messageHandling.getTableFirstColBindingContextForTextAnnotation(
-			oTable,
-			oTableRowContext,
-			sTableFirstColProperty
+		const tableColBindingContextTextAnnotation = messageHandling.getTableColBindingContextForTextAnnotation(
+			table,
+			tableRowContext,
+			tableColProperty
 		);
-		const sTableFirstColTextAnnotationPath = oTableFirstColBindingContextTextAnnotation
-			? oTableFirstColBindingContextTextAnnotation.getObject("$Path")
+		const tableColTextAnnotationPath = tableColBindingContextTextAnnotation
+			? tableColBindingContextTextAnnotation.getObject("$Path")
 			: undefined;
-		const sTableFirstColTextArrangement =
-			sTableFirstColTextAnnotationPath && oTableFirstColBindingContextTextAnnotation
-				? oTableFirstColBindingContextTextAnnotation.getObject("@com.sap.vocabularies.UI.v1.TextArrangement/$EnumMember")
+		const tableColTextArrangement =
+			tableColTextAnnotationPath && tableColBindingContextTextAnnotation
+				? tableColBindingContextTextAnnotation.getObject("@com.sap.vocabularies.UI.v1.TextArrangement/$EnumMember")
 				: undefined;
-		if (oTableRowBindingContexts.length > 0) {
+		if (tableRowBindingContexts.length > 0) {
 			// set Row subtitle text
-			if (oTargetedControl) {
+			if (targetedControl) {
 				// The UI error is on the first column, we then get the control input as the row indicator:
-				sRowSubtitleValue = (oTargetedControl as FieldAPI).getValue();
-			} else if (oTableRowContext && sTableFirstColProperty) {
-				sRowSubtitleValue = messageHandling.getTableFirstColValue(
-					sTableFirstColProperty,
-					oTableRowContext,
-					sTableFirstColTextAnnotationPath,
-					sTableFirstColTextArrangement
+				rowSubtitleValue = (targetedControl as FieldAPI).getValue();
+			} else if (tableRowContext && tableColProperty && tableColProperty.length === 1) {
+				// Getting the column label and its value of a single row
+				rowSubtitleValue = (table.getParent() as TableAPI)?.getTableColValue(
+					tableRowContext,
+					tableColTextAnnotationPath,
+					tableColTextArrangement,
+					tableColProperty
 				);
+			} else if (tableRowContext && tableColProperty && tableColProperty.length > 1) {
+				// If there are multiple rows, the subtitle is displayed as ‘See message details’
+				rowSubtitleValue = resourceModel.getText("T_MESSAGE_ITEM_SUBTITLE_DETAILED_ROW_INFO");
 			} else {
-				sRowSubtitleValue = undefined;
+				rowSubtitleValue = undefined;
 			}
 			// set the message subtitle
-			const oColumnInfo: ColumnInfoType = messageHandling.determineColumnInfo(oColFromTableSettings, resourceModel);
-			if (sRowSubtitleValue && sTableTargetColName) {
-				sMessageSubtitle = resourceModel.getText("T_MESSAGE_ITEM_SUBTITLE", [sRowSubtitleValue, sTableTargetColName]);
-			} else if (sRowSubtitleValue && oColumnInfo.sColumnIndicator === "Hidden") {
-				sMessageSubtitle = `${resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_ROW_WITH_IDENTIFIER", [
-					sRowSubtitleValue
-				])}, ${oColumnInfo.sColumnValue}`;
-			} else if (sRowSubtitleValue && oColumnInfo.sColumnIndicator === "Unknown") {
-				sMessageSubtitle = resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_ROW_WITH_IDENTIFIER", [sRowSubtitleValue]);
-			} else if (sRowSubtitleValue && oColumnInfo.sColumnIndicator === "undefined") {
-				sMessageSubtitle = resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_ROW_WITH_IDENTIFIER", [sRowSubtitleValue]);
-			} else if (!sRowSubtitleValue && sTableTargetColName) {
-				sMessageSubtitle = resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_COLUMN") + ": " + sTableTargetColName;
-			} else if (!sRowSubtitleValue && oColumnInfo.sColumnIndicator === "Hidden") {
-				sMessageSubtitle = oColumnInfo.sColumnValue;
+			const oColumnInfo: ColumnInfoType = messageHandling.determineColumnInfo(colFromTableSettings, resourceModel);
+			if (rowSubtitleValue && tableTargetColName) {
+				messageSubtitle = resourceModel.getText("T_MESSAGE_ITEM_SUBTITLE", [rowSubtitleValue, tableTargetColName]);
+			} else if (rowSubtitleValue && oColumnInfo.sColumnIndicator === "Hidden") {
+				messageSubtitle = `${resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_ROW_WITH_IDENTIFIER", [rowSubtitleValue])}, ${
+					oColumnInfo.sColumnValue
+				}`;
+			} else if (rowSubtitleValue && oColumnInfo.sColumnIndicator === "Unknown") {
+				messageSubtitle = resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_ROW_WITH_IDENTIFIER", [rowSubtitleValue]);
+			} else if (rowSubtitleValue && oColumnInfo.sColumnIndicator === "undefined") {
+				messageSubtitle = resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_ROW_WITH_IDENTIFIER", [rowSubtitleValue]);
+			} else if (!rowSubtitleValue && tableTargetColName) {
+				messageSubtitle = resourceModel.getText("T_MESSAGE_GROUP_DESCRIPTION_TABLE_COLUMN") + ": " + tableTargetColName;
+			} else if (!rowSubtitleValue && oColumnInfo.sColumnIndicator === "Hidden") {
+				messageSubtitle = oColumnInfo.sColumnValue;
 			} else {
-				sMessageSubtitle = null;
+				messageSubtitle = null;
 			}
 		} else {
-			sMessageSubtitle = null;
+			messageSubtitle = null;
 		}
 	}
-
-	return sMessageSubtitle;
+	return messageSubtitle;
 }
 
 /**
- * This function will get the first column for text Annotation, this is needed to set subtitle of Message.
- *
- * @param oTable
- * @param oTableRowContext
- * @param sTableFirstColProperty
+ * This function gets the first column for text Annotation, this is needed to set subtitle of Message.
+ * @param table
+ * @param tableRowContext
+ * @param tableColProperty
  * @returns Binding context.
  */
-function getTableFirstColBindingContextForTextAnnotation(
-	oTable: MDCTable,
-	oTableRowContext: ODataV4Context | undefined,
-	sTableFirstColProperty: string
+function getTableColBindingContextForTextAnnotation(
+	table: MDCTable,
+	tableRowContext: ODataV4Context | undefined,
+	tableColProperty: TableColumnProperties
 ): Context | null | undefined {
-	let oBindingContext;
-	if (oTableRowContext && sTableFirstColProperty) {
-		const oModel = oTable?.getModel();
+	let bindingContext;
+	if (tableRowContext && tableColProperty && tableColProperty.length === 1) {
+		const { key } = tableColProperty[0];
+		const oModel = table?.getModel();
 		const oMetaModel = oModel?.getMetaModel() as ODataMetaModel | undefined; // must be an ODataMetaModel to match the type of the table row context
-		const sMetaPath = oMetaModel?.getMetaPath(oTableRowContext.getPath());
-		if (oMetaModel?.getObject(`${sMetaPath}/${sTableFirstColProperty}@com.sap.vocabularies.Common.v1.Text/$Path`)) {
-			oBindingContext = oMetaModel.createBindingContext(`${sMetaPath}/${sTableFirstColProperty}@com.sap.vocabularies.Common.v1.Text`);
+		const sMetaPath = oMetaModel?.getMetaPath(tableRowContext.getPath());
+		if (oMetaModel?.getObject(`${sMetaPath}/${key}@com.sap.vocabularies.Common.v1.Text/$Path`)) {
+			bindingContext = oMetaModel.createBindingContext(`${sMetaPath}/${key}@com.sap.vocabularies.Common.v1.Text`);
 		}
 	}
-	return oBindingContext;
-}
-
-/**
- * This function will get the value of first Column of Table, with its text Arrangement.
- *
- * @param sTableFirstColProperty
- * @param oTableRowContext
- * @param sTextAnnotationPath
- * @param sTextArrangement
- * @returns Column Value.
- */
-function getTableFirstColValue(
-	sTableFirstColProperty: string,
-	oTableRowContext: Context,
-	sTextAnnotationPath: string,
-	sTextArrangement: string
-): string {
-	const sCodeValue = oTableRowContext.getObject(sTableFirstColProperty);
-	let sTextValue;
-	let sComputedValue = sCodeValue;
-	if (sTextAnnotationPath) {
-		if (sTableFirstColProperty.lastIndexOf("/") > 0) {
-			// the target property is replaced with the text annotation path
-			sTableFirstColProperty = sTableFirstColProperty.slice(0, sTableFirstColProperty.lastIndexOf("/") + 1);
-			sTableFirstColProperty = sTableFirstColProperty.concat(sTextAnnotationPath);
-		} else {
-			sTableFirstColProperty = sTextAnnotationPath;
-		}
-		sTextValue = oTableRowContext.getObject(sTableFirstColProperty);
-		if (sTextValue) {
-			if (sTextArrangement) {
-				const sEnumNumber = sTextArrangement.slice(sTextArrangement.indexOf("/") + 1);
-				switch (sEnumNumber) {
-					case "TextOnly":
-						sComputedValue = sTextValue;
-						break;
-					case "TextFirst":
-						sComputedValue = `${sTextValue} (${sCodeValue})`;
-						break;
-					case "TextLast":
-						sComputedValue = `${sCodeValue} (${sTextValue})`;
-						break;
-					case "TextSeparate":
-						sComputedValue = sCodeValue;
-						break;
-					default:
-				}
-			} else {
-				sComputedValue = `${sTextValue} (${sCodeValue})`;
-			}
-		}
-	}
-	return sComputedValue;
+	return bindingContext;
 }
 
 /**
  * The method that is called to retrieve the column info from the associated message of the message popover.
- *
  * @param oMessage Message object
  * @param oTable MdcTable
  * @returns Returns the column info.
  */
+
 function fetchColumnInfo(oMessage: MessageWithHeader, oTable: MDCTable): TableColumn | undefined {
 	const sColNameFromMessageObj = oMessage?.getTargets()[0].split("/").pop();
-	return (oTable.getParent() as TableAPI).getTableDefinition().columns.find(function (oColumn): boolean {
-		return oColumn.key.split("::").pop() === sColNameFromMessageObj;
-	});
+	return (oTable.getParent() as TableAPI)?.getKeyColumnInfo(sColNameFromMessageObj);
 }
 
 /**
- * This function get the Column data depending on its availability in Table, this is needed for setting subtitle of Message.
- *
+ * This function gets the Column data depending on its availability in Table, this is needed for setting subtitle of Message.
  * @param oColFromTableSettings
  * @param resourceModel
  * @returns Column data.
@@ -1315,7 +1395,6 @@ function determineColumnInfo(oColFromTableSettings: TableColumn | undefined, res
 
 /**
  * This function check if a given control id is a part of Table.
- *
  * @param oTable
  * @param sControlId
  * @returns True if control is part of table.
@@ -1386,7 +1465,6 @@ function getMessagesFromMessageModel(oMessageModel: MessageModel, sPathToBeRemov
 
 /**
  * Get relevant messages.
- *
  * @param bBoundMessages To get only bound messages
  * @param bTransitionOnly To get only transition messages
  * @param sPathToBeRemoved Filter out bound messages with path
@@ -1457,7 +1535,6 @@ function setMessageSubtitle(oTable: MDCTable, aContexts: Context[], message: Mes
 
 /**
  * The method retrieves the visible sections from an object page.
- *
  * @param oObjectPageLayout The objectPageLayout object for which we want to retrieve the visible sections.
  * @returns Array of visible sections.
  */
@@ -1469,7 +1546,6 @@ function getVisibleSectionsFromObjectPageLayout(oObjectPageLayout: Control | Obj
 
 /**
  * This function checks if control ids from message are a part of a given subsection.
- *
  * @param subSection
  * @param oMessageObject
  * @returns SubSection matching control ids.
@@ -1505,7 +1581,6 @@ function getTableColProperty(oTable: Control, oMessageObject: MessageWithHeader,
 
 /**
  * This function gives the column information if it matches with the property name from target of message.
- *
  * @param oTable
  * @param sTableTargetColProperty
  * @returns Column name and property.
@@ -1571,7 +1646,6 @@ function getTableColInfo(
 
 /**
  * This function gives Table and column info if any of it matches the target from Message.
- *
  * @param oTable
  * @param oMessageObject
  * @param oElement
@@ -1617,7 +1691,6 @@ function fnFilterUponIds(aControlIds: string[], oItem: UI5Element): boolean {
 
 /**
  * This function gives the group name having section and subsection data.
- *
  * @param section
  * @param subSection
  * @param bMultipleSubSections
@@ -1651,9 +1724,96 @@ function bIsOrphanElement(oElement: UI5Element, aElements: UI5Element[]): boolea
 	});
 }
 
+/**
+ * This function filters and gives back the messages based on the context passed.
+ * @param context
+ * @returns Messages.
+ */
+function getMessagesForContext(context: Context): Message[] {
+	const oMessageModel = Messaging.getMessageModel();
+	const listBinding = oMessageModel.bindList("/");
+	listBinding.filter(
+		new Filter({
+			path: "",
+			test: (message: Message) => message.getTargets().length > 0 && message.getTargets()[0].startsWith(context.getPath())
+		})
+	);
+	const currentContexts = listBinding.getCurrentContexts();
+	return currentContexts.map((currentContext) => currentContext.getObject());
+}
+
+/**
+ * This function returns the boolean to check if the target is present in the dialog based on the control Ids.
+ * @param controlIds Array of control Ids
+ * @returns Boolean value based on the target present in the dialog.
+ */
+function isMessageOutOfParameterDialog(controlIds: string[]): boolean {
+	let oControl: ManagedObject | null | undefined, errorFieldControl;
+	const index = Infinity;
+	if (controlIds.length === 1) {
+		oControl = UI5Element.getElementById(controlIds[0]);
+		errorFieldControl = UI5Element.getElementById(controlIds[0]) as UI5Element;
+	} else {
+		let errorControlId;
+		controlIds.forEach((controlId) => {
+			const control = UI5Element.getElementById(controlId);
+			if (control?.isA("sap.ui.mdc.Field")) {
+				errorControlId = controlId;
+				oControl = UI5Element.getElementById(errorControlId);
+			}
+		});
+	}
+	while (oControl) {
+		const fieldRankinDialog = Infinity;
+		if (oControl instanceof Dialog) {
+			if (index > fieldRankinDialog) {
+				// Set the focus to the dialog's control
+				errorFieldControl?.focus();
+			}
+			// messages with target inside sap.m.Dialog should not bring up the message dialog
+			return false;
+		}
+		oControl = oControl.getParent();
+	}
+	return true;
+}
+
+/**
+ * This method is responsible for removing messages related to the context from the message model when there is error on the dialog and when the dialog is open.
+ * @param messages Array of messages
+ * @param contexts Contexts array
+ */
+function removeContextMessagesfromModel(messages?: Message[], contexts?: Context[]): void {
+	const boundContextMessages: Message[] = [];
+	if (contexts?.length === 1) {
+		messages?.forEach((message: Message) => {
+			if (
+				message.getTargets().length === 1 &&
+				message.getTargets()[0] === contexts?.[0]?.getPath() &&
+				message.getPersistent() === true
+			) {
+				boundContextMessages.push(message);
+			}
+		});
+	}
+	if (boundContextMessages.length > 0) {
+		Messaging.removeMessages(boundContextMessages);
+	}
+}
+
+/**
+ * This method is responsible for removing messages related to the action parameter dialog from showing the messages.
+ * @param messages Array of messages
+ * @returns Array of messages after removing the messages related to the action parameter dialog.
+ */
+function removeMessagesForActionParameterDialog(messages: Message[]): Message[] {
+	const messagesToBeRemoved = messages?.filter((message: Message) => message.getPersistent() === true && message.getTargets()[0] !== "");
+	messages = messages?.filter((message: Message) => !messagesToBeRemoved?.includes(message));
+	return messages;
+}
+
 /**
  * Static functions for Fiori Message Handling
- *
  * @namespace
  * @experimental This module is only for experimental use! <br/><b>This is only a POC and maybe deleted</b>
  * @since 1.56.0
@@ -1680,11 +1840,10 @@ const messageHandling: messageHandlingType = {
 	getMessageSubtitle: getMessageSubtitle,
 	determineColumnInfo: determineColumnInfo,
 	fetchColumnInfo: fetchColumnInfo,
-	getTableFirstColBindingContextForTextAnnotation: getTableFirstColBindingContextForTextAnnotation,
+	getTableColBindingContextForTextAnnotation: getTableColBindingContextForTextAnnotation,
 	getMessageRank: getMessageRank,
 	hasTransitionErrorsOrWarnings: hasTransitionErrorsOrWarnings,
 	fnCallbackSetGroupName: fnCallbackSetGroupName,
-	getTableFirstColValue: getTableFirstColValue,
 	setGroupNameOPDisplayMode: setGroupNameOPDisplayMode,
 	updateMessageObjectGroupName: updateMessageObjectGroupName,
 	setGroupNameLRTable: setGroupNameLRTable,
@@ -1695,7 +1854,14 @@ const messageHandling: messageHandlingType = {
 	showMessagesInUI: showMessagesInUI,
 	showMessageDialogControl: showMessageDialogControl,
 	showMessageToast: showMessageToast,
-	showMessageBoxControl: showMessageBoxControl
+	showMessageBoxControl: showMessageBoxControl,
+	getMessagesForContext: getMessagesForContext,
+	isMessageOutOfParameterDialog: isMessageOutOfParameterDialog,
+	removeContextMessagesfromModel: removeContextMessagesfromModel,
+	removeMessagesForActionParameterDialog: removeMessagesForActionParameterDialog,
+	setGroupNameOPTableDisplayMode: setGroupNameOPTableDisplayMode,
+	updateAddtionalTextForMessageInOPTable: updateAddtionalTextForMessageInOPTable,
+	updateHeaderNameForMessageInOPTable: updateHeaderNameForMessageInOPTable
 };
 
 export default messageHandling;