@sapui5/sap.fe.core 1.93.3 → 1.96.2

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/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();
 									}
@@ -496,7 +502,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;
 															}
@@ -800,6 +819,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 +1004,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 +1162,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() {})();
 				});
 			}
 		}

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

@@ -66,6 +66,7 @@ sap.ui.define(
 					saveDocument: { "public": true, "final": true },
 					cancelDocument: { "public": true, "final": true },
 					deleteDocument: { "public": true, "final": true },
+					deleteMultipleDocuments: { "public": true, "final": true },
 					applyDocument: { "public": true, "final": true },
 					invokeAction: { "public": true, "final": true },
 					securedExecution: { "public": true, "final": true },
@@ -125,6 +126,13 @@ sap.ui.define(
 					});
 			},
 
+			deleteMultipleDocuments: function(aContexts, mParameters) {
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.deleteMultipleDocuments(aContexts, mParameters);
+			},
+
 			/**
 			 * Updates the draft status and displays the error messages if there are errors during an update.
 			 *
@@ -161,13 +169,14 @@ sap.ui.define(
 										sEntitySetName = oMetaModel.getMetaContext(oBindingContext.getPath()).getObject("@sapui.name"),
 										aSemanticKeys = SemanticKeyHelper.getSemanticKeys(oMetaModel, sEntitySetName);
 									if (aSemanticKeys && aSemanticKeys.length) {
-										var oCurrentSematicMapping = that.base
+										var oCurrentSemanticMapping = that.base
 												.getAppComponent()
 												.getRoutingService()
 												.getLastSemanticMapping(),
-											sCurrentSematicPath = oCurrentSematicMapping && oCurrentSematicMapping.semanticPath;
-										var sChangedPath = SemanticKeyHelper.getSemanticPath(oBindingContext);
-										if (sCurrentSematicPath !== sChangedPath) {
+											sCurrentSemanticPath = oCurrentSemanticMapping && oCurrentSemanticMapping.semanticPath,
+											sChangedPath = SemanticKeyHelper.getSemanticPath(oBindingContext, true);
+
+										if (sCurrentSemanticPath !== sChangedPath) {
 											return that._handleNewContext(oBindingContext, true, undefined, true).then(function() {
 												that._setDraftStatus(DraftStatus.Saved);
 											});
@@ -236,8 +245,10 @@ sap.ui.define(
 					// Create by navigating to an external target
 					// TODO: Call appropriate function (currently using the same as for outbound chevron nav, and without any context - 3rd param)
 					return this._syncTask().then(function() {
-						var oController = that.getView().getController();
-						oController.handlers.onChevronPressNavigateOutBound(oController, mParameters.outbound, undefined);
+						var oController = that.getView().getController(),
+							sCreatePath = CommonUtils.getAbsoluteMetaPathForListBinding(that.getView(), vListBinding);
+
+						oController.handlers.onChevronPressNavigateOutBound(oController, mParameters.outbound, undefined, sCreatePath);
 					});
 				}
 
@@ -714,7 +725,7 @@ sap.ui.define(
 			toggleDraftActive: function(oContext) {
 				var oContextData = oContext.getObject();
 				var that = this;
-				var bEditable, sEditMode, bUseSemanticKey;
+				var bEditable;
 				var bIsDraft = oContext && this._getProgrammingModel(oContext) === ProgrammingModel.Draft;
 				var oToggleContext = oContext
 					.getModel()
@@ -735,28 +746,22 @@ sap.ui.define(
 				if (!oContextData.IsActiveEntity && oContextData.HasActiveEntity) {
 					//start Point: edit draft
 					bEditable = false;
-					sEditMode = EditMode.Display;
-					bUseSemanticKey = false;
 				} else if (oContextData.IsActiveEntity && oContextData.HasDraftEntity) {
 					// start point active document
 					bEditable = true;
-					sEditMode = EditMode.Editable;
-					bUseSemanticKey = true;
 				}
 				oToggleContext
 					.requestCanonicalPath()
 					.then(function(sCanonicalPath) {
-						if (oToggleContext.getPath() !== sCanonicalPath) {
-							sCanonicalPath = bUseSemanticKey ? SemanticKeyHelper.getSemanticPath(oContext) : sCanonicalPath;
-							oToggleContext = oToggleContext
-								.getModel()
-								.bindContext(sCanonicalPath)
-								.getBoundContext();
-						}
-						return oToggleContext;
+						// We use the canonical path for the navigation instead of the semantic path, as the
+						// semantic key values may have changed between the draft and the active version (BCP 2170216142)
+						return oToggleContext
+							.getModel()
+							.bindContext(sCanonicalPath)
+							.getBoundContext();
 					})
 					.then(function(oToggleContext) {
-						that._setEditMode(sEditMode, false); //switch to edit mode only if a draft is available
+						that._setEditMode(bEditable ? EditMode.Editable : EditMode.Display, false); //switch to edit mode only if a draft is available
 						that._handleNewContext(oToggleContext, bEditable, true, true);
 					})
 					.catch(function(err) {
@@ -887,9 +892,7 @@ sap.ui.define(
 			applyDocument: function(oContext) {
 				var that = this,
 					oLockObject = this._getGlobalUIModel();
-
 				BusyLocker.lock(oLockObject);
-
 				return (
 					this._submitOpenChanges(oContext)
 						// check if there are any validation/parse errors
@@ -900,7 +903,9 @@ sap.ui.define(
 							return true;
 						})
 						.finally(function() {
-							BusyLocker.unlock(oLockObject);
+							if (BusyLocker.isLocked(oLockObject)) {
+								BusyLocker.unlock(oLockObject);
+							}
 						})
 				);
 			},
@@ -1034,6 +1039,8 @@ sap.ui.define(
 				} else {
 					mParameters.bGetBoundContext = true;
 				}
+				// Need to know that the action is called from ObjectPage for changeSet Isolated workaround
+				mParameters.bObjectPage = oView.getViewData().converterType === "ObjectPage";
 				return this._syncTask()
 					.then(
 						transactionHelper.callAction.bind(
@@ -1178,11 +1185,14 @@ sap.ui.define(
 			 */
 			handlePatchSent: function(oEvent) {
 				var that = this;
+				this.mPatchPromises = this.mPatchPromises ? this.mPatchPromises : {};
+				// do this for every unique object (eg: every table) so that each associated promise is fulfilled at the end
 				var oPatchPromise = new Promise(function(resolve, reject) {
-					that.resolvePatchPromise = resolve;
-					that.rejectPatchPromise = reject;
+					that.mPatchPromises[oEvent.getSource()] = {
+						resolvePatchPromise: resolve,
+						rejectPatchPromise: reject
+					};
 				});
-
 				this.updateDocument(oEvent.getSource(), oPatchPromise);
 			},
 
@@ -1194,10 +1204,11 @@ sap.ui.define(
 			handlePatchCompleted: function(oEvent) {
 				var bSuccess = oEvent.getParameter("success");
 				if (bSuccess) {
-					this.resolvePatchPromise();
+					this.mPatchPromises[oEvent.getSource()].resolvePatchPromise();
 				} else {
-					this.rejectPatchPromise();
+					this.mPatchPromises[oEvent.getSource()].rejectPatchPromise();
 				}
+				delete this.mPatchPromises[oEvent.getSource()];
 			},
 
 			//////////////////////////////////////
@@ -1335,15 +1346,22 @@ sap.ui.define(
 			},
 
 			_submitOpenChanges: function(oContext) {
-				var oModel = oContext.getModel();
-
+				var oModel = oContext.getModel(),
+					oLockObject = this._getGlobalUIModel();
 				//Currently we are using only 1 updateGroupId, hence submitting the batch directly here
-				return oModel.submitBatch("$auto").then(function() {
-					if (oModel.hasPendingChanges("$auto")) {
-						// the submit was not successful
-						return Promise.reject("submit of open changes failed");
-					}
-				});
+				return oModel
+					.submitBatch("$auto")
+					.then(function() {
+						if (oModel.hasPendingChanges("$auto")) {
+							// the submit was not successful
+							return Promise.reject("submit of open changes failed");
+						}
+					})
+					.finally(function() {
+						if (BusyLocker.isLocked(oLockObject)) {
+							BusyLocker.unlock(oLockObject);
+						}
+					});
 			},
 
 			_handleStickyOn: function(oContext) {
@@ -1491,7 +1509,8 @@ sap.ui.define(
 					editable: bEditable,
 					bPersistOPScroll: true,
 					bRecreateContext: bRecreateContext,
-					bDraftNavigation: bDraftNavigation
+					bDraftNavigation: bDraftNavigation,
+					showPlaceholder: false
 				});
 			},
 

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

@@ -67,7 +67,7 @@ sap.ui.define(
 				// to be overridden
 			},
 
-			createMultipleDocuments: function(oListBinding, aData, bCreateAtEnd) {
+			createMultipleDocuments: function(oListBinding, aData, bCreateAtEnd, bFromCopyPaste) {
 				var that = this,
 					transactionHelper = this.getTransactionHelper(),
 					oLockObject = this.getGlobalUIModel(),
@@ -101,12 +101,18 @@ sap.ui.define(
 							// Remove navigation properties as we don't support deep create
 							for (var sPropertyPath in mPropertyValues) {
 								var oProperty = oMetaModel.getObject(sMetaPath + "/" + sPropertyPath);
-								if (oProperty && oProperty.$kind !== "NavigationProperty") {
+								if (oProperty && oProperty.$kind !== "NavigationProperty" && mPropertyValues[sPropertyPath]) {
 									mParameters.data[sPropertyPath] = mPropertyValues[sPropertyPath];
 								}
 							}
 
-							return transactionHelper.createDocument(oListBinding, mParameters, oResourceBundle, that.getMessageHandler());
+							return transactionHelper.createDocument(
+								oListBinding,
+								mParameters,
+								oResourceBundle,
+								that.getMessageHandler(),
+								bFromCopyPaste
+							);
 						});
 
 						return Promise.all(aCreationPromises);
@@ -338,9 +344,10 @@ sap.ui.define(
 
 				// TODO: this setting and removing of contexts shouldn't be in the transaction helper at all
 				// for the time being I kept it and provide the internal model context to not break something
-				mParameters.internalModelContext = mParameters.id
-					? this.getView()
-							.byId(mParameters.id)
+				mParameters.internalModelContext = mParameters.controlId
+					? sap.ui
+							.getCore()
+							.byId(mParameters.controlId)
 							.getBindingContext("internal")
 					: null;