@sapui5/sap.fe.core 1.97.0 → 1.98.0

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(
 	[
@@ -76,7 +76,13 @@ sap.ui.define(
 			},
 			getProgrammingModel: function(oContext) {
 				if (!this.sProgrammingModel && oContext) {
-					if (ModelHelper.isDraftSupported(oContext.getModel().getMetaModel(), oContext.getPath())) {
+					var sPath;
+					if (oContext.isA("sap.ui.model.odata.v4.Context")) {
+						sPath = oContext.getPath();
+					} else {
+						sPath = oContext.isRelative() ? oContext.getResolvedPath() : oContext.getPath();
+					}
+					if (ModelHelper.isDraftSupported(oContext.getModel().getMetaModel(), sPath)) {
 						this.sProgrammingModel = ProgrammingModel.Draft;
 					} else if (ModelHelper.isStickySessionSupported(oContext.getModel().getMetaModel())) {
 						this.sProgrammingModel = ProgrammingModel.Sticky;
@@ -93,9 +99,8 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.TransactionHelper
 			 * @static
-			 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData v4 ListBinding object
+			 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData V4 ListBinding object
 			 * @param {object} [mParameters] Optional, can contain the following attributes:
-			 * @param {boolean} [mParameters.refreshList] If the list shall be refreshed immediately after creating the instance
 			 * @param {map} [mParameters.data] A map of data that should be sent within the POST
 			 * @param {string} [mParameters.busyMode] Global (default), Local, None TODO: to be refactored
 			 * @param {map} [mParameters.keepTransientContextOnFailed] If set, the context stays in the list if the POST failed and POST will be repeated with the next change
@@ -109,7 +114,6 @@ sap.ui.define(
 			createDocument: function(oMainListBinding, mParameters, oResourceBundle, messageHandler, bFromCopyPaste) {
 				var oNewDocumentContext,
 					that = this,
-					bSkipRefresh,
 					oModel = oMainListBinding.getModel(),
 					oMetaModel = oModel.getMetaModel(),
 					sMetaPath = oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()),
@@ -131,8 +135,18 @@ sap.ui.define(
 						oMetaModel.getObject(
 							ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) +
 								"@com.sap.vocabularies.Common.v1.DefaultValuesFunction"
-						);
-
+						),
+					bFunctionOnNavProp;
+				if (sFunctionName) {
+					if (
+						oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction") &&
+						ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) !== sMetaPath
+					) {
+						bFunctionOnNavProp = true;
+					} else {
+						bFunctionOnNavProp = false;
+					}
+				}
 				if (sMessagesPath) {
 					mBindingParameters["$select"] = sMessagesPath;
 				}
@@ -150,7 +164,6 @@ sap.ui.define(
 					sBusyPath = "/busyLocal/" + oMainListBinding.sId;
 				}
 				BusyLocker.lock(this.oLockObject, sBusyPath);
-				bSkipRefresh = !mParameters.refreshList;
 				var oResourceBundleCore = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");
 				if (sNewAction) {
 					oCreationPromise = this.callAction(
@@ -158,7 +171,7 @@ sap.ui.define(
 						{
 							contexts: oMainListBinding.getHeaderContext(),
 							showActionParameterDialog: true,
-							label: oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"),
+							label: this._getSpecificCreateActionDialogLabel(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore),
 							bindingParameters: mBindingParameters,
 							parentControl: mParameters.parentControl,
 							bIsCreateAction: true
@@ -173,8 +186,29 @@ sap.ui.define(
 						? CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath)
 						: [];
 					sFunctionName = bFromCopyPaste ? null : sFunctionName;
-					oCreationPromise = operations
-						.callFunctionImport(sFunctionName, oModel)
+					var sFunctionPath, oFunctionContext;
+					if (sFunctionName) {
+						//bound to the source entity:
+						if (bFunctionOnNavProp) {
+							sFunctionPath =
+								oMainListBinding.getContext() &&
+								oMetaModel.getMetaPath(oMainListBinding.getContext().getPath()) + "/" + sFunctionName;
+							oFunctionContext = oMainListBinding.getContext();
+						} else {
+							sFunctionPath =
+								oMainListBinding.getHeaderContext() &&
+								oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()) + "/" + sFunctionName;
+							oFunctionContext = oMainListBinding.getHeaderContext();
+						}
+					}
+					var oFunction = sFunctionPath && oMetaModel.createBindingContext(sFunctionPath);
+					if (oFunction && oFunction.getObject() && oFunction.getObject()[0].$IsBound) {
+						oCreationPromise = operations.callBoundFunction(sFunctionName, oFunctionContext, oModel);
+					} else {
+						oCreationPromise = operations.callFunctionImport(sFunctionName, oModel);
+					}
+
+					oCreationPromise = oCreationPromise
 						.then(function(oContext) {
 							if (oContext) {
 								return oContext.getObject();
@@ -183,7 +217,7 @@ sap.ui.define(
 							}
 						})
 						.catch(function(oError) {
-							Log.error("Error while calling function Import " + sFunctionName, oError);
+							Log.error("Error while executing the function " + sFunctionName, oError);
 							throw oError;
 						})
 						.then(function(oData) {
@@ -202,7 +236,7 @@ sap.ui.define(
 									}
 								);
 								oTransientListBinding.refreshInternal = function() {};
-								oNewDocumentContext = oTransientListBinding.create(mParameters.data, bSkipRefresh);
+								oNewDocumentContext = oTransientListBinding.create(mParameters.data, true);
 								return that._launchDialogWithKeyFields(
 									oMainListBinding,
 									oTransientListBinding,
@@ -213,7 +247,7 @@ sap.ui.define(
 									messageHandler
 								);
 							} else {
-								oNewDocumentContext = oMainListBinding.create(mParameters.data, bSkipRefresh, mParameters.createAtEnd);
+								oNewDocumentContext = oMainListBinding.create(mParameters.data, true, mParameters.createAtEnd);
 								return that.onAfterCreateCompletion(
 									oMainListBinding,
 									oNewDocumentContext,
@@ -407,22 +441,13 @@ sap.ui.define(
 								}
 								mParameters = getParameters(mParameters);
 								if (mParameters.title) {
-									if (mParameters.description) {
-										aParams = [mParameters.title, mParameters.description];
-										oDeleteMessage.text = CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
-											oResourceBundle,
-											aParams,
-											mParameters.entitySetName
-										);
-									} else {
-										oDeleteMessage.text = CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-											oResourceBundle,
-											null,
-											mParameters.entitySetName
-										);
-									}
+									aParams = [mParameters.title, mParameters.description];
+									oDeleteMessage.text = CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
+										oResourceBundle,
+										aParams,
+										mParameters.entitySetName
+									);
 								} else {
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
 										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
@@ -632,8 +657,14 @@ sap.ui.define(
 							bDialogConfirmed = true;
 							BusyLocker.lock(that.oLockObject);
 							var aContexts = aDeletableContexts;
-							return that
-								.findActiveDraftRootContexts(aContexts, mParameters.bFindActiveContexts)
+							var onBeforeDeletePromise;
+							if (mParameters.beforeDeleteCallBack) {
+								onBeforeDeletePromise = mParameters.beforeDeleteCallBack({ contexts: aContexts });
+							} else {
+								onBeforeDeletePromise = Promise.resolve();
+							}
+							return onBeforeDeletePromise
+								.then(that.findActiveDraftRootContexts.bind(that, aContexts, mParameters.bFindActiveContexts))
 								.then(function(activeContexts) {
 									//make sure to fetch the active contexts before deleting the drafts
 									return Promise.all(
@@ -783,7 +814,7 @@ sap.ui.define(
 			 * @param {sap.ui.model.odata.v4.Context} oContext Context of the document to be canceled or deleted
 			 * @param {object} [mParameters] Optional, can contain the following attributes:
 			 * @param {sap.m.Button} mParameters.cancelButton Cancel Button of the discard popover (mandatory for now)
-			 * @param {boolean} mParameters.bSkipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
+			 * @param {boolean} mParameters.skipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
 			 * @param oResourceBundle
 			 * @param messageHandler
 			 * @returns {Promise} Promise resolves with ???
@@ -802,6 +833,7 @@ sap.ui.define(
 				var oParamsContext = oContext,
 					oCancelButton = mParameters.cancelButton,
 					oModel = oParamsContext.getModel(),
+					onBeforeCancelPromise,
 					sCanonicalPath;
 				return Promise.resolve(this.getProgrammingModel(oContext))
 					.then(function(sPModel) {
@@ -820,12 +852,20 @@ sap.ui.define(
 						}
 					})
 					.then(function() {
-						if (!mParameters.bSkipDiscardPopover) {
+						if (!mParameters.skipDiscardPopover) {
 							return that._showDiscardPopover(oCancelButton, that._bIsModified, oResourceBundle);
 						} else {
 							return Promise.resolve();
 						}
 					})
+					.then(function() {
+						if (mParameters.beforeCancelCallBack) {
+							onBeforeCancelPromise = mParameters.beforeCancelCallBack({ context: oContext });
+						} else {
+							onBeforeCancelPromise = Promise.resolve();
+						}
+						return onBeforeCancelPromise;
+					})
 					.then(function() {
 						// eslint-disable-next-line default-case
 						switch (sProgrammingModel) {
@@ -975,7 +1015,7 @@ sap.ui.define(
 					});
 			},
 			/**
-			 * Calls a bound/unbound action.
+			 * Calls a bound or unbound action.
 			 *
 			 * @function
 			 * @static
@@ -983,9 +1023,9 @@ sap.ui.define(
 			 * @memberof sap.fe.core.TransactionHelper
 			 * @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 {string} [mParameters.invocationGrouping] Mode how actions are to be called: Changeset to put all action calls into one changeset, Isolated to put them into separate changesets (TODO: create enum)
+			 * @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 is to be called
+			 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] Mandatory for an unbound action: An instance of an OData V4 model
+			 * @param {string} [mParameters.invocationGrouping] Mode how actions are to be called: 'ChangeSet' to put all action calls into one changeset, 'Isolated' to put them into separate changesets
 			 * @param {string} [mParameters.label] A human-readable label for the action
 			 * @param {boolean} [mParameters.bGetBoundContext] If specified, the action promise returns the bound context
 			 * @param {object} oView Contains the object of the current view
@@ -1321,8 +1361,9 @@ sap.ui.define(
 						oMetaModel = oModel.getMetaModel(),
 						aImmutableFields = [],
 						oAppComponent = that._getAppComponent(),
-						oEntitySetContext = oMetaModel.createBindingContext(oListBinding.getPath()),
-						sMetaPath = oMetaModel.getMetaPath(oListBinding.getPath());
+						sPath = oListBinding.isRelative() ? oListBinding.getResolvedPath() : oListBinding.getPath(),
+						oEntitySetContext = oMetaModel.createBindingContext(sPath),
+						sMetaPath = oMetaModel.getMetaPath(sPath);
 					for (var i in mFields) {
 						aImmutableFields.push(oMetaModel.createBindingContext(sMetaPath + "/" + mFields[i]));
 					}
@@ -1575,6 +1616,50 @@ sap.ui.define(
 							: undefined;
 				}
 				return sNewAction;
+			},
+			/**
+			 * Retrieves the label for the title of a specific create action dialog, e.g. Create Sales Order from Quotation.
+			 *
+			 * The following priority is applied:
+			 * 1. label of line-item annotation.
+			 * 2. label annotated in the action.
+			 * 3. "Create" as a constant from i18n.
+			 *
+			 * @function
+			 * @static
+			 * @private
+			 * @name sap.fe.core.TransactionHelper._getSpecificCreateActionDialogLabel
+			 * @memberof sap.fe.core.TransactionHelper
+			 * @param {object} oMetaModel The MetaModel used to check for the NewAction parameter
+			 * @param {string} sMetaPath The MetaPath
+			 * @param {string} sNewAction Contains the name of the action to be executed
+			 * @param {object} oResourceBundleCore ResourceBundle to access the default Create label
+			 * @returns {string} The label for the Create Action Dialog
+			 * @ui5-restricted
+			 * @final
+			 **/
+			_getSpecificCreateActionDialogLabel: function(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore) {
+				var fnGetLabelFromLineItemAnnotation = function() {
+					if (oMetaModel && oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")) {
+						var iLineItemIndex = oMetaModel
+							.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")
+							.findIndex(function(oLineItem) {
+								var aLineItemAction = oLineItem.Action ? oLineItem.Action.split("(") : undefined;
+								return aLineItemAction ? aLineItemAction[0] === sNewAction : false;
+							});
+						return iLineItemIndex > -1
+							? oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")[iLineItemIndex].Label
+							: undefined;
+					} else {
+						return undefined;
+					}
+				};
+
+				return (
+					fnGetLabelFromLineItemAnnotation() ||
+					(oMetaModel && oMetaModel.getObject(sMetaPath + "/" + sNewAction + "@com.sap.vocabularies.Common.v1.Label")) ||
+					(oResourceBundleCore && oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"))
+				);
 			}
 		});
 	}

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
@@ -75,6 +75,21 @@ sap.ui.define(
 			PREPARE: "PreparationAction"
 		};
 
+		/**
+		 * Static functions for the draft programming model
+		 *
+		 * @namespace
+		 * @alias sap.fe.core.actions.draft
+		 * @private
+		 * @experimental This module is only for experimental use! <br/><b>This is only a POC and maybe deleted</b>
+		 * @since 1.54.0
+		 */
+		var draft = {
+			createDraftFromActiveDocument: createDraftFromActiveDocument,
+			activateDocument: activateDocument,
+			deleteDraft: deleteDraft
+		};
+
 		/**
 		 * Determines action name for a draft operation.
 		 *
@@ -134,23 +149,49 @@ sap.ui.define(
 				var oOptions = { $$inheritExpandSelect: true };
 				var oOperation = createOperation(oContext, draftOperations.EDIT, oOptions);
 				oOperation.setParameter("PreserveChanges", bPreserveChanges);
-				var oEditPromise = oOperation.execute("direct").then(function(oDraftDocumentContext) {
-					return oDraftDocumentContext;
-				});
-				oOperation.getModel().submitBatch("direct");
+				var sGroupId = "direct";
+				var oEditPromise = oOperation
+					.execute(sGroupId, undefined, fnOnStrictHandlingFailed.bind(draft, oContext, sGroupId))
+					.then(function(oDraftDocumentContext) {
+						return oDraftDocumentContext;
+					});
+				oOperation.getModel().submitBatch(sGroupId);
 				return oEditPromise;
 			} else {
-				throw new Error("The edit action cannot be executed on a draft document");
+				throw new Error("You cannot edit this draft document");
+			}
+		}
+
+		function fnOnStrictHandlingFailed(oContext, sGroupId, aMessages) {
+			if (aMessages.length === 1) {
+				var sMessage = aMessages[0].message,
+					dialogPromise = new Promise(function(resolve) {
+						sap.ui.require(["sap/m/MessageBox"], function(MessageBox) {
+							MessageBox.warning(sMessage, {
+								title: "Warning",
+								actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
+								onClose: function(sAction) {
+									if (sAction === MessageBox.Action.OK) {
+										resolve(true);
+										oContext.getModel().submitBatch(sGroupId);
+									} else {
+										resolve(false);
+									}
+								}
+							});
+						});
+					});
+				return dialogPromise;
 			}
 		}
 
 		/**
-		 * 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 {object} oAppComponent The AppComponent
-		 * @param {string} [sGroupId] the optional batch group where we want to execute the operation in
+		 * @param {string} [sGroupId] The optional batch group in which the operation is to be executed
 		 * @returns {Promise.<sap.ui.model.odata.v4.Context>} Resolve function returns the context of the operation
 		 * @private
 		 * @ui5-restricted
@@ -166,7 +207,7 @@ sap.ui.define(
 			if (!oContext.getProperty("IsActiveEntity")) {
 				var oOperation = createOperation(oContext, draftOperations.ACTIVATION, { $$inheritExpandSelect: true });
 				return oOperation
-					.execute(sGroupId, bIgnoreEtag)
+					.execute(sGroupId, bIgnoreEtag, fnOnStrictHandlingFailed.bind(draft, oContext, sGroupId)) //3rd parameter<------
 					.then(function(oActiveDocumentContext) {
 						return oActiveDocumentContext;
 					})
@@ -563,20 +604,6 @@ sap.ui.define(
 				return executeDraftDiscardAction(oContext);
 			}
 		}
-		/**
-		 * Static functions for the draft programming model
-		 *
-		 * @namespace
-		 * @alias sap.fe.core.actions.draft
-		 * @private
-		 * @experimental This module is only for experimental use! <br/><b>This is only a POC and maybe deleted</b>
-		 * @since 1.54.0
-		 */
-		var draft = {
-			createDraftFromActiveDocument: createDraftFromActiveDocument,
-			activateDocument: activateDocument,
-			deleteDraft: deleteDraft
-		};
 
 		return draft;
 	}

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
@@ -165,10 +165,7 @@ sap.ui.define(
 					oDateFormat = DateFormat.getDateTimeInstance({
 						pattern: "MMMM dd, yyyy 'at' hh:mm a"
 					});
-					sRetryAfterMessage = oResourceBundle.getText(
-						"C_MESSAGE_HANDLING_SAPFE_503_ERROR_YEAR",
-						oDateFormat.format(dRetryAfter)
-					);
+					sRetryAfterMessage = oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR", oDateFormat.format(dRetryAfter));
 				} else if (dNow.getFullYear() == dRetryAfter.getFullYear()) {
 					//same year
 					if (bMessageDialog) {
@@ -359,6 +356,8 @@ sap.ui.define(
 										this.setVisible(false);
 									}
 								});
+							// Update proper ETag Mismatch error
+							var bHasEtagMessage = fnModifyETagMessagesOnly(oMessageManager, oResourceBundle);
 							that.oMessageView.setModel(oMessageDialogModel);
 							that.oDialog =
 								that.oDialog ||
@@ -394,8 +393,6 @@ sap.ui.define(
 									}
 								});
 
-							// Update proper ETag Mismatch error
-							var bHasEtagMessage = fnModifyETagMessagesOnly(oMessageManager, oResourceBundle);
 							if (bHasEtagMessage) {
 								sap.ui.require(["sap/m/ButtonType"], function(ButtonType) {
 									that.oDialog.setBeginButton(
@@ -460,6 +457,7 @@ sap.ui.define(
 			var oMessageManager = sap.ui.getCore().getMessageManager(),
 				oMessageModel = oMessageManager.getMessageModel(),
 				aMessages = oMessageModel.getObject("/"),
+				oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core"),
 				aTransitionMessages = [];
 
 			for (var i = 0; i < aMessages.length; i++) {
@@ -474,8 +472,13 @@ sap.ui.define(
 			}
 
 			for (var i = 0; i < aTransitionMessages.length; i++) {
-				if (aTransitionMessages[i].code === "503") {
-					aTransitionMessages[i].message = "\n" + aTransitionMessages[i].message;
+				if (
+					aTransitionMessages[i].code === "503" &&
+					aTransitionMessages[i].message !== "" &&
+					aTransitionMessages[i].message.indexOf(oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_BACKEND_PREFIX")) === -1
+				) {
+					aTransitionMessages[i].message =
+						"\n" + oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_BACKEND_PREFIX") + aTransitionMessages[i].message;
 				}
 			}
 			return aTransitionMessages;

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)
@@ -35,7 +35,8 @@ sap.ui.define(
 	) {
 		"use strict";
 
-		var Constants = FELibrary.Constants;
+		var Constants = FELibrary.Constants,
+			InvocationGrouping = FELibrary.InvocationGrouping;
 
 		/**
 		 * Calls a bound action for one or multiple contexts
@@ -44,7 +45,7 @@ sap.ui.define(
 		 * @name sap.fe.core.actions.operations.callBoundAction
 		 * @memberof sap.fe.core.actions.operations
 		 * @param {string} sActionName The name of the action to be called
-		 * @param {sap.ui.model.odata.v4.Context} contexts Either one context or an array with contexts for which the action shall be called
+		 * @param {sap.ui.model.odata.v4.Context} contexts Either one context or an array with contexts for which the action is to be be called
 		 * @param {sap.ui.model.odata.v4.Model} oModel OData Model
 		 * @param {object} oAppComponent The AppComponent
 		 * @param {map} [mParameters] Optional, can contain the following attributes:
@@ -53,7 +54,7 @@ sap.ui.define(
 		 * @param {Array} [mParameters.additionalSideEffect] array of property paths to be requested in addition to actual target properties of the side effect
 		 * @param {boolean} [mParameters.showActionParameterDialog] [false] if set and if parameters exist the user retrieves a dialog to fill in parameters, if actionParameters are passed they are shown to the user
 		 * @param {string} [mParameters.label] a human-readable label for the action
-		 * @param {string} [mParameters.invocationGrouping] [Isolated] mode how actions shall be called: Changeset to put all action calls into one changeset, Isolated to put them into separate changesets
+		 * @param {string} [mParameters.invocationGrouping] [Isolated] mode how actions are to be called: Changeset to put all action calls into one changeset, Isolated to put them into separate changesets
 		 * @param {Function} [mParameters.onSubmitted] Function which is called once the actions are submitted with an array of promises
 		 * @param {map} [mParameters.defaultParameters] can contain default parameters from FLP user defaults
 		 * @param {sap.ui.core.Element} [mParameters.parentControl] if specified the dialogs are added as dependent of the parent control
@@ -166,7 +167,7 @@ sap.ui.define(
 		function _executeFunction(sFunctionName, oModel, oFunction, context) {
 			var oFunctionPromise, sGroupId;
 			if (!oFunction || !oFunction.getObject()) {
-				return Promise.reject(new Error("Function" + sFunctionName + " not found"));
+				return Promise.reject(new Error("Function " + sFunctionName + " not found"));
 			}
 			if (context) {
 				oFunction = oModel.bindContext(sFunctionName + "(...)", context);
@@ -198,7 +199,7 @@ sap.ui.define(
 					sMessagesPath,
 					iMessageSideEffect;
 				if (!oAction || !oAction.getObject()) {
-					return reject(new Error("Action" + sActionName + " not found"));
+					return reject(new Error("Action " + sActionName + " not found"));
 				}
 				if (bShowActionParameterDialog || aActionParameters.length > 0) {
 					aActionParameters = prepareActionParameters(oAction, aActionParameters);
@@ -257,7 +258,7 @@ sap.ui.define(
 					mActionExecutionParameters.aContexts = aContexts;
 					mActionExecutionParameters.mBindingParameters = mParameters.mBindingParameters;
 					mActionExecutionParameters.additionalSideEffect = mParameters.additionalSideEffect;
-					mActionExecutionParameters.bGrouped = mParameters.invocationGrouping === "ChangeSet";
+					mActionExecutionParameters.bGrouped = mParameters.invocationGrouping === InvocationGrouping.ChangeSet;
 					mActionExecutionParameters.bReturnAsArray = mParameters.bReturnAsArray;
 					mActionExecutionParameters.internalModelContext = mParameters.internalModelContext;
 					mActionExecutionParameters.operationAvailableMap = mParameters.operationAvailableMap;
@@ -415,7 +416,9 @@ sap.ui.define(
 								if (oMessage.target.includes("APD_::" + sParameter)) {
 									aFieldInvalid.push("APD_::" + sParam);
 									oMessage.target = bClearTarget ? "" : oMessage.target;
-									oMessageManager.removeMessages(oMessage);
+									if (bClearTarget) {
+										oMessageManager.removeMessages(oMessage);
+									}
 								}
 							});
 						});
@@ -461,6 +464,7 @@ 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 aContexts;
 								var oResourceBundle = oParentControl.getController().oResourceBundle;
 								var oDialog = new Dialog({
 									title:
@@ -843,7 +847,7 @@ sap.ui.define(
 								oDialog.setModel(oMVFModel, "mvfview");
 
 								var sActionPath = sActionName + "(...)";
-								var aContexts = mParameters.aContexts || [];
+								aContexts = mParameters.aContexts || [];
 								if (!aContexts.length) {
 									sActionPath = "/" + sActionPath;
 								}

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