@sapui5/sap.fe.core 1.92.0 → 1.93.3

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

@@ -15,9 +15,10 @@ sap.ui.define(
 		"sap/ui/model/Filter",
 		"sap/ui/model/FilterOperator",
 		"sap/ui/core/message/Message",
-		"sap/ui/core/IconPool"
+		"sap/ui/core/IconPool",
+		"sap/ui/model/json/JSONModel"
 	],
-	function(MessageToast, MessageItem, MessageView, Button, Dialog, CoreLib, Filter, FilterOperator, Message, IconPool) {
+	function(MessageToast, MessageItem, MessageView, Button, Dialog, CoreLib, Filter, FilterOperator, Message, IconPool, JSONModel) {
 		"use strict";
 		var MessageType = CoreLib.MessageType;
 		var that = this;
@@ -154,7 +155,10 @@ sap.ui.define(
 				oMessageManager = sap.ui.getCore().getMessageManager(),
 				sHighestPriority,
 				sHighestPriorityText,
-				aFilters = [new Filter({ path: "code", operator: FilterOperator.NE, value1: undefined })],
+				aFilters = [
+					new Filter({ path: "code", operator: FilterOperator.NE, value1: null }),
+					new Filter({ path: "persistent", operator: FilterOperator.NE, value1: false })
+				],
 				showMessageDialog = false;
 
 			if (bShowBoundTransition) {
@@ -213,10 +217,19 @@ sap.ui.define(
 				});
 			}
 			var oListBinding = oMessageManager.getMessageModel().bindList("/", undefined, undefined, aFilters),
-				aCurrentContexts = oListBinding.getCurrentContexts();
+				aCurrentContexts = oListBinding.getCurrentContexts(),
+				oMessageDialogModel = new JSONModel();
 			if (aCurrentContexts && aCurrentContexts.length > 0) {
 				// Don't show dialog incase there are no errors to show
 				showMessageDialog = true;
+				// As fitering has already happened here hence
+				// using the message model again for the message dialog view and then filtering on that binding again is unnecessary.
+				// So we create new json model to use for the message dialog view.
+				var aMessages = [];
+				aCurrentContexts.forEach(function(oContext) {
+					aMessages.push(oContext.getObject());
+				});
+				oMessageDialogModel.setData(aMessages);
 			}
 			if (aUnboundMessages.length === 0 && !aCustomMessages && !bHasEtagMessage) {
 				// Don't show the popup if there are no transient messages
@@ -263,7 +276,6 @@ sap.ui.define(
 									},
 									items: {
 										path: "/",
-										filters: aFilters,
 										template: that.oMessageTemplate
 									}
 								});
@@ -277,7 +289,7 @@ sap.ui.define(
 										this.setVisible(false);
 									}
 								});
-							that.oMessageView.setModel(oMessageManager.getMessageModel());
+							that.oMessageView.setModel(oMessageDialogModel);
 							that.oDialog =
 								that.oDialog ||
 								new Dialog({

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

@@ -336,24 +336,6 @@ sap.ui.define(
 			});
 		}
 
-		function _isSingleton(sPath, oMetaModel) {
-			if (!sPath || !oMetaModel) {
-				return false;
-			}
-
-			// Find the underlying entity set from the property path and check whether it is a singleton.
-			// In order to do it,
-			// split the path on '/',
-			// remove the last entry (property name) and
-			// join the remaining parts to form the navigation path
-			var sNavigationPath = sPath
-					.split("/")
-					.slice(0, -1)
-					.join("/"),
-				oEntitySet = sNavigationPath && oMetaModel.getObject("/" + sNavigationPath);
-			return (oEntitySet && oEntitySet.$kind === "Singleton") || false;
-		}
-
 		function showActionParameterDialog(
 			sActionName,
 			oAppComponent,
@@ -458,8 +440,6 @@ sap.ui.define(
 											validateRequiredProperties()
 												.then(function(aEmptyMandatoryFields) {
 													if (aEmptyMandatoryFields.length) {
-														var oMessageManager = sap.ui.getCore().getMessageManager();
-														oMessageManager.removeAllMessages();
 														var oMessages = [];
 														for (var i = 0; i < aEmptyMandatoryFields.length; i++) {
 															oMessages.push({
@@ -571,28 +551,21 @@ sap.ui.define(
 											var prefillParameter = function(sParamName, vParamDefaultValue) {
 												return new Promise(function(resolve, reject) {
 													// Case 1: There is a ParameterDefaultValue annotation
-													if (vParamDefaultValue) {
+													if (vParamDefaultValue !== undefined) {
 														if (aContexts.length > 0 && vParamDefaultValue.$Path) {
-															var oPromise;
-															//check for singleton
-															if (
-																_isSingleton(
-																	vParamDefaultValue.$Path,
-																	oOperationBinding.getModel().getMetaModel()
-																)
-															) {
-																//request value and resolve
-																var oPropertyBinding = oOperationBinding
-																	.getModel()
-																	.bindProperty("/" + vParamDefaultValue.$Path);
-																oPromise = oPropertyBinding.requestValue();
-															} else {
-																// Case 1.1: ParameterDefaultValue points to a path (i.e. vParamDefaultValue = { $Path: 'somePath' })
-																oPromise = oOperationBinding
-																	.getParameterContext()
-																	.requestProperty(vParamDefaultValue.$Path);
-															}
+															var oPromise = CommonUtils.requestSingletonProperty(
+																vParamDefaultValue.$Path,
+																oOperationBinding.getModel()
+															);
 															oPromise
+																.then(function(oValue) {
+																	if (oValue === null) {
+																		return oOperationBinding
+																			.getParameterContext()
+																			.requestProperty(vParamDefaultValue.$Path);
+																	}
+																	return oValue;
+																})
 																.then(function(vParamValue) {
 																	if (aContexts.length > 1) {
 																		// For multi select, need to loop over aContexts (as contexts cannot be retrieved via binding parameter of the operation binding)
@@ -734,7 +707,10 @@ sap.ui.define(
 																aActionParameters[i].$Name,
 																oFunctionParamsFromManifest[sDialogParamName]
 															);
-														} else if (aCurrentParamDefaultValue[i] && aCurrentParamDefaultValue[i].value) {
+														} else if (
+															aCurrentParamDefaultValue[i] &&
+															aCurrentParamDefaultValue[i].value !== undefined
+														) {
 															oOperationBinding.setParameter(
 																aActionParameters[i].$Name,
 																aCurrentParamDefaultValue[i].value

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

@@ -17,7 +17,9 @@ sap.ui.define(
 		"sap/ui/model/odata/v4/ODataListBinding",
 		"sap/fe/core/helpers/SemanticKeyHelper",
 		"sap/fe/core/helpers/EditState",
-		"sap/fe/core/helpers/FPMHelper"
+		"sap/fe/core/helpers/FPMHelper",
+		"sap/ui/core/message/Message",
+		"sap/ui/core/MessageType"
 	],
 	function(
 		ControllerExtension,
@@ -33,7 +35,9 @@ sap.ui.define(
 		ODataListBinding,
 		SemanticKeyHelper,
 		EditState,
-		FPMHelper
+		FPMHelper,
+		Message,
+		MessageType
 	) {
 		"use strict";
 
@@ -66,7 +70,7 @@ sap.ui.define(
 					invokeAction: { "public": true, "final": true },
 					securedExecution: { "public": true, "final": true },
 
-					onBeforeSave: { "public": false, "final": false, "overrideExecution": OverrideExecution.Instead }
+					onBeforeSave: { "public": true, "final": false, "overrideExecution": OverrideExecution.Instead }
 				}
 			},
 
@@ -104,17 +108,19 @@ sap.ui.define(
 						if (sProgrammingModel === ProgrammingModel.Sticky) {
 							that._getInternalModel().setProperty("/sessionOn", true);
 						}
-						that._setEditMode(EditMode.Editable, false);
-						that._getMessageHandler().showMessageDialog();
+						if (oNewDocumentContext) {
+							that._setEditMode(EditMode.Editable, false);
+							that._getMessageHandler().showMessageDialog();
 
-						if (oNewDocumentContext !== oContext) {
-							return that._handleNewContext(oNewDocumentContext, true, undefined, bDraftNavigation).then(function() {
-								if (sProgrammingModel === ProgrammingModel.Sticky) {
-									// The stickyOn handler must be set after the navigation has been done,
-									// as the URL may change in the case of FCL
-									that._handleStickyOn(oNewDocumentContext);
-								}
-							});
+							if (oNewDocumentContext !== oContext) {
+								return that._handleNewContext(oNewDocumentContext, true, undefined, bDraftNavigation).then(function() {
+									if (sProgrammingModel === ProgrammingModel.Sticky) {
+										// The stickyOn handler must be set after the navigation has been done,
+										// as the URL may change in the case of FCL
+										that._handleStickyOn(oNewDocumentContext);
+									}
+								});
+							}
 						}
 					});
 			},
@@ -179,6 +185,9 @@ sap.ui.define(
 								}
 							}
 						)
+						.catch(function(oError) {
+							Log.error("Error while updating the document", oError);
+						})
 						.finally(function() {
 							that._getMessageHandler().showMessageDialog();
 						});
@@ -212,14 +221,14 @@ sap.ui.define(
 					transactionHelper = this._getTransactionHelper(),
 					oLockObject = this._getGlobalUIModel(),
 					oTable,
-					iCountTableItems,
+					iCountTableItems = 0,
 					oResourceBundle = that.getView().getController().oResourceBundle,
 					bShouldBusyLock =
 						!mParameters ||
 						(mParameters.creationMode !== CreationMode.Inline &&
 							mParameters.creationMode !== CreationMode.CreationRow &&
 							mParameters.creationMode !== CreationMode.External),
-					oExecFunctionFromManifestPromise = Promise.resolve(true),
+					oExecFunctionFromManifestPromise = Promise.resolve([]),
 					oAppComponent = CommonUtils.getAppComponent(this.getView());
 				oAppComponent.getRouterProxy().removeIAppStateKey();
 
@@ -292,32 +301,91 @@ sap.ui.define(
 							Log.error("Error while creating the document", oError);
 						});
 				}
+
+				/**
+				 * @param {Array} aValidationMessages Error messages from custom validation function
+				 */
+				function createCustomValidationMessages(aValidationMessages) {
+					var sCustomValidationFunction = oTable && oTable.getCreationRow().data("customValidationFunction"),
+						mCustomValidity = oTable && oTable.getBindingContext("internal").getProperty("creationRowCustomValidity"),
+						oMessageManager = sap.ui.getCore().getMessageManager(),
+						aCustomMessages = [],
+						oFieldControl,
+						sTarget;
+
+					// Remove existing CustomValidation message
+					oMessageManager
+						.getMessageModel()
+						.getData()
+						.forEach(function(oMessage) {
+							if (oMessage.code === sCustomValidationFunction) {
+								oMessageManager.removeMessages(oMessage);
+							}
+						});
+
+					aValidationMessages.forEach(function(oValidationMessage) {
+						// Handle Bound CustomValidation message
+						if (oValidationMessage.messageTarget) {
+							oFieldControl = sap.ui.getCore().getControl(mCustomValidity[oValidationMessage.messageTarget].fieldId);
+							sTarget = oFieldControl.getBindingContext().getPath() + "/" + oFieldControl.getBindingPath("value");
+							// Add validation message if still not exists
+							if (
+								oMessageManager
+									.getMessageModel()
+									.getData()
+									.filter(function(oMessage) {
+										return oMessage.target === sTarget;
+									}).length === 0
+							) {
+								oMessageManager.addMessages(
+									new Message({
+										message: oValidationMessage.messageText,
+										processor: that.getView().getModel(),
+										type: MessageType.Error,
+										code: sCustomValidationFunction,
+										technical: false,
+										persistent: false,
+										target: sTarget
+									})
+								);
+							}
+							// Add controlId in order to get the focus handling of the error popover runable
+							var aExistingValidationMessages = oMessageManager
+								.getMessageModel()
+								.getData()
+								.filter(function(oMessage) {
+									return oMessage.target === sTarget;
+								});
+							aExistingValidationMessages[0].addControlId(mCustomValidity[oValidationMessage.messageTarget].fieldId);
+
+							// Handle Unbound CustomValidation message
+						} else {
+							aCustomMessages.push({
+								code: sCustomValidationFunction,
+								text: oValidationMessage.messageText,
+								persistent: true,
+								type: MessageType.Error
+							});
+						}
+					});
+
+					if (aCustomMessages.length > 0) {
+						that._getMessageHandler().showMessageDialog({
+							customMessages: aCustomMessages
+						});
+					}
+				}
+
 				bShouldBusyLock && BusyLocker.lock(oLockObject);
 				return this._syncTask(oExecFunctionFromManifestPromise)
 					.then(function(aValidationMessages) {
 						if (aValidationMessages.length > 0) {
-							// handle validation message
-							var oCustomMessages = [];
-							aValidationMessages.forEach(function(oMessage) {
-								oCustomMessages.push({
-									text: oMessage.messageText,
-									target: oMessage.messageTarget,
-									code: 200,
-									persistent: false,
-									type: "Error"
-								});
-							});
-							that._getMessageHandler().showMessageDialog({
-								customMessages: oCustomMessages
-							});
-							// if validation error prevent row creation
-							bShouldBusyLock && BusyLocker.unlock(oLockObject);
-							return Promise.reject();
-						} else {
-							return Promise.resolve();
+							createCustomValidationMessages(aValidationMessages);
+							Log.error("Custom Validation failed");
+							// if custom validation fails, we leave the method immediately
+							return;
 						}
-					})
-					.then(function() {
+
 						var sProgrammingModel, oListBinding, oModel;
 
 						mParameters = mParameters || {};
@@ -500,10 +568,17 @@ sap.ui.define(
 								if (sProgrammingModel === ProgrammingModel.Sticky) {
 									that._getInternalModel().setProperty("/sessionOn", true);
 								}
+								var bIsNewPageCreation =
+									mParameters.creationMode !== CreationMode.CreationRow &&
+									mParameters.creationMode !== CreationMode.Inline;
 								if (oCreation) {
 									return Promise.all([oCreation, oNavigation])
 										.then(function(aParams) {
-											that._setEditMode(EditMode.Editable, true);
+											if (bIsNewPageCreation) {
+												that._setEditMode(EditMode.Editable, bIsNewPageCreation);
+											} else {
+												that._setEditMode(EditMode.Editable);
+											}
 											var oNewDocumentContext = aParams[0];
 											if (oNewDocumentContext) {
 												EditState.setEditStateDirty();
@@ -601,7 +676,7 @@ sap.ui.define(
 						.then(this._submitOpenChanges.bind(this, oContext))
 						// check if there are any validation/parse errors
 						.then(this._checkForValidationErrors.bind(this, oContext))
-						.then(this.onBeforeSave.bind(this))
+						.then(this.base.editFlow.onBeforeSave.bind(this))
 						// and finally if all user changes are submitted and valid save the document
 						.then(
 							transactionHelper.saveDocument.bind(
@@ -777,6 +852,7 @@ sap.ui.define(
 			 */
 			deleteDocument: function(oContext, mParameters) {
 				var that = this;
+				var oAppComponent = CommonUtils.getAppComponent(that.getView());
 				if (!mParameters) {
 					mParameters = {
 						bFindActiveContexts: false
@@ -790,6 +866,10 @@ sap.ui.define(
 					EditState.setEditStateDirty();
 
 					that._getRoutingListener().navigateBackFromContext(oContext);
+					// After delete is successfull, we need to dettch the setBackNavigation Methods
+					if (oAppComponent) {
+						oAppComponent.getShellServices().setBackNavigation();
+					}
 				});
 			},
 
@@ -889,6 +969,8 @@ sap.ui.define(
 						// TODO: currently this selected contexts update is done within the operation, should be moved out
 						mParameters.internalModelContext = oTable.getBindingContext("internal");
 					}
+				} else {
+					mParameters.internalModelContext = oView.getBindingContext("internal");
 				}
 
 				if (sActionName && sActionName.indexOf("(") > -1) {
@@ -965,11 +1047,13 @@ sap.ui.define(
 					.then(function(oResponse) {
 						// if the returned context for the bound action is different than the context on which action was called,
 						// refresh the corresponding list binding
-						return that
-							._refreshListIfRequired(that._getActionResponseDataAndKeys(sActionName, oResponse), mParameters.contexts[0])
-							.then(function() {
-								return oResponse;
-							});
+						if (mParameters.contexts) {
+							return that
+								._refreshListIfRequired(that._getActionResponseDataAndKeys(sActionName, oResponse), mParameters.contexts[0])
+								.then(function() {
+									return oResponse;
+								});
+						}
 					})
 					.then(function(oResponse) {
 						if (oCurrentActionCallBacks) {

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

@@ -216,22 +216,22 @@ sap.ui.define(
 					}
 				},
 				/**
-				 * Triggered everytime this controller is the target of a navigation.
+				 * Triggered every time this controller is a navigation target.
 				 */
 				onRouteMatched: function() {},
 				onRouteMatchedFinished: function() {},
 				onBeforeBinding: function(oBindingContext, mParameters) {
-					this.base
-						.getView()
-						.getController()
-						.routing.onBeforeBinding(oBindingContext, mParameters);
+					var oRouting = this.base.getView().getController().routing;
+					if (oRouting && oRouting.onBeforeBinding) {
+						oRouting.onBeforeBinding(oBindingContext, mParameters);
+					}
 				},
 				onAfterBinding: function(oBindingContext, mParameters) {
 					this._oAppComponent.getRootViewController().onContextBoundToView(oBindingContext);
-					this.base
-						.getView()
-						.getController()
-						.routing.onAfterBinding(oBindingContext, mParameters);
+					var oRouting = this.base.getView().getController().routing;
+					if (oRouting && oRouting.onAfterBinding) {
+						oRouting.onAfterBinding(oBindingContext, mParameters);
+					}
 				},
 
 				///////////////////////////////////////////////////////////
@@ -240,7 +240,7 @@ sap.ui.define(
 				///////////////////////////////////////////////////////////
 
 				/**
-				 * Navigate to specified navigation target name.
+				 * Navigates to the specified navigation target.
 				 * @param {sap.ui.model.odata.v4.Context} oContext Context instance
 				 * @param {string} sNavigationTargetName Navigation target name
 				 * @param oSemanticObject
@@ -944,7 +944,7 @@ sap.ui.define(
 
 				override: {
 					onExit: function() {
-						this._oRoutingService.detachRouteMatched(this._fnRouteMatchedBound);
+						this._oRoutingService && this._oRoutingService.detachRouteMatched(this._fnRouteMatchedBound);
 					},
 					onInit: function() {
 						var that = this;