@sapui5/sap.suite.ui.generic.template 1.136.21 → 1.136.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.136.21",
+  "version": "1.136.22",
   "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.136.21</version>
+	<version>1.136.22</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.136.21"
+			"version": "1.136.22"
 		},
 		"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.136.21"
+			"version": "1.136.22"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_zh_CN.properties

@@ -39,7 +39,7 @@ CONTACT_FAX=\u4F20\u771F
 
 CONTACT_ADDRESS=\u5730\u5740
 
-MESSAGE_SINGLE_VALUE_L_FORM=\u8FC7\u6EE4\u5668 "{0}" \u4E0E\u6807\u7B7E "{1}" \u65E0\u5173\u3002\u8BBE\u7F6E\u6B64\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
+MESSAGE_SINGLE_VALUE_L_FORM=\u8FC7\u6EE4\u5668\u201C{0}\u201D\u4E0E\u6807\u7B7E\u201C{1}\u201D\u65E0\u5173\u3002\u8BBE\u7F6E\u6B64\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
 
 MESSAGE_SINGLE_VALUE_S_FORM=\u65E0\u6CD5\u5728 "{1}" \u6807\u7B7E\u4E0A\u6309 "{0}" \u8FDB\u884C\u8FC7\u6EE4\u3002
 
@@ -55,7 +55,7 @@ EDIT_REMAINING={1} \u4E2A\u5BF9\u8C61\u4E2D\u6709 {0} \u4E2A\u65E0\u6CD5\u8FDB\u
 
 EDIT_REMAINING_PLURAL={1} \u4E2A\u5BF9\u8C61\u4E2D\u6709 {0} \u4E2A\u65E0\u6CD5\u8FDB\u884C\u7F16\u8F91\u3002\u5982\u679C\u6709\u4EBA\u6B63\u5728\u5904\u7406\u8BE5\u5BF9\u8C61\u6216\u4E0D\u5141\u8BB8\u7F16\u8F91\uFF0C\u5C31\u53EF\u80FD\u4F1A\u53D1\u751F\u8FD9\u79CD\u60C5\u51B5\u3002\n\n \u662F\u5426\u8981\u7F16\u8F91\u5176\u4F59 {2} \u4E2A\u5BF9\u8C61\uFF1F
 
-MESSAGE_MULTIPLE_VALUES_L_FORM=\u67D0\u4E9B\u8FC7\u6EE4\u5668\u4E0E\u6807\u7B7E "{1}" \u65E0\u5173 ({0})\u3002\u8BBE\u7F6E\u8FD9\u4E9B\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
+MESSAGE_MULTIPLE_VALUES_L_FORM=\u67D0\u4E9B\u8FC7\u6EE4\u5668\u4E0E\u6807\u7B7E\u201C{1}\u201D\u65E0\u5173 ({0})\u3002\u8BBE\u7F6E\u8FD9\u4E9B\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
 
 MESSAGE_MULTIPLE_VALUES_S_FORM=\u65E0\u6CD5\u5728 "{1}" \u6807\u7B7E\u4E0A\u4F7F\u7528\u4EE5\u4E0B\u8FC7\u6EE4\u5668\uFF1A"{0}"\u3002
 

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.136.21"
+			"version": "1.136.22"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.136.21"
+			"version": "1.136.22"
 		},
 		"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.136.21"
+			"version": "1.136.22"
 		},
 		"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.136.21"
+		"version": "1.136.22"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -26,6 +26,12 @@ sap.ui.define([
 		var bIsApplying = false;
 		var aBasicFilters = [];
 		var oSmartFilterBar = oControl;
+		// Holds SVM callbacks once setSVMWrapperCallbacks is called. The afterVariantLoad handler
+		// is attached eagerly (in fnInitialize) so it fires even when setSVMWrapperCallbacks has
+		// not yet been called (race condition on second navigation: bAllControlsInitialized=true
+		// causes fnApplyVariantState to run synchronously, triggering afterVariantLoad before the
+		// Promise.all in SmartVariantManagementWrapper resolves and calls setSVMWrapperCallbacks).
+		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -40,14 +46,39 @@ sap.ui.define([
 
 			// Initialize variant management promise
 			oVariantManagementInitializedPromise = oSmartFilterBar.getInitializedPromise();
+
+			// 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();
+				// variant stored with 1.103 or later: all customFilter data stored in property customFilters
+				// legacy variant stored with 1.102 or earlier: customFilters (from storing point of view) separated according to their origin
+				var oCustomFiltersState = oCustomData[dataPropertyNameGeneric].customFilters || {
+						editState: oCustomData[dataPropertyNameGeneric].editStateFilter,
+						appExtension: oCustomData[dataPropertyNameCustom],
+						adaptationExtensions: oCustomData[dataPropertyNameExtension]
+					};
+
+				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
+				if (oSVMWrapperCallbacks) {
+					oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
+				}
+			});
 		}
 
+		// 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 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){
+		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
@@ -58,25 +89,6 @@ sap.ui.define([
 				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
 				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.
-			oSmartFilterBar.attachAfterVariantLoad(function(){
-				var oCustomData = oSmartFilterBar.getCustomFilterData();
-				// variant stored with 1.103 or later: all customFilter data stored in property customFilters
-				// legacy variant stored with 1.102 or earlier: customFilters (from storing point of view) separated according to their origin
-				var oCustomFiltersState = oCustomData[dataPropertyNameGeneric].customFilters || {
-						editState: oCustomData[dataPropertyNameGeneric].editStateFilter,
-						appExtension: oCustomData[dataPropertyNameCustom],
-						adaptationExtensions: oCustomData[dataPropertyNameExtension]
-					};
-
-				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-				oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
-			});
-
 		}
 
 		function fnGetState() {

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

@@ -153,6 +153,13 @@ sap.ui.define([
                 oState.variantId = oState.sVariantId;
             }
 
+            // Compare current passed and control states. If states are same, setting state make no change, but trigger table refresh.
+            // For performance reason we compare object stringified versions. Object key order should not change as it only get applied at runtime.
+            var oControlState = bVariantManagementActive ? oVariantManagementStateWrapper.getState() : oSmartControlStateWrapper.getState();
+            if (JSON.stringify(oState) === JSON.stringify(oControlState)) {
+                return;
+            }
+
             if (bVariantManagementActive) {
                 // In case VariantManagement is configured
                 oVariantManagementStateWrapper.setState(oState);

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

@@ -966,7 +966,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.136.21
+	 * @version 1.136.22
 	 * @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

@@ -810,6 +810,18 @@ sap.ui.define(["sap/ui/base/Object",
 				return oTemplateContract.oNavigationControllerProxy.preloadComponent(sRouteName);
 			} 
 		
+			// Returns true when a navigation call will open in a new tab rather than replacing the current app.
+			// sap-ushell-navmode (manifest-level) takes priority; sap-ushell-next-navmode (FLP startup parameter,
+			// system-level) is the fallback — mirroring how NavigationHandler itself determines explace.
+			function fnIsExplaceNavigation(oOutboundParameters) {
+				if (oOutboundParameters && oOutboundParameters["sap-ushell-navmode"] === "explace") {
+					return true;
+				}
+				var oComponentData = oTemplateContract.oAppComponent.getComponentData && oTemplateContract.oAppComponent.getComponentData();
+				var oStartupParams = oComponentData && oComponentData.startupParameters;
+				return !!(oStartupParams && oStartupParams["sap-ushell-next-navmode"] && oStartupParams["sap-ushell-next-navmode"][0] === "explace");
+			}
+
 			oTemplateContract.oApplicationProxy = { // inject own api for AppComponent into the Template Contract. Other classes (NavigationController, BusyHelper) will call these functions accordingly.
 				createDraftSiblingPromise: oContextBookkeeping.createDraftSiblingPromise,
 				getDraftSiblingPromise: oContextBookkeeping.getDraftSiblingPromise,
@@ -916,6 +928,7 @@ sap.ui.define(["sap/ui/base/Object",
 				mustRequireRequestsCanonical: mustRequireRequestsCanonical,
 				getNavigationHandler: getNavigationHandler,
 				navigateExternal: fnNavigateExternal,
+				isExplaceNavigation: fnIsExplaceNavigation,
 				getStatePreservationMode: getStatePreservationMode,
 				setObjectInEditMode: fnSetObjectInEditMode,
 				getObjectInEditMode: fnGetObjectInEditMode,

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

@@ -716,7 +716,7 @@ 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
 			// 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") {
+			if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
 				var oNavHandler = oServices.oApplication.getNavigationHandler();
 				if (oNavHandler.navigate) {
 					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");
@@ -736,7 +736,15 @@ sap.ui.define(["sap/ui/base/Object",
 			oCommonUtils.removePropertiesFromNavigationContext(oSelectionVariant, oEventSource);
 			oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
-			oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError);
+			// SmartLink outbounds have no manifest parameters so sap-ushell-navmode is never set.
+			// System-level sap-ushell-next-navmode can still force a new tab — bypass the re-entry guard in that case.
+			if (oServices.oApplication.isExplaceNavigation()) {
+				if (oNavigationHandler.navigate) {
+					oNavigationHandler.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 fnHideTitleArea(oSmLiContent,aContactTitleArea) {
@@ -1111,6 +1119,13 @@ sap.ui.define(["sap/ui/base/Object",
 						// Sometimes, the SmartLink is located on a field group which belongs to the child entity set of object page.
 						// So, we have to always derive the entity type from the smart link's binding context.
 						var oEntityType = ModelUtil.getEntityTypeFromContext(oControl.getBindingContext());
+						// CS20260013063140: ModelUtil.getEntityTypeFromContext returns null when the SmartLink
+						// is resolved via SmartLinkDelegate, because the binding context is not yet resolvable
+						// to an entity type at that point.
+						// Fall back to deriving the entity type from the enclosing entity set instead.
+						if (!oEntityType) {
+							oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+						}
 						var oField = oEntityType.property.find(function (oProperty) { return oProperty.name === sSourceClickedField; });
 						var sTextArrangement = "descriptionAndId";
 						if (oField) { // TODO: Need to provide the correct field Object using the entityType and corresponding association (should be handled by a BLI)
@@ -2635,7 +2650,7 @@ sap.ui.define(["sap/ui/base/Object",
 			oCommonUtils.setComponentRefreshBehaviour(oOutbound);
 			// 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") {
+			if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
 				var oNavHandler = oServices.oApplication.getNavigationHandler();
 				if (oNavHandler.navigate) {
 					oNavHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, oCommonUtils.handleError, null, "explace");

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

@@ -788,10 +788,10 @@ sap.ui.define(["sap/ui/base/Object",
 
 				setComponentRefreshBehaviour(oOutbound);
 
-				// We now  ensure that the 'sap-ushell-navmode' parameter is passed to the NavigationHandler.navigate method
-				// and skip setting the app to busy mode when opening a new tab
-				if (oOutbound.parameters["sap-ushell-navmode"] === "explace") {
-					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, oOutbound.parameters["sap-ushell-navmode"]);
+				// We now skip setting the app to busy mode when opening a new tab and bypass the re-entry guard (fnNavigateExternal) for explace navigations:
+				// the source app stays alive when a new tab is opened, so without the bypass AppComponent.restore() is never called and the guard is never reset.
+				if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
+					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, "explace");
 				} else {
 					oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError);
 					//null object has to be passed to the NavigationHandler as an

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

@@ -58,10 +58,43 @@ sap.ui.define([
 
             var mFilterProperties = {}; // todo : Add the properties from navigation entites
             var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
-            oEntityType.property.map(function (oProperty) {
-                var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox" | "MenuWithSingleSelect"
-                if (filterHelper.isPropertyFilterable(oProperty)) {
 
+            // Capabilities.FilterRestrictions takes priority over sap:filterable (matches SFB behaviour).
+            var oEntitySetMeta = oSFBMetaModel.getODataEntitySet(sEntitySet);
+            var oCapFilterRestrictions = oEntitySetMeta &&
+                oEntitySetMeta["Org.OData.Capabilities.V1.FilterRestrictions"];
+            var bEntityNonFilterable = !!oCapFilterRestrictions &&
+                oCapFilterRestrictions.Filterable === "false";
+            var mCapNonFilterable = {};
+            if (oCapFilterRestrictions && oCapFilterRestrictions.NonFilterableProperties) {
+                oCapFilterRestrictions.NonFilterableProperties.forEach(function(oEntry) {
+                    if (oEntry.PropertyPath) {
+                        mCapNonFilterable[oEntry.PropertyPath] = true;
+                    }
+                });
+            }
+
+            // Helper: add properties from a 1:1 nav property's entity type into mFilterProperties,
+            // applying Capabilities.FilterRestrictions from the nav entity-set metadata.
+            function addNavPropertiesFromEntityType(entityType, prefix, oNavEntitySetMeta) {
+                var oNavCapFilterRestrictions = oNavEntitySetMeta &&
+                    oNavEntitySetMeta["Org.OData.Capabilities.V1.FilterRestrictions"];
+                var bNavEntityNonFilterable = !!oNavCapFilterRestrictions &&
+                    oNavCapFilterRestrictions.Filterable === "false";
+                var mNavCapNonFilterable = {};
+                if (oNavCapFilterRestrictions && oNavCapFilterRestrictions.NonFilterableProperties) {
+                    oNavCapFilterRestrictions.NonFilterableProperties.forEach(function(oEntry) {
+                        if (oEntry.PropertyPath) {
+                            mNavCapNonFilterable[oEntry.PropertyPath] = true;
+                        }
+                    });
+                }
+                entityType.property && entityType.property.forEach(function(oProperty) {
+                    var bFilterable = filterHelper.isPropertyFilterable(oProperty);
+                    if (oNavCapFilterRestrictions) {
+                        bFilterable = !bNavEntityNonFilterable && !mNavCapNonFilterable[oProperty.name];
+                    }
+                    var sTokenType = "ValueHelp";
                     var bIsCodeListRequired;
                     oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
                         if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
@@ -69,31 +102,95 @@ sap.ui.define([
                             bIsCodeListRequired = true;
                         }
                     });
-
-                    // Calculate the token type based on the property type and display format
-                    // It will be better if this is done at the control level
                     if ((oProperty.type === "Edm.DateTime" && oProperty["sap:display-format"] === "Date") ||
                     (oProperty.type === "Edm.String" && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"] && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"].Bool === "true")) {
                         sTokenType = "Calendar";
                     } else if (oProperty.type === "Edm.DateTimeOffset") {
                         sTokenType = "Time";
                     }
-
-                    mFilterProperties[oProperty.name] = {
-                        name: oProperty.name,
-                        //label: oProperty.label,  Name is added from the filter item control
+                    var propName = prefix + "." + oProperty.name;
+                    mFilterProperties[propName] = {
+                        name: propName,
                         dataType: oProperty.type,
-                        defaultValue : [], // Fill values from FLP user defaults , SV or other sources
-                        filterable: true,
+                        defaultValue: [],
+                        filterable: bFilterable,
                         sortable: false,
-                        codeList : bIsCodeListRequired,
+                        codeList: bIsCodeListRequired,
                         type: sTokenType,
                         unit: oProperty["sap:unit"] || "",
                         required: oProperty["sap:required-in-filter"] === "true" ? true : false
                     };
+                });
+            }
+
+            oEntityType.property.map(function (oProperty) {
+                var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox" | "MenuWithSingleSelect"
+                var bFilterable = filterHelper.isPropertyFilterable(oProperty);
+
+                // When Capabilities.FilterRestrictions is present, its answer is authoritative.
+                // A property absent from NonFilterableProperties is filterable even if sap:filterable="false".
+                if (oCapFilterRestrictions) {
+                    bFilterable = !bEntityNonFilterable && !mCapNonFilterable[oProperty.name];
+                }
+
+                var bIsCodeListRequired;
+                oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
+                    if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
+                        sTokenType = "MenuWithCheckBox";
+                        bIsCodeListRequired = true;
+                    }
+                });
+
+                // Calculate the token type based on the property type and display format
+                // It will be better if this is done at the control level
+                if ((oProperty.type === "Edm.DateTime" && oProperty["sap:display-format"] === "Date") ||
+                (oProperty.type === "Edm.String" && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"] && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"].Bool === "true")) {
+                    sTokenType = "Calendar";
+                } else if (oProperty.type === "Edm.DateTimeOffset") {
+                    sTokenType = "Time";
                 }
+
+                mFilterProperties[oProperty.name] = {
+                    name: oProperty.name,
+                    //label: oProperty.label,  Name is added from the filter item control
+                    dataType: oProperty.type,
+                    defaultValue : [], // Fill values from FLP user defaults , SV or other sources
+                    filterable: bFilterable,
+                    sortable: false,
+                    codeList : bIsCodeListRequired,
+                    type: sTokenType,
+                    unit: oProperty["sap:unit"] || "",
+                    required: oProperty["sap:required-in-filter"] === "true" ? true : false
+                };
             });
 
+            // Add 1:1 navigation properties' properties
+            if (oEntityType.navigationProperty) {
+                oEntityType.navigationProperty.forEach(function(navProp) {
+                    var oAssocEnd = null;
+                    var oAssoc = null;
+                    if (oSFBMetaModel && navProp.relationship) {
+                        oAssoc = oSFBMetaModel.getODataAssociationEnd && oSFBMetaModel.getODataAssociationEnd(oEntityType, navProp.name);
+                        oAssocEnd = oAssoc;
+                    }
+                    var isOneToOne = false;
+                    if (oAssocEnd && oAssocEnd.multiplicity && (oAssocEnd.multiplicity === "0..1" || oAssocEnd.multiplicity === "1")) {
+                        isOneToOne = true;
+                    }
+                    if (isOneToOne) {
+                        var sTargetType = navProp.type || (oAssocEnd && oAssocEnd.type);
+                        if (sTargetType) {
+                            var oTargetEntityType = oSFBMetaModel.getODataEntityType && oSFBMetaModel.getODataEntityType(sTargetType);
+                            if (oTargetEntityType) {
+                                var oAssocSetEnd = oSFBMetaModel.getODataAssociationSetEnd && oSFBMetaModel.getODataAssociationSetEnd(oEntityType, navProp.name);
+                                var oNavEntitySetMeta = oAssocSetEnd && oAssocSetEnd.entitySet && oSFBMetaModel.getODataEntitySet(oAssocSetEnd.entitySet);
+                                addNavPropertiesFromEntityType(oTargetEntityType, navProp.name, oNavEntitySetMeta);
+                            }
+                        }
+                    }
+                });
+            }
+
             oEasyFilterMetadata = {
                 version: 1,
                 entitySet: sEntitySet,

package/src/sap/suite/ui/generic/template/lib/insights/InsightsCardHelper.js

@@ -50,6 +50,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		var oAppComponent = oComponent.getAppComponent();
 		var oUIManifest = oAppComponent.getManifestEntry("sap.ui");
 		var oAppManifest = oAppComponent.getManifestEntry("sap.app");
+		var oOutbounds = oAppManifest && oAppManifest["crossNavigation"] && oAppManifest["crossNavigation"]["outbounds"];
 		if (oAppManifest && oAppManifest["crossNavigation"]) {
 			delete oAppManifest["crossNavigation"];
 		}
@@ -57,7 +58,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		oAppManifest.id = InsightsCardHelper.getCardId(oAppComponent);
 		oManifest["sap.app"] = fnCreateManifestSapApp(oAppManifest);
 		oManifest["sap.ui"] = oUIManifest;
-		oManifest["sap.card"] = fnCreateManifestSapCard(oCardDefinition);
+		oManifest["sap.card"] = fnCreateManifestSapCard(oCardDefinition, oOutbounds);
 		oManifest["sap.insights"] = fnCreateManifestSapInsight(oCardDefinition);
 		oManifest["sap.ui5"] = fnCreateSapui5();
 		return oManifest;
@@ -91,7 +92,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		return oManifestAppData;
 	};
 
-	var fnCreateManifestSapCard = function (oCardDefinition) {
+	var fnCreateManifestSapCard = function (oCardDefinition, oOutbounds) {
 		var oCardConfig = {};
 		var sComponentName = oCardDefinition['component'].getMetadata().getName();
 		oCardConfig["type"] = getCardType(sComponentName);
@@ -104,7 +105,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		} else {
 			oCardConfig["content"] = InsightsCardHelper.fnCreateManifestSapTableCardContent(oCardDefinition, oCardConfig);
 		}
-        InsightsCardHelper.getCardActions(oCardDefinition, oCardConfig);
+        InsightsCardHelper.getCardActions(oCardDefinition, oCardConfig, oOutbounds);
 		return oCardConfig;
 	};
 
@@ -693,7 +694,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 		return aDimensions;
 	};
 
-	InsightsCardHelper.getCardActions = function (oCardDefinition, oSapCard) {
+	InsightsCardHelper.getCardActions = function (oCardDefinition, oSapCard, oOutbounds) {
         var sHash = window.hasher.getHash(), aSemanticObjAction = sHash.split('&/')[0], sAppVarId;
 
         if (aSemanticObjAction.includes('?')) {
@@ -725,6 +726,10 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
         }];
 
         var oContentParams = JSON.parse(JSON.stringify(oHeaderParams));
+        var oRowOutbound = fnGetRowNavigationOutbound(oOutbounds, aSemanticObjAction[0]);
+        if (oRowOutbound) {
+            oContentParams.ibnTarget = oRowOutbound;
+        }
 
         var oContentParameterValue = [{
             "type": "Navigation",
@@ -747,6 +752,21 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
         }
     };
 
+	var fnGetRowNavigationOutbound = function (oOutbounds, sSemanticObject) {
+        if (!oOutbounds || !sSemanticObject) {
+            return null;
+        }
+        var oResult = null;
+        Object.keys(oOutbounds).some(function (sKey) {
+            var oOutbound = oOutbounds[sKey];
+            if (oOutbound && oOutbound.semanticObject === sSemanticObject && oOutbound.action) {
+                oResult = { semanticObject: oOutbound.semanticObject, action: oOutbound.action };
+                return oOutbound.action === "displayFactSheet";
+            }
+        });
+        return oResult;
+    };
+
 	var fnGetLineItemAnnotation = function (oCardDefinition) {
 		var oEntityType = oCardDefinition['entityType'];
 		var aCustomData = oCardDefinition['currentControlHandler'].getControl().getCustomData();

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

@@ -2429,7 +2429,7 @@ sap.ui.define(["sap/ui/base/Object",
 			};
 			for (var oHistoricHash = oCurrentHash; oHistoricHash.iHashChangeCount > 0; oHistoricHash = aPreviousHashes[oHistoricHash.backTarget]){
 				var oIdentity = (oHistoricHash === oCurrentHash) ? oCurrentIdentity : oHistoricHash.identity;
-				var oReducedIdentity = oIdentity.treeNode && {
+				var oReducedIdentity = oIdentity && oIdentity.treeNode && {
 					sRouteName: oIdentity.treeNode.sRouteName,
 					keys: oIdentity.keys,
 					appStates: oIdentity.appStates
@@ -3109,6 +3109,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnPrepareHostView = testableHelper.testable(fnPrepareHostView, "prepareHostView");
 		var fnPreloadComponent = testableHelper.testable(fnPreloadComponent, "preloadComponent");
 		var fnGetRouteInfoByHash = testableHelper.testable(fnGetRouteInfoByHash, "getRouteInfoByHash");
+		var fnUpdateHistoryState = testableHelper.testable(fnUpdateHistoryState, "updateHistoryState");
 		
 		// Note: Function createHostView will be added by routingHelper.
 		// Allow to mock this by unit tests
@@ -3119,8 +3120,16 @@ sap.ui.define(["sap/ui/base/Object",
 		testableHelper.testable(function(fnPrepareHostViewStub){
 			fnPrepareHostView = fnPrepareHostViewStub;
 		}, "setPrepareHostView");
-		/* eslint-enable */
 
+		testableHelper.testable(function(oCurrentHashParam, aPreviousHashesParam, oCurrentIdentityParam, oHistoryStateParam){
+			oCurrentHash = oCurrentHashParam;
+			aPreviousHashes = aPreviousHashesParam;
+			oCurrentIdentity = oCurrentIdentityParam;
+			if (oHistoryStateParam !== undefined){
+				oHistoryState = oHistoryStateParam;
+			}
+		}, "setInternalNavigationState");
+		/* eslint-enable */
 
 		oTemplateContract.oBusyHelper.setBusy((getParsedShellHashFromFLP() || Promise.resolve()).then(function(oResults){
 			var oParsedUrl = oResults && oResults.parseParameters(document.location.search);
@@ -3206,7 +3215,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.136.21
+	 * @version 1.136.22
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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