@sapui5/sap.suite.ui.generic.template 1.136.6 → 1.136.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.136.6",
+  "version": "1.136.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.136.6</version>
+	<version>1.136.8</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_kk.properties

@@ -45,7 +45,7 @@ GO_FILTERS=\u04E8\u0442\u0443
 
 SHOW_ON_FILTER_BAR=\u0421\u04AF\u0437\u0433\u0456 \u0436\u043E\u043B\u0430\u0493\u044B\u043D\u0434\u0430 \u043A\u04E9\u0440\u0441\u0435\u0442\u0443
 
-VISUAL_FILTER_FILTERS=\u0421\u04AF\u0437\u0433\u0456\u043B\u0435\u0440\u0434\u0456 \u0441\u04D9\u0439\u043A\u0435\u0441\u0442\u0435\u043D\u0434\u0456\u0440\u0443
+VISUAL_FILTER_FILTERS=\u0421\u04AF\u0437\u0433\u0456\u043B\u0435\u0440\u0434\u0456 \u0431\u0435\u0439\u0456\u043C\u0434\u0435\u0443
 
 VISUAL_FILTER_FILTERS_WITH_COUNT=\u0421\u04AF\u0437\u0433\u0456\u043B\u0435\u0440\u0434\u0456 \u0431\u0435\u0439\u0456\u043C\u0434\u0435\u0443 ({0})
 

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.6"
+			"version": "1.136.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.136.6"
+			"version": "1.136.8"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -84,12 +84,12 @@ sap.ui.define([
 		var aPageVariantControlStateWrappers = []; // controls handled from page variant management if used: smartTable, searchfield, partly multiple views
 
 		// SmartTable state: Table Settings and (in case of control level variant management) selected variant and whether it's dirty
-		// In case of multipleViews with multiple tables (mode "multi"), each tab has an own table or chart, which has an own state, so multipleViewsHandler has to take care of 
+		// In case of multipleViews with multiple tables (mode "multi"), each tab has an own table or chart, which has an own state, so multipleViewsHandler has to take care of
 		// storing/restoring their states (in its part of the appState stored in genericData.tableTabData)
-		// In this case, mutliViewsHandler exchanges oState.oPresentationControlHandler (setting it always to the current visible one), so don't rely on that to get the wrapper. 
+		// In this case, mutliViewsHandler exchanges oState.oPresentationControlHandler (setting it always to the current visible one), so don't rely on that to get the wrapper.
 		// Using the id (without providing optional parameter sQuickVariantKey) returns the smartTable only in single table case.
 		var oSmartTable = oController.byId(StableIdHelper.getStableId({type: "ListReportTable", subType: "SmartTable"}));
-		if (oSmartTable){ // in multipleViews case (with multiple tables) currently multipleViews handler handles complete state information 
+		if (oSmartTable){ // in multipleViews case (with multiple tables) currently multipleViews handler handles complete state information
 			aControlStateWrappers.push(oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartTable));
 		}
 
@@ -128,7 +128,7 @@ sap.ui.define([
 
 		// List of handlers to react on (app or adaptation) extension state changes. Only one entry expected (handler in  SFB wrapper). Currently, extensions are only possible in
 		// SFB - if extensions at other places are needed, the similar handler might differ depending on whether page variant management is used.
-		var aExtensionStateChangeHandlers = []; 
+		var aExtensionStateChangeHandlers = [];
 		function customAppStateChange() {
 			aExtensionStateChangeHandlers.forEach(function(fnHandler) {
 				fnHandler();
@@ -239,7 +239,7 @@ sap.ui.define([
 
 
 		// Wrapper to control whether data is loaded
-		
+
 		function fnGetDataLoadedWrapper(){
 			// Wrapper to control whether data is expected to be loaded - controls the state, but does not trigger loading data on restore!
 			var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
@@ -247,15 +247,15 @@ sap.ui.define([
 			// - startup with iAppState: anyway setState will be called
 			// - other startup cases: applyInitialLoadBehavior calls setState explicitly
 			// - navigation
-			
+
 			function fnSetState(bState){
 				oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", bState);
 			}
-			
+
 			function fnGetState(){
 				return oTemplatePrivateModel.getProperty("/generic/bDataAreShownInTable");
 			}
-			
+
 			function fnSetDataShown(bDataShown, fnHandler){
 				if (bDataShown === fnGetState()){
 					return;
@@ -263,7 +263,7 @@ sap.ui.define([
 				fnSetState(bDataShown);
 				fnHandler();
 			}
-			
+
 			return {
 				getLocalId: function(){
 					return "$dataLoaded";
@@ -271,7 +271,7 @@ sap.ui.define([
 				setState: fnSetState,
 				getState: fnGetState,
 				attachStateChanged: function(fnHandler){
-					// changing from data not loaded to data loaded: 
+					// changing from data not loaded to data loaded:
 					// - when SFB triggers search
 					oState.oSmartFilterbar.attachSearch(fnSetDataShown.bind(null, true, fnHandler));
 
@@ -286,7 +286,7 @@ sap.ui.define([
 				}
 			};
 		}
-		
+
 		var oDataLoadedWrapper = fnGetDataLoadedWrapper();
 		aControlStateWrappers.push(oDataLoadedWrapper);
 //		oDataLoadedWrapper.attachStateChanged(changeIappState);
@@ -396,7 +396,7 @@ sap.ui.define([
 			if (Device.system.phone) {
 				collapseHeader();
 			}
-			// Ideally, oDataLoadedWrapper should ensure to keep its state correct. However, currently we have no means to attach to the command - i.e. oDataLoadedWrapper only 
+			// Ideally, oDataLoadedWrapper should ensure to keep its state correct. However, currently we have no means to attach to the command - i.e. oDataLoadedWrapper only
 			// attaches to SFB's search event, which is only triggered when user presses the go button. When keyboard shortcut is used instead, this handler would be called (as it
 			// is attached to the command), but SFB's search event would not be triggered. As workaround, we additionally set data loaded state to true here and inform explicitly
 			// the the state has changed.
@@ -440,7 +440,7 @@ sap.ui.define([
 				}
 			}
 		}
-		
+
 		/*
 			This method is called when an LR app is the target of an external navigation and the XAppState data contains a presentationVariant.
 			The sorting from this presentationVariant is then applied to the table.
@@ -460,13 +460,13 @@ sap.ui.define([
 			fnAdaptOtherControlsToAppState(oAppData.controlStates);
 			if (areDataShownInTable()){
 				// fnAdaptOtherControlsToAppState only (synchronously) sets the state including the information whether data should be loaded - if this is the case, the actual loading
-				// (which happens asynchronous of course) still needs to be triggered 
+				// (which happens asynchronous of course) still needs to be triggered
 				loadData();
 			} else {
 				// hide placeholder already here, if no data is to be loaded - in case data is loaded, it will be hidden in data received event
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
-			} 
-			
+			}
+
 			// special case: when restoring an old app state with data loaded, but in the meantime a filter not set in that state has been changed to mandatory, SFB.search would not
 			// trigger a request (but instead only mark that filter) - thus hiding placeholder now to avoid it to stay forever
 			// TODO: refactor: Still in that case our internal data shows data are loaded - ideally, that should not be the case
@@ -603,7 +603,7 @@ sap.ui.define([
 
 		function fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
 			handleVariantIdPassedViaURLParams(oURLParameters);
-			
+
 			var oSFBUiState = oState.oSmartFilterbar.getUiState();
 			var oSFBSemanticDates = oSFBUiState.getSemanticDates();
 			//oStartupObject to be passed to the extension where urlParameters and selectedQuickVariantSelectionKey are optional
@@ -766,23 +766,24 @@ sap.ui.define([
 			default:
 				throw new FeError(sClassName, "Invalid navigation type: " + sNavType);
 			}
-			
+
 			// common to all startup cases (except iAppState)
 			if (areDataShownInTable()){
 				// trigger search if needed
 				oState.oSmartFilterbar.search();
-				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices, 
+				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices,
 				// collapse the header only if search is triggered.
 				if (Device.system.desktop) {
 					oTemplateUtils.oCommonUtils.getControlStateWrapper(oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}))).setHeaderState(oController, true);
 				} else {
 					collapseHeader();
 				}
-			} else {
-				// if no data are loaded, place holder has to be hidden now - otherwise it will be hidden when data is received 
+			}
+			if (!areDataShownInTable() || Object.keys(oState.oSmartFilterbar.verifySearchAllowed()).length > 0) {
+				// if no data are loaded or search is not allowed, place holder has to be hidden now - otherwise it will be hidden when data is received
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
 			}
-			
+
 			// ensure first iAppState is created
 			changeIappState();
 		}
@@ -999,14 +1000,14 @@ sap.ui.define([
 		}
 
 		// provide data load settings including defaulting
-		// ideally, this should be implemented in a generic way in template assembler, so that generated getters also return default values for objects if not explicitely set in 
+		// ideally, this should be implemented in a generic way in template assembler, so that generated getters also return default values for objects if not explicitely set in
 		// manifest (i.e. it should be sufficient to define the default in component - no need to individually implement defaulting!)
 		function getDataLoadSettings(){
 			// general default
 			var oDefaultDataLoadSettings = {loadDataOnAppLaunch: "ifAnyFilterExist"};
 
 			// intension is boolean, but unfortunately faulty values are (historically) not treated consistently
-			var bEnableAutoBindingMultiViews = oState.oMultipleViewsHandler.getOriginalEnableAutoBinding(); 
+			var bEnableAutoBindingMultiViews = oState.oMultipleViewsHandler.getOriginalEnableAutoBinding();
 
 			// if multiple views settings is not defined (also the case in single views case), general default is taken. Unlike other faulty values, null is treated like undefined
 			if (bEnableAutoBindingMultiViews !== undefined && bEnableAutoBindingMultiViews !== null){
@@ -1016,13 +1017,13 @@ sap.ui.define([
 
 			var oManifestDataLoadSettings = oController.getOwnerComponent().getDataLoadSettings();
 			// (historically) explicit setting empty string (not an allowed value according to definition in component!) is treated like undefined (including adopting multiple views
-			// settings. Other not allowed values (any other sting) were ignored, i.e. returning undefined from getInitialLoadBehaviourSettings, thus setting undefined to 
-			// oSmartVariantManagement.setExecuteOnStandard (which actually only sets the default) and finally using the value returned from 
+			// settings. Other not allowed values (any other sting) were ignored, i.e. returning undefined from getInitialLoadBehaviourSettings, thus setting undefined to
+			// oSmartVariantManagement.setExecuteOnStandard (which actually only sets the default) and finally using the value returned from
 			// oSmartVariantManagement.getExecuteOnStandard (only different from overall default (false), if user has explicitly set it)
 			if (oManifestDataLoadSettings && oManifestDataLoadSettings.loadDataOnAppLaunch === ""){
 				oManifestDataLoadSettings.loadDataOnAppLaunch = undefined;
 			}
-			
+
 			// explicit setting has highest priority
 			return extend(oDefaultDataLoadSettings, oManifestDataLoadSettings);
 		}
@@ -1031,7 +1032,7 @@ sap.ui.define([
 		// - sets default value for flag whether standard variant should be execute on select
 		// - determines whether we actually should load data
 		function applyInitialLoadBehavior(bDataLoadCausedByNavigation){
-			// cases definitely determining to load data initially 
+			// cases definitely determining to load data initially
 			// - worklist
 			// - livemode
 			// - master detail (i.e. bLoadListAndFirstEntryOnStartup is set)
@@ -1040,17 +1041,17 @@ sap.ui.define([
 
 			var sLoadBehaviour = getDataLoadSettings().loadDataOnAppLaunch;
 			if (!oSmartVariantManagement || oController.getOwnerComponent().getVariantManagementHidden()){
-				// No VM -> 
+				// No VM ->
 				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour === "always";
 				bShouldDataBeLoaded = bShouldDataBeLoaded || (sLoadBehaviour === "ifAnyFilterExist" && oSmartFilterbar.getFiltersWithValues().length > 0);
 				// behavior of last patch set would translate to the following - seems not to be correct (in case of setting ifAnyFilterExist but no filters provided)
 				//				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour !== "never";
 			} else {
-				// in case of a (visible) SVM, we need to set the default value 
-				// default value for standard variant 
+				// in case of a (visible) SVM, we need to set the default value
+				// default value for standard variant
 				// - true if one of the conditions above is fulfilled
-				// - or for any manifest setting but "never" 
-				//		(Remark: "ifAnyFilterExist" leads to mark the standard variant true, even if no filter is provided - this looks ok for startup, as the text shown to the user 
+				// - or for any manifest setting but "never"
+				//		(Remark: "ifAnyFilterExist" leads to mark the standard variant true, even if no filter is provided - this looks ok for startup, as the text shown to the user
 				//		contains the condition, but if reselecting the standard variant, it  will also select without filters!
 				//		TODO: check, how to solve that inconsistency)
 				// - but in both cases not, if a mandatory filter is missing

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

@@ -43,7 +43,7 @@ MESSAGE_SINGLE_VALUE_L_FORM=O filtro "{0}" n\u00E3o \u00E9 relevante para a fich
 
 MESSAGE_SINGLE_VALUE_S_FORM=N\u00E3o \u00E9 poss\u00EDvel filtrar por "{0}" na ficha "{1}".
 
-MULTI_EDIT=Processar
+MULTI_EDIT=Editar
 
 MULTI_EDIT_DIALOG_TITLE=Editar ({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.136.6"
+			"version": "1.136.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -190,7 +190,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 						return accBlock;
 					}, [])
 					.forEach(function(entry) {
-						if (!oSubSectionInfoObject) {
+						if (!oSubSectionInfoObject || (entry.getGroups().length === 1 && entry.getGroups()[0].getTitle && !entry.getGroups()[0].getTitle())) {
 							// Case: header is editable. manifest.json, editableHeaderContent=true
 							var sInvisibleTextID = `${entry.getId()}-ariaLabelBy-InvisibleText`,
 								oInvisibleText = Element.getElementById(sInvisibleTextID);

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pt.properties

@@ -189,7 +189,7 @@ CREATE_DIALOG_TITLE=Item novo
 
 DELETE_WITH_OBJECTINFO=Eliminar este objeto ({1} {2})?
 
-DELETE_WITH_OBJECTTITLE=Eliminar objeto {0}?
+DELETE_WITH_OBJECTTITLE=Excluir objeto {0}?
 
 SHOW_SIDE_CONTENT=Exibir detalhes
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_vi.properties

@@ -229,8 +229,8 @@ ENTER_MANDATORY=Nh\u1EADp gi\u00E1 tr\u1ECB cho tr\u01B0\u1EDDng {0}.
 
 REQUIRED_PROP_ERROR=Nh\u1EADp gi\u00E1 tr\u1ECB.
 
-REQUIRED_PROP_COLUMN_HIDDEN_ERROR=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p ba\u0309ng.
-REQUIRED_PROP_COLUMN_HIDDEN_ERROR_PLURAL=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p ba\u0309ng.
+REQUIRED_PROP_COLUMN_HIDDEN_ERROR=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p m\u00E0n h\u00ECnh.
+REQUIRED_PROP_COLUMN_HIDDEN_ERROR_PLURAL=Ba\u0309ng ch\u01B0\u0301a l\u00F4\u0303i. {0} la\u0300 gi\u00E1 tr\u1ECB b\u0103\u0301t bu\u00F4\u0323c nh\u01B0ng kh\u00F4ng \u0111\u01B0\u01A1\u0323c hi\u00EA\u0309n thi\u0323 trong ba\u0309ng. Vui lo\u0300ng th\u00EAm gi\u00E1 tr\u1ECB trong thi\u00EA\u0301t l\u00E2\u0323p m\u00E0n h\u00ECnh.
 
 T_PAGINATOR_CONTROL_PAGINATOR_TOOLTIP_UP=Mu\u0323c tr\u01B0\u01A1\u0301c
 

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

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

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartForm.fragment.xml

@@ -21,7 +21,7 @@
 			<core:CustomData key="defaultDropDownDisplayBehaviour" value="descriptionOnly" />
 			<core:CustomData key="defaultTextInEditModeSource" value="ValueListNoValidation" />
 			<core:CustomData key="dateFormatSettings" value='\{"UTC":true,"style":"medium"\}' />
-			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'}], formatter: 'AH.getSmartFormTitle'}" />
+			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'},  {path: 'block>'}, {path: 'subSectionData>'}], formatter: 'AH.getSmartFormTitle'}" />
 		</sfo:customData>
 		<sfo:layout>
 			<template:if test="{= ${appSettings>/useColumnLayoutForSmartForm} !== false}">

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

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

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

@@ -3017,7 +3017,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				};
 			}
 		},
-		getTextArrangement: function (oEntityType, oField) {
+		getTextArrangementFromAnnotations: function (oEntityType, oField) {
 			var sTextArrangement;
 			// 1. check TextArrangement definition for property directly - has prio 1
 			if (oField["com.sap.vocabularies.UI.v1.TextArrangement"] && oField["com.sap.vocabularies.UI.v1.TextArrangement"].EnumMember) {
@@ -3036,11 +3036,19 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					sTextArrangement = oAnnotationHelper._mapTextArrangement4smartControl(oEntityType["com.sap.vocabularies.UI.v1.TextArrangement"].EnumMember);
 				}
 			}
+			return sTextArrangement;
+		},
+		getTextArrangement: function(oEntityType, oField) {
+			var sTextArrangement = this.getTextArrangementFromAnnotations(oEntityType, oField);
 			if (!sTextArrangement) { //coming from the title should get a readable description and underneath is the id - the default
 				sTextArrangement = "descriptionAndId";
 			}
 			return sTextArrangement;
 		},
+		getTextArrangementForEasyFilter: function (oEntityType, oField) {
+			var sTextArrangement = this.getTextArrangementFromAnnotations(oEntityType, oField) || "idAndDescription";
+			return sTextArrangement;
+		},
 		getTextArrangementPath: function (oField) {
 			return oField["com.sap.vocabularies.Common.v1.Text"] && oField["com.sap.vocabularies.Common.v1.Text"].Path;
 		},
@@ -4524,10 +4532,31 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			};
 		},
 
-		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName) {
+		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName, oBlock, oSubSectionData) {
 			if (!oFacet) {
+				return oAnnotationHelper.getTitleForSectionsForms(oBlock, oSubSectionData);
+			}
+			return oAnnotationHelper.getTitleForHeaderForm(oInterface, oFacet, sEntitySetName);
+		},
+
+		getTitleForSectionsForms: function(oBlock, oSubSectionData) {
+			if (oSubSectionData?.annotations?.Facet?.annotation?.Facets?.length > 1
+				|| oSubSectionData?.annotations?.Facet?.annotation?.Label?.String !== oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String
+			) {
+				// In case Section -> SubSection have more than one form, SmartForm will have it's titles visible
+				// or
+				// SubSectin title !== SmartForm title, SmartForm title will also be visible
 				return;
 			}
+			if (oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String !==  oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String) {
+				// Compare SmartForm title !== FiledGroup title
+				// if they differs -> use FiledGoup title
+				return oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String;
+			}
+			return;
+		},
+
+		getTitleForHeaderForm: function(oInterface, oFacet, sEntitySetName) {
 			if (oFacet.Target && oFacet.Target.AnnotationPath && oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.DataPoint") > -1) {
 				// Process DataPoint case
 				var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);

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

@@ -950,7 +950,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.136.6
+	 * @version 1.136.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/ai/EasyFilterBarHandler.js

@@ -5,8 +5,9 @@ sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
     "sap/ui/model/FilterOperator",
     'sap/ui/model/Filter',
-    'sap/suite/ui/generic/template/js/AnnotationHelper'
-], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper) {
+    'sap/suite/ui/generic/template/js/AnnotationHelper',
+    "./EasyFilterDataFetcherHelper"
+], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper,EasyFilterDataFetcherHelper) {
     'use strict';
 
     /*
@@ -305,24 +306,28 @@ sap.ui.define([
                     // keySpecificSelectedValues will have one selectedValues object for each operator
                     // ex : [{operator: "EQ", selectedValues: ["HT-1010","HT-10001","1097"]}, {operator: "Contains", selectedValues: ["HT-100"]}]
                     oFilterItem.keySpecificSelectedValues.forEach(function (oSelectedValues) {
-                        var oRange = {
-                            Sign: "I", // currently not considering "E"
-                            High: ""
-                        };
-
                         if ((oSelectedValues.operator === "BT" || oSelectedValues.operator === "NB")) {
+                            var oRange = {
+                                Sign: oSelectedValues.operator === "NB" ? "E" : "I",
+                                High: ""
+                            };
                             oRange.Low = oSelectedValues.selectedValues[0];
                             oRange.High = oSelectedValues.selectedValues[1];
-                            oRange.Option = oSelectedValues.operator;
+                            oRange.Option = "BT";
                             oFilter.Ranges.push(oRange);
                         } else {
-                            oSelectedValues.selectedValues.forEach(function (oValue) {
-                                if (oSelectedValues.operator === "Contains") { // need to check for other operators if special handling is required
+                            oSelectedValues.selectedValues.forEach(function (sValue) {
+                                var oRange = {
+                                    Sign: EasyFilterDataFetcherHelper.isNegationOperator(oSelectedValues.operator) ? "E" : "I",
+                                    High: ""
+                                };
+
+                                if (isCPOperator(oSelectedValues.operator)) {
                                     oRange.Option = "CP";
-                                    oRange.Low = oValue;
+                                    oRange.Low = getValueForCPOperator(sValue,oSelectedValues.operator);
                                 } else {
-                                    oRange.Option = oSelectedValues.operator;
-                                    oRange.Low = oValue;
+                                    oRange.Option = EasyFilterDataFetcherHelper.isNegationOperator(oSelectedValues.operator) ? EasyFilterDataFetcherHelper.getReverseOperator(oSelectedValues.operator) : oSelectedValues.operator;
+                                    oRange.Low = sValue;
                                 }
                                 oFilter.Ranges.push(oRange);
                             });
@@ -338,6 +343,29 @@ sap.ui.define([
             };
         }
 
+        function getValueForCPOperator(sValue,sOperator) {
+            sOperator = EasyFilterDataFetcherHelper.isNegationOperator(sOperator) ? EasyFilterDataFetcherHelper.getReverseOperator(sOperator) : sOperator;
+            switch (sOperator) {
+                case FilterOperator.Contains:
+                    sValue = `*${sValue}*`;
+                    break;
+                case FilterOperator.EndsWith:
+                    sValue = `*${sValue}`;
+                    break;
+                case FilterOperator.StartsWith:
+                    sValue = `${sValue}*`;
+                    break;
+                default:
+                    break;
+            }
+            return sValue;
+        }
+
+        function isCPOperator(sOperator) {
+            return sOperator === FilterOperator.Contains || sOperator === FilterOperator.EndsWith || sOperator === FilterOperator.NotContains || sOperator === FilterOperator.NotEndsWith
+            || sOperator === FilterOperator.NotStartsWith || sOperator === FilterOperator.StartsWith;
+        }
+
         /**
          * This method is used to get the EasyFilter control from the floorplan
          * @returns EasyFilter control
@@ -403,7 +431,6 @@ sap.ui.define([
             if (oSmartFilterBarVariant.semanticDates) {
                 var { Low: value1, High: value2 } = oVariantDataFromAI.aSelectOptions[0].Ranges[0];
                 var dateData = oSmartFilterBarVariant.semanticDates.Dates[0].Data;
-            
                 dateData.operation = "DATERANGE";
                 dateData.value1 = value1;
                 dateData.value2 = value2 || value1;
@@ -513,191 +540,10 @@ sap.ui.define([
             }
         }
 
-        function getFiltersForDataFetching(key,keySpecificSelectedResult) {
-            const aFilters = [];
-
-            for (var i = 0; i < keySpecificSelectedResult.length;++i) {
-                    const result = keySpecificSelectedResult[i];
-                    if (result.operator === FilterOperator.BT || result.operator === FilterOperator.NB) {
-                        aFilters.push(new Filter({
-                            path: key,
-                            operator: result.operator,
-                            value1: result.selectedValues[0],
-                            value2: result.selectedValues[1]
-                        }));
-                    } else {
-                        for (var i = 0;i < result.selectedValues.length;++i) {
-                            aFilters.push(new Filter({
-                                path: key,
-                                operator: result.operator,
-                                value1: result.selectedValues[i]
-                            }));
-                        }
-                    }
-            }
-            return aFilters;
-        }
-
         function onDataFetcher(key,keySpecificSelectedResult,totalAIResponse) {
-            return new Promise((resolve,reject)=>{
-
-            var aFinalResponse = [];
-            var oOwnerFilterControl = oState.oSmartFilterbar;
-            var sKey = key;
-            var sEntitySet = oController.getOwnerComponent().getEntitySet();
-            var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
-            var oSFBModel = oOwnerFilterControl.getModel();
-            var oSFBMetaModel = oSFBModel.getMetaModel();
-            var aFilters = getFiltersForDataFetching(key,keySpecificSelectedResult);
-            var oProperty = oSFBMetaModel.getODataProperty(oEntityType, key);
-            var sPropertyPath = oSFBMetaModel.getODataProperty(oEntityType, key,true);
-            var isValueHelpTableAvailable = AnnotationHelper.isValueHelpTableAvailable(oProperty);
-
-            if (isValueHelpTableAvailable) {
-                var oPropertyContext = oSFBMetaModel.createBindingContext(sPropertyPath);
-                var oVHPromise = oSFBMetaModel.getODataValueLists(oPropertyContext);
-                var filtersLength = aFilters.length;
-                // //Every Search on a value, create a seperate call to backend,but they are grouped into one batch
-                // //We need to ensure that once all calls are completed inside the batch to resolve the promise, else the system would be waiting indefenitely
-                var ctr = 0;
-                let fnForDescription = (oResponse,aMatchedFilterResults,sTextArrangementPath,sTextArrangement) => {
-                    ++ctr;
-                    var aResults = oResponse.results;
-
-                    //Check the description is present and follow the textArrangement annotation as well
-                    //If the value is not present ,make the ID and Description same
-                    aMatchedFilterResults.forEach((oFilter)=>{
-                        var result = aResults.find((res)=>res[key] === oFilter.getValue1());
-                        if (result) {
-                            aFinalResponse.push({
-                                operator: FilterOperator.EQ,
-                                selectedValues: [{
-                                    value: result[key],
-                                    description: AnnotationHelper.getTextArrangementFinalString(result,key,sTextArrangementPath.split("/")[1],sTextArrangement)
-                                   }]
-                            });
-                        } else {
-                            //Ideally description should be present, if in case its not present we will fallback to our default case where value and description would be same
-                            aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter));
-                        }
-                    });
-
-                    if (ctr === filtersLength) {
-                        resolve(aFinalResponse);
-                    }
-                };
-
-                
-                
-                let fnSuccessForValueList = (oResponse,oFilter,sValueListEntity) => {
-                    var oValueHelpEntity = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sValueListEntity);
-                    var oValueHelpProperty = oSFBMetaModel.getODataProperty(oValueHelpEntity, key);
-                    var aResults = oResponse.results;
-                    var sTextArrangementPath = AnnotationHelper.getTextArrangementPath(oValueHelpProperty);
-                    var sTextArrangement = AnnotationHelper.getTextArrangement(oValueHelpEntity,oValueHelpProperty) || "idOnly";
-                    var navigationProperty = null;
-                    var sEntityForTextDescription = null;
-                    
-                    if (sTextArrangementPath && sTextArrangementPath.split("/").length > 1) {
-                        navigationProperty = sTextArrangementPath.split("/")[0];
-                        sEntityForTextDescription = oSFBMetaModel.getODataAssociationSetEnd(oValueHelpEntity,navigationProperty).entitySet;
-                    }
-
-                    //We are triggering the below call, only for fetching of the TextDescription.If its a different entity than ValueList only then trigger it
-                    if (aResults.length === 0) {
-                        ++ctr;
-                        aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter));
-                    } else if (aResults.length !== 0 && sEntityForTextDescription && sValueListEntity !== sEntityForTextDescription) {
-                        var aAllMatchedResults = aResults.map((result)=>{
-                            return result[key];
-                        });
-                       var aMatchedFilterResults = aAllMatchedResults.map((matchedResult)=>{
-                            return new Filter({
-                                path: key,
-                                operator: FilterOperator.EQ,
-                                value1:matchedResult
-                            });
-                       });
-                       // The below code only be executed when the textDescription and ValueList entities are different  
-                       oSFBModel.read("/" + sEntityForTextDescription, {
-                        filters: aMatchedFilterResults,
-                        success : function(response) {
-                                fnForDescription(response,aMatchedFilterResults);
-                            }
-                        });
-                    } else {
-                        //The below condition is when valueList entity and navigation property entity are same
-                        ++ctr;
-                        aResults.forEach((result)=>{
-                            aFinalResponse.push({
-                                operator: FilterOperator.EQ,
-                                selectedValues: [{
-                                    value: result[key],
-                                    description: AnnotationHelper.getTextArrangementFinalString(result,key,
-                                    sTextArrangementPath,sTextArrangement)
-                                   }]
-                            });
-                        });
-                    }
-
-                    if (ctr === filtersLength) {
-                        resolve(aFinalResponse);
-                    }
-                };
-
-                oVHPromise.then((oValueList)=>{
-                var oValueListDefaultBinding = oValueList[""];
-                var sValueListEntity = oValueListDefaultBinding.CollectionPath.String;
-                if (Array.isArray(oValueListDefaultBinding.Parameters)) {
-                    var oParameter = oValueListDefaultBinding.Parameters.find(oParam => (oParam.RecordType === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" && oParam.LocalDataProperty.PropertyPath === sKey));
-                if (oParameter) {    
-                    key = oParameter.ValueListProperty.String; 
-                    }
-                }
-                    //Get All Records using $search
-                    aFilters.forEach((oFilter)=>{
-                        oSFBModel.read("/" + sValueListEntity, {
-                            urlParameters : {
-                                search: oFilter.getValue1()
-                            },
-                            success : function(response) {
-                                fnSuccessForValueList(response,oFilter,sValueListEntity);
-                            }
-                        });
-                    });
-                });
-
-            } else {
-                //When there is no valueList associate, just return the original value in CodeList type
-                aFilters.forEach((oFilter)=>aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter)));
-                resolve(aFinalResponse);
-            }
-        });
-    }
-
-         function getkeySpecifiedResultFromFilters(oFilter) {
-            var values = [];
-            if (oFilter.getOperator() === FilterOperator.BT || oFilter.getOperator() === FilterOperator.NB) {
-                var values = [{
-                    value: oFilter.getValue1(),
-                    description: oFilter.getValue1()
-                },{
-                    value: oFilter.getValue2(),
-                    description: oFilter.getValue2()
-                }];
-            } else {
-                values.push({
-                    value: oFilter.getValue1(),
-                    description: oFilter.getValue1()
-                });
-            }
-            return {
-                operator: oFilter.getOperator(),
-                selectedValues: values
-            };
+            return EasyFilterDataFetcherHelper.fetchDataForKey(key, keySpecificSelectedResult, oState, oController, oTemplateUtils);
         }
 
-
         return {
             getEasyFilterBar : fnGetEasyFilterBar,
             initialiseEasyFilterBar : fnInitialiseEasyFilterBar,
@@ -711,8 +557,7 @@ sap.ui.define([
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,
-            onDataFetcher,
-            getkeySpecifiedResultFromFilters
+            onDataFetcher
         };
     }
 
@@ -721,5 +566,5 @@ sap.ui.define([
             extend(this, getMethods(oState, oController, oTemplateUtils));
         }
     });
-    
+
 });

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

@@ -0,0 +1,334 @@
+sap.ui.define([
+    'sap/ui/model/FilterOperator',
+    'sap/ui/model/Filter',
+    'sap/suite/ui/generic/template/js/AnnotationHelper'
+], function(FilterOperator, Filter, AnnotationHelper) {
+    'use strict';
+
+    const mReverseOperator = {};
+    fillReverseOperator();
+
+    function fillReverseOperator() {
+        mReverseOperator[FilterOperator.EQ] = FilterOperator.NE;
+        mReverseOperator[FilterOperator.Contains] = FilterOperator.NotContains;
+        mReverseOperator[FilterOperator.EndsWith] = FilterOperator.NotEndsWith;
+        mReverseOperator[FilterOperator.StartsWith] = FilterOperator.NotStartsWith;
+        mReverseOperator[FilterOperator.BT] = FilterOperator.NB;
+
+        mReverseOperator[FilterOperator.NE] = FilterOperator.EQ;
+        mReverseOperator[FilterOperator.NotContains] = FilterOperator.Contains;
+        mReverseOperator[FilterOperator.NotEndsWith] = FilterOperator.EndsWith;
+        mReverseOperator[FilterOperator.NotStartsWith] = FilterOperator.StartsWith;
+        mReverseOperator[FilterOperator.NB] = FilterOperator.BT;
+    }
+
+    function getFiltersForDataFetching(sKey, keySpecificSelectedResult) {
+        const aFilters = [];
+
+        for (let i = 0; i < keySpecificSelectedResult.length; ++i) {
+            const result = keySpecificSelectedResult[i];
+            if (result.operator === FilterOperator.BT || result.operator === FilterOperator.NB) {
+                aFilters.push(new Filter({
+                    path: sKey,
+                    operator: result.operator,
+                    value1: result.selectedValues[0],
+                    value2: result.selectedValues[1]
+                }));
+            } else {
+                for (let j = 0; j < result.selectedValues.length; ++j) {
+                    aFilters.push(new Filter({
+                        path: sKey,
+                        operator: result.operator,
+                        value1: result.selectedValues[j]
+                    }));
+                }
+            }
+        }
+        return aFilters;
+    }
+
+    function isComparitveOperator(sFilter) {
+        return sFilter === FilterOperator.BT || sFilter === FilterOperator.NB ||
+               sFilter === FilterOperator.GT || sFilter === FilterOperator.LT ||
+               sFilter === FilterOperator.GE || sFilter === FilterOperator.LE;
+    }
+
+    function isNegationOperator(sOperator) {
+        return sOperator === FilterOperator.NE || sOperator === FilterOperator.NotContains ||
+               sOperator === FilterOperator.NotEndsWith || sOperator === FilterOperator.NotStartsWith ||
+               sOperator === FilterOperator.NB;
+    }
+
+    function getkeySpecifiedResultFromFilters(oFilter) {
+        let values = [];
+        if (oFilter.getOperator() === FilterOperator.BT || oFilter.getOperator() === FilterOperator.NB) {
+            values = [{
+                value: oFilter.getValue1(),
+                description: oFilter.getValue1()
+            },{
+                value: oFilter.getValue2(),
+                description: oFilter.getValue2()
+            }];
+        } else {
+            values.push({
+                value: oFilter.getValue1(),
+                description: oFilter.getValue1()
+            });
+        }
+        return {
+            operator: oFilter.getOperator(),
+            selectedValues: values
+        };
+    }
+
+    async function fetchRecordsFromValueList(oValueList, oFilter, sKey, oSFBModel,oTemplateUtils) {
+        return new Promise((resolve, reject) => {
+            let oValueListDefaultBinding = oValueList[""];
+            let sValueListEntity = oValueListDefaultBinding.CollectionPath.String;
+
+            if (Array.isArray(oValueListDefaultBinding.Parameters)) {
+                let oParameter = oValueListDefaultBinding.Parameters.find(oParam => (oParam.RecordType === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" && oParam.LocalDataProperty.PropertyPath === sKey));
+                if (oParameter) {
+                    sKey = oParameter.ValueListProperty.String;
+                }
+            }
+
+            let bIsNotOperator = isNegationOperator(oFilter.getOperator());
+            if (bIsNotOperator) {
+                oFilter = new Filter({
+                    path: sKey,
+                    operator: mReverseOperator[oFilter.getOperator()],
+                    value1: oFilter.getValue1()
+                });
+            } else {
+                oFilter = new Filter({
+                    path: sKey,
+                    operator: oFilter.getOperator(),
+                    value1: oFilter.getValue1()
+                });
+            }
+
+            oSFBModel.read("/" + sValueListEntity, {
+                filters: [oFilter],
+                success: async function(oResponse) {
+                    const aResults = oResponse.results;
+                    let aResponse;
+                    try {
+                        if (aResults.length > 0) {
+                            aResponse = await getDescriptionForResponse(oResponse.results, sValueListEntity, sKey, oSFBModel,oTemplateUtils,oFilter);
+                        } else {
+                            aResponse = await fetchRecordsFromValueListUsingFuzzySearch(sValueListEntity, oFilter, sKey, oSFBModel,oTemplateUtils);
+                        }
+                        resolve({
+                            operator: (bIsNotOperator) ? mReverseOperator[oFilter.getOperator()] : oFilter.getOperator(),
+                            selectedValues: aResponse
+                        });
+                    } catch (error) {
+                        reject(error);
+                    }
+                },
+                error: async function(oError) {
+                    //If the error is because of some property validation, we can try to do a fuzzy search
+                    try {
+                        const aResponse = await fetchRecordsFromValueListUsingFuzzySearch(sValueListEntity, oFilter, sKey, oSFBModel,oTemplateUtils);
+                        resolve({
+                            operator: (bIsNotOperator) ? mReverseOperator[oFilter.getOperator()] : oFilter.getOperator(),
+                            selectedValues: aResponse
+                        });
+                    } catch (error) {
+                        reject(error);
+                    }
+                }
+            });
+        });
+    }
+
+    async function fetchRecordsFromValueListUsingFuzzySearch(sValueListEntity, oFilter, sKey, oSFBModel,oTemplateUtils) {
+        return new Promise((resolve, reject) => {
+            oSFBModel.read("/" + sValueListEntity, {
+                urlParameters: {
+                    search: oFilter.getValue1()
+                },
+                success: async function(oResponse) {
+                    let aResults = oResponse.results;
+                    if (aResults.length == 0) {
+                        //If it dosent have any records, the return the original value
+                        resolve([{
+                            value: oFilter.getValue1(),
+                            description: oFilter.getValue1()
+                        }]);
+                    } else {
+                        try {
+                            aResults = await getDescriptionForResponse(aResults, sValueListEntity, sKey, oSFBModel,oTemplateUtils,oFilter);
+                            resolve(aResults);
+                        } catch (oError) {
+                            reject(oError);
+                        }
+                    }
+                },
+                error: function(oError) {
+                    reject(oError);
+                }
+            });
+        });
+    }
+
+    function performClientSideSearch(aResults, oFilter,sKey,sDescriptionField) {
+        if (!sKey || !sDescriptionField) {
+            return aResults;
+        }
+        if (oFilter.getOperator() === FilterOperator.EQ || oFilter.getOperator() === FilterOperator.NE) {
+            const aFilteredResults = aResults.filter(result => result[sKey].toString().toLowerCase() === oFilter.getValue1().toString().toLowerCase() || result[sDescriptionField].toString().toLowerCase() === oFilter.getValue1().toString().toLowerCase());
+            return aFilteredResults.length > 0 ? aFilteredResults : aResults;
+        }
+        return aResults;
+    }
+
+    async function getDescriptionForResponse(aResults, sValueListEntity, sKey, oSFBModel, oTemplateUtils,oFilter) {
+        return new Promise((resolve, reject) => {
+            const aResultsWithTextArrangement = [];
+
+            let oSFBMetaModel = oSFBModel.getMetaModel();
+            let oValueHelpEntity = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sValueListEntity);
+            let oValueHelpProperty = oSFBMetaModel.getODataProperty(oValueHelpEntity, sKey);
+            let sTextArrangementPath = AnnotationHelper.getTextArrangementPath(oValueHelpProperty);
+            let sTextArrangement = AnnotationHelper.getTextArrangementForEasyFilter(oValueHelpEntity, oValueHelpProperty);
+            let navigationProperty = null;
+            let sEntityForTextDescription = sValueListEntity;
+
+            if (sTextArrangementPath && sTextArrangementPath.split("/").length > 1) {
+                navigationProperty = sTextArrangementPath.split("/")[0];
+                sEntityForTextDescription = oSFBMetaModel.getODataAssociationSetEnd(oValueHelpEntity, navigationProperty).entitySet;
+                sTextArrangementPath = sTextArrangementPath.split("/")[1];
+            }
+
+            aResults = performClientSideSearch(aResults, oFilter,sKey,sTextArrangementPath);
+
+            if (sValueListEntity === sEntityForTextDescription) {
+                aResults.forEach((result) => {
+                    aResultsWithTextArrangement.push({
+                        value: result[sKey],
+                        description: AnnotationHelper.getTextArrangementFinalString(result, sKey, sTextArrangementPath, sTextArrangement)
+                    });
+                });
+                resolve(aResultsWithTextArrangement);
+            } else {
+                let aAllMatchedResults = aResults.map((result) => {
+                    return result[sKey];
+                });
+                let aMatchedFilterResults = aAllMatchedResults.map((matchedResult) => {
+                    return new Filter({
+                        path: sKey,
+                        operator: FilterOperator.EQ,
+                        value1: matchedResult
+                    });
+                });
+
+                // The below code only be executed when the textDescription and ValueList entities are different
+                oSFBModel.read("/" + sEntityForTextDescription, {
+                    filters: aMatchedFilterResults,
+                    success: function(oResponse) {
+                        let aResults = oResponse.results;
+
+                        aMatchedFilterResults.forEach((oFilter) => {
+                            let result = aResults.find((res) => res[sKey] === oFilter.getValue1());
+                            aResultsWithTextArrangement.push({
+                                value: oFilter.getValue1(),
+                                description: (result) ? AnnotationHelper.getTextArrangementFinalString(result, sKey, sTextArrangementPath, sTextArrangement) : oFilter.getValue1()
+                            });
+                        });
+                        resolve(aResultsWithTextArrangement);
+                    },
+                    error: function(oError) {
+                        reject(oError);
+                    }
+                });
+            }
+        });
+    }
+
+        /**
+         * The primary responsibility of this function is to convert the given values into their corresponding
+         * IDs and Descriptions, respecting the defined TextArrangement.
+         *
+         * This process is carried out in two phases:
+         *
+         *  Fetching the ID:
+         *  1) Make a $filter call using the provided value and operator.
+         *     - If this returns results, we proceed to fetch the corresponding descriptions for these IDs.
+         *  2) If no results are returned, make a $search (fuzzy search) call instead.
+         *
+         *  Fetching the Description:
+         *  1) The description is determined by the sap:text/com.sap.vocabularies.UI.v1.TextArrangement
+         *     annotation of the ValueHelp entity, not from the main entity.
+         *  2) To fetch the description, we use a $filter call, since the IDs were already retrieved in the first step.
+         *
+         * Edge cases with negation operators:
+         *  1) For negation operators such as NB, NotStartsWith, etc., we make a batch call using the
+         *     positive equivalent of these operators (e.g., BT, StartsWith).
+         *  2) After receiving the results, we return them with the original negation operator
+         *     (e.g., NB, NotStartsWith).
+        */
+
+    function fetchDataForKey(sKey, keySpecificSelectedResult, oState, oController, oTemplateUtils) {
+        return new Promise(async(resolve, reject) => {
+            try {
+                const aFinalResponse = [];
+                const oOwnerFilterControl = oState.oSmartFilterbar;
+                const sEntitySet = oController.getOwnerComponent().getEntitySet();
+                const oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
+                const oSFBModel = oOwnerFilterControl.getModel();
+                const oSFBMetaModel = oSFBModel.getMetaModel();
+                const aFilters = getFiltersForDataFetching(sKey, keySpecificSelectedResult);
+                const oProperty = oSFBMetaModel.getODataProperty(oEntityType, sKey);
+                const sPropertyPath = oSFBMetaModel.getODataProperty(oEntityType, sKey, true);
+                const isValueHelpTableAvailable = AnnotationHelper.isValueHelpTableAvailable(oProperty);
+
+                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);
+                }
+
+                // Get value help lists from metadata
+                const oPropertyContext = oSFBMetaModel.createBindingContext(sPropertyPath);
+                const oValueList = await oSFBMetaModel.getODataValueLists(oPropertyContext);
+
+                // Process each filter in parallel
+                const pPromises = [];
+
+                for (const oFilter of aFilters) {
+                    if (isComparitveOperator(oFilter.getOperator())) {
+                        // For comparative operators, just add the original values
+                        aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter));
+                    } else {
+                        // For other operators, fetch records from value list
+                        pPromises.push(fetchRecordsFromValueList(oValueList, oFilter, sKey, oSFBModel, oTemplateUtils));
+                    }
+                }
+
+                // Wait for all promises to resolve
+                if (pPromises.length > 0) {
+                    const aResponses = await Promise.all(pPromises);
+                    aResponses.forEach(aResponse => {
+                        aFinalResponse.push(aResponse);
+                    });
+                }
+
+                resolve(aFinalResponse);
+            } catch (error) {
+                reject(error); // Re-throw to allow caller to handle
+            }
+        });
+    }
+
+    return {
+        fetchDataForKey: fetchDataForKey,
+        getFiltersForDataFetching: getFiltersForDataFetching,
+        isComparitveOperator: isComparitveOperator,
+        isNegationOperator: isNegationOperator,
+        getReverseOperator: function(operator) {
+            return mReverseOperator[operator];
+        }
+    };
+});

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

@@ -37,7 +37,7 @@ DATA_LOSS_DISCARD_CHANGES=Kass\u00E9r \u00E6ndringer
 
 ST_KEEP_DRAFT_BTN=Behold udkast
 
-ST_DISCARD_DRAFT_BTN=Kass\u00E9r udkast
+ST_DISCARD_DRAFT_BTN=Kasser udkast
 
 ST_UNSAVED_CHANGES_TITLE=Ikkegemte \u00E6ndringer
 

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

@@ -271,7 +271,7 @@ NOITEMS_SMARTCHART=Tidak ditemukan data.
 
 NOITEMS_LR_SMARTCHART=Tidak ada data untuk tampilan bagan dan kriteria filter yang dipilih.
 
-NOITEMS_SMARTCHART_WITH_FILTER=Data tak ada. Ubah parameter filter.
+NOITEMS_SMARTCHART_WITH_FILTER=Data tidak ditemukan. Coba sesuaikan parameter filter.
 
 SMARTCHART_INITIAL_NODATA=Untuk memulai, tetapkan filter yang relevan, pilih "Masuk".
 
@@ -424,9 +424,9 @@ RTA_DEFAULT_FILTER_MODE=Mode Filter Default
 
 RTA_DEFAULT_FILTER_MODE_DESC=Mode Filter Default
 
-RTA_SELECTION_MODE=Mode Pilihan
+RTA_SELECTION_MODE=Mode Pemilihan
 
-RTA_SELECTION_MODE_DESC=Tentukan mode pilihan
+RTA_SELECTION_MODE_DESC=Tentukan mode pemilihan
 
 RTA_OP_EDITABLE_HEADER_CONTENT=Konten Header yang Dapat Diedit
 

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

@@ -1,5 +1,5 @@
 
-ST_GENERIC_DRAFT_WITH_ACTIVE_DOCUMENT_DELETED=\uBCC0\uACBD \uC0AC\uD56D\uC774 \uBB34\uC2DC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
+ST_GENERIC_DRAFT_WITH_ACTIVE_DOCUMENT_DELETED=\uBCC0\uACBD\uC0AC\uD56D\uC774 \uBB34\uC2DC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 
 ST_GENERIC_DRAFT_WITHOUT_ACTIVE_DOCUMENT_DELETED=\uB4DC\uB798\uD504\uD2B8\uAC00 \uBB34\uC2DC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 

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

@@ -244,7 +244,7 @@ ST_GENERIC_DELETE_SELECTED=Eliminar este objeto?
 
 DELETE_WITH_OBJECTINFO=Eliminar este objeto ({1} {2})?
 
-DELETE_WITH_OBJECTTITLE=Eliminar objeto {0}?
+DELETE_WITH_OBJECTTITLE=Excluir objeto {0}?
 
 ST_GENERIC_OBJECT_DELETED=O objeto foi exclu\u00EDdo.
 

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

@@ -3216,7 +3216,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.6
+	 * @version 1.136.8
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartTableHandler.js

@@ -580,7 +580,7 @@ sap.ui.define([
 			const getFieldProps = function (sField) {
 				return {
 					"sProperty": sField,
-					"sLabel": mPropertyByFieldName[sField]["sap:label"],
+					"sLabel": (mPropertyByFieldName[sField]["com.sap.vocabularies.Common.v1.Label"] || "").String || mPropertyByFieldName[sField]["sap:label"] || "",
 					"sValue": oItemContext.getProperty(sField),
 					"bHidden": !aVisibleColumns.has(sField)
 				};

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

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