@sapui5/sap.fe.core 1.95.0 → 1.98.0

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
@@ -16,9 +16,23 @@ sap.ui.define(
 		"sap/ui/model/FilterOperator",
 		"sap/ui/core/message/Message",
 		"sap/ui/core/IconPool",
-		"sap/ui/model/json/JSONModel"
+		"sap/ui/model/json/JSONModel",
+		"sap/ui/core/format/DateFormat"
 	],
-	function(MessageToast, MessageItem, MessageView, Button, Dialog, CoreLib, Filter, FilterOperator, Message, IconPool, JSONModel) {
+	function(
+		MessageToast,
+		MessageItem,
+		MessageView,
+		Button,
+		Dialog,
+		CoreLib,
+		Filter,
+		FilterOperator,
+		Message,
+		IconPool,
+		JSONModel,
+		DateFormat
+	) {
 		"use strict";
 		var MessageType = CoreLib.MessageType;
 		var that = this;
@@ -129,12 +143,60 @@ sap.ui.define(
 			});
 			return bMessagesModified;
 		}
+
 		// Dialog close Handling
 		function dialogCloseHandler() {
 			that.oDialog.close();
 			that.oBackButton.setVisible(false);
 			removeUnboundTransitionMessages();
 		}
+
+		function getRetryAfterMessage(oMessage, bMessageDialog) {
+			var dNow = new Date();
+			var oTechnicalDetails = oMessage.getTechnicalDetails(),
+				oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core"),
+				sRetryAfterMessage;
+			if (oTechnicalDetails && oTechnicalDetails.httpStatus === 503 && oTechnicalDetails.retryAfter) {
+				var dRetryAfter = oTechnicalDetails.retryAfter;
+				var sRetryAfterMessage;
+				var oDateFormat;
+				if (dNow.getFullYear() !== dRetryAfter.getFullYear()) {
+					//different years
+					oDateFormat = DateFormat.getDateTimeInstance({
+						pattern: "MMMM dd, yyyy 'at' hh:mm a"
+					});
+					sRetryAfterMessage = oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR", oDateFormat.format(dRetryAfter));
+				} else if (dNow.getFullYear() == dRetryAfter.getFullYear()) {
+					//same year
+					if (bMessageDialog) {
+						//less than 2 min
+						sRetryAfterMessage =
+							oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_TITLE") +
+							" " +
+							oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_DESC");
+					} else if (dNow.getMonth() !== dRetryAfter.getMonth() || dNow.getDate() !== dRetryAfter.getDate()) {
+						oDateFormat = sap.ui.core.format.DateFormat.getDateTimeInstance({
+							pattern: "MMMM dd 'at' hh:mm a"
+						}); //different months or different days of same month
+						sRetryAfterMessage = oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR", oDateFormat.format(dRetryAfter));
+					} else {
+						//same day
+						oDateFormat = sap.ui.core.format.DateFormat.getDateTimeInstance({
+							pattern: "hh:mm a"
+						});
+						sRetryAfterMessage = oResourceBundle.getText(
+							"C_MESSAGE_HANDLING_SAPFE_503_ERROR_DAY",
+							oDateFormat.format(dRetryAfter)
+						);
+					}
+				}
+			}
+
+			if (oTechnicalDetails && oTechnicalDetails.httpStatus === 503 && !oTechnicalDetails.retryAfter) {
+				sRetryAfterMessage = oResourceBundle.getText("C_MESSAGE_HANDLING_SAPFE_503_ERROR_NO_RETRY_AFTER");
+			}
+			return sRetryAfterMessage;
+		}
 		/**
 		 * Shows all unbound (including technical) messages and removes the ones which are transient.
 		 *
@@ -227,7 +289,12 @@ sap.ui.define(
 				// So we create new json model to use for the message dialog view.
 				var aMessages = [];
 				aCurrentContexts.forEach(function(oContext) {
-					aMessages.push(oContext.getObject());
+					var oMessage = oContext.getObject(),
+						sRetryAfterMessage = getRetryAfterMessage(oMessage, true);
+					if (sRetryAfterMessage) {
+						oMessage.setMessage(sRetryAfterMessage + " " + oMessage.getMessage());
+					}
+					aMessages.push(oMessage);
 				});
 				oMessageDialogModel.setData(aMessages);
 			}
@@ -289,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 ||
@@ -324,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(
@@ -390,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++) {
@@ -403,6 +471,16 @@ sap.ui.define(
 				}
 			}
 
+			for (var i = 0; i < aTransitionMessages.length; i++) {
+				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;
 		}
 
@@ -431,7 +509,8 @@ sap.ui.define(
 			showUnboundMessages: showUnboundMessages,
 			removeUnboundTransitionMessages: removeUnboundTransitionMessages,
 			removeBoundTransitionMessages: removeBoundTransitionMessages,
-			modifyETagMessagesOnly: fnModifyETagMessagesOnly
+			modifyETagMessagesOnly: fnModifyETagMessagesOnly,
+			getRetryAfterMessage: getRetryAfterMessage
 		};
 		return messageHandling;
 	}

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;
@@ -375,7 +376,9 @@ sap.ui.define(
 									return oField.getRequired() && oField.getValueState() !== "Error";
 								})
 								.map(function(oFormElement) {
-									var value = oFormElement.getFields()[0].getValue();
+									var value = oFormElement.getFields()[0].isA("sap.ui.mdc.MultiValueField")
+										? oFormElement.getFields()[0].getItems()
+										: oFormElement.getFields()[0].getValue();
 									if (value === undefined || value === null || value === "") {
 										return oFormElement.getLabel().getText();
 									}
@@ -387,6 +390,40 @@ sap.ui.define(
 							return aResults;
 						});
 					},
+					_validateMessages = function(aActionParameters, aFieldInvalid, bClearTarget) {
+						var oMessageManager = sap.ui.getCore().getMessageManager();
+						var aMessages = oMessageManager.getMessageModel().getData();
+
+						aFieldInvalid = [];
+
+						aActionParameters.forEach(function(oActionParameters) {
+							var sParameter = oActionParameters.$Name;
+							aMessages.forEach(function(oMessage) {
+								var sParam = sParameter.replace("-inner", "");
+								if (
+									oMessage.controlIds.length > 0 &&
+									(oMessage.getControlId().includes("APD_::" + sParameter) ||
+										(oMessage.getControlId().includes("APD_::" + sParameter + "inner") &&
+											aFieldInvalid.indexOf("APD_::" + sParam) < 0))
+								) {
+									if (bClearTarget) {
+										oMessageManager.removeMessages(oMessage);
+									} else {
+										aFieldInvalid.push("APD_::" + sParam);
+									}
+								}
+								// Handle messages related to input with invalid token
+								if (oMessage.target.includes("APD_::" + sParameter)) {
+									aFieldInvalid.push("APD_::" + sParam);
+									oMessage.target = bClearTarget ? "" : oMessage.target;
+									if (bClearTarget) {
+										oMessageManager.removeMessages(oMessage);
+									}
+								}
+							});
+						});
+						return aFieldInvalid;
+					},
 					oController = {
 						handleChange: function(oEvent) {
 							messageHandler.removeTransitionMessages();
@@ -398,6 +435,7 @@ sap.ui.define(
 									return oField.getValue();
 								});
 							}
+							_validateMessages(aActionParameters, aFieldInvalid);
 						}
 					};
 
@@ -426,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:
@@ -461,29 +500,11 @@ sap.ui.define(
 														});
 														return;
 													}
-													var aMessages = sap.ui
-														.getCore()
-														.getMessageManager()
-														.getMessageModel()
-														.getData();
 
-													aFieldInvalid = [];
-													aActionParameters.forEach(function(oActionParameters) {
-														var sParameter = oActionParameters.$Name;
-														aMessages.forEach(function(oMessage) {
-															var sParam = sParameter.replace("-inner", "");
-															if (
-																oMessage.controlIds.length > 0 &&
-																(oMessage.getControlId().includes("APD_::" + sParameter) ||
-																	(oMessage.getControlId().includes("APD_::" + sParameter + "inner") &&
-																		aFieldInvalid.indexOf("APD_::" + sParam) < 0))
-															) {
-																aFieldInvalid.push("APD_::" + sParam);
-															}
-														});
-													});
+													aFieldInvalid = _validateMessages(aActionParameters, aFieldInvalid);
+
 													if (aFieldInvalid.length > 0) {
-														return;
+														return messageHandling.showUnboundMessages();
 													}
 													BusyLocker.lock(oDialog);
 													return Promise.all(
@@ -500,7 +521,20 @@ sap.ui.define(
 																oParameterContext =
 																	oOperationBinding && oOperationBinding.getParameterContext();
 															for (var i in aActionParameters) {
-																vParameterValue = oParameterContext.getProperty(aActionParameters[i].$Name);
+																if (aActionParameters[i].$isCollection) {
+																	var aMVFContent = oDialog
+																			.getModel("mvfview")
+																			.getProperty("/" + aActionParameters[i].$Name),
+																		aKeyValues = [];
+																	for (var j in aMVFContent) {
+																		aKeyValues.push(aMVFContent[j].Key);
+																	}
+																	vParameterValue = aKeyValues;
+																} else {
+																	vParameterValue = oParameterContext.getProperty(
+																		aActionParameters[i].$Name
+																	);
+																}
 																aActionParameters[i].value = vParameterValue;
 																vParameterValue = undefined;
 															}
@@ -520,10 +554,13 @@ sap.ui.define(
 																oResourceBundle
 															);
 
-															messageHandler.showMessageDialog({
+															messageHandler.showMessages({
 																bHasEtagMessage: bHasEtagMessage,
 																context: mParameters.aContexts[0],
-																isActionParameterDialogOpen: true
+																isActionParameterDialogOpen: true,
+																messagePageNavigationCallback: function() {
+																	oDialog.close();
+																}
 															});
 															if (oDialog && bHasEtagMessage) {
 																oDialog.close(); //close the action parameter dialog after refresh of the context after etag mismatch
@@ -541,6 +578,7 @@ sap.ui.define(
 									endButton: {
 										text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
 										press: function() {
+											_validateMessages(aActionParameters, aFieldInvalid, true);
 											oDialog.close();
 											messageHandler.removeTransitionMessages();
 											reject(Constants.CancelActionDialog);
@@ -804,8 +842,12 @@ sap.ui.define(
 									path: "/",
 									model: "paramsModel"
 								});
+								// empty model to add elements dynamically depending on number of MVF fields defined on the dialog
+								var oMVFModel = new JSONModel({});
+								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