@sapui5/sap.fe.core 1.93.3 → 1.97.0

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

@@ -545,7 +545,19 @@ sap.ui.define(
 
 			if (bIsActiveEntity || (!bIsActiveEntity && !sDiscardAction)) {
 				//Use Delete in case of active entity and no discard action available for draft
-				return oContext.delete();
+				if (oContext.hasPendingChanges()) {
+					oContext
+						.getBinding()
+						.resetChanges()
+						.then(function() {
+							return oContext.delete();
+						})
+						.catch(function(error) {
+							return Promise.reject(error);
+						});
+				} else {
+					return oContext.delete();
+				}
 			} else {
 				//Use Discard Post Action if it is a draft entity and discard action exists
 				return executeDraftDiscardAction(oContext);

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

@@ -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,63 @@ 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_YEAR",
+						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 +292,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);
 			}
@@ -403,6 +473,11 @@ sap.ui.define(
 				}
 			}
 
+			for (var i = 0; i < aTransitionMessages.length; i++) {
+				if (aTransitionMessages[i].code === "503") {
+					aTransitionMessages[i].message = "\n" + aTransitionMessages[i].message;
+				}
+			}
 			return aTransitionMessages;
 		}
 
@@ -431,7 +506,8 @@ sap.ui.define(
 			showUnboundMessages: showUnboundMessages,
 			removeUnboundTransitionMessages: removeUnboundTransitionMessages,
 			removeBoundTransitionMessages: removeBoundTransitionMessages,
-			modifyETagMessagesOnly: fnModifyETagMessagesOnly
+			modifyETagMessagesOnly: fnModifyETagMessagesOnly,
+			getRetryAfterMessage: getRetryAfterMessage
 		};
 		return messageHandling;
 	}

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

@@ -152,6 +152,9 @@ sap.ui.define(
 		 * @private
 		 */
 		function callFunctionImport(sFunctionName, oModel) {
+			if (!sFunctionName) {
+				return Promise.resolve();
+			}
 			var oMetaModel = oModel.getMetaModel(),
 				sFunctionPath = oModel.bindContext("/" + sFunctionName).getPath(),
 				oFunctionImport = oMetaModel.createBindingContext(
@@ -258,6 +261,7 @@ sap.ui.define(
 					mActionExecutionParameters.bReturnAsArray = mParameters.bReturnAsArray;
 					mActionExecutionParameters.internalModelContext = mParameters.internalModelContext;
 					mActionExecutionParameters.operationAvailableMap = mParameters.operationAvailableMap;
+					mActionExecutionParameters.bObjectPage = mParameters.bObjectPage;
 				}
 				if (bIsCreateAction) {
 					mActionExecutionParameters.bIsCreateAction = bIsCreateAction;
@@ -371,7 +375,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();
 									}
@@ -383,6 +389,38 @@ 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;
+									oMessageManager.removeMessages(oMessage);
+								}
+							});
+						});
+						return aFieldInvalid;
+					},
 					oController = {
 						handleChange: function(oEvent) {
 							messageHandler.removeTransitionMessages();
@@ -394,6 +432,7 @@ sap.ui.define(
 									return oField.getValue();
 								});
 							}
+							_validateMessages(aActionParameters, aFieldInvalid);
 						}
 					};
 
@@ -457,29 +496,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(
@@ -496,7 +517,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;
 															}
@@ -516,10 +550,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
@@ -537,6 +574,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);
@@ -800,6 +838,10 @@ 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 || [];
 								if (!aContexts.length) {
@@ -981,59 +1023,156 @@ sap.ui.define(
 										Log.error("Error while requesting side effects", oError);
 									});
 							}
+						},
+						fnExecuteSingleAction = function(oAction, index, oSideEffect) {
+							var oPromise = new Promise(function(resolve, reject) {
+								var oLocalPromise,
+									aLocalPromise = [];
+								setActionParameterDefaultValue();
+								// For invocation grouping "isolated" need batch group per action call
+								sGroupId = "apiMode" + index;
+								oActionPromise = bGetBoundContext
+									? oAction.execute(sGroupId).then(function() {
+											return oAction.getBoundContext();
+									  })
+									: oAction.execute(sGroupId);
+
+								aActionPromises.push(oActionPromise);
+								aLocalPromise.push(oActionPromise);
+								var oSideEffectsService = oAppComponent.getSideEffectsService();
+								// trigger actions from side effects
+								if (oSideEffect && oSideEffect.triggerActions && oSideEffect.triggerActions.length) {
+									oSideEffect.triggerActions.forEach(function(sTriggerAction) {
+										if (sTriggerAction) {
+											oLocalPromise = oSideEffectsService.executeAction(
+												sTriggerAction,
+												oSideEffect.context,
+												sGroupId
+											);
+											aLocalPromise.push(oLocalPromise);
+										}
+									});
+								}
+								// request side effects for this action
+								// as we move the messages request to POST $select we need to be prepared for an empty array
+								if (oSideEffect && oSideEffect.pathExpressions && oSideEffect.pathExpressions.length > 0) {
+									oLocalPromise = oSideEffectsService.requestSideEffects(
+										oSideEffect.pathExpressions,
+										oSideEffect.context,
+										sGroupId
+									);
+									aLocalPromise.push(oLocalPromise);
+									oLocalPromise
+										.then(function() {
+											if (mParameters.operationAvailableMap && mParameters.internalModelContext) {
+												CommonUtils.setActionEnablement(
+													mParameters.internalModelContext,
+													JSON.parse(mParameters.operationAvailableMap),
+													mParameters.aContexts
+												);
+											}
+										})
+										.catch(function(oError) {
+											Log.error("Error while requesting side effects", oError);
+										});
+								}
+								oModel.submitBatch(sGroupId);
+								Promise.all(aLocalPromise)
+									.then(function() {
+										return resolve();
+									})
+									.catch(function() {
+										return resolve();
+									});
+							});
+							return oPromise;
 						};
 
-					for (i = 0; i < aContexts.length; i++) {
-						oAction = oModel.bindContext(sActionName + "(...)", aContexts[i], mBindingParameters);
-						fnExecuteAction(oAction, aContexts.length <= 1 ? null : i, {
-							context: aContexts[i],
-							pathExpressions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions,
-							triggerActions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.triggerActions
+					function fnExecuteSequentially(aContexts) {
+						// One action and its side effects are completed before the next action is executed
+						(fnOnSubmitted || function noop() {})(aActionPromises);
+						function processOneAction(context, i) {
+							oAction = oModel.bindContext(sActionName + "(...)", context, mBindingParameters);
+							return fnExecuteSingleAction(oAction, i, {
+								context: context,
+								pathExpressions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions,
+								triggerActions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.triggerActions
+							});
+						}
+
+						var oActionAndSideEffectPromise = Promise.resolve(undefined);
+						var j = 0;
+						aContexts.forEach(function(context) {
+							var id = ++j;
+							oActionAndSideEffectPromise = oActionAndSideEffectPromise.then(function() {
+								return processOneAction(context, id);
+							});
 						});
+						oActionAndSideEffectPromise
+							.then(function() {
+								fnHandleResults();
+							})
+							.catch();
 					}
 
-					// trigger onSubmitted "event"
-					(fnOnSubmitted || jQuery.noop)(aActionPromises);
+					if (mParameters.bObjectPage && !bGrouped) {
+						// For invocation grouping "isolated" called from ObjectPage, ensure that each action and matching side effects
+						// are processed before the next set is submitted. Workaround until JSON batch is available.
+						fnExecuteSequentially(aContexts);
+					} else {
+						for (i = 0; i < aContexts.length; i++) {
+							oAction = oModel.bindContext(sActionName + "(...)", aContexts[i], mBindingParameters);
+							fnExecuteAction(oAction, aContexts.length <= 1 ? null : i, {
+								context: aContexts[i],
+								pathExpressions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.pathExpressions,
+								triggerActions: mParameters.additionalSideEffect && mParameters.additionalSideEffect.triggerActions
+							});
+						}
+						(fnOnSubmitted || function noop() {})(aActionPromises);
+						fnHandleResults();
+					}
 
-					Promise.all(aActionPromises.map(fnDifferentiate))
-						.then(function(results) {
-							var aRejectedItems = [],
-								aResolvedItems = [],
-								iResultCount;
-							for (iResultCount = 0; iResultCount < results.length; iResultCount++) {
-								if (results[iResultCount].status === "rejected") {
-									aRejectedItems.push(results[iResultCount].response);
+					function fnHandleResults() {
+						Promise.all(aActionPromises.map(fnDifferentiate))
+							.then(function(results) {
+								var aRejectedItems = [],
+									aResolvedItems = [],
+									iResultCount;
+								for (iResultCount = 0; iResultCount < results.length; iResultCount++) {
+									if (results[iResultCount].status === "rejected") {
+										aRejectedItems.push(results[iResultCount].response);
+									}
+									if (results[iResultCount].status === "resolved") {
+										if (bIsCreateAction && bActionParametersExist) {
+											//only used for NewAction
+											results[iResultCount].bConsiderDocumentModified = true;
+											aResolvedItems.push(results[iResultCount]);
+										} else {
+											aResolvedItems.push(results[iResultCount].response);
+										}
+									}
+								}
+								if (!results || (results && results.length === 0)) {
+									reject(true);
 								}
-								if (results[iResultCount].status === "resolved") {
-									if (bIsCreateAction && bActionParametersExist) {
-										//only used for NewAction
-										results[iResultCount].bConsiderDocumentModified = true;
-										aResolvedItems.push(results[iResultCount]);
+								if (aRejectedItems.length === 0) {
+									if (bReturnAsArray) {
+										resolve(aResolvedItems);
 									} else {
-										aResolvedItems.push(results[iResultCount].response);
+										// context is given directly without an array so also no array is expected
+										resolve(aResolvedItems[0]);
 									}
-								}
-							}
-							if (!results || (results && results.length === 0)) {
-								reject(true);
-							}
-							if (aRejectedItems.length === 0) {
-								if (bReturnAsArray) {
-									resolve(aResolvedItems);
 								} else {
-									// context is given directly without an array so also no array is expected
-									resolve(aResolvedItems[0]);
+									reject({
+										resolvedItems: aResolvedItems,
+										rejectedItems: aRejectedItems
+									});
 								}
-							} else {
-								reject({
-									resolvedItems: aResolvedItems,
-									rejectedItems: aRejectedItems
-								});
-							}
-						})
-						.catch(reject);
+							})
+							.catch(reject);
+					}
 				}).finally(function() {
-					(fnOnResponse || jQuery.noop)();
+					(fnOnResponse || function noop() {})();
 				});
 			} else {
 				var oActionPromise;
@@ -1042,9 +1181,9 @@ sap.ui.define(
 				oActionPromise = oAction.execute("actionImport");
 				oModel.submitBatch("actionImport");
 				// trigger onSubmitted "event"
-				(fnOnSubmitted || jQuery.noop)(oActionPromise);
+				(fnOnSubmitted || function noop() {})(oActionPromise);
 				return oActionPromise.finally(function() {
-					(fnOnResponse || jQuery.noop)();
+					(fnOnResponse || function noop() {})();
 				});
 			}
 		}