@sapui5/sap.suite.ui.generic.template 1.151.0 → 1.152.0

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

@@ -107,12 +107,36 @@ sap.ui.define([
             // Helper to add properties to mFilterProperties, with optional prefix.
             // bOverrideSortable and mOverrideNonSortable allow callers (e.g. nav property processing)
             // to pass entity-set-specific sort restrictions instead of the root entity set's.
-            function addPropertiesFromEntityType(entityType, prefix, bOverrideSortable, mOverrideNonSortable) {
+            // oEffectiveEntitySetMeta allows callers to pass the entity-set metadata for
+            // Capabilities.FilterRestrictions lookup; falls back to the root entity set's metadata.
+            function addPropertiesFromEntityType(entityType, prefix, bOverrideSortable, mOverrideNonSortable, oEffectiveEntitySetMeta) {
                 var bEffectiveSortable = (bOverrideSortable !== undefined) ? bOverrideSortable : bEntitySetSortable;
                 var mEffectiveNonSortable = mOverrideNonSortable || mNonSortableProperties;
+
+                // Capabilities.FilterRestrictions takes priority over sap:filterable (matches SFB behaviour).
+                var oCapFilterRestrictions = oEffectiveEntitySetMeta &&
+                    oEffectiveEntitySetMeta["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;
+                        }
+                    });
+                }
+
                 entityType.property.forEach(function (oProperty) {
                     var sTokenType = "ValueHelp";
                     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;
                     var bIsHidden = false;
                     var bIsHiddenFilter = false;
@@ -167,7 +191,7 @@ sap.ui.define([
             }
 
             // Add direct properties
-            addPropertiesFromEntityType(oEntityType, "");
+            addPropertiesFromEntityType(oEntityType, "", undefined, undefined, oEntitySetMeta);
 
             // Add 1:1 navigation properties' properties
             if (oEntityType.navigationProperty) {
@@ -214,7 +238,7 @@ sap.ui.define([
                                         }
                                     }
                                 }
-                                addPropertiesFromEntityType(oTargetEntityType, navProp.name, bNavSortable, mNavNonSortable);
+                                addPropertiesFromEntityType(oTargetEntityType, navProp.name, bNavSortable, mNavNonSortable, oNavEntitySetMeta);
                             }
                         }
                     }
@@ -709,22 +733,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).
@@ -819,8 +940,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/i18n/i18n_en_US_saptrc.properties

@@ -263,7 +263,7 @@ UNNAMED_OBJECT=/7tWejRWY+/VKNEqKMeUig_Unnamed Object
 
 NOITEMS_SMARTTABLE=4mF5yAkQczyduvBbpfEiUQ_No items available.
 
-NOITEMS_SMARTTABLE_ILLUSTRATION_TITLE=doyvmYFBR/YAir1JRbBrjg_There are no entries yet.
+NOITEMS_SMARTTABLE_ILLUSTRATION_TITLE=doyvmYFBR/YAir1JRbBrjg_There are no entries yet
 
 NOITEMS_SMARTTABLE_ILLUSTRATION_DESCRIPTION=ILWfzXjlD1V0V2FH3J0ydg_When there are, you\u2019ll see them here.
 
@@ -281,7 +281,7 @@ NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON_ILLUSTRATION_DESCRIPTION=GGyy
 
 NOITEMS_SMARTCHART=E8PAJqLnlL8D5qjtuHM1PA_No data found.
 
-NOITEMS_SMARTCHART_ILLUSTRATION_TITLE=SwZw2xSjtz9Vh+0KWhZtdA_There are no entries yet.
+NOITEMS_SMARTCHART_ILLUSTRATION_TITLE=SwZw2xSjtz9Vh+0KWhZtdA_There are no entries yet
 
 NOITEMS_SMARTCHART_ILLUSTRATION_DESCRIPTION=bEw0TDVPaEKar/6e6st0jg_When there are, you\u2019ll see them here.
 
@@ -293,7 +293,7 @@ NOITEMS_LR_SMARTCHART_ILLUSTRATION_DESCRIPTION=gBq3I96wPrF1Ewim63QYtA_Try changi
 
 NOITEMS_SMARTCHART_WITH_FILTER=018xLIIeu5CBFsduDE+3NQ_No data found. Try adjusting the filter parameters.
 
-NOITEMS_SMARTCHART_WITH_FILTER_ILLUSTRATION_TITLE=CsqDaNt4K/dfxZsSwIG5pg_No results found.
+NOITEMS_SMARTCHART_WITH_FILTER_ILLUSTRATION_TITLE=CsqDaNt4K/dfxZsSwIG5pg_No results found
 
 NOITEMS_SMARTCHART_WITH_FILTER_ILLUSTRATION_DESCRIPTION=Y8sxldqS54RjkfbsCOBJhA_Try changing your filter criteria.
 
@@ -305,7 +305,7 @@ SMARTCHART_INITIAL_NODATA_ILLUSTRATION_DESCRIPTION=8HfZHgwhmWenmTsdn39Wqg_Start
 
 NOITEMS_LR_SMARTTABLE=mzjlT4T4Bwjpy44Z9NjCDA_No data found.
 
-NOITEMS_LR_SMARTTABLE_ILLUSTRATION_TITLE=xDgxD4GNBL2TBLA8rDeMBg_There are no entries yet.
+NOITEMS_LR_SMARTTABLE_ILLUSTRATION_TITLE=xDgxD4GNBL2TBLA8rDeMBg_There are no entries yet
 
 NOITEMS_LR_SMARTTABLE_ILLUSTRATION_DESCRIPTION=8rudXxT/Jqj7Jf4NGwoN+A_When there are, you\u2019ll see them here.
 
@@ -506,7 +506,7 @@ EASY_FILL_SECOND_LABEL_TEXT=6ClfQBkJaEH1PfDiwA5Y/Q_Provide any information that
 
 EASY_FILL_TEXTAREA_PLACEHOLDER=SM5b7MpHJMd0bpuaOXui/Q_Provide any information that helps AI fill the appropriate fields. Note that AI can only assist with visible fields and rows.
 
-EASY_FILL_ILLUSTRATION_TITLE_INITIAL=rJs6dgsnWPZqespMCljKGw_Let\u2019s fill in some fields.
+EASY_FILL_ILLUSTRATION_TITLE_INITIAL=rJs6dgsnWPZqespMCljKGw_Let\u2019s fill in some fields
 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_INITIAL=vXZZ5PgERzHudzaOWZMclA_You can start by providing the required information to see the proposed results.
 
@@ -514,7 +514,7 @@ EASY_FILL_ILLUSTRATION_TITLE_NO_ENTRIES=r9q+6s8j3XyumHEvE3wWMQ_No fields filled
 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_NO_ENTRIES=Dtc9imG1YicZJWol2mAedQ_We couldn\u2019t match your query to any of the existing fields.
 
-EASY_FILL_ILLUSTRATION_TITLE_ERROR=3MAHZSkGTXtr7nB3SvlsjA_Unable to fill in the fields.
+EASY_FILL_ILLUSTRATION_TITLE_ERROR=3MAHZSkGTXtr7nB3SvlsjA_Unable to fill in the fields
 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_ERROR=/yhJuCWe50MguIjZv+mJGA_It looks like an error occurred. Try again and if that doesn\u2019t help, check with your administrator.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_fi.properties

@@ -267,13 +267,13 @@ NOITEMS_SMARTTABLE_ILLUSTRATION_TITLE=Merkint\u00F6j\u00E4 ei viel\u00E4 ole
 
 NOITEMS_SMARTTABLE_ILLUSTRATION_DESCRIPTION=Kun niit\u00E4 on, n\u00E4et ne t\u00E4ss\u00E4.
 
-NOITEMS_SMARTTABLE_WITH_FILTER=EiRivej\u00E4. YrMuutHakTaiSuodPar
+NOITEMS_SMARTTABLE_WITH_FILTER=Ei elementtej\u00E4. Yrit\u00E4 mukauttaa haku- tai suodatusperusteita.
 
 NOITEMS_SMARTTABLE_WITH_FILTER_ILLUSTRATION_TITLE=Tuloksia ei l\u00F6ytynyt
 
 NOITEMS_SMARTTABLE_WITH_FILTER_ILLUSTRATION_DESCRIPTION=Kokeile muuttaa suodatusperusteita.
 
-NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON=EiRivej\u00E4ValSuodPerJaTaulN\u00E4kVar
+NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON=Elementtej\u00E4 ei l\u00F6ytynyt valittujen suodatusperusteiden ja valitun taulukkon\u00E4kym\u00E4n osalta.
 
 NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON_ILLUSTRATION_TITLE=Tuloksia ei l\u00F6ytynyt
 
@@ -285,7 +285,7 @@ NOITEMS_SMARTCHART_ILLUSTRATION_TITLE=Merkint\u00F6j\u00E4 ei viel\u00E4 ole
 
 NOITEMS_SMARTCHART_ILLUSTRATION_DESCRIPTION=Kun niit\u00E4 on, n\u00E4et ne t\u00E4ss\u00E4.
 
-NOITEMS_LR_SMARTCHART=Ei tietoja valitulla suodatinperusteella ja kaavion\u00E4kym\u00E4ll\u00E4.
+NOITEMS_LR_SMARTCHART=Tietoja ei l\u00F6ytynyt valittujen suodatusperusteiden ja valitun kaavion\u00E4kym\u00E4n osalta.
 
 NOITEMS_LR_SMARTCHART_ILLUSTRATION_TITLE=Tuloksia ei l\u00F6ytynyt
 
@@ -315,7 +315,7 @@ NOITEMS_LR_SMARTTABLE_WITH_FILTER_ILLUSTRATION_TITLE=Tuloksia ei l\u00F6ytynyt
 
 NOITEMS_LR_SMARTTABLE_WITH_FILTER_ILLUSTRATION_DESCRIPTION=Kokeile muuttaa suodatusperusteita.
 
-NOITEMS_MULTIVIEW_LR_SMARTTABLE_WITH_FILTER=EiTietValSuodPerJaTaulN\u00E4kVart
+NOITEMS_MULTIVIEW_LR_SMARTTABLE_WITH_FILTER=Tietoja ei l\u00F6ytynyt valittujen suodatusperusteiden ja valitun taulukkon\u00E4kym\u00E4n osalta.
 
 NOITEMS_MULTIVIEW_LR_SMARTTABLE_WITH_FILTER_ILLUSTRATION_TITLE=Tuloksia ei l\u00F6ytynyt
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_sl.properties

@@ -182,7 +182,7 @@ ST_GENERIC_ERROR_NAVIGATION_PROPERTY_NOT_CORRECT=Lastnost navigacije {0} v pripo
 
 ST_GENERIC_FCL_FULLSCREEN=Celotni ekran
 
-ST_GENERIC_FCL_EXIT_FULLSCREEN=Izhod iz modusa celotnega ekrana
+ST_GENERIC_FCL_EXIT_FULLSCREEN=Izhod iz celozaslonskega na\u010Dina
 
 ST_GENERIC_FCL_CLOSE_COLUMN=Zapri
 

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

@@ -820,11 +820,17 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 						oCriticalityAnnotation = oAnnotation;
 						return (oAnnotation.Criticality && oAnnotation.Value && oAnnotation.Value.Path) === oProperty.name;
 					});
+
+					// sColumnValue stays a PLAIN concatenated path (unchanged behavior from before).
+					// Currency/Unit paths are tracked separately so formatting can be applied later,
+					// only where it's safe to do so (i.e. no Text-arrangement wrapping follows).
+					var sCurrencyPath, sUnitPath;
 					if (oProperty["Org.OData.Measures.V1.ISOCurrency"] && oProperty["Org.OData.Measures.V1.ISOCurrency"].Path) {
-						sColumnValue = sColumnValue.concat(" " + "{" + sNavigation + oProperty["Org.OData.Measures.V1.ISOCurrency"].Path + "}");
-					}
-					if (oProperty["Org.OData.Measures.V1.Unit"] && oProperty["Org.OData.Measures.V1.Unit"].Path) {
-						sColumnValue = sColumnValue.concat(" " + "{" + sNavigation + oProperty["Org.OData.Measures.V1.Unit"].Path + "}");
+						sCurrencyPath = sNavigation + oProperty["Org.OData.Measures.V1.ISOCurrency"].Path;
+						sColumnValue = sColumnValue.concat(" " + "{" + sCurrencyPath + "}");
+					} else if (oProperty["Org.OData.Measures.V1.Unit"] && oProperty["Org.OData.Measures.V1.Unit"].Path) {
+						sUnitPath = sNavigation + oProperty["Org.OData.Measures.V1.Unit"].Path;
+						sColumnValue = sColumnValue.concat(" " + "{" + sUnitPath + "}");
 					}
 
 					if (oProperty['com.sap.vocabularies.Common.v1.Text'] && oProperty['com.sap.vocabularies.Common.v1.Text'].Path) {
@@ -861,6 +867,12 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
 						if (bIsPropertySemanticKey) {
 							oColumnObject.identifier = bIsPropertySemanticKey;
 						}
+						// Safe to format here: no outer expression wrapping will happen for this column.
+						if (oProperty.type === 'Edm.Decimal' && sCurrencyPath) {
+							oColumnObject['value'] = "{= format.currency(${" + oProperty.name + "}, ${" + sCurrencyPath + "})}";
+						} else if (oProperty.type === 'Edm.Decimal' && sUnitPath) {
+							oColumnObject['value'] = "{= format.unit(${" + oProperty.name + "}, ${" + sUnitPath + "})}";
+						}
 					}
 					if (bIsCriticality) {
 						oColumnObject.state = fnBuildExpressionForCriticalityColor(oCriticalityAnnotation);

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

@@ -2242,6 +2242,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var sRoute = oRegistryEntry.route;
 			var iCurrentActivity = oActivationInfo.componentsDisplayed[sRoute];
 			var bIsComponentCurrentlyActive = iCurrentActivity === 1;
+			var bIsBackwards = isBackwards();
 			var fnPerformActivation = function(sBindingPath){
 				oRegistryEntry.sCurrentBindingPath = sBindingPath;
 				var fnActivate = function() {
@@ -2249,7 +2250,7 @@ sap.ui.define(["sap/ui/base/Object",
 					var bindComponentPromise = oRegistryEntry.utils.bindComponent(oRegistryEntry.sCurrentBindingPath, bIsComponentCurrentlyActive);
 					return bindComponentPromise
 						.then(function(){
-							(oRegistryEntry.methods.onActivate || Function.prototype)(sBindingPath, bIsComponentCurrentlyActive);
+							(oRegistryEntry.methods.onActivate || Function.prototype)(sBindingPath, bIsComponentCurrentlyActive, bIsBackwards);
 						})
 						.then(function(){
 							if (sComponentId === oCurrentIdentity.treeNode.componentId){
@@ -3222,7 +3223,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.151.0
+	 * @version 1.152.0
 	 * @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.151.0",
+		version: "1.152.0",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/themes/base/ObjectPage.less

@@ -416,7 +416,7 @@ html[dir='rtl'] .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageSubSect
 		height: 100%;
 
 		.sapUiFormCL .sapUiFormCLElement .sapEasyFillPreviouslyLabel {
-				min-width: 5rem;
+				color: var(--sapContent_LabelColor);
 			}
 
 			.sapUxAPBlockContainer {