@sapui5/sap.fe.core 1.90.0 → 1.90.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.90.0",
+	"version": "1.90.4",
 	"description": "SAPUI5 Library sap.fe.core",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

package/src/sap/fe/core/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.90.0</version>
+    <version>1.90.4</version>
 
     <documentation>UI5 library: sap.fe.core</documentation>
 

package/src/sap/fe/core/AnnotationHelper.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(

package/src/sap/fe/core/AppComponent.js

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // ----------------------------------------------------------------------------------

package/src/sap/fe/core/AppStateHandler.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

package/src/sap/fe/core/BaseController.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/ui/core/mvc/Controller", "sap/fe/core/CommonUtils"], function(Controller, CommonUtils) {
 	"use strict";

package/src/sap/fe/core/BusyLocker.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(["sap/base/Log"], function(Log) {

package/src/sap/fe/core/CommonUtils.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(
@@ -141,7 +141,11 @@ sap.ui.define(
 			return (
 				aRestrictedProperties &&
 				aRestrictedProperties.find(function(oRestrictedProperty) {
-					return oRestrictedProperty.NavigationProperty.$NavigationPropertyPath === sNavigationPath;
+					return (
+						oRestrictedProperty &&
+						oRestrictedProperty.NavigationProperty &&
+						oRestrictedProperty.NavigationProperty.$NavigationPropertyPath === sNavigationPath
+					);
 				})
 			);
 		}

package/src/sap/fe/core/PageController.js

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

package/src/sap/fe/core/RouterProxy.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 /* eslint-disable no-alert */
 sap.ui.define(

package/src/sap/fe/core/Synchronization.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/base/Log", "sap/ui/base/Object"], function(Log, BaseObject) {
 	"use strict";

package/src/sap/fe/core/TemplateComponent.js

@@ -1,6 +1,6 @@
 /*
  * ! SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/ui/core/UIComponent", "sap/fe/core/CommonUtils", "sap/base/Log"],

package/src/sap/fe/core/TemplateModel.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/base/Log", "sap/ui/base/Object", "sap/ui/model/json/JSONModel"], function(Log, BaseObject, JSONModel) {
 	"use strict";

package/src/sap/fe/core/TransactionHelper.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

package/src/sap/fe/core/actions/draft.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides static functions for the draft programming model
@@ -109,7 +109,7 @@ sap.ui.define(
 		 * Check if optional draft prepare action exists.
 		 *
 		 * @param {sap.ui.model.odata.v4.Context} oContext The context that should be bound to the operation
-		 * @returns {boolean} True if a a prepare action exists
+		 * @returns {boolean} True if a prepare action exists
 		 */
 		function hasPrepareAction(oContext) {
 			return !!getActionName(oContext, draftOperations.PREPARE);
@@ -119,10 +119,10 @@ sap.ui.define(
 		 * Creates a new draft from an active document.
 		 *
 		 * @function
-		 * @param {sap.ui.model.odata.v4.Context} oContext context for which the action should be performed
+		 * @param {sap.ui.model.odata.v4.Context} oContext The context for which the action is performed
 		 * @param {boolean} bPreserveChanges
 		 *  <ul>
-		 * 		<li>true - existing changes from another user that are not locked are preserved and an error message (http status 409) is send from the backend</li>
+		 * 		<li>true - existing changes from another user that are not locked are preserved and an error message (http status 409) is sent from the back end</li>
 		 * 		<li>false - existing changes from another user that are not locked are overwritten</li>
 		 * 	</ul>
 		 * @returns {Promise.<sap.ui.model.odata.v4.Context>} Resolve function returns the context of the operation
@@ -146,28 +146,34 @@ sap.ui.define(
 		}
 
 		/**
-		 * Activates a draft document. The draft will replace the sibling entity and will be deleted by the backend.
+		 * Activates a draft document. The draft will replace the sibling entity and will be deleted by the back end.
 		 *
 		 * @function
-		 * @param {sap.ui.model.odata.v4.Context} oContext context for which the action should be performed
-		 * @param {string} [sGroupId] the optional batch group where we want to execute the operation in
+		 * @param {sap.ui.model.odata.v4.Context} oContext The context for which the action is performed
+		 * @param {string} [sGroupId] The optional batch group in which the operation is executed
 		 * @returns {Promise.<sap.ui.model.odata.v4.Context>} Resolve function returns the context of the operation
 		 * @private
 		 * @ui5-restricted
 		 */
 
 		function executeDraftActivationAction(oContext, sGroupId) {
+			var bHasPrepareAction = hasPrepareAction(oContext);
+
+			// According to the draft spec if the service contains a prepare action and we trigger both prepare and
+			// activate in one $batch the activate action is called with iF-Match=*
+			var bIgnoreEtag = bHasPrepareAction;
+
 			if (!oContext.getProperty("IsActiveEntity")) {
 				var oOperation = createOperation(oContext, draftOperations.ACTIVATION, { $$inheritExpandSelect: true });
 				return oOperation
-					.execute(sGroupId)
+					.execute(sGroupId, bIgnoreEtag)
 					.then(function(oActiveDocumentContext) {
 						return oActiveDocumentContext;
 					})
 					.catch(
 						//if ACTIVATE action fails then we request either the sideEffects against PREPARE action (if annotated) or the messages as fallback:
 						function() {
-							if (hasPrepareAction(oContext)) {
+							if (bHasPrepareAction) {
 								var sActionName = getActionName(oContext, draftOperations.PREPARE),
 									oBindingParameters = SideEffectsUtil.getSideEffectsForAction(sActionName, oContext),
 									aTargetPaths = oBindingParameters && oBindingParameters.pathExpressions;
@@ -193,7 +199,7 @@ sap.ui.define(
 		 * Execute a preparation action.
 		 *
 		 * @function
-		 * @param {sap.ui.model.odata.v4.Context} oContext Context for which the action should be performed
+		 * @param {sap.ui.model.odata.v4.Context} oContext The context for which the action is performed
 		 * @param {string} [sGroupId] The optional batch group where we want to execute the operation in
 		 * @param {boolean} [bPrepareForEdit] Shall the messages be requested if supported by service
 		 * @returns {Promise.<sap.ui.model.odata.v4.Context>} Resolve function returns the context of the operation
@@ -240,7 +246,7 @@ sap.ui.define(
 		 * Determines the message path for a context.
 		 *
 		 * @function
-		 * @param {sap.ui.model.odata.v4.Context} oContext Context for which the path shall be determined
+		 * @param {sap.ui.model.odata.v4.Context} oContext The context for which the action is performed
 		 * @returns {string} Message path, empty if not annotated
 		 * @private
 		 * @ui5-restricted
@@ -256,7 +262,7 @@ sap.ui.define(
 		 * Requests the messages if annotated for a given context.
 		 *
 		 * @function
-		 * @param {sap.ui.model.odata.v4.Context} oContext Context for which the messages shall be requested
+		 * @param {sap.ui.model.odata.v4.Context} oContext The context for which the action is performed
 		 * @returns {Promise} Promise which is resolved once messages were requested
 		 * @private
 		 * @ui5-restricted
@@ -272,7 +278,7 @@ sap.ui.define(
 		 * Executes discard of a draft function using HTTP Post.
 		 *
 		 * @function
-		 * @param {sap.ui.model.odata.v4.Context} oContext context for which the action should be performed
+		 * @param {sap.ui.model.odata.v4.Context} oContext The context for which the action is performed
 		 * @returns {Promise.<sap.ui.model.odata.v4.Context>} Resolve function returns the context of the operation
 		 * @private
 		 * @ui5-restricted

package/src/sap/fe/core/actions/messageHandling.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Static functions for Fiori Message Handling
@@ -153,10 +153,70 @@ sap.ui.define(
 			var aUnboundMessages = getMessages(),
 				oMessageManager = sap.ui.getCore().getMessageManager(),
 				sHighestPriority,
-				sHighestPriorityText;
+				sHighestPriorityText,
+				aFilters = [new Filter({ path: "code", operator: FilterOperator.NE, value1: undefined })],
+				showMessageDialog = false;
 
 			if (bShowBoundTransition) {
 				aUnboundMessages.push.apply(aUnboundMessages, getMessages(true, true));
+				// we only want to show bound transition messages not bound state messages hence add a filter for the same
+				aFilters.push(new Filter({ path: "persistent", operator: FilterOperator.EQ, value1: true }));
+				var fnCheckControlIdInDialog = function(aControlIds) {
+					var index = Infinity,
+						oControl = sap.ui.getCore().byId(aControlIds[0]),
+						errorFieldControl = sap.ui.getCore().byId(aControlIds[0]);
+					while (oControl) {
+						var fieldRankinDialog =
+							oControl instanceof Dialog
+								? errorFieldControl
+										.getParent()
+										.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;
+				};
+				aFilters.push(
+					new Filter({
+						path: "controlIds",
+						test: fnCheckControlIdInDialog,
+						caseSensitive: true
+					})
+				);
+			} else {
+				// only unbound messages have to be shown so add filter accordingly
+				aFilters.push(new Filter({ path: "target", operator: FilterOperator.EQ, value1: "" }));
+			}
+			if (aCustomMessages && aCustomMessages.length) {
+				aCustomMessages.forEach(function(oMessage) {
+					var messageCode = oMessage.code ? oMessage.code : "";
+					oMessageManager.addMessages(
+						new Message({
+							message: oMessage.text,
+							type: oMessage.type,
+							target: "",
+							persistent: true,
+							code: messageCode
+						})
+					);
+					//The target and persistent properties of the message are hardcoded as "" and true because the function deals with only unbound messages.
+				});
+			}
+			var oListBinding = oMessageManager.getMessageModel().bindList("/", undefined, undefined, aFilters),
+				aCurrentContexts = oListBinding.getCurrentContexts();
+			if (aCurrentContexts && aCurrentContexts.length > 0) {
+				// Don't show dialog incase there are no errors to show
+				showMessageDialog = true;
 			}
 			if (aUnboundMessages.length === 0 && !aCustomMessages && !bHasEtagMessage) {
 				// Don't show the popup if there are no transient messages
@@ -167,7 +227,7 @@ sap.ui.define(
 					oMessageManager.removeMessages(aUnboundMessages);
 					resolve();
 				});
-			} else {
+			} else if (showMessageDialog) {
 				that.aResolveFunctions = that.aResolveFunctions || [];
 				return new Promise(function(resolve, reject) {
 					that.aResolveFunctions.push(resolve);
@@ -203,7 +263,7 @@ sap.ui.define(
 									},
 									items: {
 										path: "/",
-										filters: [new Filter("code", FilterOperator.NE, undefined)],
+										filters: aFilters,
 										template: that.oMessageTemplate
 									}
 								});
@@ -217,21 +277,6 @@ sap.ui.define(
 										this.setVisible(false);
 									}
 								});
-							if (aCustomMessages && aCustomMessages.length) {
-								aCustomMessages.forEach(function(oMessage) {
-									var messageCode = oMessage.code ? oMessage.code : "";
-									oMessageManager.addMessages(
-										new Message({
-											message: oMessage.text,
-											type: oMessage.type,
-											target: "",
-											persistent: true,
-											code: messageCode
-										})
-									);
-									//The target and persistent properties of the message are hardcoded as "" and true because the function deals with only unbound messages.
-								});
-							}
 							that.oMessageView.setModel(oMessageManager.getMessageModel());
 							that.oDialog =
 								that.oDialog ||
@@ -239,7 +284,13 @@ sap.ui.define(
 									resizable: true,
 									content: that.oMessageView,
 									endButton: new Button({
-										press: dialogCloseHandler,
+										press: function() {
+											dialogCloseHandler();
+											// also remove bound transition messages if we were showing them
+											if (bShowBoundTransition) {
+												removeBoundTransitionMessages();
+											}
+										},
 										text: oResourceBundle.getText("C_COMMON_SAPFE_CLOSE")
 									}),
 									customHeader: new sap.m.Bar({
@@ -294,6 +345,8 @@ sap.ui.define(
 						})
 						.catch(reject);
 				});
+			} else {
+				return Promise.resolve(true);
 			}
 		}
 

package/src/sap/fe/core/actions/nonDraft.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides static functions for the non-draft programming model

package/src/sap/fe/core/actions/operations.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides static functions to call OData actions (bound/import) and functions (bound/import)
@@ -423,7 +423,6 @@ sap.ui.define(
 								// TODO: move the dialog into the fragment and move the handlers to the oController
 								return Fragment.load({ definition: oFragment, controller: oController }).then(function(oDialogContent) {
 									var oOperationBinding;
-									var messageParams = {};
 									var oResourceBundle = oParentControl.getController().oResourceBundle;
 									var oDialog = new Dialog({
 										title:
@@ -456,8 +455,9 @@ sap.ui.define(
 																	type: "Error"
 																});
 															}
-															messageParams.customMessages = oMessages;
-															messageHandler.showMessageDialog(messageParams);
+															messageHandler.showMessageDialog({
+																customMessages: oMessages
+															});
 															return;
 														}
 														var aMessages = sap.ui
@@ -523,9 +523,11 @@ sap.ui.define(
 																	oResourceBundle
 																);
 
-																messageParams.bHasEtagMessage = bHasEtagMessage;
-																messageParams.context = mParameters.aContexts[0];
-																messageHandler.showMessageDialog(messageParams);
+																messageHandler.showMessageDialog({
+																	bHasEtagMessage: bHasEtagMessage,
+																	context: mParameters.aContexts[0],
+																	isActionParameterDialogOpen: true
+																});
 																if (oDialog && bHasEtagMessage) {
 																	oDialog.close(); //close the action parameter dialog after refresh of the context after etag mismatch
 																}
@@ -922,16 +924,14 @@ sap.ui.define(
 						sGroupId,
 						fnExecuteAction = function(oAction, index, oSideEffect) {
 							setActionParameterDefaultValue();
-							sGroupId = !bGrouped ? "actionGroup" : oAction.getUpdateGroupId();
+							// For invocation grouping "isolated" need batch group per action call
+							sGroupId = !bGrouped ? "$auto." + index : oAction.getUpdateGroupId();
 							oActionPromise = bGetBoundContext
 								? oAction.execute(sGroupId).then(function() {
 										return oAction.getBoundContext();
 								  })
 								: oAction.execute(sGroupId);
 							aActionPromises.push(oActionPromise);
-							if (!bGrouped) {
-								oModel.submitBatch(sGroupId);
-							}
 							// trigger actions from side effects
 							if (oSideEffect && oSideEffect.triggerActions && oSideEffect.triggerActions.length) {
 								oSideEffect.triggerActions.forEach(function(sTriggerAction) {

package/src/sap/fe/core/actions/sticky.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides static functions for the sticky session programming model

package/src/sap/fe/core/controllerextensions/ControllerExtensionMetadata.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides ControllerMetadata

package/src/sap/fe/core/controllerextensions/EditFlow.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -104,16 +104,19 @@ sap.ui.define(
 						if (sProgrammingModel === ProgrammingModel.Sticky) {
 							that._getInternalModel().setProperty("/sessionOn", true);
 						}
-						that._setEditMode(EditMode.Editable, false);
+						if (oNewDocumentContext) {
+							that._setEditMode(EditMode.Editable, false);
+							that._getMessageHandler().showMessageDialog();
 
-						if (oNewDocumentContext !== oContext) {
-							return that._handleNewContext(oNewDocumentContext, true, undefined, bDraftNavigation).then(function() {
-								if (sProgrammingModel === ProgrammingModel.Sticky) {
-									// The stickyOn handler must be set after the navigation has been done,
-									// as the URL may change in the case of FCL
-									that._handleStickyOn(oNewDocumentContext);
-								}
-							});
+							if (oNewDocumentContext !== oContext) {
+								return that._handleNewContext(oNewDocumentContext, true, undefined, bDraftNavigation).then(function() {
+									if (sProgrammingModel === ProgrammingModel.Sticky) {
+										// The stickyOn handler must be set after the navigation has been done,
+										// as the URL may change in the case of FCL
+										that._handleStickyOn(oNewDocumentContext);
+									}
+								});
+							}
 						}
 					});
 			},
@@ -221,6 +224,10 @@ sap.ui.define(
 				function handleSideEffects(oListBinding, oCreationPromise) {
 					oCreationPromise
 						.then(function(oNewContext) {
+							// transient contexts are reliably removed once oNewContext.created() is resolved
+							return oNewContext.created();
+						})
+						.then(function() {
 							var oBindingContext = that.getView().getBindingContext();
 							// if there are transient contexts, we must avoid requesting side effects
 							// this is avoid a potential list refresh, there could be a side effect that refreshes the list binding
@@ -541,6 +548,7 @@ sap.ui.define(
 							}
 
 							that._setEditMode(EditMode.Display, false);
+							that._getMessageHandler().showMessageDialog();
 
 							if (oActiveDocumentContext !== oContext) {
 								that._handleNewContext(oActiveDocumentContext, false, undefined, bDraftNavigation);
@@ -548,6 +556,7 @@ sap.ui.define(
 						})
 						.catch(function(oError) {
 							Log.error("Error while saving the document", oError);
+							return Promise.reject(oError);
 						})
 				);
 			},

package/src/sap/fe/core/controllerextensions/IntentBasedNavigation.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution"], function(
 	ControllerExtension,

package/src/sap/fe/core/controllerextensions/InternalEditFlow.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -113,6 +113,14 @@ sap.ui.define(
 
 						return Promise.all(aCreationPromises);
 					})
+					.then(function(aContexts) {
+						// transient contexts are reliably removed once oNewContext.created() is resolved
+						return Promise.all(
+							aContexts.map(function(oNewContext) {
+								return oNewContext.created();
+							})
+						);
+					})
 					.then(function() {
 						var oBindingContext = that.getView().getBindingContext();
 

package/src/sap/fe/core/controllerextensions/InternalIntentBasedNavigation.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

package/src/sap/fe/core/controllerextensions/InternalRouting.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[

package/src/sap/fe/core/controllerextensions/MessageHandler.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution", "sap/fe/core/actions/messageHandling"], function(
@@ -68,10 +68,20 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideE
 		 * @since 1.90.0
 		 */
 		showMessageDialog: function(mParameters) {
-			var customMessages = mParameters && mParameters.customMessages ? mParameters.customMessages : undefined;
+			var customMessages = mParameters && mParameters.customMessages ? mParameters.customMessages : undefined,
+				oOPInternalBindingContext = this.base.getView().getBindingContext("internal");
+			// set isActionParameterDialog open so that it can be used in the controller extension to decide whether message dialog should open or not
+			if (mParameters && mParameters.isActionParameterDialogOpen && oOPInternalBindingContext) {
+				oOPInternalBindingContext.setProperty("isActionParameterDialogOpen", true);
+			}
 			var bShowBoundMessages = this.getShowBoundMessagesInMessageDialog();
 			var oBindingContext = mParameters && mParameters.context ? mParameters.context : this.getView().getBindingContext();
 			var bEtagMessage = mParameters && mParameters.bHasEtagMessage;
+			// reset  isActionParameterDialogOpen
+			// cannot do this operations.js since it is not aware of the view
+			if (oOPInternalBindingContext) {
+				oOPInternalBindingContext.setProperty("isActionParameterDialogOpen", false);
+			}
 			return new Promise(function(resolve, reject) {
 				// we have to set a timeout to be able to access the most recent messages
 				setTimeout(function() {

package/src/sap/fe/core/controllerextensions/Placeholder.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/fe/core/BusyLocker", "sap/base/util/UriParameters", "sap/base/Log"], function(

package/src/sap/fe/core/controllerextensions/Routing.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution"], function(
 	ControllerExtension,

package/src/sap/fe/core/controllerextensions/RoutingListener.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/controllerextensions/InternalRouting"], function(InternalRouting) {
 	"use strict";

package/src/sap/fe/core/controllerextensions/ViewState.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[