@sapui5/sap.fe.core 1.100.0 → 1.102.0

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

@@ -1,28 +1,31 @@
-import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
-import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import Log from "sap/base/Log";
+import FlexibleColumnLayout from "sap/f/FlexibleColumnLayout";
 import CommonUtils from "sap/fe/core/CommonUtils";
-import BusyLocker from "sap/fe/core/BusyLocker";
-import FELibrary from "sap/fe/core/library";
-import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
-import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
+import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
+import { send } from "sap/fe/core/controllerextensions/collaboration/ActivitySync";
+import { Activity } from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
+import draft, { SiblingInformation } from "sap/fe/core/controllerextensions/editFlow/draft";
+import { defineUI5Class, extensible, finalExtension, publicExtension } from "sap/fe/core/helpers/ClassSupport";
 import EditState from "sap/fe/core/helpers/EditState";
-import Message from "sap/ui/core/message/Message";
-import coreLibrary from "sap/ui/core/library";
 import ModelHelper, { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
-import { Extensible, Final, Public, UI5Class } from "sap/fe/core/helpers/ClassSupport";
-import ControllerExtensionMetadata from "sap/fe/core/controllerextensions/ControllerExtensionMetadata";
+import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
+import FELibrary from "sap/fe/core/library";
 import PageController from "sap/fe/core/PageController";
-import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import { SemanticMapping } from "sap/fe/core/services/RoutingServiceFactory";
+import { standardActions, triggerConfiguredSurvey, triggerType } from "sap/fe/templates/Feedback";
+import NavContainer from "sap/m/NavContainer";
+import Control from "sap/ui/core/Control";
+import Core from "sap/ui/core/Core";
+import coreLibrary from "sap/ui/core/library";
+import Message from "sap/ui/core/message/Message";
+import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
+import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import Table from "sap/ui/mdc/Table";
 import Context from "sap/ui/model/odata/v4/Context";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
-import Control from "sap/ui/core/Control";
-import { send } from "sap/fe/core/actions/collaboration/ActivitySync";
-import { Activity } from "sap/fe/core/actions/collaboration/CollaborationCommon";
+import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
+import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import ODataModel from "sap/ui/model/odata/v4/ODataModel";
-import FlexibleColumnLayout from "sap/f/FlexibleColumnLayout";
-import NavContainer from "sap/m/NavContainer";
+import { CoreEx } from "types/extension_types";
 
 const CreationMode = FELibrary.CreationMode,
 	ProgrammingModel = FELibrary.ProgrammingModel,
@@ -30,6 +33,7 @@ const CreationMode = FELibrary.CreationMode,
 	DraftStatus = FELibrary.DraftStatus,
 	EditMode = FELibrary.EditMode,
 	MessageType = coreLibrary.MessageType;
+
 /**
  * A controller extension offering hooks into the edit flow of the application
  *
@@ -37,9 +41,9 @@ const CreationMode = FELibrary.CreationMode,
  * @public
  * @since 1.90.0
  */
-@UI5Class("sap.fe.core.controllerextensions.EditFlow", ControllerExtensionMetadata)
+@defineUI5Class("sap.fe.core.controllerextensions.EditFlow")
 class EditFlow extends ControllerExtension {
-	private base!: PageController;
+	protected base!: PageController;
 
 	//////////////////////////////////////
 	// Public methods
@@ -60,42 +64,51 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
-	editDocument(oContext: Context): Promise<any> {
+	@publicExtension()
+	@finalExtension()
+	async editDocument(oContext: Context): Promise<void> {
 		const bDraftNavigation = true;
 		const transactionHelper = this._getTransactionHelper();
+		const oRootViewController = this._getRootViewController() as any;
+		let rightmostContext;
+		try {
+			await this.base.editFlow.onBeforeEdit({ context: oContext });
+			const oNewDocumentContext = await transactionHelper.editDocument(oContext, this.getView(), this._getMessageHandler());
+
+			const sProgrammingModel = this._getProgrammingModel(oContext);
+
+			this._setStickySessionInternalProperties(sProgrammingModel, oContext.getModel() as ODataModel);
+
+			if (oNewDocumentContext) {
+				this._setEditMode(EditMode.Editable, false);
+				this._getMessageHandler().showMessageDialog();
+
+				if (oNewDocumentContext !== oContext) {
+					let contextToNavigate = oNewDocumentContext;
+					if (this._isFclEnabled()) {
+						rightmostContext = oRootViewController.getRightmostContext();
+						let siblingInfo = await this._computeSiblingInformation(oContext, rightmostContext, sProgrammingModel, true);
+						siblingInfo = siblingInfo ?? this._createSiblingInfo(oContext, oNewDocumentContext);
+						this._updatePathsInHistory(siblingInfo.pathMapping);
+						if (siblingInfo.targetContext.getPath() != oNewDocumentContext.getPath()) {
+							contextToNavigate = siblingInfo.targetContext;
+						}
+					}
 
-		return this.base.editFlow
-			.onBeforeEdit({ context: oContext })
-			.then(transactionHelper.editDocument.bind(transactionHelper, oContext, this.getView(), this._getMessageHandler()))
-			.then((oNewDocumentContext: any) => {
-				const sProgrammingModel = this._getProgrammingModel(oContext);
-
-				if (sProgrammingModel === ProgrammingModel.Sticky) {
-					this._getInternalModel().setProperty("/sessionOn", true);
-				}
-				if (oNewDocumentContext) {
-					this._setEditMode(EditMode.Editable, false);
-					this._getMessageHandler().showMessageDialog();
-
-					if (oNewDocumentContext !== oContext) {
-						return this._handleNewContext(oNewDocumentContext, true, false, bDraftNavigation, true).then(() => {
-							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
-								this._handleStickyOn(oNewDocumentContext);
-							}
-						});
+					await this._handleNewContext(contextToNavigate, true, false, bDraftNavigation, true);
+					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
+						this._handleStickyOn(oNewDocumentContext);
 					}
 				}
-			})
-			.catch(function(oError: any) {
-				Log.error("Error while editing the document", oError);
-			});
+			}
+		} catch (oError) {
+			Log.error("Error while editing the document", oError as any);
+		}
 	}
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	deleteMultipleDocuments(aContexts: any, mParameters: any) {
 		if (mParameters) {
 			mParameters.beforeDeleteCallBack = this.base.editFlow.onBeforeDelete;
@@ -118,18 +131,20 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
-	updateDocument(oContext: object, oPromise: Promise<any>): Promise<void> {
-		const transactionHelper = this._getTransactionHelper(),
-			oBindingContext = this.getView().getBindingContext(),
-			bIsDraft = this._getProgrammingModel(oContext) === ProgrammingModel.Draft;
+	@publicExtension()
+	@finalExtension()
+	updateDocument(oContext: object, oPromise: Promise<any>): Promise<void> | undefined {
+		const transactionHelper = this._getTransactionHelper();
+		const originalBindingContext = this.getView().getBindingContext();
+		const bIsDraft = this._getProgrammingModel(oContext) === ProgrammingModel.Draft;
 
 		this._getMessageHandler().removeTransitionMessages();
 		return this._syncTask(() => {
-			if (oBindingContext) {
+			if (originalBindingContext) {
 				transactionHelper.handleDocumentModifications();
-				EditState.setEditStateDirty();
+				if (!this._isFclEnabled()) {
+					EditState.setEditStateDirty();
+				}
 
 				if (bIsDraft) {
 					this._setDraftStatus(DraftStatus.Saving);
@@ -140,18 +155,19 @@ class EditFlow extends ControllerExtension {
 			return oPromise
 				.then(
 					() => {
-						if (bIsDraft && oBindingContext) {
+						// If a navigation happened while oPromise was being resolved, the binding context of the page changed
+						// In that case, we shouldn't do anything
+						const oBindingContext = this.getView().getBindingContext();
+						if (bIsDraft && oBindingContext && oBindingContext === originalBindingContext) {
 							const oMetaModel = oBindingContext.getModel().getMetaModel() as ODataMetaModel,
 								sEntitySetName = (oMetaModel as any).getMetaContext(oBindingContext.getPath()).getObject("@sapui.name"),
 								aSemanticKeys = SemanticKeyHelper.getSemanticKeys(oMetaModel, sEntitySetName);
 							if (aSemanticKeys && aSemanticKeys.length) {
-								const oCurrentSemanticMapping = (this.base.getAppComponent() as any)
-										.getRoutingService()
-										.getLastSemanticMapping(),
+								const oCurrentSemanticMapping = this._getSemanticMapping(),
 									sCurrentSemanticPath = oCurrentSemanticMapping && oCurrentSemanticMapping.semanticPath,
 									sChangedPath = SemanticKeyHelper.getSemanticPath(oBindingContext, true);
-
-								if (sCurrentSemanticPath !== sChangedPath) {
+								// sCurrentSemanticPath could be null if we have navigated via deep link then there are no semanticMappings to calculate it from
+								if (sCurrentSemanticPath && sCurrentSemanticPath !== sChangedPath) {
 									return this._handleNewContext(oBindingContext, true, false, true).then(() => {
 										this._setDraftStatus(DraftStatus.Saved);
 									});
@@ -164,12 +180,12 @@ class EditFlow extends ControllerExtension {
 						}
 					},
 					() => {
-						if (bIsDraft && oBindingContext) {
+						if (bIsDraft && originalBindingContext) {
 							this._setDraftStatus(DraftStatus.Clear);
 						}
 					}
 				)
-				.catch(function(oError: any) {
+				.catch(function (oError: any) {
 					Log.error("Error while updating the document", oError);
 				})
 				.finally(() => {
@@ -204,8 +220,8 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	createDocument(
 		vListBinding: ODataListBinding | string,
 		mInParameters: {
@@ -216,10 +232,9 @@ class EditFlow extends ControllerExtension {
 	): Promise<void> {
 		const transactionHelper = this._getTransactionHelper(),
 			oLockObject = this._getGlobalUIModel();
-		let oTable: Table;
-		let iCountTableItems = 0;
+		let oTable: any; //should be Table but there are missing methods into the def
 		let mParameters: any = mInParameters;
-		const oResourceBundle = (this.getView().getController() as any).oResourceBundle;
+		const oResourceBundle = this._getResourceBundle();
 		const bShouldBusyLock =
 			!mParameters ||
 			(mParameters.creationMode !== CreationMode.Inline &&
@@ -270,7 +285,7 @@ class EditFlow extends ControllerExtension {
 		 */
 		const handleSideEffects = (oListBinding: any, oCreationPromise: Promise<Context>) => {
 			oCreationPromise
-				.then(function(oNewContext: any) {
+				.then(function (oNewContext: any) {
 					// transient contexts are reliably removed once oNewContext.created() is resolved
 					return oNewContext.created();
 				})
@@ -286,7 +301,7 @@ class EditFlow extends ControllerExtension {
 							.requestSideEffectsForNavigationProperty(oListBinding.getPath(), oBindingContext);
 					}
 				})
-				.catch(function(oError: any) {
+				.catch(function (oError: any) {
 					Log.error("Error while creating the document", oError);
 				});
 		};
@@ -297,7 +312,7 @@ class EditFlow extends ControllerExtension {
 		const createCustomValidationMessages = (aValidationMessages: any[]) => {
 			const sCustomValidationFunction = oTable && (oTable.getCreationRow() as any).data("customValidationFunction");
 			const mCustomValidity = oTable && oTable.getBindingContext("internal")?.getProperty("creationRowCustomValidity");
-			const oMessageManager = sap.ui.getCore().getMessageManager();
+			const oMessageManager = Core.getMessageManager();
 			const aCustomMessages: any[] = [];
 			let oFieldControl;
 			let sTarget: string;
@@ -306,7 +321,7 @@ class EditFlow extends ControllerExtension {
 			oMessageManager
 				.getMessageModel()
 				.getData()
-				.forEach(function(oMessage: any) {
+				.forEach(function (oMessage: any) {
 					if (oMessage.code === sCustomValidationFunction) {
 						oMessageManager.removeMessages(oMessage);
 					}
@@ -315,14 +330,14 @@ class EditFlow extends ControllerExtension {
 			aValidationMessages.forEach((oValidationMessage: any) => {
 				// Handle Bound CustomValidation message
 				if (oValidationMessage.messageTarget) {
-					oFieldControl = sap.ui.getCore().getControl(mCustomValidity[oValidationMessage.messageTarget].fieldId) as Control;
+					oFieldControl = Core.getControl(mCustomValidity[oValidationMessage.messageTarget].fieldId) as Control;
 					sTarget = oFieldControl.getBindingContext()?.getPath() + "/" + oFieldControl.getBindingPath("value");
 					// Add validation message if still not exists
 					if (
 						oMessageManager
 							.getMessageModel()
 							.getData()
-							.filter(function(oMessage: any) {
+							.filter(function (oMessage: any) {
 								return oMessage.target === sTarget;
 							}).length === 0
 					) {
@@ -342,7 +357,7 @@ class EditFlow extends ControllerExtension {
 					const aExistingValidationMessages = oMessageManager
 						.getMessageModel()
 						.getData()
-						.filter(function(oMessage: any) {
+						.filter(function (oMessage: any) {
 							return oMessage.target === sTarget;
 						});
 					aExistingValidationMessages[0].addControlId(mCustomValidity[oValidationMessage.messageTarget].fieldId);
@@ -392,7 +407,6 @@ class EditFlow extends ControllerExtension {
 				}
 
 				const oModel = oListBinding.getModel();
-				iCountTableItems = oListBinding.iMaxLength || 0;
 				const sCreationMode = mParameters.creationMode;
 
 				return Promise.resolve(this._getProgrammingModel(oListBinding))
@@ -452,7 +466,7 @@ class EditFlow extends ControllerExtension {
 								// prefill data from creation row
 								oPayload = oCreationRowContext.getObject();
 								mParameters.data = {};
-								Object.keys(oPayload).forEach(function(sPropertyPath: string) {
+								Object.keys(oPayload).forEach(function (sPropertyPath: string) {
 									const oProperty = oMetaModel.getObject(sMetaPath + "/" + sPropertyPath);
 									// ensure navigation properties are not part of the payload, deep create not supported
 									if (oProperty && oProperty.$kind === "NavigationProperty") {
@@ -512,9 +526,9 @@ class EditFlow extends ControllerExtension {
 								if (sProgrammingModel == ProgrammingModel.Sticky || mParameters.createAction) {
 									mArgs.transient = true;
 								}
-								oNavigation = oCreation.then(function(oNewDocumentContext: any) {
+								oNavigation = oCreation.then(function (oNewDocumentContext: any) {
 									if (!oNewDocumentContext) {
-										const oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
+										const oResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
 										return oRoutingListener.navigateToMessagePage(
 											oResourceBundle.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),
 											{
@@ -535,7 +549,7 @@ class EditFlow extends ControllerExtension {
 								// the creation row shall be cleared once the validation check was successful and
 								// therefore the POST can be sent async to the backend
 								oNavigation = oValidationCheck
-									.then(function() {
+									.then(function () {
 										const oCreationRowListBinding = oCreationRowContext.getBinding();
 
 										if (!mParameters.bSkipSideEffects) {
@@ -546,7 +560,7 @@ class EditFlow extends ControllerExtension {
 										oCreationRow.setBindingContext(oNewTransientContext);
 
 										// this is needed to avoid console errors TO be checked with model colleagues
-										oNewTransientContext.created().catch(function() {
+										oNewTransientContext.created().catch(function () {
 											Log.trace("transient fast creation context deleted");
 										});
 										return oCreationRowContext.delete("$direct");
@@ -564,14 +578,13 @@ class EditFlow extends ControllerExtension {
 								break;
 						}
 
-						if (sProgrammingModel === ProgrammingModel.Sticky) {
-							this._getInternalModel().setProperty("/sessionOn", true);
-						}
 						const bIsNewPageCreation =
 							mParameters.creationMode !== CreationMode.CreationRow && mParameters.creationMode !== CreationMode.Inline;
 						if (oCreation) {
 							return Promise.all([oCreation, oNavigation])
 								.then((aParams: [any, any]) => {
+									this._setStickySessionInternalProperties(sProgrammingModel, oModel);
+
 									if (bIsNewPageCreation) {
 										this._setEditMode(EditMode.Editable, bIsNewPageCreation);
 									} else {
@@ -579,15 +592,23 @@ class EditFlow extends ControllerExtension {
 									}
 									const oNewDocumentContext = aParams[0];
 									if (oNewDocumentContext) {
-										EditState.setEditStateDirty();
-										send(this.getView(), Activity.Create, oNewDocumentContext);
+										if (!this._isFclEnabled()) {
+											EditState.setEditStateDirty();
+										}
+										this._sendActivity(Activity.Create, oNewDocumentContext);
 										if (sProgrammingModel === ProgrammingModel.Sticky) {
 											this._handleStickyOn(oNewDocumentContext);
 										}
 									}
 								})
-								.catch(function(oError: any) {
-									if (oError && (oError.navigateBackFromTransientState || oError == Constants.CancelActionDialog)) {
+								.catch(function (oError: any) {
+									if (
+										oError &&
+										(oError.navigateBackFromTransientState ||
+											oError == Constants.CancelActionDialog ||
+											oError.canceled ||
+											(oError.rejectedItems && oError.rejectedItems[0].canceled))
+									) {
 										oRoutingListener.navigateBackFromTransientState();
 									}
 
@@ -596,23 +617,12 @@ class EditFlow extends ControllerExtension {
 						}
 					});
 			})
-			.finally(function() {
+			.finally(function () {
 				if (oTable && oTable.isA("sap.ui.mdc.Table")) {
 					const fnFocusOrScroll =
 						mParameters.creationMode === CreationMode.Inline ? oTable.focusRow.bind(oTable) : oTable.scrollToIndex.bind(oTable);
-					oTable.getRowBinding().attachEventOnce("change", function() {
-						switch (mParameters.createAtEnd) {
-							case true:
-								if (oTable.data("tableType") === "ResponsiveTable" && oTable.getThreshold()) {
-									fnFocusOrScroll(oTable.getThreshold(), true);
-								} else {
-									fnFocusOrScroll(iCountTableItems, true);
-								}
-								break;
-							case false:
-								fnFocusOrScroll(0, true);
-								break;
-						}
+					oTable.getRowBinding().attachEventOnce("change", function () {
+						fnFocusOrScroll(mParameters.createAtEnd ? oTable.getRowBinding().getLength() : 0, true);
 					});
 				}
 				bShouldBusyLock && BusyLocker.unlock(oLockObject);
@@ -632,11 +642,10 @@ class EditFlow extends ControllerExtension {
 	 * @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
 	 */
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	onBeforeSave(mParameters?: { context?: Context }): Promise<void> {
 		// to be overridden
@@ -656,11 +665,10 @@ class EditFlow extends ControllerExtension {
 	 * @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
 	 */
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	onBeforeCreate(mParameters?: { contextPath?: string; createParameters?: any[] }): Promise<void> {
 		// to be overridden
@@ -679,11 +687,10 @@ class EditFlow extends ControllerExtension {
 	 * @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
 	 */
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	onBeforeEdit(mParameters?: { context?: Context }): Promise<void> {
 		// to be overridden
@@ -702,11 +709,10 @@ class EditFlow extends ControllerExtension {
 	 * @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
 	 */
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	onBeforeDiscard(mParameters?: { context?: Context }): Promise<void> {
 		// to be overridden
@@ -725,11 +731,10 @@ class EditFlow extends ControllerExtension {
 	 * @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
 	 */
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	onBeforeDelete(mParameters?: { contexts?: Context[] }): Promise<void> {
 		// to be overridden
@@ -753,68 +758,80 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
-	saveDocument(oContext: Context, mParameters: any): Promise<void> {
+	@publicExtension()
+	@finalExtension()
+	async saveDocument(oContext: Context, mParameters: any): Promise<void> {
 		mParameters = mParameters || {};
 		const bExecuteSideEffectsOnError = mParameters.bExecuteSideEffectsOnError || undefined;
 		const bDraftNavigation = true;
 		const transactionHelper = this._getTransactionHelper();
-		const oResourceBundle = (this.getView().getController() as any).oResourceBundle;
+		const oResourceBundle = this._getResourceBundle();
 		const aBindings = mParameters.bindings;
-		// first of all wait until all key-match-requests are done
-		return (
-			this._syncTask()
-				// submit any open changes if there any (although there are validation/parse errors)
-				.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, { context: oContext }))
-				// and finally if all user changes are submitted and valid save the document
-				.then(
-					transactionHelper.saveDocument.bind(
-						transactionHelper,
-						oContext,
-						oResourceBundle,
-						bExecuteSideEffectsOnError,
-						aBindings,
-						this._getMessageHandler()
-					)
-				)
-				.then((oActiveDocumentContext: any) => {
-					const sProgrammingModel = this._getProgrammingModel(oContext);
 
-					this._removeContextsFromPages();
-					if (sProgrammingModel === ProgrammingModel.Sticky) {
-						this._getInternalModel().setProperty("/sessionOn", false);
-						this._handleStickyOff(/*oContext*/);
-					}
+		try {
+			await this._syncTask();
+			await this._submitOpenChanges(oContext);
+			await this._checkForValidationErrors();
+			await this.base.editFlow.onBeforeSave({ context: oContext });
+
+			const sProgrammingModel = this._getProgrammingModel(oContext);
+			const oRootViewController = this._getRootViewController() as any;
+			let siblingInfo: SiblingInformation | undefined;
+			if (
+				(sProgrammingModel === ProgrammingModel.Sticky || oContext.getProperty("HasActiveEntity")) &&
+				oRootViewController.isFclEnabled()
+			) {
+				// No need to try to get rightmost context in case of a new object
+				siblingInfo = await this._computeSiblingInformation(
+					oContext,
+					oRootViewController.getRightmostContext(),
+					sProgrammingModel,
+					true
+				);
+			}
+
+			const activeDocumentContext = await transactionHelper.saveDocument(
+				oContext,
+				oResourceBundle,
+				bExecuteSideEffectsOnError,
+				aBindings,
+				this._getMessageHandler()
+			);
+
+			this._removeContextsFromPages();
+			this._removeStickySessionInternalProperties(sProgrammingModel);
 
-					send(this.getView(), Activity.Activate, oActiveDocumentContext);
+			this._sendActivity(Activity.Activate, activeDocumentContext);
+			this._triggerConfiguredSurvey(standardActions.save, triggerType.standardAction);
 
-					this._setEditMode(EditMode.Display, false);
-					this._getMessageHandler().showMessageDialog();
+			this._setEditMode(EditMode.Display, false);
+			this._getMessageHandler().showMessageDialog();
 
-					if (oActiveDocumentContext !== oContext) {
-						this._handleNewContext(oActiveDocumentContext, false, false, bDraftNavigation, true);
+			if (activeDocumentContext !== oContext) {
+				let contextToNavigate = activeDocumentContext;
+				if (oRootViewController.isFclEnabled()) {
+					siblingInfo = siblingInfo ?? this._createSiblingInfo(oContext, activeDocumentContext);
+					this._updatePathsInHistory(siblingInfo.pathMapping);
+					if (siblingInfo.targetContext.getPath() !== activeDocumentContext.getPath()) {
+						contextToNavigate = siblingInfo.targetContext;
 					}
-				})
-				.catch(function(oError: any) {
-					Log.error("Error while saving the document", oError);
-					return Promise.reject(oError);
-				})
-		);
+				}
+
+				await this._handleNewContext(contextToNavigate, false, false, bDraftNavigation, true);
+			}
+		} catch (oError: any) {
+			if (!(oError && oError.canceled)) {
+				Log.error("Error while saving the document", oError);
+			}
+			return Promise.reject(oError);
+		}
 	}
-	@Public
-	@Final
-	toggleDraftActive(oContext: any) {
+	@publicExtension()
+	@finalExtension()
+	async toggleDraftActive(oContext: Context): Promise<void> {
 		const oContextData = oContext.getObject();
 		let bEditable: boolean;
 		const bIsDraft = oContext && this._getProgrammingModel(oContext) === ProgrammingModel.Draft;
-		const oToggleContext = oContext
-			.getModel()
-			.bindContext(oContext.getPath() + "/SiblingEntity")
-			.getBoundContext();
 
 		//toggle between draft and active document is only available for edit drafts and active documents with draft)
 		if (
@@ -830,27 +847,34 @@ class EditFlow extends ControllerExtension {
 		if (!oContextData.IsActiveEntity && oContextData.HasActiveEntity) {
 			//start Point: edit draft
 			bEditable = false;
-		} else if (oContextData.IsActiveEntity && oContextData.HasDraftEntity) {
+		} else {
 			// start point active document
 			bEditable = true;
 		}
-		oToggleContext
-			.requestCanonicalPath()
-			.then(function(sCanonicalPath: any) {
-				// 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((oToggleContext: any) => {
+
+		try {
+			const oRootViewController = this._getRootViewController() as any;
+			const oRightmostContext = oRootViewController.isFclEnabled() ? oRootViewController.getRightmostContext() : oContext;
+			const siblingInfo = await this._computeSiblingInformation(oContext, oRightmostContext, ProgrammingModel.Draft, false);
+			if (siblingInfo) {
 				this._setEditMode(bEditable ? EditMode.Editable : EditMode.Display, false); //switch to edit mode only if a draft is available
-				this._handleNewContext(oToggleContext, bEditable, true, true, true);
-			})
-			.catch(function(err: any) {
-				return Promise.reject("Error in EditFlow.toggleDraftActive:" + err);
-			});
+
+				if (oRootViewController.isFclEnabled()) {
+					const lastSemanticMapping = this._getSemanticMapping();
+					if (lastSemanticMapping?.technicalPath === oContext.getPath()) {
+						const targetPath = siblingInfo.pathMapping[siblingInfo.pathMapping.length - 1].newPath;
+						siblingInfo.pathMapping.push({ oldPath: lastSemanticMapping!.semanticPath, newPath: targetPath });
+					}
+					this._updatePathsInHistory(siblingInfo.pathMapping);
+				}
+
+				await this._handleNewContext(siblingInfo.targetContext, bEditable, true, true, true, false);
+			} else {
+				return Promise.reject("Error in EditFlow.toggleDraftActive - Cannot find sibling");
+			}
+		} catch (oError) {
+			return Promise.reject(("Error in EditFlow.toggleDraftActive:" + oError) as any);
+		}
 	}
 
 	// Internal only params ---
@@ -861,7 +885,7 @@ class EditFlow extends ControllerExtension {
 	 * Discard the editable document.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oContext  Context of the editable document
+	 * @param 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
 	 * @param {boolean} mParameters.skipDiscardPopover Optional, supresses the discard popover and allows custom handling
@@ -870,58 +894,86 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
-	cancelDocument(oContext: object, mParameters: { control: object; skipDiscardPopover?: boolean }): Promise<void> {
-		const transactionHelper = this._getTransactionHelper(),
-			oResourceBundle = (this.getView().getController() as any).oResourceBundle;
+	@publicExtension()
+	@finalExtension()
+	async cancelDocument(oContext: Context, mParameters: { control: object; skipDiscardPopover?: boolean }): Promise<any> {
+		const transactionHelper = this._getTransactionHelper();
+		const oResourceBundle = this._getResourceBundle();
 		const mInParameters: any = mParameters;
+		let siblingInfo: SiblingInformation | undefined;
+
 		mInParameters.cancelButton = mParameters.control || mInParameters.cancelButton;
 		mInParameters.beforeCancelCallBack = this.base.editFlow.onBeforeDiscard;
-		return this._syncTask()
-			.then(
-				transactionHelper.cancelDocument.bind(transactionHelper, oContext, mParameters, oResourceBundle, this._getMessageHandler())
-			)
-			.then((oActiveDocumentContext: any) => {
-				const bDraftNavigation = true,
-					sProgrammingModel = this._getProgrammingModel(oContext);
-
-				this._removeContextsFromPages();
-				if (sProgrammingModel === ProgrammingModel.Sticky) {
-					this._getInternalModel().setProperty("/sessionOn", false);
-					this._handleStickyOff(/*oContext*/);
-				}
 
-				send(this.getView(), Activity.Discard, oActiveDocumentContext);
+		try {
+			await this._syncTask();
+			const sProgrammingModel = this._getProgrammingModel(oContext);
+			if ((sProgrammingModel === ProgrammingModel.Sticky || oContext.getProperty("HasActiveEntity")) && this._isFclEnabled()) {
+				const oRootViewController = this._getRootViewController() as any;
+
+				// No need to try to get rightmost context in case of a new object
+				siblingInfo = await this._computeSiblingInformation(
+					oContext,
+					oRootViewController.getRightmostContext(),
+					sProgrammingModel,
+					true
+				);
+			}
 
-				this._setEditMode(EditMode.Display, false);
-				this._setDraftStatus(DraftStatus.Clear);
+			const oActiveDocumentContext = await transactionHelper.cancelDocument(
+				oContext,
+				mInParameters,
+				oResourceBundle,
+				this._getMessageHandler()
+			);
+			const bDraftNavigation = true;
+
+			this._removeContextsFromPages();
+			this._removeStickySessionInternalProperties(sProgrammingModel);
+
+			this._setEditMode(EditMode.Display, false);
+			this._setDraftStatus(DraftStatus.Clear);
+			// we force the edit state even for FCL because the draft discard might not be implemented
+			// and we may just delete the draft
+			EditState.setEditStateDirty();
+
+			if (!oActiveDocumentContext) {
+				this._sendActivity(Activity.Discard, undefined);
+				//in case of a new document, no activeContext is returned --> navigate back.
+				if (!mInParameters.skipBackNavigation) {
+					await this._getRoutingListener().navigateBackFromContext(oContext);
+				}
+			} else {
+				this._sendActivity(Activity.Discard, oActiveDocumentContext);
+				let contextToNavigate = oActiveDocumentContext;
+				if (this._isFclEnabled()) {
+					siblingInfo = siblingInfo ?? this._createSiblingInfo(oContext, oActiveDocumentContext);
+					this._updatePathsInHistory(siblingInfo.pathMapping);
+					if (siblingInfo.targetContext.getPath() !== oActiveDocumentContext.getPath()) {
+						contextToNavigate = siblingInfo.targetContext;
+					}
+				}
 
-				//in case of a new document, the value of hasActiveEntity is returned. navigate back.
-				if (!oActiveDocumentContext) {
-					EditState.setEditStateDirty();
-					return mInParameters.skipBackNavigation ? undefined : this._getRoutingListener().navigateBackFromContext(oContext);
-				} else if (sProgrammingModel === ProgrammingModel.Draft) {
+				if (sProgrammingModel === ProgrammingModel.Draft) {
 					// We need to load the semantic keys of the active context, as we need them
 					// for the navigation
-					return this._fetchSemanticKeyValues(oActiveDocumentContext).then(() => {
-						// 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 (mInParameters.skipBindingToView) {
-							return oActiveDocumentContext;
-						} else {
-							return this._handleNewContext(oActiveDocumentContext, false, true, bDraftNavigation, true);
-						}
-					});
+					await this._fetchSemanticKeyValues(oActiveDocumentContext);
+					// 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 (!mInParameters.skipBindingToView) {
+						await this._handleNewContext(contextToNavigate, false, true, bDraftNavigation, true);
+					} else {
+						return oActiveDocumentContext;
+					}
 				} else {
 					//active context is returned in case of cancel of existing document
-					return this._handleNewContext(oActiveDocumentContext, false, false, bDraftNavigation, true);
+					await this._handleNewContext(contextToNavigate, false, false, bDraftNavigation, true);
 				}
-			})
-			.catch(function(oError: any) {
-				Log.error("Error while discarding the document", oError);
-			});
+			}
+		} catch (oError) {
+			Log.error("Error while discarding the document", oError as any);
+		}
 	}
 
 	// Internal only params ---
@@ -940,11 +992,10 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	deleteDocument(oContext: Context, mInParameters: { title: string; description: string }): Promise<void> {
 		const oAppComponent = CommonUtils.getAppComponent(this.getView());
-		const sPath = oContext.getPath();
 		let mParameters: any = mInParameters;
 		if (!mParameters) {
 			mParameters = {
@@ -958,9 +1009,10 @@ class EditFlow extends ControllerExtension {
 			.then(() => {
 				// 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();
-
-				send(this.getView(), Activity.Delete, sPath);
+				if (!this._isFclEnabled()) {
+					EditState.setEditStateDirty();
+				}
+				this._sendActivity(Activity.Delete, oContext);
 
 				this._getRoutingListener().navigateBackFromContext(oContext);
 				// After delete is successfull, we need to dettch the setBackNavigation Methods
@@ -968,7 +1020,7 @@ class EditFlow extends ControllerExtension {
 					oAppComponent.getShellServices().setBackNavigation();
 				}
 			})
-			.catch(function(oError: any) {
+			.catch(function (oError: any) {
 				Log.error("Error while deleting the document", oError);
 			});
 	}
@@ -983,26 +1035,23 @@ class EditFlow extends ControllerExtension {
 	 * @public
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
-	applyDocument(oContext: object): Promise<void> {
+	@publicExtension()
+	@finalExtension()
+	async applyDocument(oContext: object): Promise<void> {
 		const oLockObject = this._getGlobalUIModel();
 		BusyLocker.lock(oLockObject);
-		return (
-			this._submitOpenChanges(oContext)
-				// check if there are any validation/parse errors
-				.then(this._checkForValidationErrors.bind(this, oContext))
-				.then(() => {
-					this._getMessageHandler().showMessageDialog();
-					this._getRoutingListener().navigateBackFromContext(oContext);
-					return true;
-				})
-				.finally(function() {
-					if (BusyLocker.isLocked(oLockObject)) {
-						BusyLocker.unlock(oLockObject);
-					}
-				})
-		);
+
+		try {
+			await this._syncTask();
+			await this._submitOpenChanges(oContext);
+			await this._checkForValidationErrors();
+			await this._getMessageHandler().showMessageDialog();
+			await this._getRoutingListener().navigateBackFromContext(oContext);
+		} finally {
+			if (BusyLocker.isLocked(oLockObject)) {
+				BusyLocker.unlock(oLockObject);
+			}
+		}
 	}
 
 	// Internal only params ---
@@ -1028,8 +1077,8 @@ class EditFlow extends ControllerExtension {
 	 * @since 1.90.0
 	 * @final
 	 **/
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	invokeAction(
 		sActionName: string,
 		mInParameters?: {
@@ -1113,11 +1162,8 @@ class EditFlow extends ControllerExtension {
 						oBindingContext = oCurrentControl.getBindingContext();
 						if (
 							oBindingContext &&
-							oBindingContext
-								.getModel()
-								.getMetaModel()
-								.getMetaContext(oBindingContext.getPath())
-								.getObject("$Type") === sOverloadEntityType
+							oBindingContext.getModel().getMetaModel().getMetaContext(oBindingContext.getPath()).getObject("$Type") ===
+								sOverloadEntityType
 						) {
 							mParameters.contexts = oBindingContext;
 							break;
@@ -1144,12 +1190,7 @@ class EditFlow extends ControllerExtension {
 				oCurrentActionCallBacks = this._createActionPromise(sActionName, oControl.sId);
 			}
 		}
-
-		if (mParameters.isNavigable) {
-			mParameters.bGetBoundContext = false;
-		} else {
-			mParameters.bGetBoundContext = true;
-		}
+		mParameters.bGetBoundContext = this._getBoundContext(oView, mParameters);
 		// Need to know that the action is called from ObjectPage for changeSet Isolated workaround
 		mParameters.bObjectPage = (oView.getViewData() as any).converterType === "ObjectPage";
 		return this._syncTask()
@@ -1161,13 +1202,14 @@ class EditFlow extends ControllerExtension {
 					return this._refreshListIfRequired(
 						this._getActionResponseDataAndKeys(sActionName, oResponse),
 						mParameters.contexts[0]
-					).then(function() {
+					).then(function () {
 						return oResponse;
 					});
 				}
 			})
 			.then((oResponse: any) => {
-				send(this.getView(), Activity.Action, mParameters.contexts);
+				this._sendActivity(Activity.Action, mParameters.contexts);
+				this._triggerConfiguredSurvey(sActionName, triggerType.action);
 
 				if (oCurrentActionCallBacks) {
 					oCurrentActionCallBacks.fResolver(oResponse);
@@ -1185,7 +1227,9 @@ class EditFlow extends ControllerExtension {
 					 first one as they are anyway siblings
 					 */
 				if (mParameters.contexts) {
-					EditState.setEditStateDirty();
+					if (!this._isFclEnabled()) {
+						EditState.setEditStateDirty();
+					}
 					this._getInternalModel().setProperty("/sCustomAction", sActionName);
 				}
 				if (mParameters.isNavigable) {
@@ -1210,14 +1254,16 @@ class EditFlow extends ControllerExtension {
 					}
 				}
 			})
-			.catch(function(err: any) {
+			.catch(function (err: any) {
 				if (oCurrentActionCallBacks) {
 					oCurrentActionCallBacks.fRejector();
 				}
 				if (err == Constants.CancelActionDialog) {
 					return Promise.reject("Dialog cancelled.");
 				} else {
-					return Promise.reject("Error in EditFlow.invokeAction:" + err);
+					if (!(err && (err.canceled || (err.rejectedItems && err.rejectedItems[0].canceled)))) {
+						return Promise.reject("Error in EditFlow.invokeAction:" + err);
+					}
 				}
 			});
 	}
@@ -1238,8 +1284,8 @@ class EditFlow extends ControllerExtension {
 	 * @experimental As of version 1.90.0
 	 * @since 1.90.0
 	 */
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	securedExecution(
 		fnFunction: Function,
 		mParameters?: {
@@ -1275,7 +1321,9 @@ class EditFlow extends ControllerExtension {
 			.then(() => {
 				if (bUpdatesDocument) {
 					this._getTransactionHelper().handleDocumentModifications();
-					EditState.setEditStateDirty();
+					if (!this._isFclEnabled()) {
+						EditState.setEditStateDirty();
+					}
 					if (bIsDraft) {
 						this._setDraftStatus(DraftStatus.Saved);
 					}
@@ -1300,33 +1348,43 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * @param oEvent
 	 */
-	@Public
+	@publicExtension()
 	handlePatchSent(oEvent: any) {
-		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
-		const oPatchPromise = new Promise((resolve, reject) => {
-			this.mPatchPromises[oEvent.getSource()] = {
-				resolvePatchPromise: resolve,
-				rejectPatchPromise: reject
-			};
-		});
-		this.updateDocument(oEvent.getSource(), oPatchPromise);
+		if (!(this.base.getView()?.getBindingContext("internal") as InternalModelContext)?.getProperty("skipPatchHandlers")) {
+			// Create a promise that will be resolved or rejected when the path is completed
+			const oPatchPromise = new Promise<void>((resolve, reject) => {
+				oEvent.getSource().attachEventOnce("patchCompleted", (oEvent: any) => {
+					const bSuccess = oEvent.getParameter("success");
+					if (bSuccess) {
+						resolve();
+					} else {
+						reject();
+					}
+				});
+			});
+			this.updateDocument(oEvent.getSource(), oPatchPromise);
+		}
 	}
 
 	/**
-	 * Handles the patchCompleted event: resolves or rejects document modification.
+	 * Handles the CreateActivate event.
 	 *
 	 * @param oEvent
 	 */
-	@Public
-	handlePatchCompleted(oEvent: any) {
-		const bSuccess = oEvent.getParameter("success");
-		if (bSuccess) {
-			this.mPatchPromises[oEvent.getSource()].resolvePatchPromise();
-		} else {
-			this.mPatchPromises[oEvent.getSource()].rejectPatchPromise();
-		}
-		delete this.mPatchPromises[oEvent.getSource()];
+	handleCreateActivate(oEvent: any) {
+		const oBinding = oEvent.getSource();
+		const transactionHelper = this._getTransactionHelper();
+		const bAtEnd = true;
+		const bInactive = true;
+		const oResourceBundle = this._getResourceBundle();
+		const oParams: any = {
+			creationMode: CreationMode.Inline,
+			createAtEnd: bAtEnd,
+			inactive: bInactive,
+			keepTransientContextOnFailed: false, // currently not fully supported
+			busyMode: "None"
+		};
+		transactionHelper.createDocument(oBinding, oParams, oResourceBundle, this._getMessageHandler(), false, this.getView());
 	}
 
 	//////////////////////////////////////
@@ -1379,6 +1437,18 @@ class EditFlow extends ControllerExtension {
 		return (this.base.getView().getController() as PageController)._editFlow.getInternalModel();
 	}
 
+	_getRootViewController() {
+		return this.base.getAppComponent().getRootViewController();
+	}
+
+	_getResourceBundle() {
+		return (this.getView().getController() as any).oResourceBundle;
+	}
+
+	_getSemanticMapping(): SemanticMapping | undefined {
+		return this.base.getAppComponent().getRoutingService().getLastSemanticMapping();
+	}
+
 	/**
 	 * Creates a new promise to wait for an action to be executed
 	 *
@@ -1405,6 +1475,15 @@ class EditFlow extends ControllerExtension {
 		return (this.base.getView().getController() as PageController)._editFlow.getMessageHandler();
 	}
 
+	_sendActivity(action: Activity, relatedContexts: Context | Context[] | undefined) {
+		const content = Array.isArray(relatedContexts) ? relatedContexts.map((context) => context.getPath()) : relatedContexts?.getPath();
+		send(this.getView(), action, content);
+	}
+
+	_triggerConfiguredSurvey(sActionName: string, triggerType: triggerType) {
+		triggerConfiguredSurvey(this.getView(), sActionName, triggerType);
+	}
+
 	/**
 	 * @function
 	 * @name _getActionResponseDataAndKeys
@@ -1417,23 +1496,29 @@ class EditFlow extends ControllerExtension {
 		return (this.base.getView().getController() as PageController)._editFlow.getActionResponseDataAndKeys(sActionName, oResponse);
 	}
 
-	_submitOpenChanges(oContext: any) {
+	async _submitOpenChanges(oContext: any): Promise<any> {
 		const 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");
-				}
-			})
-			.finally(function() {
-				if (BusyLocker.isLocked(oLockObject)) {
-					BusyLocker.unlock(oLockObject);
-				}
-			});
+
+		try {
+			// Submit any leftover changes that are not yet submitted
+			// Currently we are using only 1 updateGroupId, hence submitting the batch directly here
+			await oModel.submitBatch("$auto");
+
+			// Wait for all currently running changes
+			// For the time being we agreed with the v4 model team to use an internal method. We'll replace it once
+			// a public or restricted method was provided
+			await oModel.oRequestor.waitForRunningChangeRequests("$auto");
+
+			// Check if all changes were submitted successfully
+			if (oModel.hasPendingChanges("$auto")) {
+				throw new Error("submit of open changes failed");
+			}
+		} finally {
+			if (BusyLocker.isLocked(oLockObject)) {
+				BusyLocker.unlock(oLockObject);
+			}
+		}
 	}
 
 	_handleStickyOn(oContext: Context) {
@@ -1452,20 +1537,54 @@ class EditFlow extends ControllerExtension {
 		return (this.base.getView().getController() as PageController)._editFlow.discardStickySession(oContext);
 	}
 
-	_handleNewContext(oContext: any, bEditable: boolean, bRecreateContext: boolean, bDraftNavigation: boolean, bForceFocus?: boolean) {
-		EditState.setEditStateDirty();
+	_setStickySessionInternalProperties(programmingModel: any, model: ODataModel) {
+		if (programmingModel === ProgrammingModel.Sticky) {
+			const internalModel = this._getInternalModel();
+			internalModel.setProperty("/sessionOn", true);
+			internalModel.setProperty("/stickySessionToken", (model.getHttpHeaders(true) as any)["SAP-ContextId"]);
+		}
+	}
+
+	_removeStickySessionInternalProperties(programmingModel: any) {
+		if (programmingModel === ProgrammingModel.Sticky) {
+			const internalModel = this._getInternalModel();
+			internalModel.setProperty("/sessionOn", false);
+			internalModel.setProperty("/stickySessionToken", undefined);
+			this._handleStickyOff(/*oContext*/);
+		}
+	}
 
-		return this._getRoutingListener().navigateToContext(oContext, {
+	async _handleNewContext(
+		oContext: any,
+		bEditable: boolean,
+		bRecreateContext: boolean,
+		bDraftNavigation: boolean,
+		bForceFocus?: boolean,
+		bNavigateToSiblingEntity?: boolean
+	) {
+		if (!this._isFclEnabled()) {
+			EditState.setEditStateDirty();
+		}
+
+		await this._getRoutingListener().navigateToContext(oContext, {
 			checkNoHashChange: true,
 			editable: bEditable,
 			bPersistOPScroll: true,
 			bRecreateContext: bRecreateContext,
 			bDraftNavigation: bDraftNavigation,
 			showPlaceholder: false,
-			bForceFocus: bForceFocus
+			bForceFocus: bForceFocus,
+			keepCurrentLayout: true,
+			bNavigateToSiblingEntity: bNavigateToSiblingEntity
 		});
 	}
 
+	_getBoundContext(view: any, params: any) {
+		const viewLevel = (view.getViewData() as any).viewLevel;
+		const bRefreshAfterAction = viewLevel > 1 || (viewLevel === 1 && params.controlId);
+		return !params.isNavigable || !!bRefreshAfterAction;
+	}
+
 	/**
 	 * Checks if there are validation (parse) errors for controls bound to a given context
 	 *
@@ -1478,11 +1597,7 @@ class EditFlow extends ControllerExtension {
 	_checkForValidationErrors() {
 		return this._syncTask().then(() => {
 			const sViewId = this.base.getView().getId();
-			const aMessages = sap.ui
-				.getCore()
-				.getMessageManager()
-				.getMessageModel()
-				.getData();
+			const aMessages = sap.ui.getCore().getMessageManager().getMessageModel().getData();
 			let oControl;
 			let oMessage;
 
@@ -1493,7 +1608,7 @@ class EditFlow extends ControllerExtension {
 			for (let i = 0; i < aMessages.length; i++) {
 				oMessage = aMessages[i];
 				if (oMessage.validation) {
-					oControl = sap.ui.getCore().byId(oMessage.getControlId());
+					oControl = Core.byId(oMessage.getControlId());
 					while (oControl) {
 						if (oControl.getId() === sViewId) {
 							return Promise.reject("validation errors exist");
@@ -1527,13 +1642,13 @@ class EditFlow extends ControllerExtension {
 			// ensure context is in the response
 			if (Object.keys(oContextData).length) {
 				// check if context in response is different than the bound context
-				bReturnedContextIsSame = aKeys.every(function(sKey: any) {
+				bReturnedContextIsSame = aKeys.every(function (sKey: any) {
 					return oCurrentData[sKey] === oContextData[sKey];
 				});
 				if (!bReturnedContextIsSame) {
-					return new Promise<void>(resolve => {
+					return new Promise<void>((resolve) => {
 						if ((oBinding as any).isRoot()) {
-							oBinding.attachEventOnce("dataReceived", function() {
+							oBinding.attachEventOnce("dataReceived", function () {
 								resolve();
 							});
 							oBinding.refresh();
@@ -1543,15 +1658,15 @@ class EditFlow extends ControllerExtension {
 								.getSideEffectsService()
 								.requestSideEffects([{ $NavigationPropertyPath: oBinding.getPath() }], oBinding.getContext() as Context)
 								.then(
-									function() {
+									function () {
 										resolve();
 									},
-									function() {
+									function () {
 										Log.error("Error while refreshing the table");
 										resolve();
 									}
 								)
-								.catch(function(e: any) {
+								.catch(function (e: any) {
 									Log.error("Error while refreshing the table", e);
 								});
 						}
@@ -1563,13 +1678,13 @@ class EditFlow extends ControllerExtension {
 		return Promise.resolve();
 	}
 
-	_fetchSemanticKeyValues(oContext: any) {
-		const oMetaModel = oContext.getModel().getMetaModel(),
+	_fetchSemanticKeyValues(oContext: Context): Promise<any> {
+		const oMetaModel = oContext.getModel().getMetaModel() as any,
 			sEntitySetName = oMetaModel.getMetaContext(oContext.getPath()).getObject("@sapui.name"),
 			aSemanticKeys = SemanticKeyHelper.getSemanticKeys(oMetaModel, sEntitySetName);
 
 		if (aSemanticKeys && aSemanticKeys.length) {
-			const aRequestPromises = aSemanticKeys.map(function(oKey: any) {
+			const aRequestPromises = aSemanticKeys.map(function (oKey: any) {
 				return oContext.requestObject(oKey.$PropertyPath);
 			});
 
@@ -1586,7 +1701,7 @@ class EditFlow extends ControllerExtension {
 		let aPages: any[] = [];
 		const oAppComponent = CommonUtils.getAppComponent(this.getView());
 
-		if (oAppComponent._isFclEnabled()) {
+		if (this._isFclEnabled()) {
 			const oFCL = oAppComponent.getRootContainer() as FlexibleColumnLayout;
 			aPages = aPages.concat(oFCL.getMidColumnPages() || []);
 			aPages = aPages.concat(oFCL.getEndColumnPages() || []);
@@ -1595,7 +1710,7 @@ class EditFlow extends ControllerExtension {
 			aPages = oNavContainer.getPages() || [];
 		}
 
-		aPages.forEach(function(oPage: any) {
+		aPages.forEach(function (oPage: any) {
 			if (oPage.isA("sap.ui.core.ComponentContainer")) {
 				oPage = oPage.getComponentInstance(); // The binding context is set at the component level, not the component container
 			}
@@ -1612,7 +1727,7 @@ class EditFlow extends ControllerExtension {
 		function _checkActions(aActions: Array<object>) {
 			let oActionBindingContext: any;
 			try {
-				aActions.forEach(function(oAction: any) {
+				aActions.forEach(function (oAction: any) {
 					oActionBindingContext = oAction.getBindingContext();
 					if (
 						oActionBindingContext
@@ -1633,10 +1748,13 @@ class EditFlow extends ControllerExtension {
 		function _checkSubSections(aSubSections: Array<object>) {
 			let oActionBindingContext: any;
 			try {
-				aSubSections.forEach(function(oSubSection: any) {
+				aSubSections.forEach(function (oSubSection: any) {
 					if (oActionBindingContext) {
 						throw "context found - stop SubSections loop";
 					}
+					if (oSubSection.getBindingContext() === null) {
+						oSubSection.setBindingContext(undefined);
+					}
 					const aActions = oSubSection.getAggregation("actions");
 					oActionBindingContext = _checkActions(aActions);
 				});
@@ -1663,10 +1781,74 @@ class EditFlow extends ControllerExtension {
 				return _checkSubSections(aSubSections);
 			}
 		} catch (error) {
-			Log.info(error);
+			Log.info(error as any);
 			return undefined;
 		}
 	}
+
+	_createSiblingInfo(currentContext: Context, newContext: Context): SiblingInformation {
+		return {
+			targetContext: newContext,
+			pathMapping: [
+				{
+					oldPath: currentContext.getPath(),
+					newPath: newContext.getPath()
+				}
+			]
+		};
+	}
+
+	_updatePathsInHistory(mappings: { oldPath: string; newPath: string }[]) {
+		const oAppComponent = this.base.getAppComponent();
+		oAppComponent.getRouterProxy().setPathMapping(mappings);
+
+		// Also update the semantic mapping in the routing service
+		const lastSemanticMapping = this._getSemanticMapping();
+		if (mappings.length && lastSemanticMapping?.technicalPath === mappings[mappings.length - 1].oldPath) {
+			lastSemanticMapping.technicalPath = mappings[mappings.length - 1].newPath;
+		}
+	}
+
+	/**
+	 * This methods creates a sibling context for a sub-object page, and calculates a sibling path for
+	 * all intermediates paths between the OP and the sub-OP.
+	 *
+	 * @param {object} rootCurrentContext The context for the root of the draft
+	 * @param {object} rightmostCurrentContext The context of the sub-object
+	 * @param {string} sProgrammingModel The programming model
+	 * @param {boolean} doNotComputeIfRoot If true, we don't compute siblingInfo if the root and the rightmost contexts are the same
+	 * @returns {Promise} Returns the siblingInformation object
+	 */
+	async _computeSiblingInformation(
+		rootCurrentContext: Context,
+		rightmostCurrentContext: Context,
+		sProgrammingModel: string,
+		doNotComputeIfRoot: boolean
+	): Promise<SiblingInformation | undefined> {
+		if (!rightmostCurrentContext.getPath().startsWith(rootCurrentContext.getPath())) {
+			// Wrong usage !!
+			Log.error("Cannot compute rightmost sibling context");
+			throw new Error("Cannot compute rightmost sibling context");
+		}
+		if (doNotComputeIfRoot && rightmostCurrentContext.getPath() === rootCurrentContext.getPath()) {
+			return Promise.resolve(undefined);
+		}
+
+		const model = rootCurrentContext.getModel();
+		if (sProgrammingModel === ProgrammingModel.Draft) {
+			return draft.computeSiblingInformation(rootCurrentContext, rightmostCurrentContext);
+		} else {
+			// If not in draft mode, we just recreate a context from the path of the rightmost context
+			// No path mapping is needed
+			return {
+				targetContext: model.bindContext(rightmostCurrentContext.getPath()).getBoundContext() as Context,
+				pathMapping: []
+			};
+		}
+	}
+	_isFclEnabled(): boolean {
+		return CommonUtils.getAppComponent(this.getView())._isFclEnabled();
+	}
 }
 
 export default EditFlow;