@sapui5/sap.fe.core 1.124.5 → 1.124.6

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

@@ -405,6 +405,20 @@ export type ShowMessageParameters = {
 	filteredMessages?: Message[];
 	fnGetMessageSubtitle?: Function;
 };
+
+function isNonTechnicalMessage(message: Message): boolean {
+	const technicalDetails = message.getTechnicalDetails() as MessageTechnicalDetails | undefined;
+	if (
+		(technicalDetails &&
+			((technicalDetails.originalMessage !== undefined && technicalDetails.originalMessage !== null) ||
+				(technicalDetails.httpStatus !== undefined && technicalDetails.httpStatus !== null))) ||
+		message.getCode()
+	) {
+		return true;
+	}
+	return false;
+}
+
 async function showUnboundMessages(
 	this: messageHandlingType,
 	aCustomMessages: CustomMessage[] | undefined,
@@ -424,6 +438,7 @@ async function showUnboundMessages(
 	let showMessageDialog: boolean | undefined = false,
 		showMessageBox: boolean | undefined = false;
 
+	const isNonTechnicalMessageFilter = new Filter({ path: "", test: isNonTechnicalMessage });
 	if (bShowBoundTransition) {
 		aTransitionMessages = aTransitionMessages.concat(getMessages(true, true));
 		// we only want to show bound transition messages not bound state messages hence add a filter for the same
@@ -457,9 +472,21 @@ async function showUnboundMessages(
 				caseSensitive: true
 			})
 		);
+		aFilters.push(isNonTechnicalMessageFilter);
 	} else {
 		// only unbound messages have to be shown so add filter accordingly
-		aFilters.push(new Filter({ path: "target", operator: FilterOperator.EQ, value1: "" }));
+		aFilters.push(
+			new Filter({
+				filters: [
+					new Filter({
+						path: "",
+						test: (message: Message) => message.getTargets().length === 0 || message.getTargets()[0] === ""
+					}),
+					isNonTechnicalMessageFilter
+				],
+				and: true
+			})
+		);
 	}
 	if (aCustomMessages && aCustomMessages.length) {
 		aCustomMessages.forEach(function (oMessage: CustomMessage) {
@@ -1240,18 +1267,7 @@ function getMessages(bBoundMessages = false, bTransitionOnly = false, sPathToBeR
 		}
 	}
 	//Filtering messages again here to avoid showing pure technical messages raised by the model
-	const backendMessages: Message[] = [];
-	for (i = 0; i < aTransitionMessages.length; i++) {
-		const technicalDetails = aTransitionMessages[i].getTechnicalDetails() as MessageTechnicalDetails | undefined;
-		if (
-			(technicalDetails &&
-				((technicalDetails.originalMessage !== undefined && technicalDetails.originalMessage !== null) ||
-					(technicalDetails.httpStatus !== undefined && technicalDetails.httpStatus !== null))) ||
-			aTransitionMessages[i].getCode()
-		) {
-			backendMessages.push(aTransitionMessages[i]);
-		}
-	}
+	const backendMessages: Message[] = aTransitionMessages.filter(isNonTechnicalMessage);
 
 	return backendMessages;
 }