@sapui5/sap.suite.ui.generic.template 1.148.6 → 1.148.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.148.6",
+  "version": "1.148.8",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.148.6</version>
+	<version>1.148.8</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.148.6"
+			"version": "1.148.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.148.6"
+			"version": "1.148.8"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/AnnotationHelperSmartList.js

@@ -108,7 +108,7 @@ sap.ui.define([
                 aCollection.sort(function (oFirstData, oSecondData) {
                     var iFirstDataImportance = getImportance(oFirstData);
                     var iSecondDataImportance = getImportance(oSecondData);
-                    return iFirstDataImportance < iSecondDataImportance ? -1 : 1;
+                    return iFirstDataImportance < iSecondDataImportance ? -1 : iFirstDataImportance > iSecondDataImportance ? 1 : 0;
                 });
             }
 

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.148.6"
+			"version": "1.148.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -2770,9 +2770,11 @@ sap.ui.define([
 					onDataFieldForIntentBasedNavigation: function (oEvent) {
 						oEvent = merge({}, oEvent);
 						oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(function () {
+							var oCustomData = oTemplateUtils.oCommonUtils.getCustomDataFromEvent(oEvent);
+							var oTarget = { semanticObject: oCustomData.SemanticObject, action: oCustomData.Action };
 							oTemplateUtils.oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function () {
 								oTemplateUtils.oCommonEventHandlers.onDataFieldForIntentBasedNavigation(oEvent, oBase.state);
-							}, Function.prototype, "LeaveApp");
+							}, Function.prototype, "LeaveApp", false, oTarget);
 						}, true);
 					},
 					onDataFieldWithIntentBasedNavigation: function (oEvent) {

package/src/sap/suite/ui/generic/template/ObjectPage/controller/RelatedAppsHandler.js

@@ -25,7 +25,7 @@ sap.ui.define([
 						oTemplateUtils.oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function () {
 							var oContext = oController.getView().getBindingContext();
 							oTemplateUtils.oCommonEventHandlers.onRelatedAppNavigation(oTarget, oContext);
-						}, Function.prototype, "LeaveApp");
+						}, Function.prototype, "LeaveApp", false, oTarget);
 					}
 				}, "buttons");
 		}

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.148.6"
+			"version": "1.148.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.148.6"
+			"version": "1.148.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.148.6"
+		"version": "1.148.8"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -28,6 +28,7 @@ sap.ui.define([
 		var oSmartFilterBar = oControl;
 		var oEasyFilterCallbacks = null;
 		var oPendingEasyFilterState = null;
+		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -38,62 +39,15 @@ sap.ui.define([
 			// (which would harm performance). Can only be retrieved in initialized event.
 			oSmartFilterBar.getInitializedPromise().then(function () {
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
-
-				// Cold-start recovery: setSVMWrapperCallbacks registers attachAfterVariantLoad
-				// after SVM has already fired afterVariantLoad("INIT"), so the _CUSTOM restore
-				// handler in setSVMWrapperCallbacks is never reached on first page load.
-				// By this point getInitializedPromise has resolved, setSVMWrapperCallbacks has
-				// run, and the variant is active — apply the _CUSTOM fallback now if
-				// getCustomFilterData() is still null (i.e. no beforeVariantFetch has run yet).
-				if (!oSmartFilterBar.getCustomFilterData()) {
-					try {
-						var oSVM = oSmartFilterBar.getSmartVariant();
-						var sVariantKey = oSVM && (oSVM.getCurrentVariantKey ? oSVM.getCurrentVariantKey() : oSVM.getStandardVariantKey());
-						var oVariantContent = oSVM && oSVM.getVariantContent(oSmartFilterBar, sVariantKey);
-						var oFilterBarVariant = oVariantContent && oVariantContent.filterBarVariant && JSON.parse(oVariantContent.filterBarVariant);
-						var oCustomSection = oFilterBarVariant && oFilterBarVariant._CUSTOM;
-						var oGenericData = (oCustomSection && oCustomSection[dataPropertyNameGeneric]) || Object.create(null);
-						var oCustomFiltersState = oGenericData.customFilters || {
-							editState: oGenericData.editStateFilter,
-							appExtension: oGenericData.appExtension
-						};
-						mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-					} catch (e) {
-						// Silently skip — absence of _CUSTOM data is a valid state for new variants
-					}
-				}
 			});
 
 			// Initialize variant management promise
 			oVariantManagementInitializedPromise = oSmartFilterBar.getInitializedPromise();
-		}
-
-		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
-		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
-		// - standard filters: handled directly by SFB
-		// - extension filters: provided from mParams.oCustomFiltersWrapper
-		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
-		function setSVMWrapperCallbacks(oSVMWrapperCallbacks){
-			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
-			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
-			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
-			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
-			oSmartFilterBar.attachBeforeVariantFetch(function(){
-				var oCustomData = Object.create(null);
-				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
-				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
-				if (oEasyFilterCallbacks) {
-					var oEFState = oEasyFilterCallbacks.getState();
-					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
-					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
-				}
-				oSmartFilterBar.setCustomFilterData(oCustomData);
-			});
 
-			// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
-			// in SFB instead of SVM where it would make more sense.
-			// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
-			// after this has happened, we can get the custom data from SFB.
+			// Attach afterVariantLoad eagerly so custom filter state is restored regardless of
+			// when setSVMWrapperCallbacks is called. setManagedControlStates is only called if
+			// SVM callbacks are already available; otherwise those controls are restored via the
+			// iAppState path (SmartVariantManagementWrapper.fnSetManagedControlStates).
 			oSmartFilterBar.attachAfterVariantLoad(function(){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
 				var oGenericData;
@@ -101,10 +55,8 @@ sap.ui.define([
 					oGenericData = oCustomData[dataPropertyNameGeneric];
 				} else {
 					// getCustomFilterData() returns null when no beforeVariantFetch has run yet for this
-					// variant (e.g. a named variant being switched to for the first time in the session).
+					// variant (e.g. a named variant being switched to for the first time in the session, or cold-start INIT).
 					// The _CUSTOM section is present in the variant content — fall back to reading it via getVariantContent().
-					// Note: the cold-start case (INIT event) is handled separately in fnInitialize via
-					// getInitializedPromise().then(), because this listener is registered after INIT fires.
 					try {
 						var oSVM = oSmartFilterBar.getSmartVariant();
 						// getCurrentVariantId() converts STANDARDVARIANTKEY to "" which _getVariantById can't look up.
@@ -127,7 +79,9 @@ sap.ui.define([
 					};
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-				oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
+				if (oSVMWrapperCallbacks) {
+					oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
+				}
 				if (oEasyFilterCallbacks) {
 					oEasyFilterCallbacks.setState({
 						filterMode: oGenericData.filterMode,
@@ -140,7 +94,30 @@ sap.ui.define([
 					};
 				}
 			});
+		}
 
+		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
+		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
+		// - standard filters: handled directly by SFB
+		// - extension filters: provided from mParams.oCustomFiltersWrapper
+		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
+		function setSVMWrapperCallbacks(oCallbacks){
+			oSVMWrapperCallbacks = oCallbacks;
+			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
+			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
+			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
+			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
+			oSmartFilterBar.attachBeforeVariantFetch(function(){
+				var oCustomData = Object.create(null);
+				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
+				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
+				if (oEasyFilterCallbacks) {
+					var oEFState = oEasyFilterCallbacks.getState();
+					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
+					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
+				}
+				oSmartFilterBar.setCustomFilterData(oCustomData);
+			});
 		}
 
 		function fnGetState() {

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -661,6 +661,7 @@ sap.ui.define([
 
 		function restore(){
 			oTemplateContract.oBusyHelper.setBusyReason("exiting", false);
+			oTemplateContract.oApplicationProxy.resetExternalNavigation();
 			for (var sComponentId in oTemplateContract.componentRegistry){
 				var oRegistryEntry = oTemplateContract.componentRegistry[sComponentId];
 				if (oRegistryEntry.methods.onRestore) {
@@ -942,6 +943,7 @@ sap.ui.define([
 		var fnNormalizePagesMapToArray = testableHelper.testable(fnNormalizePagesMapToArray, "fnNormalizePagesMapToArray");
 		getConfig = testableHelper.testable(getConfig, "getConfig");
 		testableHelper.testable(setLeaveAppPromise, "AppComponent_setLeaveAppPromise");
+		testableHelper.testable(restore, "AppComponent_restore");
 		/* eslint-enable */
 
 		return oMethods;
@@ -959,7 +961,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.148.6
+	 * @version 1.148.8
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/Application.js

@@ -82,6 +82,11 @@ sap.ui.define(["sap/ui/base/Object",
 		 */
 		function getMethods(oTemplateContract) {
 
+			// Set on first fnNavigateExternal call; blocks re-entry until reset. NavigationHandler.navigate() calls fnOnError
+			// on all failure paths and does not call it on the success path (app is leaving). The two valid reset points are
+			// therefore fnOnErrorWrapper (navigation failed) and AppComponent.restore() (FLP re-activated this app).
+			var bExternalNavigationTriggered = false;
+
 			var oFocusHelper = new FocusHelper(oTemplateContract);
 			var oContextBookkeeping = new ContextBookkeeping(oTemplateContract);
 			var mEntitySetToETagInfo = Object.create(null); // maps the name of the entity sets which have been already checked for eTag
@@ -671,8 +676,13 @@ sap.ui.define(["sap/ui/base/Object",
 				if (oCurrentNavigationHandler === GHOSTNAVIGATIONHANDLER){
 					return;
 				}
+				if (bExternalNavigationTriggered){
+					return;
+				}
+				bExternalNavigationTriggered = true;
 				oTemplateContract.oNavigationControllerProxy.leave();
-				var fnOnErrorWrapper = function(){
+				var fnOnErrorWrapper = function () {
+					bExternalNavigationTriggered = false;
 					oFocusHelper.setNextFocus(Function.prototype); // Do not change focus in case exiting the application fails
 					oTemplateContract.oBusyHelper.setBusyReason("exiting", false);  // in error case we are not navigating away         
 					if (fnOnError){
@@ -834,7 +844,10 @@ sap.ui.define(["sap/ui/base/Object",
 				removeTransientMessages: fnRemoveTransientMessages,
 				getTransientMessages: getTransientMessages,
 				setNextFocus: oFocusHelper.setNextFocus,
-				setStates: setStates
+				setStates: setStates,
+				resetExternalNavigation: function() {
+					bExternalNavigationTriggered = false;
+				}
 			};
 
 			return {

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -720,7 +720,16 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 
 			// null object has to be passed as the fourth argument (i.e. for oInnerAppData) to the navigate method as an indicator that the state should not be overwritten
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// Explace outbounds must bypass fnNavigateExternal to avoid setting the app busy and consuming the re-entry guard.
+			// getNavigationHandler() returns a ghost stub (no .navigate) when ghostapp=true — guard before calling.
+			if (oOutbound.parameters && oOutbound.parameters["sap-ushell-navmode"] === "explace") {
+				var oNavHandler = oServices.oApplication.getNavigationHandler();
+				if (oNavHandler.navigate) {
+					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
+				}
+			} else {
+				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			}
 		}
 
 		function fnNavigateIntentSmartLink(oOutbound, oEventSource) {
@@ -803,9 +812,10 @@ sap.ui.define(["sap/ui/base/Object",
 
 		function fnOnSemanticObjectLinkNavigationPressed(oEventSource, oEventParameters){
 			var oEventObject = deepExtend({}, oEventSource);
+			var sSemanticObject = oEventObject.data('SemanticObject');
+			var sAction = oEventObject.data('Action');
+			var oTarget = (sSemanticObject && sAction) ? { semanticObject: sSemanticObject, action: sAction } : undefined;
 			oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function() {
-				var sSemanticObject = oEventObject.data('SemanticObject');
-				var sAction = oEventObject.data('Action');
 				var sSemanticAttributes = oEventObject.data('SemanticAttributes');
 				if (sSemanticObject && sAction){
 					var oOutbound = {
@@ -818,7 +828,7 @@ sap.ui.define(["sap/ui/base/Object",
 					}
 					fnNavigateIntentSmartLink(oOutbound, oEventObject);
 				}
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		function fnOnSemanticObjectLinkNavigationTargetObtained(sEntitySet, mFieldSemanticObjects, oEventParameters, oState, sTitle) {
@@ -1988,6 +1998,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var oContext = oEventSource.getParent().getBindingContext();
 			var sSemanticObject = oEventSource.data("SemanticObject");
 			var sAction = oEventSource.data("Action");
+			var oTarget = { semanticObject: sSemanticObject, action: sAction };
 
 			oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function() {
 				var oOutbound = {
@@ -1995,7 +2006,7 @@ sap.ui.define(["sap/ui/base/Object",
 						semanticObject:	sSemanticObject
 				};
 				fnNavigateIntent(oOutbound, [oContext], oState.oSmartFilterbar || undefined);
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		/*
@@ -2025,13 +2036,15 @@ sap.ui.define(["sap/ui/base/Object",
 			if (bRequiresContext && !aSelectedContexts.length) { // not consistent, since contexts missing
 				fnShowMessageForInvalidNumberOfSelects(aSelectedContexts.length);
 			} else {
+				var oTarget = { semanticObject: oCustomData.SemanticObject, action: oCustomData.Action };
 				oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function () {
 					onDataFieldForIntentBasedNavigationSelectedContext(oCustomData, aSelectedContexts, oSmartFilterbar);
-				}, Function.prototype, "LeaveApp");
+				}, Function.prototype, "LeaveApp", false, oTarget);
 			}
 		}
 
 		function onInlineDataFieldForIntentBasedNavigation(oEventSource, oState){
+			var oTarget = { semanticObject: oEventSource.data("SemanticObject"), action: oEventSource.data("Action") };
 			oCommonUtils.fnProcessDataLossOrDraftDiscardConfirmation(function() {
 				var oOutbound = {
 						semanticObject: oEventSource.data("SemanticObject"),
@@ -2039,7 +2052,7 @@ sap.ui.define(["sap/ui/base/Object",
 				};
 				var oContext = oEventSource.getParent().getBindingContext();
 				fnNavigateIntent(oOutbound, [oContext], oState.oSmartFilterbar);
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, oTarget);
 		}
 
 		function onInlineDataFieldForAction(oEvent) {
@@ -2709,7 +2722,16 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSelectionVariant = fnBuildSelectionVariantForNavigation(oOutbound, [], oContext);
 			oController.adaptNavigationParameterExtension(oSelectionVariant, oOutbound);
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// Explace outbounds must bypass fnNavigateExternal to avoid setting the app busy and consuming the re-entry guard.
+			// getNavigationHandler() returns a ghost stub (no .navigate) when ghostapp=true — guard before calling.
+			if (oOutbound.parameters && oOutbound.parameters["sap-ushell-navmode"] === "explace") {
+				var oNavHandler = oServices.oApplication.getNavigationHandler();
+				if (oNavHandler.navigate) {
+					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
+				}
+			} else {
+				oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			}
 		}
 
 		function onSmartFieldInitialise(oEvent,sViewId){

package/src/sap/suite/ui/generic/template/lib/CommonUtils.js

@@ -845,7 +845,7 @@ sap.ui.define(["sap/ui/base/Object",
 					//indicator that the state should not be overwritten
 					//if draft enabled then passing NavigateExternal else on back button passing LeavePage
 				}
-			}, Function.prototype, "LeaveApp");
+			}, Function.prototype, "LeaveApp", false, { semanticObject: oOutbound.semanticObject, action: oOutbound.action });
 		}
 
 		function fnGetNavigationKeyProperties(sTargetEntitySet) {
@@ -1369,10 +1369,10 @@ sap.ui.define(["sap/ui/base/Object",
 		// "LeaveApp": leave the app via a forward navigation
 		// "LeavePage": leave the page via an internal navigation or a backward navigation (which may or may not be internal)
 		// Note: if sMode is faulty it will be considered as "LeavePage"
-		function fnProcessDataLossOrDraftDiscardConfirmation(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck){
+		function fnProcessDataLossOrDraftDiscardConfirmation(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, oTarget){
 			sMode = sMode || "LeavePage";
 			if (oComponentUtils.isDraftEnabled()){
-				return oServices.oPageLeaveHandler.performAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, false);
+				return oServices.oPageLeaveHandler.performAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, false, oTarget);
 			} else {
 				return oServices.oDataLossHandler.performIfNoDataLoss(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, false);
 			}

package/src/sap/suite/ui/generic/template/lib/PageLeaveHandler.js

@@ -22,19 +22,24 @@ sap.ui.define(["sap/ui/base/Object",
 			firstListItemOption.focus();
 		}
 
-		function checkIfNavigationIsExplace() {
+		function checkIfNavigationIsExplace(oTarget) {
 			var UShellContainer = sap.ui.require("sap/ushell/Container");
 			if (!UShellContainer) {
-				return Promise.resolve(false); // No UShell container, assume inplace navigation
+				return Promise.resolve(false);
 			}
 
-			return UShellContainer.getServiceAsync("FioriElements").then(function(oFioriElementsService) {
-				if (oFioriElementsService && typeof oFioriElementsService.isExplaceNavigation === "function") {
-					return oFioriElementsService.isExplaceNavigation();
-				}
-				return false; // API not available, default to inplace behavior
-			}).catch(function() {
-				return false; // Service not available or error, default to inplace behavior
+			return new Promise(function(resolve) {
+				sap.ui.require(["sap/ushell/api/FioriElements"], function(FioriElements) {
+					FioriElements.isExplaceNavigation(oTarget ? { target: oTarget } : undefined)
+						.then(function(bExplace) {
+							resolve(bExplace);
+						})
+						.catch(function() {
+							resolve(false);
+						});
+				}, function() {
+					resolve(false);
+				});
 			});
 		}
 
@@ -147,7 +152,7 @@ sap.ui.define(["sap/ui/base/Object",
 			return oDiscardPromise;
 		}
 
-		function fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical) {
+		function fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical, oTarget) {
 			var sEnableDiscardDraftConfirmation = oTemplateContract.oNavigationControllerProxy.isDiscardDraftConfirmationNeeded();
 			var bNeedsPopup = ((sEnableDiscardDraftConfirmation === "always" && sMode.startsWith("Leave")) || (sEnableDiscardDraftConfirmation === "restricted" && sMode === "LeavePage")) && isObjectEditable();
 
@@ -157,7 +162,7 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 
 			// Check if navigation will be explace and skip popup if so
-			checkIfNavigationIsExplace().then(function(bIsExplace) {
+			checkIfNavigationIsExplace(oTarget).then(function(bIsExplace) {
 				if (bIsExplace) {
 					fnPositive(); // Skip popup for explace navigation
 				} else {
@@ -195,7 +200,7 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		// Parameter sMode has same possible values as fnProcessDataLossOrDraftDiscardConfirmation in CommonUtils
-		function fnPerformAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, bIsTechnical) {
+		function fnPerformAfterDiscardOrKeepDraft(fnProcessFunction, fnCancelFunction, sMode, bNoBusyCheck, bIsTechnical, oTarget) {
 			var oRet = new Promise(function (fnResolve, fnReject) {
 				var fnPositive = function () {
 					var oRet = fnProcessFunction();
@@ -206,9 +211,9 @@ sap.ui.define(["sap/ui/base/Object",
 					fnReject();
 				};
 				if (bNoBusyCheck) {
-					fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical);
+					fnPerformAfterDiscardOrKeepDraftImpl(fnPositive, fnNegative, sMode, bIsTechnical, oTarget);
 				} else {
-					oTemplateContract.oApplicationProxy.performAfterSideEffectExecution(fnPerformAfterDiscardOrKeepDraftImpl.bind(null, fnPositive, fnNegative, sMode, bIsTechnical), true);
+					oTemplateContract.oApplicationProxy.performAfterSideEffectExecution(fnPerformAfterDiscardOrKeepDraftImpl.bind(null, fnPositive, fnNegative, sMode, bIsTechnical, oTarget), true);
 				}
 			});
 			return oRet;

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler.js

@@ -729,22 +729,119 @@ sap.ui.define([
 			oSmartFilterBarWrapper.setState(oSmartFilterBarVariant);
 			// currentVariantSetModified intentionally omitted — pressing Go with the same
 			// query must not mark the variant as dirty.
-			// oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
-
-            // Apply sorters/groupLevels bundled with tokens after SFB state is set but
-            // before triggering search, to prevent a premature rebind with incomplete filters.
-            var aBundledSorters = oEvent.getParameter("sorters");
-            var aBundledGroupLevels = oEvent.getParameter("groupLevels");
-            if (aBundledSorters !== undefined) {
-                fnApplySortersToTable(aBundledSorters);
-            }
-            if (aBundledGroupLevels !== undefined) {
-                fnApplyGroupLevelsToTable(aBundledGroupLevels);
-            }
+
+			var aSelectOptionsNeedingInjection = fnGetCustomFieldsNeedingInjection(oSmartFilterbar, oVariantDataFromAI.aSelectOptions);
+			fnInjectCustomFiltersOnRebind(aSelectOptionsNeedingInjection);
+			fnSyncCustomFieldInputValues(aSelectOptionsNeedingInjection, oSmartFilterbar);
+
+			// Apply sorters/groupLevels bundled with tokens after SFB state is set but
+			// before triggering search, to prevent a premature rebind with incomplete filters.
+			var aBundledSorters = oEvent.getParameter("sorters");
+			var aBundledGroupLevels = oEvent.getParameter("groupLevels");
+			if (aBundledSorters !== undefined) {
+				fnApplySortersToTable(aBundledSorters);
+			}
+			if (aBundledGroupLevels !== undefined) {
+				fnApplyGroupLevelsToTable(aBundledGroupLevels);
+			}
 
 			oSmartFilterbar.search();
 		}
 
+        /**
+         * Returns the subset of aSelectOptions whose property names landed in SFB's _CUSTOM
+         * bucket after setState — meaning SFB could not route them through its standard filter
+         * pipeline (plain Input fields with no value-list annotation).
+         * @param {object} oSmartFilterbar - The SmartFilterBar control instance
+         * @param {Array} aSelectOptions - Select options built from AI tokens
+         * @returns {Array} Select options that require direct filter injection
+         */
+        function fnGetCustomFieldsNeedingInjection(oSmartFilterbar, aSelectOptions) {
+            var oFilterData = oSmartFilterbar.getFilterData();
+            var oCustomData = oFilterData && oFilterData._CUSTOM;
+            return aSelectOptions.filter(function(oSelectOption) {
+                return oCustomData && oCustomData.hasOwnProperty(oSelectOption.PropertyName);
+            });
+        }
+
+        /**
+         * Builds UI5 Filter objects for each _CUSTOM select option and registers a one-shot
+         * beforeRebindTable handler on the SmartTable that injects them into bindingParams.filters
+         * just before the OData request is built — bypassing SFB's filter pipeline entirely.
+         * EQ is remapped to Contains to match Classic SFB substringof behaviour on plain Input fields.
+         * @param {Array} aSelectOptionsNeedingInjection - Select options that require direct filter injection
+         * @returns {void}
+         */
+        function fnInjectCustomFiltersOnRebind(aSelectOptionsNeedingInjection) {
+            if (aSelectOptionsNeedingInjection.length === 0 || !oState.oPresentationControlHandler) {
+                return;
+            }
+            var oSmartTable = oState.oPresentationControlHandler.getControl();
+            if (!oSmartTable || typeof oSmartTable.attachBeforeRebindTable !== 'function') {
+                return;
+            }
+            var aInjectFilters = [];
+            aSelectOptionsNeedingInjection.forEach(function(oSelectOption) {
+                oSelectOption.Ranges.forEach(function(oRange) {
+                    var sOp = oRange.Option;
+                    var sVal = oRange.Low;
+                    if (sOp === 'CP') {
+                        aInjectFilters.push(new Filter(oSelectOption.PropertyName, FilterOperator.Contains, sVal.replace(/^\*|\*$/g, '')));
+                    } else if (sOp === 'EQ') {
+                        aInjectFilters.push(new Filter(oSelectOption.PropertyName, FilterOperator.Contains, sVal));
+                    } else if (sOp === 'BT') {
+                        aInjectFilters.push(new Filter(oSelectOption.PropertyName, FilterOperator.BT, oRange.Low, oRange.High));
+                    } else if (sOp === 'NB') {
+                        aInjectFilters.push(new Filter({path: oSelectOption.PropertyName, operator: FilterOperator.BT, value1: oRange.Low, value2: oRange.High, bExclude: true}));
+                    } else {
+                        var sMappedOp = FilterOperator[sOp];
+                        if (!sMappedOp) {
+                            oLogger.warning("EasyFilterBarHandler: unsupported select-option operator '" + sOp + "' for property '" + oSelectOption.PropertyName + "' — skipping filter injection");
+                            return;
+                        }
+                        aInjectFilters.push(new Filter(oSelectOption.PropertyName, sMappedOp, sVal));
+                    }
+                });
+            });
+            var fnOnBeforeRebind = function(oRebindEvent) {
+                oSmartTable.detachBeforeRebindTable(fnOnBeforeRebind);
+                var oBindingParams = oRebindEvent.getParameter('bindingParams');
+                oBindingParams.filters = oBindingParams.filters || [];
+                var aBindingFilters = oBindingParams.filters;
+                // Remove prior easy-filter entries for the same properties to avoid stacking.
+                aInjectFilters.forEach(function(oF) {
+                    for (var i = aBindingFilters.length - 1; i >= 0; i--) {
+                        if (aBindingFilters[i] && aBindingFilters[i].sPath === oF.sPath) {
+                            aBindingFilters.splice(i, 1);
+                        }
+                    }
+                    aBindingFilters.push(oF);
+                });
+            };
+            oSmartTable.attachBeforeRebindTable(fnOnBeforeRebind);
+        }
+
+        /**
+         * Sets the visible value on the SFB Input control for each _CUSTOM field so the Classic
+         * filter tab shows the correct value when the user switches filter modes.
+         * Uses setValue only — no fireChange — to avoid triggering SFB's async filter rebuild.
+         * @param {Array} aSelectOptionsNeedingInjection - Select options that require direct filter injection
+         * @param {object} oSmartFilterbar - The SmartFilterBar control instance
+         * @returns {void}
+         */
+        function fnSyncCustomFieldInputValues(aSelectOptionsNeedingInjection, oSmartFilterbar) {
+            aSelectOptionsNeedingInjection.forEach(function(oSelectOption) {
+                if (oSelectOption.Ranges.length > 0) {
+                    var aItems = oSmartFilterbar.getAllFilterItems(true) || [];
+                    var oItem = aItems.find(function(i) { return i.getName && i.getName() === oSelectOption.PropertyName; });
+                    var oCtrl = oItem && oItem.getControl && oItem.getControl();
+                    if (oCtrl && oCtrl.setValue) {
+                        oCtrl.setValue(oSelectOption.Ranges[0].Low);
+                    }
+                }
+            });
+        }
+
         /**
          * Event handler for the EasyFilterBarContainer's tokensChangedByUser event.
          * Fired when the user manually deletes or modifies a token (distinct from AI-resolved tokens).
@@ -839,8 +936,8 @@ sap.ui.define([
 		/**
 		 * Event handler for the EasyFilter control's showValueHelp event.
 		 * Identifies the input field for which the value help is requested and triggers the value help opening from SFB.
-		 * @param {*} oEvent
-		 * @param {*} oState
+		 * @param {sap.ui.base.Event} oEvent - The showValueHelp event fired by the EasyFilter control
+		 * @param {object} oState - The current controller state object
 		 */
 		function fnShowValueHelp(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterDataFetcherHelper.js

@@ -287,7 +287,7 @@ sap.ui.define([
                 if (!isValueHelpTableAvailable) {
                     // When there is no valueList associate, just return the original value in CodeList type
                     aFilters.forEach(oFilter => aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter)));
-                    resolve(aFinalResponse);
+                    return resolve(aFinalResponse);
                 }
 
                 // Get value help lists from metadata

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3222,7 +3222,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.148.6
+	 * @version 1.148.8
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/library.js

@@ -68,7 +68,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.148.6",
+		version: "1.148.8",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {