@sapui5/sap.fe.core 1.141.2 → 1.143.0

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

@@ -24,6 +24,7 @@ import Library from "sap/ui/core/Lib";
 import type { RoutingTarget } from "sap/ui/core/Manifest";
 import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
+import type View from "sap/ui/core/mvc/View";
 import type Router from "sap/ui/core/routing/Router";
 import type Binding from "sap/ui/model/Binding";
 import type Context from "sap/ui/model/odata/v4/Context";
@@ -131,24 +132,34 @@ class InternalRouting extends ControllerExtension {
 
 	beforeSetBindingContext(bindingContext: Context | null, _mParameters?: unknown): void {
 		this.onBeforeBinding(bindingContext, _mParameters);
-		const oRouting = this.base.getView().getController().routing;
+		const view = this.base.getView();
+		const oRouting = view.getController().routing;
 		if (oRouting && oRouting.onBeforeBinding) {
 			oRouting.onBeforeBinding(bindingContext);
 		}
+
+		if (bindingContext && view.getBindingContext() !== bindingContext) {
+			// If we change the binding context, we disable that dataStateIndicators for all tables in this page
+			// to clear their filters, as they don't make sense anymore
+			view.getBindingContext("pageInternal")?.setProperty("enableTableDataStateIndicator", false);
+		}
 	}
 
 	@publicExtension()
 	@extensible(OverrideExecution.After)
 	onAfterBinding(bindingContext: Context | null, _mParameters?: unknown): void {
 		this._oAppComponent.getRootViewController().onContextBoundToView(bindingContext);
+		this.getView().setVisible(true);
 	}
 
 	afterSetBindingContext(bindingContext: Context | null, _mParameters?: object): void {
 		this.onAfterBinding(bindingContext, { ..._mParameters, deferredCreation: true });
-		const oRouting = this.base.getView().getController().routing;
+		const view = this.base.getView();
+		const oRouting = view.getController().routing;
 		if (oRouting && oRouting.onAfterBinding) {
 			oRouting.onAfterBinding(bindingContext);
 		}
+		view.getBindingContext("pageInternal")?.setProperty("enableTableDataStateIndicator", true); // Restore dataStateIndicators for all tables in this page
 	}
 
 	///////////////////////////////////////////////////////////
@@ -263,8 +274,8 @@ class InternalRouting extends ControllerExtension {
 				// If we're navigating back, we need to find the "parent" context
 				const backPath = this._oRoutingService.getPathToNavigateBack(context.getPath());
 				// As we don't call the extension when navigating back to the LR, backPath is never empty so we can safely create a context
-				hiddenBinding = context.getModel().bindContext(backPath);
-				contextToNavigate = hiddenBinding.getBoundContext();
+				hiddenBinding = context.getModel()?.bindContext(backPath);
+				contextToNavigate = hiddenBinding?.getBoundContext();
 			}
 			const overrideNav = await this.base.getView().getController().routing.onBeforeNavigation({ bindingContext: contextToNavigate });
 			hiddenBinding?.destroy();
@@ -295,7 +306,25 @@ class InternalRouting extends ControllerExtension {
 		}
 
 		this.removeTransitionMessagesForPreviousContext();
-		return this._oRoutingService.navigateToContext(context, parameters, this._oView.getViewData(), this._oTargetInformation);
+		let skipHashGuardCheck;
+		const hiddenDraftEnabled = (this._oAppComponent?.getEnvironmentCapabilities()?.getCapabilities()?.HiddenDraft as HiddenDraft)
+			?.enabled;
+		const isDocumentModified = this._oAppComponent?.getModel("ui")?.getProperty(UiModelConstants.DocumentModified) ?? true;
+		if (
+			this._oAppComponent.getRootViewController().isFclEnabled() &&
+			this.getFCLLevel() === 0 &&
+			hiddenDraftEnabled &&
+			!isDocumentModified
+		) {
+			skipHashGuardCheck = true;
+		}
+		return this._oRoutingService.navigateToContext(
+			context,
+			parameters,
+			this._oView.getViewData(),
+			this._oTargetInformation,
+			skipHashGuardCheck
+		);
 	}
 
 	/**
@@ -721,7 +750,6 @@ class InternalRouting extends ControllerExtension {
 			this.afterSetBindingContext(null);
 			return;
 		}
-
 		const oParentListBinding = oContext.getBinding();
 		const oRootViewController = this._oAppComponent.getRootViewController();
 		if (oRootViewController.isFclEnabled()) {
@@ -1013,22 +1041,26 @@ class InternalRouting extends ControllerExtension {
 
 	/**
 	 * Sets the binding context of the page or the component.
-	 * @param oContext The binding context
+	 * @param context The binding context
 	 */
-	_setBindingContext(oContext: Context | null): void {
-		let oPreviousContext, oTargetControl;
+	_setBindingContext(context: Context | null): void {
+		let previousContext: Context, targetControl: View | EnhanceWithUI5<TemplateComponent>;
 		if (this._oPageComponent) {
-			oPreviousContext = this._oPageComponent.getBindingContext() as Context;
-			oTargetControl = this._oPageComponent;
+			previousContext = this._oPageComponent.getBindingContext() as Context;
+			targetControl = this._oPageComponent;
 		} else {
-			oPreviousContext = this._oView.getBindingContext();
-			oTargetControl = this._oView;
+			previousContext = this._oView.getBindingContext();
+			targetControl = this._oView;
 		}
 
-		oTargetControl.setBindingContext(oContext);
+		targetControl.setBindingContext(context);
 
-		if (oPreviousContext?.isKeepAlive() && oPreviousContext !== oContext) {
-			this._setKeepAlive(oPreviousContext, false);
+		if (previousContext?.isKeepAlive() && previousContext !== context) {
+			const rootViewController = this._oAppComponent.getRootViewController();
+			/* Before deleting the bindingContext, we ensure it's not also used in another page.*/
+			if (!rootViewController.getInstancedViews().some((pageView: View) => pageView.getBindingContext?.() === previousContext)) {
+				this._setKeepAlive(previousContext, false);
+			}
 		}
 	}
 
@@ -1131,7 +1163,7 @@ class InternalRouting extends ControllerExtension {
 		const isHiddenDraftEnabled = (this._oAppComponent.getEnvironmentCapabilities()?.getCapabilities()?.HiddenDraft as HiddenDraft)
 			.enabled;
 
-		if (!isDocumentModified && isHiddenDraftEnabled) {
+		if (!isDocumentModified && isHiddenDraftEnabled && oViewData?.viewLevel === 1) {
 			const mParameters = {
 				skipDiscardPopover: true,
 				skipBackNavigation: true