@sapui5/sap.fe.templates 1.92.0 → 1.93.3

package/src/sap/fe/templates/ObjectPage/AnnotationHelper.js

@@ -22,103 +22,57 @@ sap.ui.define(
 					return "{path: ''}";
 				}
 			},
+
 			/**
-			 * Function to compute the visibility of the 'Delete' button in case of 'DeleteHidden' annotation.
+			 * Function to check if draft pattern is supported.
 			 *
-			 * @param {object} [oDeleteHidden] Entity Set: 'DeleteHidden' value
-			 * @param {string} [sDeleteHiddenInEntityType] Entity Type: 'DeleteHidden' value
-			 * @returns {string} Expression binding or Boolean value based on oDeleteHidden
+			 * @param {object} oAnnotations Annotations of the current entity set.
+			 * @returns {string} Returns the Boolean value based on draft state
 			 */
-			getButtonVisiblityForDeleteHidden: function(oDeleteHidden, sDeleteHiddenInEntityType) {
-				if (oDeleteHidden) {
-					return oDeleteHidden === "false"
-						? "{= (${ui>/editMode} === 'Editable')}"
-						: "{= (${ui>/editMode} === 'Editable') &&  !$" + oDeleteHidden + "}";
-				} else if (sDeleteHiddenInEntityType) {
-					return sDeleteHiddenInEntityType === "false"
-						? "{= (${ui>/editMode} === 'Editable')}"
-						: "{= (${ui>/editMode} === 'Editable') &&  !$" + sDeleteHiddenInEntityType + "}";
+			checkDraftState: function(oAnnotations) {
+				if (
+					oAnnotations["@com.sap.vocabularies.Common.v1.DraftRoot"] &&
+					oAnnotations["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]
+				) {
+					return true;
 				} else {
-					return "{= (${ui>/editMode} === 'Editable')}";
-				}
-			},
-			/**
-			 * Function to get the visibility for the Delete button in the object page/sub-object page.
-			 *
-			 * @param {object} [oDeletable] Current Entity Set delete restriction value.
-			 * @param {number} [viewLevel] The view level to differentiate between object page and sub-object page[Only passed in case of Delete]
-			 * @param {object} [oDeleteHidden] Entity Set delete hidden value.
-			 * @param {*}	[bParentDeleteRestrictionEnabled] The parent entity's delete restriction value via navigation restriction.
-			 * @param {string} [sDeleteHiddenInEntityType] Entity Type delete hidden value
-			 * @returns {string} Returns expression binding or boolean value based on oDeleteHidden, viewLevel
-			 */
-			getDeleteButtonVisibility: function(
-				oDeletable,
-				viewLevel,
-				oDeleteHidden,
-				bParentDeleteRestrictionEnabled,
-				sDeleteHiddenInEntityType
-			) {
-				var bParentDeletable =
-					bParentDeleteRestrictionEnabled === "true" ||
-					(bParentDeleteRestrictionEnabled !== "false" && typeof bParentDeleteRestrictionEnabled === "string");
-				if ((oDeletable === "false" && !bParentDeletable) || oDeleteHidden === "true" || sDeleteHiddenInEntityType === "true") {
 					return false;
 				}
-				if (viewLevel > 1) {
-					return AnnotationHelper.getButtonVisiblityForDeleteHidden(oDeleteHidden, sDeleteHiddenInEntityType);
-				} else if (oDeleteHidden) {
-					return oDeleteHidden === "false"
-						? "{= !(${ui>/editMode} === 'Editable')}"
-						: "{= !(${ui>/editMode} === 'Editable') && !$" + oDeleteHidden + "}";
-				} else if (sDeleteHiddenInEntityType) {
-					return sDeleteHiddenInEntityType === "false"
-						? "{= !(${ui>/editMode} === 'Editable')}"
-						: "{= !(${ui>/editMode} === 'Editable') && !$" + sDeleteHiddenInEntityType + "}";
-				} else {
-					return "{= !(${ui>/editMode} === 'Editable')}";
-				}
 			},
 
 			/**
-			 * Function to get the visibility for the SwitchToActive button in the object page/subobject page.
+			 * Function to get the visibility for the SwitchToActive button in the object page or subobject page.
 			 *
-			 * @param {object} oAnnotations Annotations of current entity set.
-			 * @returns {string} Returns expression binding or Boolean value based on draft state
+			 * @param {object} oAnnotations Annotations of the current entity set.
+			 * @returns {string} Returns expression binding or Boolean value based on the draft state
 			 */
 			getSwitchToActiveVisibility: function(oAnnotations) {
-				if (
-					oAnnotations["@com.sap.vocabularies.Common.v1.DraftRoot"] &&
-					oAnnotations["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]
-				) {
-					return "{= ${viewData>/showDraftToggle} && (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsProcessedByMe} }";
+				if (this.checkDraftState(oAnnotations)) {
+					return "{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";
 				} else {
 					return false;
 				}
 			},
 
 			/**
-			 * Function to get the visibility for the SwitchToDraft button in the object page/subobject page.
+			 * Function to get the visibility for the SwitchToDraft button in the object page or subobject page.
 			 *
-			 * @param {object} oAnnotations Annotations of current entity set.
-			 * @returns {string} Returns expression binding or Boolean value based on draft state
+			 * @param {object} oAnnotations Annotations of the current entity set.
+			 * @returns {string} Returns expression binding or Boolean value based on the draft state
 			 */
 			getSwitchToDraftVisibility: function(oAnnotations) {
-				if (
-					oAnnotations["@com.sap.vocabularies.Common.v1.DraftRoot"] &&
-					oAnnotations["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]
-				) {
-					return "{= ${viewData>/showDraftToggle} && !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsProcessedByMe}) }";
+				if (this.checkDraftState(oAnnotations)) {
+					return "{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";
 				} else {
 					return false;
 				}
 			},
 
 			/**
-			 * Function to format enable property for the Delete button in the object page/sub-object page in case of Command Execution.
-			 * @param {object} oDeletable Current Entity Set delete restriction value.
-			 * @param {Array}	aConverterContextHeaderActions Array of Header actions in Object page.
-			 * @returns {string} Returns expression binding or boolean value based on oDeleteHidden, viewLevel.
+			 * Function to format the 'enable' property for the Delete button in the object page or subobject page in case of Command Execution.
+			 * @param {object} oDeletable Current 'delete' restriction value for the entity set.
+			 * @param {Array}	aConverterContextHeaderActions Array of 'header' actions on the object page.
+			 * @returns {string} Returns the expression binding or Boolean value based on oDeleteHidden, viewLevel.
 			 */
 			getDeleteCommandExecutionEnabled: function(oDeletable, aConverterContextHeaderActions) {
 				var oDeleteAction = aConverterContextHeaderActions.find(function(oAction) {
@@ -127,37 +81,36 @@ sap.ui.define(
 				return this.getDeleteButtonEnabled(oDeletable, oDeleteAction.parentEntityDeleteEnabled);
 			},
 			/**
-			 * Function to format visible property for the Delete button in the object page/sub-object page in case of Command Execution.
-			 * @param {object} oDeletable Current Entity Set delete restriction value.
-			 * @param {number} viewLevel The view level to differenciate between object page and sub-object page[Only passed in case of Delete
-			 * @param {object} oDeleteHidden Entity Set delete hidden value.
-			 * @param {Array}	aConverterContextHeaderActions Array of Header actions in Object page.
-			 * @param {string} sDeleteHiddenInEntityType Entity Type delete hidden value.
-			 * @returns {string} Returns expression binding or boolean value based on oDeleteHidden, viewLevel.
+			 * Function to format the 'visible' property for the Delete button on the object page or subobject page in case of a Command Execution.
+			 *
+			 * @param {Array} aConverterContextHeaderActions Array of header actions on the object page
+			 * @returns {string} Returns expression binding or Boolean value from the converter output
 			 */
-			getDeleteCommandExecutionVisible: function(
-				oDeletable,
-				viewLevel,
-				oDeleteHidden,
-				aConverterContextHeaderActions,
-				sDeleteHiddenInEntityType
-			) {
+			getDeleteCommandExecutionVisible: function(aConverterContextHeaderActions) {
 				var oDeleteAction = aConverterContextHeaderActions.find(function(oAction) {
 					return oAction.type === "Secondary";
 				});
-				return this.getDeleteButtonVisibility(
-					oDeletable,
-					viewLevel,
-					oDeleteHidden,
-					oDeleteAction.parentEntityDeleteEnabled,
-					sDeleteHiddenInEntityType
-				);
+
+				return oDeleteAction ? oDeleteAction.visible : "true";
 			},
 			/**
-			 * Function to get the enablement for the Delete button in the object page/sub-object page.
+			 * Function to format the 'visible' property for the Edit button on the object page or subobject page in case of a Command Execution.
 			 *
-			 * @param {object} [oDeletable] Current Entity Set delete restriction value.
-			 * @returns {string} Returns expression binding or boolean value based on oDeletable
+			 * @param {Array} aConverterContextHeaderActions Array of header actions on the object page
+			 * @returns {string} Returns expression binding or Boolean value from the converter output
+			 */
+			getEditCommandExecutionVisible: function(aConverterContextHeaderActions) {
+				var oEditAction = aConverterContextHeaderActions.find(function(oAction) {
+					return oAction.type === "Primary";
+				});
+
+				return oEditAction ? oEditAction.visible : "true";
+			},
+			/**
+			 * Function to get the enablement for the Delete button on the object page or subobject page.
+			 *
+			 * @param {object} [oDeletable] Delete restrictions on the entity set
+			 * @returns {string} Returns expression binding or Boolean value based on oDeletable
 			 */
 			fnGetDeleteButtonEnabled: function(oDeletable) {
 				if (oDeletable === "false") {
@@ -380,44 +333,19 @@ sap.ui.define(
 					return true;
 				}
 			},
+
 			/*
-			 * Get expression for header action's visible property.
-			 *
-			 * @function
-			 * @param {object} [oEntitySet] entity set information
-			 * @param {string} [sHiddenBindingExpression] hidden binding expression resolved from model
-			 * @param {string} [sUpdateHiddenInEntityType] update hidden binding expression from entityType
-			 * returns {string} Expression based on ui model's property editMode
-			 */
-			getButtonVisiblityForHeaderActions: function(oEntitySet, sHiddenBindingExpression, sUpdateHiddenInEntityType, viewData) {
-				var sResult = "{= !(${ui>/editMode} === 'Editable')";
-				if (sHiddenBindingExpression === "true" || sUpdateHiddenInEntityType === "true") {
-					return false;
-				} else if (sHiddenBindingExpression === "false" || sUpdateHiddenInEntityType === "false") {
-					sResult = sResult + "";
-				} else if (sHiddenBindingExpression) {
-					sResult = sResult + " && !$" + sHiddenBindingExpression;
-				} else if (sUpdateHiddenInEntityType) {
-					sResult = sResult + " && !$" + sUpdateHiddenInEntityType;
-				} else if (oEntitySet && !oEntitySet["@com.sap.vocabularies.UI.v1.UpdateHidden"]) {
-					sResult = sResult + "";
-				}
-				if (viewData && viewData.showDraftToggle) {
-					// test for toggle feature not showing the edit button in case of "show saved version"
-					sResult =
-						sResult + " && (!${HasDraftEntity} || (${HasDraftEntity} && !%{DraftAdministrativeData/DraftIsProcessedByMe})) ";
-				}
-				return sResult + "}";
-			},
-			/*
-			 * Get expression for annotation action's enable property.
+			 * Gets the expression for the enablement of the action annotation.
 			 *
 			 * @function
-			 * @param {object} [oBound] bound action context
-			 * @param {object} [oActionContext] action context object
-			 * @param {object} [oDataField] data field object
-			 * @param {string} [sFormattedValueOperationalAvailable] string value of operational available
-			 * returns {*}  both string and expressions if none of the condition satisfies the button is enabled in case of bound is false a string true is return
+			 * @param {object} [oBound] The Bound action context
+			 * @param {object} [oActionContext] The object of the action context
+			 * @param {object} [oDataField] The object of the data field
+			 * @param {string} [sFormattedValueOperationalAvailable] The string value of the available operation
+			 * returns {*}  returns {*} both Boolean and expression with the following logic:
+			 * if none of the conditions is met, the button is enabled
+			 * if bound is false, then 'true' is returned as a string
+			 * in all other cases a runtime binding expression is returned
 			 */
 			getButtonEnabledForAnnotationAction: function(oBound, oActionContext, oDataField, sFormattedValueOperationalAvailable) {
 				if (oBound && oBound.$IsBound !== true) {
@@ -495,14 +423,19 @@ sap.ui.define(
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
 					invocationGrouping: CommonHelper.addSingleQuotes(sInvocationGroup),
 					model: "${$source>/}.getModel()",
-					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label),
+					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label, true),
 					isNavigable: oHeaderAction && oHeaderAction.isNavigable,
 					defaultValuesExtensionFunction:
 						oHeaderAction && oHeaderAction.defaultValuesExtensionFunction
 							? "'" + oHeaderAction.defaultValuesExtensionFunction + "'"
 							: undefined
 				};
-				return CommonHelper.generateFunction(".editFlow.invokeAction", sEditableContexts, CommonHelper.objectToString(oParams));
+				return CommonHelper.generateFunction(
+					".handlers.onCallAction",
+					"${$view>/}",
+					sEditableContexts,
+					CommonHelper.objectToString(oParams)
+				);
 			},
 			/*
 			 * Method to get the expression for the 'press' event for footer annotation actions
@@ -523,7 +456,7 @@ sap.ui.define(
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
 					invocationGrouping: CommonHelper.addSingleQuotes(sInvocationGroup),
 					model: "${$source>/}.getModel()",
-					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label),
+					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label, true),
 					isNavigable: oHeaderAction && oHeaderAction.isNavigable,
 					defaultValuesExtensionFunction:
 						oHeaderAction && oHeaderAction.defaultValuesExtensionFunction
@@ -531,19 +464,19 @@ sap.ui.define(
 							: undefined
 				};
 				return CommonHelper.generateFunction(
-					".handlers.onCallActionFromFooter",
+					".handlers.onCallAction",
 					"${$view>/}",
 					sActionContexts,
 					CommonHelper.objectToString(oParams)
 				);
 			},
 			/*
-			 * Get binding of container HBox for header facet.
+			 * Gets the binding of the container HBox for the header facet.
 			 *
 			 * @function
-			 * @param {object} [oControlConfiguration] control configuration form viewData model
-			 * @param {object} [oHeaderFacet] header facet object
-			 * returns {*}  binding expression from function getBindingWithGroupIdFromConfig or undefined.
+			 * @param {object} [oControlConfiguration] The control configuration form of the viewData model
+			 * @param {object} [oHeaderFacet] The object of the header facet
+			 * returns {*}  The binding expression from function getBindingWithGroupIdFromConfig or undefined.
 			 */
 			getStashableHBoxBinding: function(oControlConfiguration, oHeaderFacet) {
 				if (oHeaderFacet && oHeaderFacet.Facet && oHeaderFacet.Facet.targetAnnotationType === "DataPoint") {
@@ -553,33 +486,14 @@ sap.ui.define(
 					);
 				}
 			},
-			/*
-			 * Get chart title for microchart in headerfacet .
-			 *
-			 * @function
-			 * @param {object} [oViewData] view data model
-			 * @param {object} [oHeaderFacet] header facet object
-			 * @param {string} [sCommonHeaderTitle] comman used header title string
-			 * returns {*}  string (commanly used header string => sCommonHeaderTitle) or undefied
-			 */
-			getChartTitleDescribedBy: function(oViewData, oHeaderFacet, sCommonHeaderTitle) {
-				var sAnnotationPath = oHeaderFacet && oHeaderFacet.Target && oHeaderFacet.Target["$AnnotationPath"],
-					bCondition =
-						oViewData &&
-						oViewData.controlConfiguration &&
-						oViewData.controlConfiguration[sAnnotationPath] &&
-						oViewData.controlConfiguration[sAnnotationPath]["navigation"] &&
-						oViewData.controlConfiguration[sAnnotationPath]["navigation"]["targetSections"];
-				return bCondition ? sCommonHeaderTitle : undefined;
-			},
 
 			/*
-			 * Get Press event expression for external and internal data point link .
+			 * Gets the 'Press' event expression for the external and internal data point link.
 			 *
 			 * @function
-			 * @param {object} [oConfiguration] view data model
-			 * @param {object} [oManifestOutbound] Manifest setting object
-			 * returns {string} the function's press event's run time binding
+			 * @param {object} [oConfiguration] Control configuration from manifest
+			 * @param {object} [oManifestOutbound] Outbounds from manifest
+			 * returns {string} The runtime binding of the 'Press' event
 			 */
 			getPressExpressionForLink: function(oConfiguration, oManifestOutbound) {
 				if (oConfiguration) {

package/src/sap/fe/templates/ObjectPage/Component.js

@@ -55,10 +55,6 @@ sap.ui.define(
 							type: "boolean",
 							defaultValue: true
 						},
-						showDraftToggle: {
-							type: "boolean",
-							defaultValue: false
-						},
 						/**
 						 * Enables the BreadCrumbs features
 						 */

package/src/sap/fe/templates/ObjectPage/ObjectPage.view.xml

@@ -38,6 +38,8 @@
 						showAnchorBar="{converterContext>showAnchorBar}"
 						upperCaseAnchorBar="false"
 						useIconTabBar="{converterContext>useIconTabBar}"
+						toggleHeaderOnTitleClick="{converterContext>showAnchorBar}"
+						headerContentPinnable="{converterContext>showAnchorBar}"
 						enableLazyLoading="true"
 						navigate=".handlers.onNavigateChange"
 					>
@@ -47,22 +49,22 @@
 							<control:CommandExecution
 								execute="._editDocument(${$view>/getBindingContext})"
 								enabled="{= OP.getEnabledExpressionForHeaderActions(${operationAvailable>}, ${entitySet>@}, ${operationAvailable>@@MODEL.format}) }"
-								visible="{= OP.getButtonVisiblityForHeaderActions(${entitySet>@}, %{entitySet>@com.sap.vocabularies.UI.v1.UpdateHidden@@MODEL.value}, ${entityType>@com.sap.vocabularies.UI.v1.UpdateHidden@@MODEL.value}, ${viewData>/}) }"
+								visible="{= OP.getEditCommandExecutionVisible(${converterContext>headerActions}) }"
 								command="Edit"
 							/>
 							<control:CommandExecution
-								execute="._toggleActiveDraft(${$view>/getBindingContext})"
+								execute=".editFlow.toggleDraftActive(${$view>/getBindingContext})"
 								visible="{= OP.getSwitchToActiveVisibility(${entitySet>@}) }"
 								command="SwitchToActiveObject"
 							/>
 							<control:CommandExecution
-								execute="._toggleActiveDraft(${$view>/getBindingContext})"
+								execute=".editFlow.toggleDraftActive(${$view>/getBindingContext})"
 								visible="{= OP.getSwitchToDraftVisibility(${entitySet>@}) }"
 								command="SwitchToDraftObject"
 							/>
 							<control:CommandExecution
 								execute="{= OP.getPressExpressionForDelete(${entitySet>@sapui.name}) }"
-								visible="{= OP.getDeleteCommandExecutionVisible(${entitySet>@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable@@MODEL.value}, ${viewData>viewLevel}, ${entitySet>@com.sap.vocabularies.UI.v1.DeleteHidden@@MODEL.value}, ${converterContext>headerActions}, ${entityType>@com.sap.vocabularies.UI.v1.DeleteHidden@@MODEL.value}) }"
+								visible="{= OP.getDeleteCommandExecutionVisible(${converterContext>headerActions}) }"
 								enabled="{= OP.getDeleteCommandExecutionEnabled(${entitySet>@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable@@MODEL.value}, ${converterContext>headerActions}) }"
 								command="DeleteObject"
 							/>

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.js

@@ -77,8 +77,6 @@ sap.ui.define(
 	) {
 		"use strict";
 
-		var iMessages;
-
 		return PageController.extend("sap.fe.templates.ObjectPage.ObjectPageController", {
 			metadata: {
 				methods: {
@@ -161,6 +159,12 @@ sap.ui.define(
 				}
 				this.extensionAPI && this.extensionAPI.destroy();
 				delete this.extensionAPI;
+
+				var oMessageButton = this.getView().byId("fe::FooterBar::MessageButton"),
+					oMessagePopover = oMessageButton ? oMessageButton.oMessagePopover : null;
+				if (oMessagePopover && oMessagePopover.isOpen()) {
+					oMessagePopover.close();
+				}
 			},
 
 			_getTableBinding: function(oTable) {
@@ -312,6 +316,7 @@ sap.ui.define(
 				aTables.forEach(function(oTable) {
 					var oInternalModelContext = oTable.getBindingContext("internal");
 					oInternalModelContext.setProperty("creationRowFieldValidity", {});
+					oInternalModelContext.setProperty("creationRowCustomValidity", {});
 
 					aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
 					// temporary workaround for BCP: 2080218004
@@ -574,7 +579,6 @@ sap.ui.define(
 			_getFooterVisibility: function(oEvent) {
 				var oInternalModelContext = this.getView().getBindingContext("internal");
 				var sViewId = this.getView().getId();
-				iMessages = oEvent.getParameter("iMessageLength");
 				oInternalModelContext.setProperty("messageFooterContainsErrors", false);
 				sap.ui
 					.getCore()
@@ -588,15 +592,23 @@ sap.ui.define(
 					});
 			},
 
-			_showMessagePopover: function(oMessageButton) {
-				var oMessagePopover = oMessageButton.oMessagePopover,
+			_showMessagePopover: function(err, oRet) {
+				if (err) {
+					Log.error(err);
+				}
+				var that = this;
+				var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton"),
+					oMessagePopover = oMessageButton.oMessagePopover,
 					oItemBinding = oMessagePopover.getBinding("items");
-				if (oItemBinding.getLength() > 0) {
+
+				if (oItemBinding.getLength() > 0 && !oMessagePopover.isOpen()) {
+					oMessageButton.setVisible(true);
 					// workaround to ensure that oMessageButton is rendered when openBy is called
 					setTimeout(function() {
 						oMessagePopover.openBy(oMessageButton);
 					}, 0);
 				}
+				return oRet;
 			},
 
 			_editDocument: function(oContext) {
@@ -647,12 +659,7 @@ sap.ui.define(
 					};
 					return that.editFlow
 						.saveDocument(oContext, mParameters)
-						.catch(function(err) {
-							var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton");
-							if (oMessageButton) {
-								that._showMessagePopover(oMessageButton);
-							}
-						})
+						.catch(that._showMessagePopover.bind(that))
 						.finally(function() {
 							BusyLocker.unlock(oModel);
 						});
@@ -664,19 +671,9 @@ sap.ui.define(
 				return this.editFlow.cancelDocument(oContext, mParameters);
 			},
 
-			_toggleActiveDraft: function(oContext) {
-				return this.editFlow.toggleDraftActive(oContext);
-			},
-
 			_applyDocument: function(oContext) {
 				var that = this;
-				return this.editFlow.applyDocument(oContext).catch(function(err) {
-					Log.error(err);
-					var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton");
-					if (oMessageButton) {
-						that._showMessagePopover(oMessageButton);
-					}
-				});
+				return this.editFlow.applyDocument(oContext).catch(that._showMessagePopover.bind(that));
 			},
 
 			_updateRelatedApps: function() {
@@ -1203,6 +1200,9 @@ sap.ui.define(
 					if (oDataStateIndicator.getFilter()(null, oTable)) {
 						oDataStateIndicator.fireDataStateChange();
 					}
+					// fire ModelContextChange on the message button whenever the table context changes
+					var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton");
+					oMessageButton.fireModelContextChange();
 				},
 
 				/**
@@ -1211,39 +1211,19 @@ sap.ui.define(
 				 * @param oView
 				 * @param {string} sActionName The name of the action to be called
 				 * @param {map} [mParameters] Contains the following attributes:
-				 * @param {sap.ui.model.odata.v4.Context} [mParameters.contexts] Mandatory for a bound action, Either one context or an array with contexts for which the action shall be called
-				 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] Mandatory for an unbound action, An instance of an OData v4 model
+				 * @param {sap.ui.model.odata.v4.Context} [mParameters.contexts] Mandatory for a bound action, either one context or an array with contexts for which the action shall be called
+				 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] Mandatory for an unbound action; an instance of an OData V4 model
 				 * @returns {Promise}
 				 * @ui5-restricted
 				 * @final
 				 */
-				onCallActionFromFooter: function(oView, sActionName, mParameters) {
+				onCallAction: function(oView, sActionName, mParameters) {
 					var oController = oView.getController();
 					var that = oController;
 					return oController.editFlow
 						.invokeAction(sActionName, mParameters)
-						.then(function() {
-							// TODO: this logic should run for every action not only for the footer ones
-							var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton");
-							if (oMessageButton.isActive()) {
-								that._showMessagePopover(oMessageButton);
-							} else if (iMessages) {
-								that._oDelegateOnAfter = {
-									onAfterRendering: function(oEvent) {
-										that._showMessagePopover(oMessageButton);
-										oMessageButton.removeEventDelegate(that._oDelegateOnAfter);
-										delete that._oDelegateOnAfter;
-									}
-								};
-								oMessageButton.addEventDelegate(that._oDelegateOnAfter, that);
-							}
-						})
-						.catch(function(err) {
-							var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton");
-							if (oMessageButton) {
-								that._showMessagePopover(oMessageButton);
-							}
-						});
+						.then(that._showMessagePopover.bind(that, undefined))
+						.catch(that._showMessagePopover.bind(that));
 				},
 				onDataPointTitlePressed: function(oController, oSource, oManifestOutbound, sControlConfig, sCollectionPath) {
 					oManifestOutbound = typeof oManifestOutbound === "string" ? JSON.parse(oManifestOutbound) : oManifestOutbound;
@@ -1270,11 +1250,16 @@ sap.ui.define(
 					}
 				},
 				/**
-				 * Triggers an outbound navigation on Chevron Press.
+				 * Triggers an outbound navigation when a user chooses the chevron.
 				 *
 				 * @param oController
 				 * @param {string} sOutboundTarget Name of the outbound target (needs to be defined in the manifest)
+<<<<<<< HEAD   (2310ec [INTERNAL] Release notes for version 1.93.1)
 				 * @param {sap.ui.model.odata.v4.Context} oContext That contain the data for the target app
+=======
+				 * @param {sap.ui.model.odata.v4.Context} oContext The context that contains the data for the target app
+				 * @param {string} sCreatePath Create path when the chevron is created.
+>>>>>>> CHANGE (657783 [FIX] The message popover controls are now closed when leavi)
 				 * @returns {Promise} Promise which is resolved once the navigation is triggered (??? maybe only once finished?)
 				 */
 				onChevronPressNavigateOutBound: function(oController, sOutboundTarget, oContext) {