@sapui5/sap.fe.core 1.97.0 → 1.99.1

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

@@ -1,12 +1,12 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
 		"sap/ui/core/mvc/ControllerExtension",
 		"sap/ui/core/mvc/OverrideExecution",
-		"sap/fe/core/actions/sticky",
 		"sap/base/Log",
 		"sap/m/Text",
 		"sap/m/Button",
@@ -25,7 +25,6 @@ sap.ui.define(
 	function(
 		ControllerExtension,
 		OverrideExecution,
-		sticky,
 		Log,
 		Text,
 		Button,
@@ -49,7 +48,6 @@ sap.ui.define(
 		 * @name sap.fe.core.controllerextensions.EditFlow
 		 * @hideconstructor
 		 * @public
-		 * @experimental As of version 1.90.0
 		 * @since 1.90.0
 		 */
 
@@ -59,7 +57,7 @@ sap.ui.define(
 			DraftStatus = FELibrary.DraftStatus,
 			EditMode = FELibrary.EditMode;
 
-		var Extension = ControllerExtension.extend("sap.fe.core.controllerextensions.EditFlow", {
+		return ControllerExtension.extend("sap.fe.core.controllerextensions.EditFlow", {
 			metadata: {
 				methods: {
 					editDocument: { "public": true, "final": true },
@@ -73,7 +71,11 @@ sap.ui.define(
 					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 }
 				}
 			},
 
@@ -90,10 +92,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) {
@@ -103,8 +106,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);
 
@@ -127,10 +139,20 @@ sap.ui.define(
 									});
 							}
 						}
+					})
+					.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()
@@ -146,30 +168,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) {
@@ -193,7 +216,7 @@ sap.ui.define(
 								}
 							},
 							function() {
-								if (bIsDraft) {
+								if (bIsDraft && oBindingContext) {
 									that._setDraftStatus(DraftStatus.Clear);
 								}
 							}
@@ -209,11 +232,9 @@ sap.ui.define(
 
 			// 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)
 
@@ -223,10 +244,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) {
@@ -241,7 +268,7 @@ sap.ui.define(
 						(mParameters.creationMode !== CreationMode.Inline &&
 							mParameters.creationMode !== CreationMode.CreationRow &&
 							mParameters.creationMode !== CreationMode.External),
-					oExecFunctionFromManifestPromise = Promise.resolve([]),
+					oExecCustomValidation = Promise.resolve([]),
 					oAppComponent = CommonUtils.getAppComponent(this.getView());
 				oAppComponent.getRouterProxy().removeIAppStateKey();
 
@@ -257,27 +284,17 @@ sap.ui.define(
 				}
 
 				if (mParameters.creationMode === CreationMode.CreationRow && mParameters.creationRow) {
+					var oCreationRowObjects = mParameters.creationRow.getBindingContext().getObject();
+					delete oCreationRowObjects["@$ui5.context.isTransient"];
 					oTable = mParameters.creationRow.getParent();
-					// get custom validation function from manifest
-					var sCustomValidationFunction = oTable.getCreationRow().data("customValidationFunction");
-					if (sCustomValidationFunction) {
-						var sModule = sCustomValidationFunction
-								.substring(0, sCustomValidationFunction.lastIndexOf(".") || -1)
-								.replace(/\./gi, "/"),
-							sFunctionName = sCustomValidationFunction.substring(
-								sCustomValidationFunction.lastIndexOf(".") + 1,
-								sCustomValidationFunction.length
-							),
-							oCreationRowObjects = mParameters.creationRow.getBindingContext().getObject();
-						delete oCreationRowObjects["@$ui5.context.isTransient"];
-						oExecFunctionFromManifestPromise = FPMHelper.validationWrapper(
-							sModule,
-							sFunctionName,
-							oCreationRowObjects,
-							that.base.getView(),
-							oTable.getBindingContext("internal")
-						);
-					}
+					oExecCustomValidation = transactionHelper.validateDocument(
+						oTable.getBindingContext(),
+						{
+							data: oCreationRowObjects,
+							customValidationFunction: oTable.getCreationRow().data("customValidationFunction")
+						},
+						that.base.getView()
+					);
 
 					// disableAddRowButtonForEmptyData is set to false in manifest converter (Table.ts) if customValidationFunction exists
 					if (oTable.getCreationRow().data("disableAddRowButtonForEmptyData") === "true") {
@@ -392,7 +409,7 @@ sap.ui.define(
 				}
 
 				bShouldBusyLock && BusyLocker.lock(oLockObject);
-				return this._syncTask(oExecFunctionFromManifestPromise)
+				return this._syncTask(oExecCustomValidation)
 					.then(function(aValidationMessages) {
 						if (aValidationMessages.length > 0) {
 							createCustomValidationMessages(aValidationMessages);
@@ -448,7 +465,11 @@ sap.ui.define(
 										}
 									}
 									var sMetaPath = oMetaModel.getMetaPath(oListBinding.getHeaderContext().getPath());
-									var aNonComputedVisibleKeyFields = CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath);
+									var aNonComputedVisibleKeyFields = CommonUtils.getNonComputedVisibleFields(
+										oMetaModel,
+										sMetaPath,
+										that.getView()
+									);
 									if (aNonComputedVisibleKeyFields.length > 0) {
 										return CreationMode.Deferred;
 									}
@@ -497,11 +518,14 @@ sap.ui.define(
 										if (!mParameters.parentControl) {
 											mParameters.parentControl = that.getView();
 										}
+										mParameters.beforeCreateCallBack = that.base.editFlow.onBeforeCreate;
 										return transactionHelper.createDocument(
 											oListBinding,
 											mParameters,
 											oResourceBundle,
-											that._getMessageHandler()
+											that._getMessageHandler(),
+											false,
+											that.getView()
 										);
 									});
 								}
@@ -546,7 +570,7 @@ sap.ui.define(
 										});
 										break;
 									case CreationMode.Inline:
-										oNavigation = handleSideEffects(oListBinding, oCreation);
+										handleSideEffects(oListBinding, oCreation);
 										that._syncTask(oCreation);
 										break;
 									case CreationMode.CreationRow:
@@ -642,21 +666,103 @@ 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
+			 * @param {Array} [mParameters.createParameters] Array of values that are filled in the Action Parameter Dialog
+			 * @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();
 			},
@@ -676,7 +782,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) {
@@ -694,7 +799,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(
@@ -785,12 +890,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) {
@@ -798,6 +903,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(
@@ -824,7 +930,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
@@ -832,7 +940,7 @@ 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, true);
@@ -842,6 +950,9 @@ sap.ui.define(
 							//active context is returned in case of cancel of existing document
 							return that._handleNewContext(oActiveDocumentContext, false, undefined, bDraftNavigation, true);
 						}
+					})
+					.catch(function(oError) {
+						Log.error("Error while discarding the document", oError);
 					});
 			},
 
@@ -853,13 +964,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) {
@@ -872,17 +982,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);
+					});
 			},
 
 			/**
@@ -893,7 +1008,6 @@ 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) {
@@ -928,22 +1042,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,
@@ -975,11 +1089,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");
@@ -996,10 +1110,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();
 					}
@@ -1012,9 +1126,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
@@ -1027,7 +1141,7 @@ sap.ui.define(
 									break;
 								} else {
 									// check parent
-									oControl = oControl.getParent();
+									oCurrentControl = oCurrentControl.getParent();
 								}
 							}
 							if (!mParameters.contexts) {
@@ -1037,7 +1151,7 @@ sap.ui.define(
 					}
 
 					if (mParameters.enableAutoScroll) {
-						oCurrentActionCallBacks = this._createActionPromise(sActionName, oTable.sId);
+						oCurrentActionCallBacks = this._createActionPromise(sActionName, oControl.sId);
 					}
 				}
 
@@ -1087,6 +1201,7 @@ sap.ui.define(
 					 */
 						if (mParameters.contexts) {
 							EditState.setEditStateDirty();
+							that._getInternalModel().setProperty("/sCustomAction", sActionName);
 						}
 						if (mParameters.isNavigable) {
 							var vContext = oResponse;
@@ -1372,140 +1487,31 @@ sap.ui.define(
 			},
 
 			_handleStickyOn: function(oContext) {
-				var that = this,
-					oAppComponent = CommonUtils.getAppComponent(this.getView());
-
-				if (!oAppComponent.getRouterProxy().hasNavigationGuard()) {
-					var sHashTracker = oAppComponent.getRouterProxy().getHash(),
-						oInternalModel = this._getInternalModel();
-
-					// Set a guard in the RouterProxy
-					// A timeout is necessary, as with deferred creation the hashChanger is not updated yet with
-					// the new hash, and the guard cannot be found in the managed history of the router proxy
-					setTimeout(function() {
-						oAppComponent.getRouterProxy().setNavigationGuard();
-					}, 0);
-
-					// Setting back navigation on shell service, to get the dicard message box in case of sticky
-					oAppComponent.getShellServices().setBackNavigation(that._onBackNavigationInSession.bind(that));
-
-					this.fnDirtyStateProvider = function(oNavigationContext) {
-						var sTargetHash = oNavigationContext.innerAppRoute,
-							oRouterProxy = oAppComponent.getRouterProxy(),
-							bDirty,
-							bSessionON = oInternalModel.getProperty("/sessionOn");
-
-						if (!bSessionON) {
-							// If the sticky session was terminated before hand.
-							// Eexample in case of navigating away from application using IBN.
-							return;
-						}
-
-						if (!oRouterProxy.isNavigationFinalized()) {
-							// If navigation is currently happening in RouterProxy, it's a transient state
-							// (not dirty)
-							bDirty = false;
-							sHashTracker = sTargetHash;
-						} else if (sHashTracker === sTargetHash) {
-							// the hash didn't change so either the user attempts to refresh or to leave the app
-							bDirty = true;
-						} else if (oRouterProxy.checkHashWithGuard(sTargetHash) || oRouterProxy.isGuardCrossAllowedByUser()) {
-							// the user attempts to navigate within the root object
-							// or crossing the guard has already been allowed by the RouterProxy
-							sHashTracker = sTargetHash;
-							bDirty = false;
-						} else {
-							// the user attempts to navigate within the app, for example back to the list report
-							bDirty = true;
-						}
-
-						if (bDirty) {
-							// the FLP doesn't call the dirty state provider anymore once it's dirty, as they can't
-							// change this due to compatibility reasons we set it back to not-dirty
-							setTimeout(function() {
-								oAppComponent.getShellServices().setDirtyFlag(false);
-							}, 0);
-						}
-
-						return bDirty;
-					};
-
-					oAppComponent.getShellServices().registerDirtyStateProvider(this.fnDirtyStateProvider);
-
-					var i18nModel = this.getView().getModel("sap.fe.i18n");
-
-					this.fnHandleSessionTimeout = function() {
-						// remove transient messages since we will showing our own message
-						that._getMessageHandler().removeTransitionMessages();
-
-						var oDialog = new Dialog({
-							title: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_TITLE}",
-							state: "Warning",
-							content: new Text({ text: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_MESSAGE}" }),
-							beginButton: new Button({
-								text: "{sap.fe.i18n>C_COMMON_DIALOG_OK}",
-								type: "Emphasized",
-								press: function() {
-									// remove sticky handling after navigation since session has already been terminated
-									that._handleStickyOff();
-									that._getRoutingListener().navigateBackFromContext(oContext);
-								}
-							}),
-							afterClose: function() {
-								oDialog.destroy();
-							}
-						});
-						oDialog.addStyleClass("sapUiContentPadding");
-						oDialog.setModel(i18nModel, "sap.fe.i18n");
-						that.getView().addDependent(oDialog);
-						oDialog.open();
-					};
-					// handle session timeout
-					this.getView()
-						.getModel()
-						.attachSessionTimeout(this.fnHandleSessionTimeout);
-
-					this._fnStickyDiscardAfterNavigation = function() {
-						var sCurrentHash = oAppComponent.getRouterProxy().getHash();
-						// either current hash is empty so the user left the app or he navigated away from the object
-						if (!sCurrentHash || !oAppComponent.getRouterProxy().checkHashWithGuard(sCurrentHash)) {
-							that._discardStickySession(oContext);
-						}
-					};
-					oAppComponent.getRoutingService().attachRouteMatched(this._fnStickyDiscardAfterNavigation);
-				}
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.handleStickyOn(oContext);
 			},
 
 			_handleStickyOff: function() {
-				var oAppComponent = CommonUtils.getAppComponent(this.getView());
-
-				if (oAppComponent.getRouterProxy) {
-					// If we have exited from the app, CommonUtils.getAppComponent doesn't return a
-					// sap.fe.core.AppComponent, hence the 'if' above
-					oAppComponent.getRouterProxy().discardNavigationGuard();
-				}
-
-				if (this.fnDirtyStateProvider) {
-					oAppComponent.getShellServices().deregisterDirtyStateProvider(this.fnDirtyStateProvider);
-					this.fnDirtyStateProvider = null;
-				}
-
-				if (this.getView().getModel() && this.fnHandleSessionTimeout) {
-					this.getView()
-						.getModel()
-						.detachSessionTimeout(this.fnHandleSessionTimeout);
-				}
-
-				oAppComponent.getRoutingService().detachRouteMatched(this._fnStickyDiscardAfterNavigation);
-				this._fnStickyDiscardAfterNavigation = null;
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.handleStickyOff();
+			},
 
-				this._setEditMode(EditMode.Display, false);
+			_onBackNavigationInSession: function() {
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.onBackNavigationInSession();
+			},
 
-				if (oAppComponent) {
-					// If we have exited from the app, CommonUtils.getAppComponent doesn't return a
-					// sap.fe.core.AppComponent, hence the 'if' above
-					oAppComponent.getShellServices().setBackNavigation();
-				}
+			_discardStickySession: function(oContext) {
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.discardStickySession(oContext);
 			},
 
 			_handleNewContext: function(oContext, bEditable, bRecreateContext, bDraftNavigation, bForceFocus) {
@@ -1563,41 +1569,6 @@ sap.ui.define(
 				});
 			},
 
-			/**
-			 * @description Method to display a 'discard' popover when exiting a sticky session.
-			 *
-			 * @function
-			 * @name _onBackNavigationInSession
-			 * @memberof sap.fe.core.controllerextensions.EditFlow
-			 */
-			_onBackNavigationInSession: function() {
-				var that = this,
-					oView = that.getView(),
-					oAppComponent = CommonUtils.getAppComponent(oView),
-					oRouterProxy = oAppComponent.getRouterProxy();
-
-				if (oRouterProxy.checkIfBackIsOutOfGuard()) {
-					var oBindingContext = oView && oView.getBindingContext();
-
-					CommonUtils.processDataLossConfirmation(
-						function() {
-							that._discardStickySession(oBindingContext);
-							history.back();
-						},
-						oView,
-						that._getProgrammingModel(oBindingContext)
-					);
-
-					return;
-				}
-				history.back();
-			},
-
-			_discardStickySession: function(oContext) {
-				sticky.discardDocument(oContext);
-				this._handleStickyOff();
-			},
-
 			/**
 			 * @function
 			 * @name _refreshListIfRequired
@@ -1697,7 +1668,5 @@ sap.ui.define(
 				});
 			}
 		});
-
-		return Extension;
 	}
 );