@sapui5/sap.fe.core 1.100.0 → 1.102.0

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

@@ -1,59 +1,68 @@
-import Event from "sap/ui/base/Event";
-import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
-import ControllerExtensionMetadata from "sap/fe/core/controllerextensions/ControllerExtensionMetadata";
-import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
-import Component from "sap/ui/core/Component";
-import CommonUtils from "sap/fe/core/CommonUtils";
-import BusyLocker from "sap/fe/core/BusyLocker";
-import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
-import Filter from "sap/ui/model/Filter";
-import FilterOperator from "sap/ui/model/FilterOperator";
 import Log from "sap/base/Log";
+import AppComponent from "sap/fe/core/AppComponent";
+import CommonUtils from "sap/fe/core/CommonUtils";
+import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
+import ActivitySync from "sap/fe/core/controllerextensions/collaboration/ActivitySync";
+import draft from "sap/fe/core/controllerextensions/editFlow/draft";
+import RouterProxy from "sap/fe/core/controllerextensions/routing/RouterProxy";
+import {
+	defineUI5Class,
+	EnhanceWithUI5,
+	extensible,
+	finalExtension,
+	methodOverride,
+	publicExtension
+} from "sap/fe/core/helpers/ClassSupport";
 import EditState from "sap/fe/core/helpers/EditState";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
-import { Extensible, Final, Override, Public, UI5Class } from "sap/fe/core/helpers/ClassSupport";
+import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
+import FELibrary from "sap/fe/core/library";
 import PageController from "sap/fe/core/PageController";
+import { RoutingService } from "sap/fe/core/services/RoutingServiceFactory";
+import TemplateComponent from "sap/fe/core/TemplateComponent";
+import Event from "sap/ui/base/Event";
+import Component from "sap/ui/core/Component";
+import Core from "sap/ui/core/Core";
+import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
+import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import View from "sap/ui/core/mvc/View";
-import AppComponent from "sap/fe/core/AppComponent";
-import { TemplateComponentType } from "sap/fe/core/TemplateComponent";
 import Router from "sap/ui/core/routing/Router";
-import RouterProxy from "sap/fe/core/RouterProxy";
-import { RoutingService } from "sap/fe/core/services/RoutingServiceFactory";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
 import JSONModel from "sap/ui/model/json/JSONModel";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Context from "sap/ui/model/odata/v4/Context";
+import { CoreEx } from "types/extension_types";
 
 /**
  * {@link sap.ui.core.mvc.ControllerExtension Controller extension}
  *
  * @namespace
  * @alias sap.fe.core.controllerextensions.InternalRouting
- *
  * @private
  * @since 1.74.0
  */
-@UI5Class("sap.fe.core.controllerextensions.InternalRouting", ControllerExtensionMetadata)
+@defineUI5Class("sap.fe.core.controllerextensions.InternalRouting")
 class InternalRouting extends ControllerExtension {
 	private base!: PageController;
 	private _oView!: View;
 	private _oAppComponent!: AppComponent;
-	private _oPageComponent!: TemplateComponentType | null;
+	private _oPageComponent!: EnhanceWithUI5<TemplateComponent> | null;
 	private _oRouter!: Router;
 	private _oRoutingService!: RoutingService;
 	private _oRouterProxy!: RouterProxy;
 	private _fnRouteMatchedBound!: Function;
 	private _oTargetInformation: any;
 
-	@Override()
+	@methodOverride()
 	onExit() {
 		this._oRoutingService && this._oRoutingService.detachRouteMatched(this._fnRouteMatchedBound);
 	}
 
-	@Override()
+	@methodOverride()
 	onInit() {
 		this._oView = this.base.getView();
 		this._oAppComponent = CommonUtils.getAppComponent(this._oView);
-		this._oPageComponent = Component.getOwnerComponentFor(this._oView) as TemplateComponentType;
+		this._oPageComponent = Component.getOwnerComponentFor(this._oView) as EnhanceWithUI5<TemplateComponent>;
 		this._oRouter = this._oAppComponent.getRouter();
 		this._oRouterProxy = (this._oAppComponent as any).getRouterProxy();
 
@@ -77,7 +86,7 @@ class InternalRouting extends ControllerExtension {
 				this._oRoutingService.attachRouteMatched(this._fnRouteMatchedBound);
 				this._oTargetInformation = oRoutingService.getTargetInformationFor(this._oPageComponent || this._oView);
 			})
-			.catch(function() {
+			.catch(function () {
 				throw new Error("This controller extension cannot work without a 'routingService' on the main AppComponent");
 			});
 	}
@@ -85,20 +94,20 @@ class InternalRouting extends ControllerExtension {
 	/**
 	 * Triggered every time this controller is a navigation target.
 	 */
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	onRouteMatched() {
 		/**/
 	}
 
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	onRouteMatchedFinished() {
 		/**/
 	}
 
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	onBeforeBinding(oBindingContext: any, mParameters?: any) {
 		const oRouting = (this.base.getView().getController() as any).routing;
 		if (oRouting && oRouting.onBeforeBinding) {
@@ -106,8 +115,8 @@ class InternalRouting extends ControllerExtension {
 		}
 	}
 
-	@Public
-	@Extensible(OverrideExecution.After)
+	@publicExtension()
+	@extensible(OverrideExecution.After)
 	onAfterBinding(oBindingContext: any, mParameters?: any) {
 		(this._oAppComponent as any).getRootViewController().onContextBoundToView(oBindingContext);
 		const oRouting = (this.base.getView().getController() as any).routing;
@@ -130,7 +139,7 @@ class InternalRouting extends ControllerExtension {
 	 * @param {boolean} bPreserveHistory True to force the new URL to be added at the end of the browser history (no replace)
 	 * @ui5-restricted
 	 */
-	@Public
+	@publicExtension()
 	navigateToTarget(oContext: any, sNavigationTargetName: string, oSemanticObject?: object, bPreserveHistory?: boolean) {
 		const oNavigationConfiguration =
 			this._oPageComponent &&
@@ -155,7 +164,7 @@ class InternalRouting extends ControllerExtension {
 	 * @returns {Promise} Promise that is resolved when the navigation is finalized
 	 * @ui5-restricted
 	 */
-	@Public
+	@publicExtension()
 	navigateToRoute(sTargetRouteName: string, oParameters?: object) {
 		return this._oRoutingService.navigateToRoute(sTargetRouteName, oParameters);
 	}
@@ -166,12 +175,11 @@ class InternalRouting extends ControllerExtension {
 	 * @param {sap.ui.model.odata.v4.Context} oContext The context to be navigated to
 	 * @param {object} [mParameters] Optional navigation parameters
 	 * @returns {Promise} Promise resolved when the navigation has been triggered
-	 *
 	 * @ui5-restricted
 	 */
-	@Public
-	@Final
-	navigateToContext(oContext: any, mParameters?: any): Promise<void> {
+	@publicExtension()
+	@finalExtension()
+	navigateToContext(oContext: any, mParameters?: any): Promise<boolean> {
 		const oContextInfo: any = {};
 		mParameters = mParameters || {};
 
@@ -190,10 +198,11 @@ class InternalRouting extends ControllerExtension {
 							editable: mParameters.editable,
 							bPersistOPScroll: mParameters.bPersistOPScroll,
 							updateFCLLevel: mParameters.updateFCLLevel,
-							bForceFocus: mParameters.bForceFocus
+							bForceFocus: mParameters.bForceFocus,
+							bNavigateToSiblingEntity: mParameters.bNavigateToSiblingEntity
 						});
 					})
-					.catch(function(oError: any) {
+					.catch(function (oError: any) {
 						Log.error("Error with the async context", oError);
 					});
 			} else if (!mParameters.bDeferredContext) {
@@ -215,7 +224,7 @@ class InternalRouting extends ControllerExtension {
 			const bOverrideNav = (this.base.getView().getController() as any).routing.onBeforeNavigation(oContextInfo);
 			if (bOverrideNav) {
 				oInternalModel.setProperty("/paginatorCurrentContext", oContext);
-				return Promise.resolve();
+				return Promise.resolve(true);
 			}
 		}
 		mParameters.FCLLevel = this._getFCLLevel();
@@ -229,11 +238,10 @@ class InternalRouting extends ControllerExtension {
 	 * @param {sap.ui.model.odata.v4.Context} oContext Context to be navigated from
 	 * @param {object} [mParameters] Optional navigation parameters
 	 * @returns {Promise} Promise resolved when the navigation has been triggered
-	 *
 	 * @ui5-restricted
 	 */
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	navigateBackFromContext(oContext: any, mParameters?: any) {
 		mParameters = mParameters || {};
 		mParameters.updateFCLLevel = -1;
@@ -247,14 +255,13 @@ class InternalRouting extends ControllerExtension {
 	 * @param {sap.ui.model.odata.v4.Context} oContext Context to be navigated to
 	 * @param {object} mParameters Optional navigation parameters
 	 * @returns {Promise} Promise resolved when the navigation has been triggered
-	 *
 	 * @ui5-restricted
 	 */
-	@Public
-	@Final
-	navigateForwardToContext(oContext: any, mParameters?: any) {
+	@publicExtension()
+	@finalExtension()
+	navigateForwardToContext(oContext: any, mParameters?: any): Promise<boolean> {
 		if (this._oView.getBindingContext("internal")?.getProperty("messageFooterContainsErrors") === true) {
-			return Promise.resolve();
+			return Promise.resolve(true);
 		}
 		mParameters = mParameters || {};
 		mParameters.updateFCLLevel = 1;
@@ -265,8 +272,8 @@ class InternalRouting extends ControllerExtension {
 	/**
 	 * Navigates back in history if the current hash corresponds to a transient state.
 	 */
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	navigateBackFromTransientState() {
 		const sHash = this._oRouterProxy.getHash();
 
@@ -276,8 +283,8 @@ class InternalRouting extends ControllerExtension {
 		}
 	}
 
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	navigateToMessagePage(sErrorMessage: any, mParameters: any) {
 		mParameters = mParameters || {};
 		if (this._oRouterProxy.getHash().indexOf("i-action=create") > -1) {
@@ -294,11 +301,10 @@ class InternalRouting extends ControllerExtension {
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oContext
 	 * @returns {boolean}
-	 *
 	 * @ui5-restricted
 	 */
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	isCurrentStateImpactedBy(oContext: any) {
 		return this._oRoutingService.isCurrentStateImpactedBy(oContext);
 	}
@@ -312,7 +318,6 @@ class InternalRouting extends ControllerExtension {
 	 * Builds the binding context from the navigation parameters, and bind the page accordingly.
 	 *
 	 * @param {object} oEvent
-	 *
 	 * @ui5-restricted
 	 */
 	_onRouteMatched(oEvent: Event) {
@@ -405,9 +410,7 @@ class InternalRouting extends ControllerExtension {
 		if (this._getBindingContext() && this._getBindingContext().hasPendingChanges()) {
 			// For now remove the pending changes to avoid the model raises errors and the object page is at least bound
 			// Ideally the user should be asked for
-			this._getBindingContext()
-				.getBinding()
-				.resetChanges();
+			this._getBindingContext().getBinding().resetChanges();
 		}
 
 		// remove the context to avoid showing old data
@@ -436,7 +439,7 @@ class InternalRouting extends ControllerExtension {
 				})
 				.catch((oError: any) => {
 					// Error handling for erroneous metadata request
-					const oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
+					const oResourceBundle = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
 
 					this.navigateToMessagePage(oResourceBundle.getText("C_COMMON_SAPFE_DATA_RECEIVED_ERROR"), {
 						title: oResourceBundle.getText("C_COMMON_SAPFE_ERROR"),
@@ -453,11 +456,10 @@ class InternalRouting extends ControllerExtension {
 	 * @param {Array} aSemanticKeys The semantic keys for the path
 	 * @param {object} oMetaModel The instance of the meta model
 	 * @returns {sap.ui.model.Filter} The filter
-	 *
 	 * @ui5-restricted
 	 */
 	_createFilterFromSemanticPath(sSemanticPath: string, aSemanticKeys: any[], oMetaModel: object) {
-		const fnUnquoteAndDecode = function(sValue: any) {
+		const fnUnquoteAndDecode = function (sValue: any) {
 			if (sValue.indexOf("'") === 0 && sValue.lastIndexOf("'") === sValue.length - 1) {
 				// Remove the quotes from the value and decode special chars
 				sValue = decodeURIComponent(sValue.substring(1, sValue.length - 1));
@@ -487,7 +489,7 @@ class InternalRouting extends ControllerExtension {
 		} else {
 			const mKeyValues: any = {};
 			// Create a map of all key values
-			aKeyValues.forEach(function(sKeyAssignment: string) {
+			aKeyValues.forEach(function (sKeyAssignment: string) {
 				const aParts = sKeyAssignment.split("="),
 					sKeyValue = fnUnquoteAndDecode(aParts[1]);
 
@@ -495,7 +497,7 @@ class InternalRouting extends ControllerExtension {
 			});
 
 			let bFailed = false;
-			aFilters = aSemanticKeys.map(function(oSemanticKey: any) {
+			aFilters = aSemanticKeys.map(function (oSemanticKey: any) {
 				const sKey = oSemanticKey.$PropertyPath,
 					sValue = mKeyValues[sKey];
 
@@ -538,7 +540,6 @@ class InternalRouting extends ControllerExtension {
 	 * @param {sap.ui.model.odata.v4.ODataModel} oModel The model for the path
 	 * @param {Array} aSemanticKeys The semantic keys for the path
 	 * @returns {Promise} A Promise containing the path with technical keys if sSemanticPath could be interpreted as a semantic path, null otherwise
-	 *
 	 * @ui5-restricted
 	 */
 	_getTechnicalPathFromSemanticPath(sSemanticPath: string, oModel: any, aSemanticKeys: any[]) {
@@ -565,7 +566,7 @@ class InternalRouting extends ControllerExtension {
 			"$$groupId": "$auto.Heroes"
 		});
 
-		return oListBinding.requestContexts(0, 2).then(function(oContexts: any) {
+		return oListBinding.requestContexts(0, 2).then(function (oContexts: any) {
 			if (oContexts && oContexts.length) {
 				return oContexts[0].getPath();
 			} else {
@@ -581,7 +582,6 @@ class InternalRouting extends ControllerExtension {
 	 * @param {string} sPath The path to test
 	 * @param {sap.ui.model.odata.v4.ODataMetaModel} oMetaModel The associated metadata model
 	 * @returns {boolean} `true` if the path is eligible
-	 *
 	 * @ui5-restricted
 	 */
 	_checkPathForSemanticBookmarking(sPath: string, oMetaModel: any) {
@@ -600,18 +600,16 @@ class InternalRouting extends ControllerExtension {
 
 	/**
 	 * Builds a path with semantic keys from a path with technical keys.
+	 *
 	 * @param {string} sPathToResolve The path to be transformed
-	 * @param oModel
+	 * @param oModel The OData model
 	 * @returns {Promise} String promise for the new path. If sPathToResolved couldn't be interpreted as a semantic path, it is returned as is.
 	 * @ui5-restricted
 	 */
 	_resolveSemanticPath(sPathToResolve: string, oModel: any): Promise<string> {
 		const oMetaModel = oModel.getMetaModel();
 		const oLastSemanticMapping = this._oRoutingService.getLastSemanticMapping();
-		let sCurrentHashNoParams = this._oRouter
-			.getHashChanger()
-			.getHash()
-			.split("?")[0];
+		let sCurrentHashNoParams = this._oRouter.getHashChanger().getHash().split("?")[0];
 
 		if (sCurrentHashNoParams && sCurrentHashNoParams.lastIndexOf("/") === sCurrentHashNoParams.length - 1) {
 			// Remove trailing '/'
@@ -653,7 +651,6 @@ class InternalRouting extends ControllerExtension {
 	 * @param {string} sTargetPath The path to build the context. Needs to contain technical keys only.
 	 * @param {sap.ui.model.odata.v4.ODataModel} oModel The OData model
 	 * @param {object} oNavigationParameters Navigation parameters
-	 *
 	 * @ui5-restricted
 	 */
 	_bindPageToPath(sTargetPath: string, oModel: any, oNavigationParameters: any) {
@@ -670,7 +667,7 @@ class InternalRouting extends ControllerExtension {
 				oTargetContext = oUseContext;
 			} else {
 				// Otherwise we need to create it from sTargetPath
-				oTargetContext = this._createBindingContext(sTargetPath, oModel);
+				oTargetContext = this._createContext(sTargetPath, oModel, oNavigationParameters.bNavigateToSiblingEntity);
 			}
 			if (oTargetContext !== oCurrentContext) {
 				this._bindPageToContext(oTargetContext, oModel, oNavigationParameters);
@@ -686,7 +683,6 @@ class InternalRouting extends ControllerExtension {
 	 * @param {sap.ui.model.odata.v4.Context} oContext Context to be bound
 	 * @param {sap.ui.model.odata.v4.ODataModel} oModel The OData model
 	 * @param {object} oNavigationParameters Navigation parameters
-	 *
 	 * @ui5-restricted
 	 */
 	_bindPageToContext(oContext: any, oModel: any, oNavigationParameters: any) {
@@ -695,18 +691,25 @@ class InternalRouting extends ControllerExtension {
 			this.onAfterBinding(null);
 		} else {
 			const oParentListBinding = oContext.getBinding();
-
-			if (!oContext.getBinding() || oContext.getBinding().isA("sap.ui.model.odata.v4.ODataListBinding")) {
-				// We need to recreate the context otherwise we get errors
-				oContext = this._createBindingContext(oContext.getPath(), oModel);
-				if (EditState.isEditStateDirty()) {
-					// TODO: as a workaround we invalidate the model cache while the app is dirty
-					// as the manage model sets the parent in an async task and the request side effects
-					// relies on the parent relationship we have to set a timeout 0
-					setTimeout(() => {
-						this._refreshBindingContext(oContext);
-					}, 0);
+			const oRootViewController = (this._oAppComponent as any).getRootViewController();
+			if (oRootViewController.isFclEnabled()) {
+				if (
+					!oParentListBinding ||
+					!oParentListBinding.isA("sap.ui.model.odata.v4.ODataListBinding") ||
+					oParentListBinding.getUpdateGroupId() === "submitLater"
+				) {
+					// if the parentBinding is not a listBinding or the transient one from the create, we create a new context
+					oContext = this._createContext(oContext.getPath(), oModel);
 				}
+				oContext.setKeepAlive(true, () => {
+					// it is possible that the context is no longer kept alive
+					if (oContext.isKeepAlive() && oRootViewController.isContextUsedInPages(oContext)) {
+						this.navigateBackFromContext(oContext);
+					}
+				});
+			} else if (!oParentListBinding || oParentListBinding.isA("sap.ui.model.odata.v4.ODataListBinding")) {
+				// We need to recreate the context otherwise we get errors
+				oContext = this._createContext(oContext.getPath(), oModel, oNavigationParameters.bNavigateToSiblingEntity);
 			}
 
 			// Set the binding context with the proper before/after callbacks
@@ -724,80 +727,109 @@ class InternalRouting extends ControllerExtension {
 	}
 
 	/**
-	 * Creates a binding context from a path.
+	 * Creates a context from a path.
 	 *
 	 * @param {string} sPath The path
 	 * @param {sap.ui.model.odata.v4.ODataModel} oModel The OData model
-	 * @returns {sap.ui.model.odata.v4.Context} Created context
-	 *
+	 * @param {boolean} navigateToSiblingEntity A parameter that tells whether to navigate to the context on data received
+	 * @returns {sap.ui.model.odata.v4.Context} The created context
 	 * @ui5-restricted
 	 */
-	_createBindingContext(sPath: string, oModel: any) {
+	@publicExtension()
+	_createContext(sPath: string, oModel: any, navigateToSiblingEntity: boolean = true) {
 		const oPageComponent = this._oPageComponent,
 			sEntitySet = oPageComponent && oPageComponent.getEntitySet && oPageComponent.getEntitySet(),
 			sContextPath =
 				(oPageComponent && oPageComponent.getContextPath && oPageComponent.getContextPath()) || (sEntitySet && "/" + sEntitySet),
 			oMetaModel = oModel.getMetaModel(),
 			mParameters: any = {
-				$$patchWithoutSideEffects: true,
 				$$groupId: "$auto.Heroes",
-				$$updateGroupId: "$auto"
+				$$updateGroupId: "$auto",
+				$$patchWithoutSideEffects: true
 			};
-
-		if (sEntitySet) {
-			const sMessagesPath = oMetaModel.getObject(sContextPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path");
-			if (sMessagesPath) {
-				mParameters.$select = sMessagesPath;
-			}
-		}
-
 		// In case of draft: $select the state flags (HasActiveEntity, HasDraftEntity, and IsActiveEntity)
 		const oDraftRoot = oMetaModel.getObject(sContextPath + "@com.sap.vocabularies.Common.v1.DraftRoot");
 		const oDraftNode = oMetaModel.getObject(sContextPath + "@com.sap.vocabularies.Common.v1.DraftNode");
-		if (oDraftRoot || oDraftNode) {
-			if (mParameters.$select === undefined) {
-				mParameters.$select = "HasActiveEntity,HasDraftEntity,IsActiveEntity";
-			} else {
-				mParameters.$select += ",HasActiveEntity,HasDraftEntity,IsActiveEntity";
+		const oRootViewController = (this._oAppComponent as any).getRootViewController();
+		if (oRootViewController.isFclEnabled()) {
+			const oContext = oModel.getKeepAliveContext(sPath, false, mParameters);
+			if (oDraftRoot || oDraftNode) {
+				// when switching between draft and edit we need to ensure those properties are requested again even if they are in the binding's cache
+				// otherwise when you edit and go to the saved version you have no way of switching back to the edit version
+				oContext.requestSideEffects(["HasActiveEntity", "HasDraftEntity", "IsActiveEntity", "DraftAdministrativeData"]);
+			}
+
+			return oContext;
+		} else {
+			if (sEntitySet) {
+				const sMessagesPath = oMetaModel.getObject(sContextPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path");
+				if (sMessagesPath) {
+					mParameters.$select = sMessagesPath;
+				}
 			}
-		}
 
-		const oHiddenBinding = oModel.bindContext(sPath, undefined, mParameters);
+			// In case of draft: $select the state flags (HasActiveEntity, HasDraftEntity, and IsActiveEntity)
+			if (oDraftRoot || oDraftNode) {
+				if (mParameters.$select === undefined) {
+					mParameters.$select = "HasActiveEntity,HasDraftEntity,IsActiveEntity";
+				} else {
+					mParameters.$select += ",HasActiveEntity,HasDraftEntity,IsActiveEntity";
+				}
+			}
 
-		oHiddenBinding.attachEventOnce("dataRequested", () => {
-			BusyLocker.lock(this._oView);
-		});
-		oHiddenBinding.attachEventOnce("dataReceived", this._dataReceivedEventHandler.bind(this));
-		return oHiddenBinding.getBoundContext();
+			const oHiddenBinding = oModel.bindContext(sPath, undefined, mParameters);
+
+			oHiddenBinding.attachEventOnce("dataRequested", () => {
+				BusyLocker.lock(this._oView);
+			});
+			oHiddenBinding.attachEventOnce("dataReceived", this._dataReceivedEventHandler.bind(this, navigateToSiblingEntity));
+			return oHiddenBinding.getBoundContext();
+		}
 	}
 
-	_dataReceivedEventHandler(oEvent: Event) {
+	async _dataReceivedEventHandler(navigateToSiblingEntity: boolean, oEvent: Event) {
+		const context = oEvent?.getSource && (oEvent?.getSource() as any)?.getBoundContext();
+		const ProgrammingModel = FELibrary.ProgrammingModel;
+		const programmingModel = (this._oView?.getController() as PageController)?._editFlow?.getProgrammingModel(context);
 		const sErrorDescription = oEvent && oEvent.getParameter("error");
 		BusyLocker.unlock(this._oView);
+		if (
+			programmingModel === ProgrammingModel.Draft &&
+			ActivitySync.isCollaborationEnabled(this._oView) &&
+			navigateToSiblingEntity &&
+			context.getProperty("IsActiveEntity") &&
+			context.getObject().DraftAdministrativeData
+		) {
+			const siblingInfo = await draft.computeSiblingInformation(context, context);
+			if (siblingInfo) {
+				this.navigateToContext(siblingInfo.targetContext);
+				return;
+			}
+		}
+
 		if (sErrorDescription) {
 			// TODO: in case of 404 the text shall be different
-			(sap.ui.getCore().getLibraryResourceBundle("sap.fe.core", true) as Promise<ResourceBundle>)
-				.then(oResourceBundle => {
-					const messageHandler = this.base.messageHandler;
-					let mParams = {};
-					if (sErrorDescription && sErrorDescription.status === 503) {
-						mParams = {
-							isInitialLoad503Error: true,
-							shellBack: true
-						};
-					} else {
-						mParams = {
-							title: oResourceBundle.getText("SAPFE_ERROR"),
-							description: sErrorDescription,
-							isDataReceivedError: true,
-							shellBack: true
-						};
-					}
-					messageHandler.showMessages(mParams);
-				})
-				.catch(function(oError) {
-					Log.error("Error while getting the core resource bundle", oError);
-				});
+			try {
+				const oResourceBundle = await (Core as CoreEx).getLibraryResourceBundle("sap.fe.core", true);
+				const messageHandler = this.base.messageHandler;
+				let mParams = {};
+				if (sErrorDescription && sErrorDescription.status === 503) {
+					mParams = {
+						isInitialLoad503Error: true,
+						shellBack: true
+					};
+				} else {
+					mParams = {
+						title: oResourceBundle.getText("SAPFE_ERROR"),
+						description: sErrorDescription,
+						isDataReceivedError: true,
+						shellBack: true
+					};
+				}
+				messageHandler.showMessages(mParams);
+			} catch (oError: any) {
+				Log.error("Error while getting the core resource bundle", oError);
+			}
 		}
 	}
 
@@ -810,7 +842,6 @@ class InternalRouting extends ControllerExtension {
 	 * request them.
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oBindingContext Context to be refreshed
-	 *
 	 * @ui5-restricted
 	 */
 	_refreshBindingContext(oBindingContext: any) {
@@ -884,7 +915,6 @@ class InternalRouting extends ControllerExtension {
 	 * Gets the binding context of the page or the component.
 	 *
 	 * @returns {sap.ui.model.odata.v4.Context} The binding context
-	 *
 	 * @ui5-restricted
 	 */
 	_getBindingContext(): Context {
@@ -899,14 +929,22 @@ class InternalRouting extends ControllerExtension {
 	 * Sets the binding context of the page or the component.
 	 *
 	 * @param {sap.ui.model.odata.v4.Context} oContext The binding context
-	 *
 	 * @ui5-restricted
 	 */
 	_setBindingContext(oContext: any) {
+		let oPreviousContext, oTargetControl;
 		if (this._oPageComponent) {
-			this._oPageComponent.setBindingContext(oContext);
+			oPreviousContext = this._oPageComponent.getBindingContext() as Context;
+			oTargetControl = this._oPageComponent;
 		} else {
-			this._oView.setBindingContext(oContext);
+			oPreviousContext = this._oView.getBindingContext() as Context;
+			oTargetControl = this._oView;
+		}
+
+		oTargetControl.setBindingContext(oContext);
+
+		if (oPreviousContext && oPreviousContext.isKeepAlive()) {
+			oPreviousContext.setKeepAlive(false);
 		}
 	}
 
@@ -914,7 +952,6 @@ class InternalRouting extends ControllerExtension {
 	 * Gets the flexible column layout (FCL) level corresponding to the view (-1 if the app is not FCL).
 	 *
 	 * @returns {number} The level
-	 *
 	 * @ui5-restricted
 	 */
 	_getFCLLevel() {
@@ -927,8 +964,8 @@ class InternalRouting extends ControllerExtension {
 	 * @ui5-restricted
 	 */
 
-	@Public
-	@Final
+	@publicExtension()
+	@finalExtension()
 	switchFullScreen() {
 		const oSource = this.base.getView();
 		const oFCLHelperModel = oSource.getModel("fclhelper"),
@@ -940,7 +977,7 @@ class InternalRouting extends ControllerExtension {
 
 		const oContext = oRootViewController.getRightmostContext ? oRootViewController.getRightmostContext() : oSource.getBindingContext();
 
-		this.base._routing.navigateToContext(oContext, { sLayout: sNextLayout }).catch(function() {
+		this.base._routing.navigateToContext(oContext, { sLayout: sNextLayout }).catch(function () {
 			Log.warning("cannot switch between column and fullscreen");
 		});
 	}
@@ -950,8 +987,8 @@ class InternalRouting extends ControllerExtension {
 	 *
 	 * @ui5-restricted
 	 */
-	@Public
-	@Extensible(OverrideExecution.Before)
+	@publicExtension()
+	@extensible(OverrideExecution.Before)
 	closeColumn() {
 		const oSource = this.base.getView();
 		const oViewData = oSource.getViewData() as any;
@@ -960,14 +997,15 @@ class InternalRouting extends ControllerExtension {
 		const oMetaModel = oContext.getModel().getMetaModel();
 
 		if (oViewData && oViewData.viewLevel === 1 && ModelHelper.isDraftSupported(oMetaModel, oContext.getPath())) {
-			CommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(
-				function() {
+			draft.processDataLossOrDraftDiscardConfirmation(
+				function () {
 					base._routing.navigateBackFromContext(oContext, { noPreservationCache: true });
 				},
 				Function.prototype,
 				oContext,
 				oSource.getController(),
-				false
+				false,
+				draft.NavigationType.BackNavigation
 			);
 		} else {
 			base._routing.navigateBackFromContext(oContext, { noPreservationCache: true });