@sapui5/sap.suite.ui.generic.template 1.139.0 → 1.139.1

package/package.json

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

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

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

@@ -1938,6 +1938,7 @@ sap.ui.define([
 							oState.oSectionTitleHandler.adjustSubSectionTitle(oSubSection);
 							// Add accessible name to the SmartForm in the first subsection if all titles are hidden, because accessible name will not propogate to the form control
 							oState.oSectionTitleHandler.addAccessibleName(oSubSection);
+							oState.oSectionTitleHandler.setHeaderSmartFormAriaLabelBy(oSubSection);
 						}
 					}
 

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

@@ -1,6 +1,6 @@
 sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/library",
-		"sap/suite/ui/generic/template/genericUtilities/FeLogger"
-	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger) {
+		"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/ui/core/Element", "sap/ui/core/InvisibleText"
+	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger, Element, InvisibleText) {
 		"use strict";
 
 		var STYLE_CLASS_FOR_ADJUSTMENT = "sapUiTableOnObjectPageAdjustmentsForSection";
@@ -174,9 +174,8 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				oSmartForm.addAriaLabelledBy(sAnchorBarSectionHeaderId);
 			}
 
-			function fnManageAccessability(oFirstSubSection) {
-				var oSubSectionInfoObject = oTemplateUtils.oInfoObjectHandler.getControlInformation(oFirstSubSection.getId()),
-					oSection = oFirstSubSection.getParent();
+			function fnSetHeaderSmartFormAriaLabelBy(oFirstSubSection) {
+				var oSubSectionInfoObject = oTemplateUtils.oInfoObjectHandler.getControlInformation(oFirstSubSection.getId());
 				oFirstSubSection.getBlocks().concat(oFirstSubSection.getMoreBlocks())
 					.reduce(function(accBlock, currentBlock) {
 						if (!currentBlock.getContent || !currentBlock.getContent() || !currentBlock.getContent().length) {
@@ -191,14 +190,19 @@ 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
-							entry._suggestTitleId(`${oSection.getId()}-title`); // set Section title id that will be used for aria
-							return;
-						}
-						if (entry.getGroups().length === 1 && entry.getGroups()[0].getTitle && !entry.getGroups()[0].getTitle()) {
-							// Case: Section -> one SubSection -> one SmartForm -> one Group. Title is not displayed in this case
-							entry._suggestTitleId(`${oFirstSubSection.getId()}-headerTitle`); // set title to SubSection title id that will be used for aria
+							var sInvisibleTextID = `${entry.getId()}-ariaLabelBy-InvisibleText`,
+								oInvisibleText = Element.getElementById(sInvisibleTextID);
+							if (!oInvisibleText) {
+								var customData = !entry.getCustomData() ? [] : entry.getCustomData().filter(function(entry) {return entry.getKey() === "smartFormAriaLabel";});
+								if (customData.length && customData[0].getValue()) {
+									oInvisibleText = new InvisibleText({id : sInvisibleTextID, text: customData[0].getValue()}).toStatic();
+								}
+							}
+							if (oInvisibleText) {
+								entry._suggestTitleId(oInvisibleText.getId()); // set Section title id that will be used for aria
+							}
 							return;
 						}
 					});
@@ -209,7 +213,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				setAsTitleOwner: fnSetAsTitleOwner,
 				adjustSubSectionTitle: fnAdjustSubSectionTitle,
 				addAccessibleName: fnAddAccessibleName,
-				manageAccessability: fnManageAccessability
+				setHeaderSmartFormAriaLabelBy: fnSetHeaderSmartFormAriaLabelBy
 			};
 		}
 

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

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

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

@@ -21,12 +21,13 @@
 			<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'},  {path: 'block>'}, {path: 'subSectionData>'}], formatter: 'AH.getSmartFormTitle'}" />
 		</sfo:customData>
 		<sfo:layout>
 			<template:if test="{= ${appSettings>/useColumnLayoutForSmartForm} !== false}">
 				<template:then>
 					<sfo:ColumnLayout columnsM="3" columnsL="4" columnsXL="{= ${appSettings>/objectPageColumns/screenSizeXL} === 4 ? '4' : '6'}" labelCellsLarge="12" />
-				</template:then>
+			</template:then>
 				<template:else>
 					<sfo:Layout columnsM="3" columnsL="4" columnsXL="{= ${appSettings>/objectPageColumns/screenSizeXL} === 4 ? '4' : '6'}" labelSpanS="12" labelSpanM="12" labelSpanL="12" labelSpanXL="12" singleGroupFullSize="false" />
 				</template:else>

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

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

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

@@ -4523,6 +4523,86 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					break;
 			}
 			return sPriority;
+		},
+
+		getModelData: function(oInterface, sBaseAnnotationPath, sEntitySetName) {
+			var oModel = oInterface.getModel() ? oInterface.getModel() : oInterface.getInterface(0).getModel(),
+				oBaseEntityType = oModel.getODataEntityType(oModel.getODataEntitySet(sEntitySetName).entityType);
+
+			if (sBaseAnnotationPath.indexOf("/") > -1) {
+				var oRelevantData = oAnnotationHelper.getRelevantDataForAnnotationRecord(oModel, sBaseAnnotationPath, oBaseEntityType);
+				return {
+					sAnnotationPath: oRelevantData.dataFieldValuePath[0] === '@' ? oRelevantData.dataFieldValuePath.substring(1) : oRelevantData.dataFieldValuePath,
+					oEntityType: oRelevantData.entityType
+				};
+			}
+			return {
+				sAnnotationPath: sBaseAnnotationPath[0] === '@' ? sBaseAnnotationPath.substring(1) : sBaseAnnotationPath,
+				oEntityType: oBaseEntityType
+			};
+		},
+
+		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);
+				if (oEntityType[sAnnotationPath] && oEntityType[sAnnotationPath].Title && oEntityType[sAnnotationPath].Title.String) {
+					return oEntityType[sAnnotationPath].Title.String;
+				}
+				// As DataPoint don't have title -> try to get property name as SmartForm title
+				if (!oEntityType[sAnnotationPath] || !oEntityType[sAnnotationPath].Value || !oEntityType[sAnnotationPath].Value.Path || !oEntityType.property) {
+					return;
+				}
+				var aProperty = oEntityType.property.filter(function(entry) {
+					return entry.name === oEntityType[sAnnotationPath].Value.Path;
+				});
+				if (aProperty.length && aProperty[0]['sap:label']) {
+					// Property name found
+					return aProperty[0]['sap:label'];
+				}
+				return;
+			}
+			// It's Identification or FieldGroup case
+			if (oFacet.Label && oFacet.Label.String) {
+				return oFacet.Label.String;
+			}
+			if (!oFacet.Target || !oFacet.Target.AnnotationPath) {
+				return;
+			}
+			if (oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.Identification") > -1) {
+				// Identification entry don't have any data which we can use as SmartForm title.
+				return;
+			}
+			var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);
+			if (oEntityType[sAnnotationPath] && oEntityType[sAnnotationPath].Label && oEntityType[sAnnotationPath].Label.String) {
+				// Use FieldGroup.Label.String as SmartForm title
+				return oEntityType[sAnnotationPath].Label.String;
+			}
+			return;
 		}
 	};
 	oAnnotationHelper.getBlockForEditableHeaderFacet.requiresIContext = true;
@@ -4593,6 +4673,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getTextArrangementPath.requiresIContext = true;
 	oAnnotationHelper.isValueHelpTableAvailable.requiresIContext = true;
 	oAnnotationHelper.getTextArrangementFinalString.requiresIContext = true;
+	oAnnotationHelper.getSmartFormTitle.requiresIContext = true;
 
 	return oAnnotationHelper;
 }, /* bExport= */ true);

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

@@ -944,7 +944,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.139.1
 	 * @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';
 
     /*
@@ -315,24 +316,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);
                             });
@@ -348,6 +353,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
@@ -506,191 +534,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 j = 0; j < result.selectedValues.length; ++j) {
-                            aFilters.push(new Filter({
-                                path: key,
-                                operator: result.operator,
-                                value1: result.selectedValues[j]
-                            }));
-                        }
-                    }
-            }
-            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.getTextArrangementForEasyFilter(oValueHelpEntity,oValueHelpProperty);
-                    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,
@@ -704,8 +551,7 @@ sap.ui.define([
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,
-            onDataFetcher,
-            getkeySpecifiedResultFromFilters
+            onDataFetcher
         };
     }
 
@@ -714,5 +560,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/navigation/NavigationController.js

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

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

@@ -582,7 +582,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.139.0",
+		version: "1.139.1",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {