@sapui5/sap.fe.core 1.102.2 → 1.104.1

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

@@ -1,37 +1,40 @@
 import Log from "sap/base/Log";
-import FlexibleColumnLayout from "sap/f/FlexibleColumnLayout";
+import type FlexibleColumnLayout from "sap/f/FlexibleColumnLayout";
 import CommonUtils from "sap/fe/core/CommonUtils";
 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 type { SiblingInformation } from "sap/fe/core/controllerextensions/editFlow/draft";
+import draft 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 ModelHelper, { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
 import FELibrary from "sap/fe/core/library";
-import PageController from "sap/fe/core/PageController";
-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 type PageController from "sap/fe/core/PageController";
+import type { SemanticMapping } from "sap/fe/core/services/RoutingServiceFactory";
+import { StandardActions, triggerConfiguredSurvey, TriggerType } from "sap/fe/templates/Feedback";
+import type NavContainer from "sap/m/NavContainer";
+import type 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 type Table from "sap/ui/mdc/Table";
+import type Context from "sap/ui/model/odata/v4/Context";
 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 { CoreEx } from "types/extension_types";
+import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
+import type { CoreEx, V4Context } from "types/extension_types";
 
 const CreationMode = FELibrary.CreationMode,
 	ProgrammingModel = FELibrary.ProgrammingModel,
 	Constants = FELibrary.Constants,
 	DraftStatus = FELibrary.DraftStatus,
 	EditMode = FELibrary.EditMode,
+	StartupMode = FELibrary.StartupMode,
 	MessageType = coreLibrary.MessageType;
 
 /**
@@ -58,15 +61,15 @@ class EditFlow extends ControllerExtension {
 	 * Creates a draft document for an existing active document.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oContext Context of the active document
-	 * @returns {Promise} Promise resolves once the editable document is available
+	 * @param oContext Context of the active document
+	 * @returns Promise resolves once the editable document is available
 	 * @alias sap.fe.core.controllerextensions.EditFlow#editDocument
 	 * @public
 	 * @since 1.90.0
 	 */
 	@publicExtension()
 	@finalExtension()
-	async editDocument(oContext: Context): Promise<void> {
+	async editDocument(oContext: V4Context): Promise<void> {
 		const bDraftNavigation = true;
 		const transactionHelper = this._getTransactionHelper();
 		const oRootViewController = this._getRootViewController() as any;
@@ -124,9 +127,9 @@ class EditFlow extends ControllerExtension {
 	 * Updates the draft status and displays the error messages if there are errors during an update.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oContext Context of the updated field
-	 * @param {object} oPromise Promise to determine when the update operation is completed. The promise should be resolved when the update operation is completed, so the draft status can be updated.
-	 * @returns {Promise} Promise resolves once draft status has been updated
+	 * @param oContext Context of the updated field
+	 * @param oPromise Promise to determine when the update operation is completed. The promise should be resolved when the update operation is completed, so the draft status can be updated.
+	 * @returns Promise resolves once draft status has been updated
 	 * @alias sap.fe.core.controllerextensions.EditFlow#updateDocument
 	 * @public
 	 * @since 1.90.0
@@ -139,7 +142,7 @@ class EditFlow extends ControllerExtension {
 		const bIsDraft = this._getProgrammingModel(oContext) === ProgrammingModel.Draft;
 
 		this._getMessageHandler().removeTransitionMessages();
-		return this._syncTask(() => {
+		return this._syncTask(async () => {
 			if (originalBindingContext) {
 				transactionHelper.handleDocumentModifications();
 				if (!this._isFclEnabled()) {
@@ -152,45 +155,38 @@ class EditFlow extends ControllerExtension {
 			}
 			this._getMessageHandler().removeTransitionMessages();
 
-			return oPromise
-				.then(
-					() => {
-						// 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._getSemanticMapping(),
-									sCurrentSemanticPath = oCurrentSemanticMapping && oCurrentSemanticMapping.semanticPath,
-									sChangedPath = SemanticKeyHelper.getSemanticPath(oBindingContext, true);
-								// 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);
-									});
-								} else {
-									this._setDraftStatus(DraftStatus.Saved);
-								}
-							} else {
-								this._setDraftStatus(DraftStatus.Saved);
-							}
-						}
-					},
-					() => {
-						if (bIsDraft && originalBindingContext) {
-							this._setDraftStatus(DraftStatus.Clear);
+			try {
+				await oPromise;
+				// 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._getSemanticMapping(),
+							sCurrentSemanticPath = oCurrentSemanticMapping && oCurrentSemanticMapping.semanticPath,
+							sChangedPath = SemanticKeyHelper.getSemanticPath(oBindingContext, true);
+						// sCurrentSemanticPath could be null if we have navigated via deep link then there are no semanticMappings to calculate it from
+						if (sCurrentSemanticPath && sCurrentSemanticPath !== sChangedPath) {
+							await this._handleNewContext(oBindingContext, true, false, true);
+							this._setDraftStatus(DraftStatus.Saved);
+						} else {
+							this._setDraftStatus(DraftStatus.Saved);
 						}
+					} else {
+						this._setDraftStatus(DraftStatus.Saved);
 					}
-				)
-				.catch(function (oError: any) {
-					Log.error("Error while updating the document", oError);
-				})
-				.finally(() => {
-					this._getMessageHandler().showMessages();
-				});
+				}
+			} catch (oError: any) {
+				Log.error("Error while updating the document", oError);
+				if (bIsDraft && originalBindingContext) {
+					this._setDraftStatus(DraftStatus.Clear);
+				}
+			} finally {
+				this._getMessageHandler().showMessages();
+			}
 		});
 	}
 
@@ -207,15 +203,15 @@ class EditFlow extends ControllerExtension {
 	 * Creates a new document.
 	 *
 	 * @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} mInParameters Contains the following attributes:
-	 * @param {string} mInParameters.creationMode The creation mode using one of the following:
+	 * @param vListBinding  ODataListBinding object or the binding path for a temporary list binding
+	 * @param mInParameters Contains the following attributes:
+	 * @param mInParameters.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} mInParameters.outbound The navigation target where the document is created in case of creationMode 'External'
-	 * @param {boolean} mInParameters.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
+	 * @param mInParameters.outbound The navigation target where the document is created in case of creationMode 'External'
+	 * @param mInParameters.createAtEnd Specifies if the new entry should be created at the top or bottom of a table in case of creationMode 'Inline'
+	 * @returns Promise resolves once the object has been created
 	 * @alias sap.fe.core.controllerextensions.EditFlow#createDocument
 	 * @public
 	 * @since 1.90.0
@@ -263,13 +259,13 @@ class EditFlow extends ControllerExtension {
 				oTable.getBindingContext(),
 				{
 					data: oCreationRowObjects,
-					customValidationFunction: (oTable.getCreationRow() as any).data("customValidationFunction")
+					customValidationFunction: oTable.getCreationRow().data("customValidationFunction")
 				},
 				this.base.getView()
 			);
 
 			// disableAddRowButtonForEmptyData is set to false in manifest converter (Table.ts) if customValidationFunction exists
-			if ((oTable.getCreationRow() as any).data("disableAddRowButtonForEmptyData") === "true") {
+			if (oTable.getCreationRow().data("disableAddRowButtonForEmptyData") === "true") {
 				const oInternalModelContext = oTable.getBindingContext("internal") as InternalModelContext;
 				oInternalModelContext.setProperty("creationRowFieldValidity", {});
 			}
@@ -279,10 +275,14 @@ class EditFlow extends ControllerExtension {
 			oTable = this.getView().byId(mParameters.tableId) as Table;
 		}
 
-		/**
-		 * @param {sap.ui.model.odata.v4.ODataListBinding} oListBinding
-		 * @param {object} oCreationPromise
-		 */
+		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 () {
+				fnFocusOrScroll(mParameters.createAtEnd ? oTable.getRowBinding().getLength() : 0, true);
+			});
+		}
+
 		const handleSideEffects = (oListBinding: any, oCreationPromise: Promise<Context>) => {
 			oCreationPromise
 				.then(function (oNewContext: any) {
@@ -295,8 +295,8 @@ class EditFlow extends ControllerExtension {
 					// this is avoid a potential list refresh, there could be a side effect that refreshes the list binding
 					// if list binding is refreshed, transient contexts might be lost
 					if (!CommonUtils.hasTransientContext(oListBinding)) {
-						const oAppComponent = CommonUtils.getAppComponent(this.getView());
-						oAppComponent
+						const appComponent = CommonUtils.getAppComponent(this.getView());
+						appComponent
 							.getSideEffectsService()
 							.requestSideEffectsForNavigationProperty(oListBinding.getPath(), oBindingContext);
 					}
@@ -307,10 +307,10 @@ class EditFlow extends ControllerExtension {
 		};
 
 		/**
-		 * @param {Array} aValidationMessages Error messages from custom validation function
+		 * @param aValidationMessages Error messages from custom validation function
 		 */
 		const createCustomValidationMessages = (aValidationMessages: any[]) => {
-			const sCustomValidationFunction = oTable && (oTable.getCreationRow() as any).data("customValidationFunction");
+			const sCustomValidationFunction = oTable && oTable.getCreationRow().data("customValidationFunction");
 			const mCustomValidity = oTable && oTable.getBindingContext("internal")?.getProperty("creationRowCustomValidity");
 			const oMessageManager = Core.getMessageManager();
 			const aCustomMessages: any[] = [];
@@ -331,7 +331,7 @@ class EditFlow extends ControllerExtension {
 				// Handle Bound CustomValidation message
 				if (oValidationMessage.messageTarget) {
 					oFieldControl = Core.getControl(mCustomValidity[oValidationMessage.messageTarget].fieldId) as Control;
-					sTarget = oFieldControl.getBindingContext()?.getPath() + "/" + oFieldControl.getBindingPath("value");
+					sTarget = `${oFieldControl.getBindingContext()?.getPath()}/${oFieldControl.getBindingPath("value")}`;
 					// Add validation message if still not exists
 					if (
 						oMessageManager
@@ -379,8 +379,9 @@ class EditFlow extends ControllerExtension {
 				});
 			}
 		};
-
-		bShouldBusyLock && BusyLocker.lock(oLockObject);
+		if (bShouldBusyLock) {
+			BusyLocker.lock(oLockObject);
+		}
 		return this._syncTask(oExecCustomValidation)
 			.then((aValidationMessages: any) => {
 				if (aValidationMessages.length > 0) {
@@ -424,12 +425,12 @@ class EditFlow extends ControllerExtension {
 									// in the absence of NewAction or NewAction with parameters, creation is async
 									sNewAction =
 										sProgrammingModel === ProgrammingModel.Draft
-											? oMetaModel.getObject(sPath + "@com.sap.vocabularies.Common.v1.DraftRoot/NewAction")
+											? oMetaModel.getObject(`${sPath}@com.sap.vocabularies.Common.v1.DraftRoot/NewAction`)
 											: oMetaModel.getObject(
-													sPath + "@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction"
+													`${sPath}@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction`
 											  );
 								if (sNewAction) {
-									const aParameters = oMetaModel.getObject("/" + sNewAction + "/@$ui5.overload/0/$Parameter") || [];
+									const aParameters = oMetaModel.getObject(`/${sNewAction}/@$ui5.overload/0/$Parameter`) || [];
 									// binding parameter (eg: _it) is not considered
 									if (aParameters.length > 1) {
 										return CreationMode.Deferred;
@@ -448,7 +449,7 @@ class EditFlow extends ControllerExtension {
 							return CreationMode.Async;
 						}
 					})
-					.then((sCreationMode: any) => {
+					.then((resolvedCreationMode: any) => {
 						let oCreation: any;
 						let mArgs: any;
 						const oCreationRow = mParameters.creationRow;
@@ -459,15 +460,15 @@ class EditFlow extends ControllerExtension {
 						const oMetaModel = oModel.getMetaModel();
 						const oRoutingListener = this._getRoutingListener();
 
-						if (sCreationMode !== CreationMode.Deferred) {
-							if (sCreationMode === CreationMode.CreationRow) {
+						if (resolvedCreationMode !== CreationMode.Deferred) {
+							if (resolvedCreationMode === CreationMode.CreationRow) {
 								oCreationRowContext = oCreationRow.getBindingContext();
 								sMetaPath = oMetaModel.getMetaPath(oCreationRowContext.getPath());
 								// prefill data from creation row
 								oPayload = oCreationRowContext.getObject();
 								mParameters.data = {};
 								Object.keys(oPayload).forEach(function (sPropertyPath: string) {
-									const oProperty = oMetaModel.getObject(sMetaPath + "/" + sPropertyPath);
+									const oProperty = oMetaModel.getObject(`${sMetaPath}/${sPropertyPath}`);
 									// ensure navigation properties are not part of the payload, deep create not supported
 									if (oProperty && oProperty.$kind === "NavigationProperty") {
 										return;
@@ -476,7 +477,7 @@ class EditFlow extends ControllerExtension {
 								});
 								oValidationCheck = this._checkForValidationErrors(/*oCreationRowContext*/);
 							}
-							if (sCreationMode === CreationMode.CreationRow || sCreationMode === CreationMode.Inline) {
+							if (resolvedCreationMode === CreationMode.CreationRow || resolvedCreationMode === CreationMode.Inline) {
 								mParameters.keepTransientContextOnFailed = false; // currently not fully supported
 								// busy handling shall be done locally only
 								mParameters.busyMode = "Local";
@@ -503,7 +504,7 @@ class EditFlow extends ControllerExtension {
 						}
 
 						let oNavigation;
-						switch (sCreationMode) {
+						switch (resolvedCreationMode) {
 							case CreationMode.Deferred:
 								oNavigation = oRoutingListener.navigateForwardToContext(oListBinding, {
 									bDeferredContext: true,
@@ -528,12 +529,12 @@ class EditFlow extends ControllerExtension {
 								}
 								oNavigation = oCreation.then(function (oNewDocumentContext: any) {
 									if (!oNewDocumentContext) {
-										const oResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
+										const coreResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
 										return oRoutingListener.navigateToMessagePage(
-											oResourceBundle.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),
+											coreResourceBundle.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"),
 											{
-												title: oResourceBundle.getText("C_COMMON_SAPFE_ERROR"),
-												description: oResourceBundle.getText("C_EDITFLOW_SAPFE_CREATION_FAILED_DESCRIPTION")
+												title: coreResourceBundle.getText("C_COMMON_SAPFE_ERROR"),
+												description: coreResourceBundle.getText("C_EDITFLOW_SAPFE_CREATION_FAILED_DESCRIPTION")
 											}
 										);
 									} else {
@@ -574,7 +575,7 @@ class EditFlow extends ControllerExtension {
 									});
 								break;
 							default:
-								oNavigation = Promise.reject("Unhandled creationMode " + sCreationMode);
+								oNavigation = Promise.reject(`Unhandled creationMode ${resolvedCreationMode}`);
 								break;
 						}
 
@@ -618,14 +619,9 @@ class EditFlow extends ControllerExtension {
 					});
 			})
 			.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 () {
-						fnFocusOrScroll(mParameters.createAtEnd ? oTable.getRowBinding().getLength() : 0, true);
-					});
+				if (bShouldBusyLock) {
+					BusyLocker.unlock(oLockObject);
 				}
-				bShouldBusyLock && BusyLocker.unlock(oLockObject);
 			});
 	}
 
@@ -636,9 +632,10 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * 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 {object} 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.
+	 *
+	 * @param mParameters Object containing the parameters passed to onBeforeSave
+	 * @param mParameters.context Page context that is going to be saved.
+	 * @returns 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
@@ -658,10 +655,11 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * 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.
+	 *
+	 * @param  mParameters Object containing the parameters passed to onBeforeCreate
+	 * @param mParameters.contextPath Path pointing to the context on which Create action is triggered
+	 * @param mParameters.createParameters Array of values that are filled in the Action Parameter Dialog
+	 * @returns 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
@@ -681,9 +679,10 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * 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 {object} 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.
+	 *
+	 * @param mParameters Object containing the parameters passed to onBeforeEdit
+	 * @param mParameters.context Page context that is going to be edited.
+	 * @returns 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
@@ -703,9 +702,10 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * 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 {object} 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.
+	 *
+	 * @param mParameters Object containing the parameters passed to onBeforeDiscard
+	 * @param mParameters.context Page context that is going to be discarded.
+	 * @returns 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
@@ -725,9 +725,10 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * 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 {object} 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.
+	 *
+	 * @param mParameters Object containing the parameters passed to onBeforeDelete
+	 * @param mParameters.contexts An array of contexts that are going to be deleted
+	 * @returns 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
@@ -752,15 +753,15 @@ class EditFlow extends ControllerExtension {
 	 * Saves a new document after checking it.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oContext  Context of the editable document
-	 * @returns {Promise} Promise resolves once save is complete
+	 * @param oContext  Context of the editable document
+	 * @returns Promise resolves once save is complete
 	 * @alias sap.fe.core.controllerextensions.EditFlow#saveDocument
 	 * @public
 	 * @since 1.90.0
 	 */
 	@publicExtension()
 	@finalExtension()
-	async saveDocument(oContext: Context, mParameters: any): Promise<void> {
+	async saveDocument(oContext: V4Context, mParameters: any): Promise<void> {
 		mParameters = mParameters || {};
 		const bExecuteSideEffectsOnError = mParameters.bExecuteSideEffectsOnError || undefined;
 		const bDraftNavigation = true;
@@ -802,7 +803,7 @@ class EditFlow extends ControllerExtension {
 			this._removeStickySessionInternalProperties(sProgrammingModel);
 
 			this._sendActivity(Activity.Activate, activeDocumentContext);
-			this._triggerConfiguredSurvey(standardActions.save, triggerType.standardAction);
+			this._triggerConfiguredSurvey(StandardActions.save, TriggerType.standardAction);
 
 			this._setEditMode(EditMode.Display, false);
 			this._getMessageHandler().showMessageDialog();
@@ -828,7 +829,7 @@ class EditFlow extends ControllerExtension {
 	}
 	@publicExtension()
 	@finalExtension()
-	async toggleDraftActive(oContext: Context): Promise<void> {
+	async toggleDraftActive(oContext: V4Context): Promise<void> {
 		const oContextData = oContext.getObject();
 		let bEditable: boolean;
 		const bIsDraft = oContext && this._getProgrammingModel(oContext) === ProgrammingModel.Draft;
@@ -863,7 +864,7 @@ class EditFlow extends ControllerExtension {
 					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 });
+						siblingInfo.pathMapping.push({ oldPath: lastSemanticMapping.semanticPath, newPath: targetPath });
 					}
 					this._updatePathsInHistory(siblingInfo.pathMapping);
 				}
@@ -873,7 +874,7 @@ class EditFlow extends ControllerExtension {
 				return Promise.reject("Error in EditFlow.toggleDraftActive - Cannot find sibling");
 			}
 		} catch (oError) {
-			return Promise.reject(("Error in EditFlow.toggleDraftActive:" + oError) as any);
+			return Promise.reject(`Error in EditFlow.toggleDraftActive:${oError}` as any);
 		}
 	}
 
@@ -886,17 +887,17 @@ class EditFlow extends ControllerExtension {
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
 	 * @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
-	 * @returns {Promise} Promise resolves once editable document has been discarded
+	 * @param mParameters Can contain the following attributes:
+	 * @param mParameters.control This is the control used to open the discard popover
+	 * @param mParameters.skipDiscardPopover Optional, supresses the discard popover and allows custom handling
+	 * @returns Promise resolves once editable document has been discarded
 	 * @alias sap.fe.core.controllerextensions.EditFlow#cancelDocument
 	 * @public
 	 * @since 1.90.0
 	 */
 	@publicExtension()
 	@finalExtension()
-	async cancelDocument(oContext: Context, mParameters: { control: object; skipDiscardPopover?: boolean }): Promise<any> {
+	async cancelDocument(oContext: V4Context, mParameters: { control: object; skipDiscardPopover?: boolean }): Promise<any> {
 		const transactionHelper = this._getTransactionHelper();
 		const oResourceBundle = this._getResourceBundle();
 		const mInParameters: any = mParameters;
@@ -983,11 +984,11 @@ class EditFlow extends ControllerExtension {
 	 * Deletes the document.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oContext  Context of the document
-	 * @param {object} mInParameters Can contain the following attributes:
-	 * @param {string} mInParameters.title Title of the object being deleted
-	 * @param {string} mInParameters.description Description of the object being deleted
-	 * @returns {Promise} Promise resolves once document has been deleted
+	 * @param oContext  Context of the document
+	 * @param mInParameters Can contain the following attributes:
+	 * @param mInParameters.title Title of the object being deleted
+	 * @param mInParameters.description Description of the object being deleted
+	 * @returns Promise resolves once document has been deleted
 	 * @alias sap.fe.core.controllerextensions.EditFlow#deleteDocument
 	 * @public
 	 * @since 1.90.0
@@ -1014,11 +1015,18 @@ class EditFlow extends ControllerExtension {
 				}
 				this._sendActivity(Activity.Delete, oContext);
 
-				this._getRoutingListener().navigateBackFromContext(oContext);
-				// After delete is successfull, we need to dettch the setBackNavigation Methods
+				// After delete is successfull, we need to detach the setBackNavigation Methods
 				if (oAppComponent) {
 					oAppComponent.getShellServices().setBackNavigation();
 				}
+
+				if (oAppComponent?.getStartupMode() === StartupMode.Deeplink && !this._isFclEnabled()) {
+					// In case the app has been launched with semantic keys, deleting the object we've landed on shall navigate back
+					// to the app we came from (except for FCL, where we navigate to LR as usual)
+					oAppComponent.getRouterProxy().exitFromApp();
+				} else {
+					this._getRoutingListener().navigateBackFromContext(oContext);
+				}
 			})
 			.catch(function (oError: any) {
 				Log.error("Error while deleting the document", oError);
@@ -1029,8 +1037,8 @@ class EditFlow extends ControllerExtension {
 	 * Submit the current set of changes and navigate back.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oContext  Context of the document
-	 * @returns {Promise} Promise resolves once the changes have been saved
+	 * @param oContext  Context of the document
+	 * @returns Promise resolves once the changes have been saved
 	 * @alias sap.fe.core.controllerextensions.EditFlow#applyDocument
 	 * @public
 	 * @since 1.90.0
@@ -1063,23 +1071,23 @@ class EditFlow extends ControllerExtension {
 	 * Invokes an action (bound or unbound) and tracks the changes so that other pages can be refreshed and show the updated data upon navigation.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {string} sActionName The name of the action to be called
-	 * @param {object} mInParameters Contains the following attributes:
-	 * @param {sap.ui.model.odata.v4.Context} mInParameters.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} mInParameters.model For an unbound action, an instance of an OData V4 model must be provided
-	 * @param {boolean} mInParameters.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} mInParameters.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} mInParameters.invocationGrouping Mode how actions are to be called: 'ChangeSet' to put all action calls into one changeset, 'Isolated' to put them into separate changesets
-	 * @param {object} mExtraParams PRIVATE
-	 * @returns {Promise}
+	 * @param sActionName The name of the action to be called
+	 * @param mInParameters Contains the following attributes:
+	 * @param mInParameters.contexts For a bound action, a context or an array with contexts for which the action is to be called must be provided
+	 * @param mInParameters.model For an unbound action, an instance of an OData V4 model must be provided
+	 * @param mInParameters.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 mInParameters.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 mInParameters.invocationGrouping Mode how actions are to be called: 'ChangeSet' to put all action calls into one changeset, 'Isolated' to put them into separate changesets
+	 * @param mExtraParams PRIVATE
+	 * @returns A promise once the action has been invoked
 	 * @alias sap.fe.core.controllerextensions.EditFlow#invokeAction
 	 * @public
 	 * @since 1.90.0
 	 * @final
-	 **/
+	 */
 	@publicExtension()
 	@finalExtension()
-	invokeAction(
+	async invokeAction(
 		sActionName: string,
 		mInParameters?: {
 			contexts?: Context | Context[];
@@ -1104,7 +1112,11 @@ class EditFlow extends ControllerExtension {
 		// Due to a mistake the invokeAction in the extensionAPI had a different API than this one.
 		// The one from the extensionAPI doesn't exist anymore as we expose the full edit flow now but
 		// due to compatibility reasons we still need to support the old signature
-		if ((mParameters.isA && mParameters.isA("sap.ui.model.odata.v4.Context")) || Array.isArray(mParameters) || arguments.length === 3) {
+		if (
+			(mParameters.isA && mParameters.isA("sap.ui.model.odata.v4.Context")) ||
+			Array.isArray(mParameters) ||
+			mExtraParams !== undefined
+		) {
 			const contexts = mParameters;
 			mParameters = mExtraParams || {};
 			if (contexts) {
@@ -1181,7 +1193,7 @@ class EditFlow extends ControllerExtension {
 					}
 
 					if (!mParameters.contexts) {
-						return Promise.reject("Context not found for entity type " + sOverloadEntityType);
+						throw new Error(`Context not found for entity type ${sOverloadEntityType}`);
 					}
 				}
 			}
@@ -1193,92 +1205,88 @@ class EditFlow extends ControllerExtension {
 		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()
-			.then(transactionHelper.callAction.bind(transactionHelper, sActionName, mParameters, this.getView(), this._getMessageHandler()))
-			.then((oResponse: any) => {
-				// if the returned context for the bound action is different than the context on which action was called,
-				// refresh the corresponding list binding
-				if (mParameters.contexts) {
-					return this._refreshListIfRequired(
-						this._getActionResponseDataAndKeys(sActionName, oResponse),
-						mParameters.contexts[0]
-					).then(function () {
-						return oResponse;
-					});
-				}
-			})
-			.then((oResponse: any) => {
-				this._sendActivity(Activity.Action, mParameters.contexts);
-				this._triggerConfiguredSurvey(sActionName, triggerType.action);
 
-				if (oCurrentActionCallBacks) {
-					oCurrentActionCallBacks.fResolver(oResponse);
+		try {
+			await this._syncTask();
+			const oResponse = await transactionHelper.callAction.bind(
+				transactionHelper,
+				sActionName,
+				mParameters,
+				this.getView(),
+				this._getMessageHandler()
+			)();
+			if (mParameters.contexts) {
+				await this._refreshListIfRequired(this._getActionResponseDataAndKeys(sActionName, oResponse), mParameters.contexts[0]);
+			}
+			this._sendActivity(Activity.Action, mParameters.contexts);
+			this._triggerConfiguredSurvey(sActionName, TriggerType.action);
+
+			if (oCurrentActionCallBacks) {
+				oCurrentActionCallBacks.fResolver(oResponse);
+			}
+			/*
+					We set the (upper) pages to dirty after an execution of an action
+					TODO: get rid of this workaround
+					This workaround is only needed as long as the model does not support the synchronization.
+					Once this is supported we don't need to set the pages to dirty anymore as the context itself
+					is already refreshed (it's just not reflected in the object page)
+					we explicitly don't call this method from the list report but only call it from the object page
+					as if it is called in the list report it's not needed - as we anyway will remove this logic
+					we can live with this
+					we need a context to set the upper pages to dirty - if there are more than one we use the
+					first one as they are anyway siblings
+					*/
+			if (mParameters.contexts) {
+				if (!this._isFclEnabled()) {
+					EditState.setEditStateDirty();
 				}
-				/*
-					 We set the (upper) pages to dirty after an execution of an action
-					 TODO: get rid of this workaround
-					 This workaround is only needed as long as the model does not support the synchronization.
-					 Once this is supported we don't need to set the pages to dirty anymore as the context itself
-					 is already refreshed (it's just not reflected in the object page)
-					 we explicitly don't call this method from the list report but only call it from the object page
-					 as if it is called in the list report it's not needed - as we anyway will remove this logic
-					 we can live with this
-					 we need a context to set the upper pages to dirty - if there are more than one we use the
-					 first one as they are anyway siblings
-					 */
-				if (mParameters.contexts) {
-					if (!this._isFclEnabled()) {
-						EditState.setEditStateDirty();
-					}
-					this._getInternalModel().setProperty("/sCustomAction", sActionName);
+				this._getInternalModel().setProperty("/sCustomAction", sActionName);
+			}
+			if (mParameters.isNavigable) {
+				let vContext = oResponse;
+				if (Array.isArray(vContext) && vContext.length === 1) {
+					vContext = vContext[0];
 				}
-				if (mParameters.isNavigable) {
-					let vContext = oResponse;
-					if (Array.isArray(vContext) && vContext.length === 1) {
-						vContext = vContext[0];
-					}
-					if (vContext && !Array.isArray(vContext)) {
-						const oMetaModel = oView.getModel().getMetaModel() as ODataMetaModel;
-						const sContextMetaPath = oMetaModel.getMetaPath(vContext.getPath());
-						const oActionContext = Array.isArray(mParameters.contexts) ? mParameters.contexts[0] : mParameters.contexts;
-						const sActionContextMetaPath = oActionContext && oMetaModel.getMetaPath(oActionContext.getPath());
-						if (sContextMetaPath != undefined && sContextMetaPath === sActionContextMetaPath) {
-							if (oActionContext.getPath() !== vContext.getPath()) {
-								this._getRoutingListener().navigateForwardToContext(vContext, {
-									noHistoryEntry: false
-								});
-							} else {
-								Log.info("Navigation to the same context is not allowed");
-							}
+				if (vContext && !Array.isArray(vContext)) {
+					const oMetaModel = oView.getModel().getMetaModel() as ODataMetaModel;
+					const sContextMetaPath = oMetaModel.getMetaPath(vContext.getPath());
+					const oActionContext = Array.isArray(mParameters.contexts) ? mParameters.contexts[0] : mParameters.contexts;
+					const sActionContextMetaPath = oActionContext && oMetaModel.getMetaPath(oActionContext.getPath());
+					if (sContextMetaPath != undefined && sContextMetaPath === sActionContextMetaPath) {
+						if (oActionContext.getPath() !== vContext.getPath()) {
+							this._getRoutingListener().navigateForwardToContext(vContext, {
+								noHistoryEntry: false
+							});
+						} else {
+							Log.info("Navigation to the same context is not allowed");
 						}
 					}
 				}
-			})
-			.catch(function (err: any) {
-				if (oCurrentActionCallBacks) {
-					oCurrentActionCallBacks.fRejector();
-				}
-				if (err == Constants.CancelActionDialog) {
-					return Promise.reject("Dialog cancelled.");
-				} else {
-					if (!(err && (err.canceled || (err.rejectedItems && err.rejectedItems[0].canceled)))) {
-						return Promise.reject("Error in EditFlow.invokeAction:" + err);
-					}
-				}
-			});
+			}
+		} catch (err: any) {
+			if (oCurrentActionCallBacks) {
+				oCurrentActionCallBacks.fRejector();
+			}
+			// FIXME: in most situations there is no handler for the rejected promises returned
+			if (err === Constants.CancelActionDialog) {
+				throw new Error("Dialog cancelled");
+			} else if (!(err && (err.canceled || (err.rejectedItems && err.rejectedItems[0].canceled)))) {
+				throw new Error(`Error in EditFlow.invokeAction:${err}`);
+			}
+		}
 	}
 
 	/**
 	 * Secured execution of the given function. Ensures that the function is only executed when certain conditions are fulfilled.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {Function} fnFunction The function to be executed. Should return a promise that is settled after completion of the execution. If nothing is returned, immediate completion is assumed.
-	 * @param {object} mParameters Definitions of the preconditions to be checked before execution
-	 * @param {object} mParameters.busy Defines the busy indicator
-	 * @param {boolean} mParameters.busy.set Triggers a busy indicator when the function is executed.
-	 * @param {boolean} mParameters.busy.check Executes function only if application isn't busy.
-	 * @param {boolean} mParameters.updatesDocument This operation updates the current document without using the bound model and context. As a result, the draft status is updated if a draft document exists, and the user has to confirm the cancellation of the editing process.
-	 * @returns {Promise} A promise that is rejected if the execution is prohibited and resolved by the promise returned by the fnFunction.
+	 * @param fnFunction The function to be executed. Should return a promise that is settled after completion of the execution. If nothing is returned, immediate completion is assumed.
+	 * @param mParameters Definitions of the preconditions to be checked before execution
+	 * @param mParameters.busy Defines the busy indicator
+	 * @param mParameters.busy.set Triggers a busy indicator when the function is executed.
+	 * @param mParameters.busy.check Executes function only if application isn't busy.
+	 * @param mParameters.updatesDocument This operation updates the current document without using the bound model and context. As a result, the draft status is updated if a draft document exists, and the user has to confirm the cancellation of the editing process.
+	 * @returns A promise that is rejected if the execution is prohibited and resolved by the promise returned by the fnFunction.
 	 * @alias sap.fe.core.controllerextensions.EditFlow#securedExecution
 	 * @public
 	 * @experimental As of version 1.90.0
@@ -1339,7 +1347,7 @@ class EditFlow extends ControllerExtension {
 				if (bBusySet) {
 					BusyLocker.unlock(oLockObject);
 				}
-				return this._getMessageHandler().showMessageDialog();
+				this._getMessageHandler().showMessageDialog();
 			});
 	}
 
@@ -1353,8 +1361,8 @@ class EditFlow extends ControllerExtension {
 		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");
+				oEvent.getSource().attachEventOnce("patchCompleted", (patchCompletedEvent: any) => {
+					const bSuccess = patchCompletedEvent.getParameter("success");
 					if (bSuccess) {
 						resolve();
 					} else {
@@ -1455,7 +1463,6 @@ class EditFlow extends ControllerExtension {
 	 * @function
 	 * @name _createActionPromise
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 *
 	 * @returns {Function} The resolver function which can be used to externally resolve the promise
 	 */
 
@@ -1480,7 +1487,7 @@ class EditFlow extends ControllerExtension {
 		send(this.getView(), action, content);
 	}
 
-	_triggerConfiguredSurvey(sActionName: string, triggerType: triggerType) {
+	_triggerConfiguredSurvey(sActionName: string, triggerType: TriggerType) {
 		triggerConfiguredSurvey(this.getView(), sActionName, triggerType);
 	}
 
@@ -1488,9 +1495,9 @@ class EditFlow extends ControllerExtension {
 	 * @function
 	 * @name _getActionResponseDataAndKeys
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {string} sActionName The name of the action that is executed
-	 * @param {object} oResponse The bound action's response data or response context
-	 * @returns {object} Object with data and names of the key fields of the response
+	 * @param sActionName The name of the action that is executed
+	 * @param oResponse The bound action's response data or response context
+	 * @returns Object with data and names of the key fields of the response
 	 */
 	_getActionResponseDataAndKeys(sActionName: string, oResponse: object) {
 		return (this.base.getView().getController() as PageController)._editFlow.getActionResponseDataAndKeys(sActionName, oResponse);
@@ -1580,7 +1587,7 @@ class EditFlow extends ControllerExtension {
 	}
 
 	_getBoundContext(view: any, params: any) {
-		const viewLevel = (view.getViewData() as any).viewLevel;
+		const viewLevel = view.getViewData().viewLevel;
 		const bRefreshAfterAction = viewLevel > 1 || (viewLevel === 1 && params.controlId);
 		return !params.isNavigable || !!bRefreshAfterAction;
 	}
@@ -1624,9 +1631,9 @@ class EditFlow extends ControllerExtension {
 	 * @function
 	 * @name _refreshListIfRequired
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oResponse The response of the bound action and the names of the key fields
-	 * @param {sap.ui.model.odata.v4.Context} oContext The bound context on which the action was executed
-	 * @returns {Promise} Always resolves to param oResponse
+	 * @param oResponse The response of the bound action and the names of the key fields
+	 * @param oContext The bound context on which the action was executed
+	 * @returns Always resolves to param oResponse
 	 */
 	_refreshListIfRequired(oResponse: any, oContext: Context) {
 		if (!oContext || !oResponse || !oResponse.oData) {
@@ -1736,7 +1743,7 @@ class EditFlow extends ControllerExtension {
 							.getMetaContext(oActionBindingContext.getPath())
 							.getObject("$Type") === sOverloadEntityType
 					) {
-						throw "context found - stop actions loop";
+						throw new Error("context found - stop actions loop");
 					}
 				});
 				return undefined;
@@ -1750,7 +1757,7 @@ class EditFlow extends ControllerExtension {
 			try {
 				aSubSections.forEach(function (oSubSection: any) {
 					if (oActionBindingContext) {
-						throw "context found - stop SubSections loop";
+						throw new Error("context found - stop SubSections loop");
 					}
 					if (oSubSection.getBindingContext() === null) {
 						oSubSection.setBindingContext(undefined);
@@ -1786,7 +1793,7 @@ class EditFlow extends ControllerExtension {
 		}
 	}
 
-	_createSiblingInfo(currentContext: Context, newContext: Context): SiblingInformation {
+	_createSiblingInfo(currentContext: V4Context, newContext: V4Context): SiblingInformation {
 		return {
 			targetContext: newContext,
 			pathMapping: [
@@ -1810,21 +1817,22 @@ class EditFlow extends ControllerExtension {
 	}
 
 	/**
-	 * This methods creates a sibling context for a sub-object page, and calculates a sibling path for
+	 * This methods creates a sibling context for a subobject 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
+	 * @param rootCurrentContext The context for the root of the draft
+	 * @param rightmostCurrentContext The context of the subobject
+	 * @param sProgrammingModel The programming model
+	 * @param doNotComputeIfRoot If true, we don't compute siblingInfo if the root and the rightmost contexts are the same
+	 * @returns Returns the siblingInformation object
 	 */
 	async _computeSiblingInformation(
-		rootCurrentContext: Context,
-		rightmostCurrentContext: Context,
+		rootCurrentContext: V4Context,
+		rightmostCurrentContext: V4Context | null | undefined,
 		sProgrammingModel: string,
 		doNotComputeIfRoot: boolean
 	): Promise<SiblingInformation | undefined> {
+		rightmostCurrentContext = rightmostCurrentContext ?? rootCurrentContext;
 		if (!rightmostCurrentContext.getPath().startsWith(rootCurrentContext.getPath())) {
 			// Wrong usage !!
 			Log.error("Cannot compute rightmost sibling context");
@@ -1841,7 +1849,7 @@ class EditFlow extends ControllerExtension {
 			// 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,
+				targetContext: model.bindContext(rightmostCurrentContext.getPath()).getBoundContext(),
 				pathMapping: []
 			};
 		}