@sapui5/sap.fe.core 1.95.0 → 1.98.0

package/src/sap/fe/core/controllerextensions/EditFlow.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(
 	[
@@ -19,7 +19,8 @@ sap.ui.define(
 		"sap/fe/core/helpers/EditState",
 		"sap/fe/core/helpers/FPMHelper",
 		"sap/ui/core/message/Message",
-		"sap/ui/core/MessageType"
+		"sap/ui/core/MessageType",
+		"sap/fe/core/helpers/ModelHelper"
 	],
 	function(
 		ControllerExtension,
@@ -37,7 +38,8 @@ sap.ui.define(
 		EditState,
 		FPMHelper,
 		Message,
-		MessageType
+		MessageType,
+		ModelHelper
 	) {
 		"use strict";
 
@@ -47,7 +49,6 @@ sap.ui.define(
 		 * @name sap.fe.core.controllerextensions.EditFlow
 		 * @hideconstructor
 		 * @public
-		 * @experimental As of version 1.90.0
 		 * @since 1.90.0
 		 */
 
@@ -66,11 +67,16 @@ 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 },
 
-					onBeforeSave: { "public": true, "final": false, "overrideExecution": OverrideExecution.Instead }
+					onBeforeSave: { "public": true, "final": false, "overrideExecution": OverrideExecution.After },
+					onBeforeDelete: { "public": true, "final": false, "overrideExecution": OverrideExecution.After },
+					onBeforeCreate: { "public": true, "final": false, "overrideExecution": OverrideExecution.After },
+					onBeforeEdit: { "public": true, "final": false, "overrideExecution": OverrideExecution.After },
+					onBeforeDiscard: { "public": true, "final": false, "overrideExecution": OverrideExecution.After }
 				}
 			},
 
@@ -87,10 +93,11 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @param {object} oContext Context of the active document
+			 * @param {map} [mParameters] Contains the following attributes:
+			 * @param {boolean} [mParameters.prepareOnEdit] For a service with a prepare action, this parameter decides if the action is to be executed
 			 * @returns {Promise} Promise resolves once the editable document is available
 			 * @alias sap.fe.core.controllerextensions.EditFlow#editDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			editDocument: function(oContext, mParameters) {
@@ -100,8 +107,17 @@ sap.ui.define(
 					bDraftNavigation = true,
 					transactionHelper = this._getTransactionHelper();
 
-				return transactionHelper
-					.editDocument(oContext, bPrepareOnEdit, that.getView(), that._getMessageHandler())
+				return this.base.editFlow
+					.onBeforeEdit({ context: oContext })
+					.then(
+						transactionHelper.editDocument.bind(
+							transactionHelper,
+							oContext,
+							bPrepareOnEdit,
+							that.getView(),
+							that._getMessageHandler()
+						)
+					)
 					.then(function(oNewDocumentContext) {
 						var sProgrammingModel = that._getProgrammingModel(oContext);
 
@@ -113,18 +129,37 @@ sap.ui.define(
 							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);
-									}
-								});
+								return that
+									._handleNewContext(oNewDocumentContext, true, undefined, bDraftNavigation, true)
+									.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);
+										}
+									});
 							}
 						}
+					})
+					.catch(function(oError) {
+						Log.error("Error while editing the document", oError);
 					});
 			},
 
+			deleteMultipleDocuments: function(aContexts, mParameters) {
+				if (mParameters) {
+					mParameters.beforeDeleteCallBack = this.base.editFlow.onBeforeDelete;
+				} else {
+					mParameters = {
+						beforeDeleteCallBack: this.base.editFlow.onBeforeDelete
+					};
+				}
+				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.
 			 *
@@ -134,30 +169,31 @@ sap.ui.define(
 			 * @returns {Promise} Promise resolves once draft status has been updated
 			 * @alias sap.fe.core.controllerextensions.EditFlow#updateDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			updateDocument: function(oContext, oPromise) {
 				var that = this,
 					transactionHelper = that._getTransactionHelper(),
+					oBindingContext = that.getView().getBindingContext(),
 					bIsDraft = that._getProgrammingModel(oContext) === ProgrammingModel.Draft;
 
 				this._getMessageHandler().removeTransitionMessages();
 				return this._syncTask(function() {
-					transactionHelper.handleDocumentModifications();
-					EditState.setEditStateDirty();
-					that._getMessageHandler().removeTransitionMessages();
+					if (oBindingContext) {
+						transactionHelper.handleDocumentModifications();
+						EditState.setEditStateDirty();
 
-					if (bIsDraft) {
-						that._setDraftStatus(DraftStatus.Saving);
+						if (bIsDraft) {
+							that._setDraftStatus(DraftStatus.Saving);
+						}
 					}
+					that._getMessageHandler().removeTransitionMessages();
 
 					return oPromise
 						.then(
 							function() {
-								if (bIsDraft) {
-									var oBindingContext = that.getView().getBindingContext(),
-										oMetaModel = oBindingContext.getModel().getMetaModel(),
+								if (bIsDraft && oBindingContext) {
+									var oMetaModel = oBindingContext.getModel().getMetaModel(),
 										sEntitySetName = oMetaModel.getMetaContext(oBindingContext.getPath()).getObject("@sapui.name"),
 										aSemanticKeys = SemanticKeyHelper.getSemanticKeys(oMetaModel, sEntitySetName);
 									if (aSemanticKeys && aSemanticKeys.length) {
@@ -181,7 +217,7 @@ sap.ui.define(
 								}
 							},
 							function() {
-								if (bIsDraft) {
+								if (bIsDraft && oBindingContext) {
 									that._setDraftStatus(DraftStatus.Clear);
 								}
 							}
@@ -190,18 +226,16 @@ sap.ui.define(
 							Log.error("Error while updating the document", oError);
 						})
 						.finally(function() {
-							that._getMessageHandler().showMessageDialog();
+							that._getMessageHandler().showMessages();
 						});
 				});
 			},
 
 			// Internal only params ---
 			// * @param {string} mParameters.creationMode The creation mode using one of the following:
-			// *                    NewPage - the created document is shown in a new page, depending on whether metadata Sync, Async or Deferred is used
 			// *                    Sync - the creation is triggered and once the document is created, the navigation is done
 			// *                    Async - the creation and the navigation to the instance are done in parallel
 			// *                    Deferred - the creation is done on the target page
-			// *                    Inline - The creation is done inline (in a table)
 			// *                    CreationRow - The creation is done inline async so the user is not blocked
 			// mParameters.creationRow Instance of the creation row - (TODO: get rid but use list bindings only)
 
@@ -211,10 +245,16 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @param {sap.ui.model.odata.v4.ODataListBinding|string} vListBinding  ODataListBinding object or the binding path for a temporary list binding
+			 * @param {map} mParameters Contains the following attributes:
+			 * @param {string} mParameters.creationMode The creation mode using one of the following:
+			 *                    NewPage - the created document is shown in a new page, depending on whether metadata 'Sync', 'Async' or 'Deferred' is used
+			 *                    Inline - The creation is done inline (in a table)
+			 *                    External - The creation is done in a different application specified via the parameter 'outbound'
+			 * @param {string} [mParameters.outbound] The navigation target where the document is created in case of creationMode 'External'
+			 * @param {boolean} [mParameters.createAtEnd] Specifies if the new entry should be created at the top or bottom of a table in case of creationMode 'Inline'
 			 * @returns {Promise} Promise resolves once the object has been created
 			 * @alias sap.fe.core.controllerextensions.EditFlow#createDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			createDocument: function(vListBinding, mParameters) {
@@ -238,7 +278,7 @@ sap.ui.define(
 					// 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(),
-							sCreatePath = CommonUtils.getAbsoluteMetaPathForListBinding(that.getView(), vListBinding);
+							sCreatePath = ModelHelper.getAbsoluteMetaPathForListBinding(that.getView(), vListBinding);
 
 						oController.handlers.onChevronPressNavigateOutBound(oController, mParameters.outbound, undefined, sCreatePath);
 					});
@@ -485,12 +525,21 @@ sap.ui.define(
 										if (!mParameters.parentControl) {
 											mParameters.parentControl = that.getView();
 										}
-										return transactionHelper.createDocument(
-											oListBinding,
-											mParameters,
-											oResourceBundle,
-											that._getMessageHandler()
-										);
+										return that.base.editFlow
+											.onBeforeCreate({ contextPath: oListBinding.getPath() })
+											.then(
+												transactionHelper.createDocument.bind(
+													transactionHelper,
+													oListBinding,
+													mParameters,
+													oResourceBundle,
+													that._getMessageHandler()
+												)
+											)
+											.catch(function(oError) {
+												Log.error("Error while creating the document", oError);
+												return Promise.reject();
+											});
 									});
 								}
 
@@ -499,18 +548,21 @@ sap.ui.define(
 									case CreationMode.Deferred:
 										oNavigation = oRoutingListener.navigateForwardToContext(oListBinding, {
 											bDeferredContext: true,
-											editable: true
+											editable: true,
+											bForceFocus: true
 										});
 										break;
 									case CreationMode.Async:
 										oNavigation = oRoutingListener.navigateForwardToContext(oListBinding, {
 											asyncContext: oCreation,
-											editable: true
+											editable: true,
+											bForceFocus: true
 										});
 										break;
 									case CreationMode.Sync:
 										mArgs = {
-											editable: true
+											editable: true,
+											bForceFocus: true
 										};
 										if (sProgrammingModel == ProgrammingModel.Sticky || mParameters.createAction) {
 											mArgs.transient = true;
@@ -571,10 +623,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();
@@ -620,21 +679,102 @@ sap.ui.define(
 			},
 
 			/**
-			 * This function can be used to intercept the save action. You can execute custom coding in this function.
-			 * The framework waits for the returned promise to be resolved before continuing the save action. If you
-			 * reject the promise the save action is stopped and the user stays in edit mode.
+			 * This function can be used to intercept the 'Save' action. You can execute custom coding in this function.
+			 * The framework waits for the returned promise to be resolved before continuing the 'Save' action.
+			 * If you reject the promise, the 'Save' action is stopped and the user stays in edit mode.
 			 *
 			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
-			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.Instead}.
-			 *
-			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the save action is triggered. If rejected, the save action is not triggered and the user stays in edit mode.
+			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
+			 * @param {map} [mParameters] Object containing the parameters passed to onBeforeSave
+			 * @param {sap.ui.model.odata.v4.Context} [mParameters.context] Page context that is going to be saved.
+			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the 'Save' action is triggered. If rejected, the 'Save' action is not triggered and the user stays in edit mode.
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @alias sap.fe.core.controllerextensions.EditFlow#onBeforeSave
 			 * @public
 			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
-			onBeforeSave: function() {
+			onBeforeSave: function(mParameters) {
+				// to be overridden
+				return Promise.resolve();
+			},
+			/**
+			 * This function can be used to intercept the 'Create' action. You can execute custom coding in this function.
+			 * The framework waits for the returned promise to be resolved before continuing the 'Create' action.
+			 * If you reject the promise, the 'Create' action is stopped.
+			 *
+			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
+			 * @param {map} [mParameters] Object containing the parameters passed to onBeforeCreate
+			 * @param {string} [mParameters.contextPath] Path pointing to the context on which 'Create' action is triggered
+			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the 'Create' action is triggered. If rejected, the 'Create' action is not triggered.
+			 * @memberof sap.fe.core.controllerextensions.EditFlow
+			 * @alias sap.fe.core.controllerextensions.EditFlow#onBeforeCreate
+			 * @public
+			 * @experimental As of version 1.98.0
+			 * @since 1.98.0
+			 */
+			onBeforeCreate: function(mParameters) {
+				// to be overridden
+				return Promise.resolve();
+			},
+			/**
+			 * This function can be used to intercept the 'Edit' action. You can execute custom coding in this function.
+			 * The framework waits for the returned promise to be resolved before continuing the 'Edit' action.
+			 * If you reject the promise, the 'Edit' action is stopped and the user stays in display mode.
+			 *
+			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
+			 * @param {map} [mParameters] Object containing the parameters passed to onBeforeEdit
+			 * @param {sap.ui.model.odata.v4.Context} [mParameters.context] Page context that is going to be edited.
+			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the 'Edit' action is triggered. If rejected, the 'Edit' action is not triggered and the user stays in display mode.
+			 * @memberof sap.fe.core.controllerextensions.EditFlow
+			 * @alias sap.fe.core.controllerextensions.EditFlow#onBeforeEdit
+			 * @public
+			 * @experimental As of version 1.98.0
+			 * @since 1.98.0
+			 */
+			onBeforeEdit: function(mParameters) {
+				// to be overridden
+				return Promise.resolve();
+			},
+			/**
+			 * This function can be used to intercept the 'Discard' action. You can execute custom coding in this function.
+			 * The framework waits for the returned promise to be resolved before continuing the 'Discard' action.
+			 * If you reject the promise, the 'Discard' action is stopped and the user stays in edit mode.
+			 *
+			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
+			 * @param {map} [mParameters] Object containing the parameters passed to onBeforeDiscard
+			 * @param {sap.ui.model.odata.v4.Context} [mParameters.context] Page context that is going to be discarded.
+			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the 'Discard' action is triggered. If rejected, the 'Discard' action is not triggered and the user stays in edit mode.
+			 * @memberof sap.fe.core.controllerextensions.EditFlow
+			 * @alias sap.fe.core.controllerextensions.EditFlow#onBeforeDiscard
+			 * @public
+			 * @experimental As of version 1.98.0
+			 * @since 1.98.0
+			 */
+			onBeforeDiscard: function(mParameters) {
+				// to be overridden
+				return Promise.resolve();
+			},
+			/**
+			 * This function can be used to intercept the 'Delete' action. You can execute custom coding in this function.
+			 * The framework waits for the returned promise to be resolved before continuing the 'Delete' action.
+			 * If you reject the promise, the 'Delete' action is stopped.
+			 *
+			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
+			 * @param {map} [mParameters] Object containing the parameters passed to onBeforeDelete
+			 * @param {Array} [mParameters.contexts] An array of contexts that are going to be deleted
+			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the 'Delete' action is triggered. If rejected, the 'Delete' action is not triggered.
+			 * @memberof sap.fe.core.controllerextensions.EditFlow
+			 * @alias sap.fe.core.controllerextensions.EditFlow#onBeforeDelete
+			 * @public
+			 * @experimental As of version 1.98.0
+			 * @since 1.98.0
+			 */
+			onBeforeDelete: function(mParameters) {
 				// to be overridden
 				return Promise.resolve();
 			},
@@ -654,7 +794,6 @@ sap.ui.define(
 			 * @returns {Promise} Promise resolves once save is complete
 			 * @alias sap.fe.core.controllerextensions.EditFlow#saveDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			saveDocument: function(oContext, mParameters) {
@@ -672,7 +811,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.base.editFlow.onBeforeSave.bind(this))
+						.then(this.base.editFlow.onBeforeSave.bind(this, { context: oContext }))
 						// and finally if all user changes are submitted and valid save the document
 						.then(
 							transactionHelper.saveDocument.bind(
@@ -697,7 +836,7 @@ sap.ui.define(
 							that._getMessageHandler().showMessageDialog();
 
 							if (oActiveDocumentContext !== oContext) {
-								that._handleNewContext(oActiveDocumentContext, false, undefined, bDraftNavigation);
+								that._handleNewContext(oActiveDocumentContext, false, undefined, bDraftNavigation, true);
 							}
 						})
 						.catch(function(oError) {
@@ -710,7 +849,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()
@@ -731,29 +870,23 @@ 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._handleNewContext(oToggleContext, bEditable, true, true);
+						that._setEditMode(bEditable ? EditMode.Editable : EditMode.Display, false); //switch to edit mode only if a draft is available
+						that._handleNewContext(oToggleContext, bEditable, true, true, true);
 					})
 					.catch(function(err) {
 						return Promise.reject("Error in EditFlow.toggleDraftActive:" + err);
@@ -769,12 +902,12 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @param {object} oContext  Context of the editable document
-			 * @param {map} [mParameters] Can contain the following attributes:
-			 * @param {object} mParameters.control This is the control used to open the Discard popover. It is mandatory.
+			 * @param {map} mParameters Can contain the following attributes:
+			 * @param {object} mParameters.control This is the control used to open the discard popover
+			 * @param {boolean} [mParameters.skipDiscardPopover] Optional, supresses the discard popover and allows custom handling
 			 * @returns {Promise} Promise resolves once editable document has been discarded
 			 * @alias sap.fe.core.controllerextensions.EditFlow#cancelDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			cancelDocument: function(oContext, mParameters) {
@@ -782,6 +915,7 @@ sap.ui.define(
 					transactionHelper = this._getTransactionHelper(),
 					oResourceBundle = that.getView().getController().oResourceBundle;
 				mParameters.cancelButton = mParameters.control || mParameters.cancelButton;
+				mParameters.beforeCancelCallBack = this.base.editFlow.onBeforeDiscard;
 				return this._syncTask()
 					.then(
 						transactionHelper.cancelDocument.bind(
@@ -808,7 +942,9 @@ sap.ui.define(
 						//in case of a new document, the value of hasActiveEntity is returned. navigate back.
 						if (!oActiveDocumentContext) {
 							EditState.setEditStateDirty();
-							that._getRoutingListener().navigateBackFromContext(oContext);
+							return mParameters.skipBackNavigation
+								? undefined
+								: that._getRoutingListener().navigateBackFromContext(oContext);
 						} else if (sProgrammingModel === ProgrammingModel.Draft) {
 							// We need to load the semantic keys of the active context, as we need them
 							// for the navigation
@@ -816,16 +952,19 @@ sap.ui.define(
 								// We force the recreation of the context, so that it's created and bound in the same microtask,
 								// so that all properties are loaded together by autoExpandSelect, so that when switching back to Edit mode
 								// $$inheritExpandSelect takes all loaded properties into account (BCP 2070462265)
-								if (mParameters.bSkipBindingToView) {
+								if (mParameters.skipBindingToView) {
 									return oActiveDocumentContext;
 								} else {
-									return that._handleNewContext(oActiveDocumentContext, false, true, bDraftNavigation);
+									return that._handleNewContext(oActiveDocumentContext, false, true, bDraftNavigation, true);
 								}
 							});
 						} else {
 							//active context is returned in case of cancel of existing document
-							return that._handleNewContext(oActiveDocumentContext, false, undefined, bDraftNavigation);
+							return that._handleNewContext(oActiveDocumentContext, false, undefined, bDraftNavigation, true);
 						}
+					})
+					.catch(function(oError) {
+						Log.error("Error while discarding the document", oError);
 					});
 			},
 
@@ -837,13 +976,12 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @param {object} oContext  Context of the document
-			 * @param {map} [mParameters] Optional, can contain the following attributes:
+			 * @param {map} mParameters Can contain the following attributes:
 			 * @param {string} mParameters.title Title of the object being deleted
 			 * @param {string} mParameters.description Description of the object being deleted
 			 * @returns {Promise} Promise resolves once document has been deleted
 			 * @alias sap.fe.core.controllerextensions.EditFlow#deleteDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			deleteDocument: function(oContext, mParameters) {
@@ -856,17 +994,22 @@ sap.ui.define(
 				} else {
 					mParameters.bFindActiveContexts = false;
 				}
-				return this._deleteDocumentTransaction(oContext, mParameters).then(function() {
-					// Single objet deletion is triggered from an OP header button (not from a list)
-					// --> Mark UI dirty and navigate back to dismiss the OP
-					EditState.setEditStateDirty();
-
-					that._getRoutingListener().navigateBackFromContext(oContext);
-					// After delete is successfull, we need to dettch the setBackNavigation Methods
-					if (oAppComponent) {
-						oAppComponent.getShellServices().setBackNavigation();
-					}
-				});
+				mParameters.beforeDeleteCallBack = this.base.editFlow.onBeforeDelete;
+				return this._deleteDocumentTransaction(oContext, mParameters)
+					.then(function() {
+						// Single objet deletion is triggered from an OP header button (not from a list)
+						// --> Mark UI dirty and navigate back to dismiss the OP
+						EditState.setEditStateDirty();
+
+						that._getRoutingListener().navigateBackFromContext(oContext);
+						// After delete is successfull, we need to dettch the setBackNavigation Methods
+						if (oAppComponent) {
+							oAppComponent.getShellServices().setBackNavigation();
+						}
+					})
+					.catch(function(oError) {
+						Log.error("Error while deleting the document", oError);
+					});
 			},
 
 			/**
@@ -877,15 +1020,12 @@ sap.ui.define(
 			 * @returns {Promise} Promise resolves once the changes have been saved
 			 * @alias sap.fe.core.controllerextensions.EditFlow#applyDocument
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 */
 			applyDocument: function(oContext) {
 				var that = this,
 					oLockObject = this._getGlobalUIModel();
-
 				BusyLocker.lock(oLockObject);
-
 				return (
 					this._submitOpenChanges(oContext)
 						// check if there are any validation/parse errors
@@ -896,7 +1036,9 @@ sap.ui.define(
 							return true;
 						})
 						.finally(function() {
-							BusyLocker.unlock(oLockObject);
+							if (BusyLocker.isLocked(oLockObject)) {
+								BusyLocker.unlock(oLockObject);
+							}
 						})
 				);
 			},
@@ -912,22 +1054,22 @@ sap.ui.define(
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @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] For a bound action, a context or an array with contexts for which the action shall be called must be provided
+			 * @param {sap.ui.model.odata.v4.Context} [mParameters.contexts] For a bound action, a context or an array with contexts for which the action is to be called must be provided
 			 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] For an unbound action, an instance of an OData V4 model must be provided
-			 * @param {boolean} [mParameters.requiresNavigation] Boolean value indicating whether navigation is required after the action has been executed. Navigation takes place to the context returned by the action.
-			 * @param {string} [mParameters.label] A human-readable label for the action. This is needed in case the action has a parameter and a parameter dialog is shown to the user.
+			 * @param {boolean} [mParameters.requiresNavigation] Boolean value indicating whether navigation is required after the action has been executed. Navigation takes place to the context returned by the action
+			 * @param {string} [mParameters.label] A human-readable label for the action. This is needed in case the action has a parameter and a parameter dialog is shown to the user. The label will be used for the title of the dialog and for the confirmation button
+			 * @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
 			 * @returns {Promise}
 			 * @alias sap.fe.core.controllerextensions.EditFlow#invokeAction
 			 * @public
-			 * @experimental As of version 1.90.0
 			 * @since 1.90.0
 			 * @final
 			 **/
 			invokeAction: function(sActionName, mParameters) {
 				var that = this,
-					oTable,
-					transactionHelper = this._getTransactionHelper(),
 					oControl,
+					transactionHelper = this._getTransactionHelper(),
+					oCurrentControl,
 					oBindingContext,
 					aParts,
 					sOverloadEntityType,
@@ -959,11 +1101,11 @@ sap.ui.define(
 					mParameters.parentControl = this.getView();
 				}
 
-				if (mParameters.prefix) {
-					oTable = this.getView().byId(mParameters.prefix);
-					if (oTable) {
+				if (mParameters.controlId) {
+					oControl = this.getView().byId(mParameters.controlId);
+					if (oControl) {
 						// TODO: currently this selected contexts update is done within the operation, should be moved out
-						mParameters.internalModelContext = oTable.getBindingContext("internal");
+						mParameters.internalModelContext = oControl.getBindingContext("internal");
 					}
 				} else {
 					mParameters.internalModelContext = oView.getBindingContext("internal");
@@ -980,10 +1122,10 @@ sap.ui.define(
 				}
 
 				if (mParameters.bStaticAction) {
-					if (oTable.isTableBound()) {
-						mParameters.contexts = oTable.getRowBinding().getHeaderContext();
+					if (oControl.isTableBound()) {
+						mParameters.contexts = oControl.getRowBinding().getHeaderContext();
 					} else {
-						var sBindingPath = oTable.data("rowsBindingInfo").path,
+						var sBindingPath = oControl.data("rowsBindingInfo").path,
 							oListBinding = new ODataListBinding(that.getView().getModel(), sBindingPath);
 						mParameters.contexts = oListBinding.getHeaderContext();
 					}
@@ -996,9 +1138,9 @@ sap.ui.define(
 							.getObject("$Type");
 						if (sOverloadEntityType !== sTableContextEntityType) {
 							// search for context in control tree hierarchy
-							oControl = oTable;
-							while (oControl) {
-								oBindingContext = oControl.getBindingContext();
+							oCurrentControl = oControl;
+							while (oCurrentControl) {
+								oBindingContext = oCurrentControl.getBindingContext();
 								if (
 									oBindingContext &&
 									oBindingContext
@@ -1011,7 +1153,7 @@ sap.ui.define(
 									break;
 								} else {
 									// check parent
-									oControl = oControl.getParent();
+									oCurrentControl = oCurrentControl.getParent();
 								}
 							}
 							if (!mParameters.contexts) {
@@ -1021,7 +1163,7 @@ sap.ui.define(
 					}
 
 					if (mParameters.enableAutoScroll) {
-						oCurrentActionCallBacks = this._createActionPromise(sActionName, oTable.sId);
+						oCurrentActionCallBacks = this._createActionPromise(sActionName, oControl.sId);
 					}
 				}
 
@@ -1176,11 +1318,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);
 			},
 
@@ -1192,10 +1337,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()];
 			},
 
 			//////////////////////////////////////
@@ -1333,15 +1479,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) {
@@ -1481,7 +1634,7 @@ sap.ui.define(
 				}
 			},
 
-			_handleNewContext: function(oContext, bEditable, bRecreateContext, bDraftNavigation, bShowPlaceholder) {
+			_handleNewContext: function(oContext, bEditable, bRecreateContext, bDraftNavigation, bForceFocus) {
 				EditState.setEditStateDirty();
 
 				return this._getRoutingListener().navigateToContext(oContext, {
@@ -1490,7 +1643,8 @@ sap.ui.define(
 					bPersistOPScroll: true,
 					bRecreateContext: bRecreateContext,
 					bDraftNavigation: bDraftNavigation,
-					showPlaceholder: false
+					showPlaceholder: false,
+					bForceFocus: bForceFocus
 				});
 			},