@sapui5/sap.suite.ui.generic.template 1.141.3 → 1.142.0

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

@@ -368,6 +368,20 @@ sap.ui.define([
 				oComponentData.feEnvironment.getShareControlVisibility();
 		}
 
+		// If the FE app is embedded within the Inbox app, the Inbox injects a dummy object named "feEnvironment" 
+		// into the "componentData". In this case, we obtain the (mocked) shell service from "feEnvironment" 
+		// instead of the standard ShellUIService. 
+		// The mocked shell service exposes few methods like "setTitle" and "setHierarchy". 
+		// They are invoked by NavigationController.
+		//
+		// Otherwise, we return the actual "ShellUIService" from the app component.
+		function fnGetShellUIServicePromise () {
+			var oComponentData = oAppComponent.getComponentData();
+			return oComponentData?.feEnvironment?.getShellService ?
+				Promise.resolve( oComponentData.feEnvironment.getShellService() ) :
+				oAppComponent.getService("ShellUIService");
+		}
+
 		function attachToApplicationController() {
 			oTemplateContract.fnAddSideEffectPromise = function(oPromise){
 				var i = 0;
@@ -427,7 +441,7 @@ sap.ui.define([
 				oViewDependencyHelper: new ViewDependencyHelper(oTemplateContract)
 			};
 			oTemplateContract.oViewDependencyHelper = oAppRegistryEntry.oViewDependencyHelper;
-			oTemplateContract.oShellServicePromise = oAppComponent.getService("ShellUIService");
+			oTemplateContract.oShellServicePromise = fnGetShellUIServicePromise();
 			oTemplateContract.oShellServicePromise.catch(function(){
 				oLogger.warning("No ShellService available");
 			});
@@ -945,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.141.3
+	 * @version 1.142.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -1049,6 +1063,10 @@ sap.ui.define([
 				skipOPContextInfoInBrowserTitle: {
 					type: "boolean",
 					defaultValue: false
+				},
+				noDataRepresentation: {
+					type: "string",
+					defaultValue: "illustration" // Possible values: 'illustration', 'illustrationWithFallback' and 'textOnly'
 				}
 			},
 			events: {

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

@@ -282,6 +282,51 @@ sap.ui.define(["sap/ui/base/Object",
 			return getSpecializedText(sKey, sSpecificI18nKey, sFrameworkKey, aParameters);
 		}
 
+		var aAppSpecificResourceBundles; 
+		/**
+		 * Returns i18n text from application's resource bundle.
+		 * 
+		 * Background: On `lib.TemplateComponent#fnEnhanceI18nModel` method, FE's resource bundles are initialized.
+		 * - The main resource bundle is `lib/i18n/i18n.properties`.
+		 * - Additional bundles (floor-plan specific FE bundles + app bundles) are added as custom bundles (`ResourceBundle#aCustomBundles`).
+		 * 
+		 * This method, 
+		 * 1. Creates an array of custom resource bundles ()`aAppSpecificResourceBundles`) which only contains the app's resource bundles.
+		 * 2. Iterates through the app's bundles in reverse order to resolve the i18n key.
+		 * 
+		 * Reason for reverse order: 
+		 * - The last bundle contains most specific text (floor-plan / entityset level).
+		 * - The first bundle is more generic one.
+		 * - This follows the same precedence logic as `sap.base.i18n.ResourceBundle#_getTextFromProperties`.
+		 * 
+		 * @param {string} sKey i18n key
+		 * @param {string[]} aArguments arguments for i18n text
+		 * @returns {string|null} i18n text if found, otherwise null
+		 */
+		function getCustomizedTextFromApp(sKey, aArguments) {
+			var sText = null, i;
+			if (aAppSpecificResourceBundles == null) {
+				var oComponent = oController.getOwnerComponent();
+				var oResourceBundle = oComponent.getModel("i18n").getResourceBundle();
+				// FE's bundles are omitted.
+				aAppSpecificResourceBundles = oResourceBundle.aCustomBundles.filter(oBundle => {
+					return !oBundle.oUrlInfo.url.includes("sap/suite/ui/generic/template");
+				});
+			}
+			// "aArguments" normalized to array
+			if (aArguments && !Array.isArray(aArguments)) {
+				aArguments = [aArguments];
+			}
+
+			for (i = aAppSpecificResourceBundles.length - 1; i >= 0; i--) {
+				sText = aAppSpecificResourceBundles[i].getText(sKey, aArguments, true);
+				if (sText != null) {
+					return sText;
+				}
+			}
+			return null;
+		}
+
 		// This functions intends to give selection from different selection behavior
 		function getSelectionPoints(oInnerChart, sSelectionBehavior) {
 			var sSelectionBehavior = sSelectionBehavior || oInnerChart.getSelectionBehavior();
@@ -2044,7 +2089,8 @@ sap.ui.define(["sap/ui/base/Object",
 			handleError: fnHandleError,
 			transformTechnicalPropsOnExportedFile: fnTransformTechnicalPropsOnExportedFile,
 			includeEntitySetParametersToExportedFile: fnIncludeEntitySetParametersToExportedFile,
-			openContextInNewTabFromListItem: fnOpenContextInNewTabFromListItem
+			openContextInNewTabFromListItem: fnOpenContextInNewTabFromListItem,
+			getCustomizedTextFromApp: getCustomizedTextFromApp
 		};
 	}
 

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

@@ -0,0 +1,107 @@
+sap.ui.define([
+    "sap/base/util/extend",
+    "sap/ui/base/Object",
+    "sap/suite/ui/generic/template/genericUtilities/FeLogger"
+], function (
+    extend,
+    BaseObject,
+    FeLogger
+) {
+    "use strict";
+    var oLogger = new FeLogger("lib.TableNoDataHandler").getLogger();
+
+    function getMethods(oController, oTemplateUtils, oNoDataConfig) {
+        var sNoDataRepresentation = oController.getOwnerComponent().getAppComponent().getNoDataRepresentation();
+
+        function fnSetNoDataMessage (oSmartTable, sScenario) {
+            if (sNoDataRepresentation === "textOnly") {
+                fnSetTextMessage(oSmartTable, sScenario);
+            } else if (["illustration", "illustrationWithFallback"].includes(sNoDataRepresentation)) {
+                fnSetIllustratedMessage(oSmartTable, sScenario);
+            }
+        }
+
+        // Sets "text" based no data message
+        function fnSetTextMessage (oSmartTable, sScenario) {
+            var sSmartTableId = oSmartTable.getId();
+            var sI18nKey = oNoDataConfig[sScenario].i18nKey;
+            var sNoDataText = oTemplateUtils.oCommonUtils.getContextText(sI18nKey, sSmartTableId);
+            oSmartTable.setNoData(sNoDataText);
+        }
+
+        // Sets "illustration" based no data message
+        function fnSetIllustratedMessage (oSmartTable, sScenario) {
+            var sSmartTableId = oSmartTable.getId();
+            var sI18nPrefix = oNoDataConfig[sScenario].i18nKey;
+            // Derive title key from base key
+            var sTitleI18nKey = sI18nPrefix + "_ILLUSTRATION_TITLE";
+            // Get title from resource bundle.
+            var sTitle = oTemplateUtils.oCommonUtils.getContextText(sTitleI18nKey, sSmartTableId);
+            // Find description (this logic varies between "illustration" and "illustrationWithFallback")
+            var sDescription = fnDeriveIllustrationDescription(sI18nPrefix, sSmartTableId);
+            // Get illustration type from config
+            var sIllustrationType = oNoDataConfig[sScenario].illustrationType;
+
+            
+            var oNoDataIllustratedMessage = oSmartTable.getNoData();
+            // oSmartTable.getNoData should actually return an illustrated message.
+            //
+            // Sometimes, app changes the no data message into text message using custom coding. 
+            // Hence, adding this type check as a safety measure.
+            if ( !(oNoDataIllustratedMessage?.isA?.("sap.m.IllustratedMessage")) ) {
+                oLogger.error(`Unable to update the no data message of smart table ${oSmartTable.getId()} as it's not an IllustratedMessage`);
+                return;
+            }
+            // Table already has illustrated no data message. Just update the attributes
+            oNoDataIllustratedMessage.setIllustrationType(sIllustrationType);
+            oNoDataIllustratedMessage.setTitle(sTitle);
+            oNoDataIllustratedMessage.setDescription(sDescription);
+        }
+
+        /**
+         * Calculates the illustrated message's description based on the manifest flag "noDataRepresentation" value
+         * 1. If manifest flag is "illustration"
+         * 	  - Just returns text for the new i18n key (legacy key + "_ILLUSTRATION_DESCRIPTION")
+         * 	  - The text can be found on either app or FE
+         * 2. If flag is "illustrationWithFallback"
+         * 	  a. Checks the app if customized text available for (legacy i18n key | tableId) (for e.g. "NOITEMS_LR_SMARTTABLE|C_SalesOrder")
+         * 	   	 - If found, returns it.
+         * 	  b. Checks the app if customized text available just for legacy i18n key (for e.g. "NOITEMS_LR_SMARTTABLE")
+         * 	   	 - If found, returns it.
+         * 	  c. Returns the text for the new i18n key (Same as "Case 1" above).
+         */
+        function fnDeriveIllustrationDescription (sI18nPrefix, sSmartTableId) {
+            var sLatestDescriptionI18nKey = sI18nPrefix + "_ILLUSTRATION_DESCRIPTION";
+            var sLatestDescription = oTemplateUtils.oCommonUtils.getContextText(sLatestDescriptionI18nKey, sSmartTableId);
+            if (sNoDataRepresentation === "illustration") {
+                return sLatestDescription;
+            }
+            // Below logic is for noDataRepresentation = "illustrationWithFallback"
+            var sLegacyDescription = null;
+            var sLegacyI18nKey = sI18nPrefix;
+            var sTableSpecificI18nSuffix = oTemplateUtils.oCommonUtils.getSpecificI18nKeyForSmartControl(sSmartTableId);
+            sTableSpecificI18nSuffix = (sTableSpecificI18nSuffix === "|") ? "" : sTableSpecificI18nSuffix; // Omit the suffix "|"
+            // If table specific i18n key is available, get the customized text for that.
+            if (sTableSpecificI18nSuffix) {
+                sLegacyDescription = oTemplateUtils.oCommonUtils.getCustomizedTextFromApp(sLegacyI18nKey + "|" + sTableSpecificI18nSuffix);
+            }
+            // If the description is not yet found, get the customized text just for the generic i18n key.
+            if (!sLegacyDescription) {
+                sLegacyDescription = oTemplateUtils.oCommonUtils.getCustomizedTextFromApp(sLegacyI18nKey);
+            }
+            // If legacy text is found, return it.
+            // Otherwise, return the latest one.
+            return sLegacyDescription || sLatestDescription;
+        }
+        
+        return {
+            setNoDataMessage: fnSetNoDataMessage
+        };
+    }
+
+    return BaseObject.extend("sap.suite.ui.generic.template.lib.TableNoDataHandler", {
+        constructor: function (oController, oTemplateUtils, oNoDataConfig) {
+            extend(this, getMethods(oController, oTemplateUtils, oNoDataConfig));
+        }
+    });
+});

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

@@ -15,8 +15,8 @@ sap.ui.define([
      * It gets initialized when the Fiori AI EasyFill  is enabled
      * Below things are handled in this class:
      * 1. Prepare Field metadata
-     * 2. Prepare EasyFill Dialog 
-     * 
+     * 2. Prepare EasyFill Dialog
+     *
      */
     function getMethods(oState, oController, oTemplateUtils, oObjectPage) {
         let oTransientContextForEasyFill;
@@ -25,13 +25,14 @@ sap.ui.define([
         let mUpdatableLookupMap;
         let oRb;
         let oAIPopover;
+        let aEditableFields = [];
 
         async function openEasyFillDialog(oEvent,oContext) {
             let oEasyFillDialog;
             oRb = oController.getView().getModel("i18n").getResourceBundle();
             const bIsModelCreated = !!oController.getView().getModel("easyFillDialogModel");
+            oObjectPageModel = oObjectPage.getModel();
             if (!bIsModelCreated) {
-                oObjectPageModel = oObjectPage.getModel();
                 const aDeferredGroups = oObjectPageModel.getDeferredGroups();
                 //Adding a defferred group will make sure that no batch call would get triggered to backend until submitChanges() is invoked
                 aDeferredGroups.push("EasyFillFETransientChanges");
@@ -107,8 +108,9 @@ sap.ui.define([
                             oObjectPageContext.setProperty(oProp, oTransientObject[oProp]);
                         }
                     }
+                    activateSideEffects();
                     resetEasyFill(true);
-                    oEasyFillDialog.close();
+                    oEasyFillDialog?.close();
                 },
                 onLiveChange: function(oEvent) {
                     const easyFillDialogModel = oController.getView().getModel("easyFillDialogModel");
@@ -124,6 +126,7 @@ sap.ui.define([
                     easyFillDialogModel.setProperty("/isBusy",true);
                     let mFieldMapping = getEntitySetMapForLLM();
                     let aiCallResult = await  oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFill.extractFieldValuesFromText(oController.byId("EasyFillInputTextArea").getValue(), mFieldMapping);
+                    aEditableFields = [];
                     easyFillDialogModel.setProperty("/isBusy",false);
                     formatDateValues(aiCallResult,mFieldMapping);       
                     if (aiCallResult.success) {
@@ -170,10 +173,56 @@ sap.ui.define([
                 }
 			}, "easyFillPopup",undefined,true,true).then(function (oPopup) {
                 oEasyFillDialog = oPopup;
-                oPopup.open();
+                oPopup?.open();
 			});
         }
 
+        function activateSideEffects() {
+            //Making a set so that , duplicate field group ids are not passed
+            const aFieldGroupIdSet = new Set();
+            aEditableFields.forEach((oSmartField)=>{
+                //SideEffect would be invoked only for the editable controls inside the SmartField
+                const aEditableInnerFields = oSmartField.getInnerControls().filter((oControl)=>oControl.getEditable());
+                aEditableInnerFields.forEach((oControl)=>{
+                    const aControlFieldGroupId = oControl.getFieldGroupIds();
+                    if (aControlFieldGroupId.length > 0) {
+                        aControlFieldGroupId.forEach((sFieldGroupId)=>{
+                            aFieldGroupIdSet.add(sFieldGroupId);
+                        });
+                    }
+                });
+
+            });
+
+            const oView = oController.getView();
+
+            aFieldGroupIdSet.forEach((sFieldGroupId)=>{
+                const oID = oView.data(sFieldGroupId);
+
+                /**
+                 * Currently, the SmartFields are created using the TransientContext, which means both
+                 * "context" and "contextObject" refer to the TransientContext instance.
+                 *
+                 * However, we need to use the original OP context so that side effects are triggered
+                 * on the original OP context when the user saves data from the EasyFill dialog back to OP.
+                 *
+                 * Therefore, we update the "context" and "contextObject" to reference the original OP context.
+                 */
+
+                if (oID) {
+                    oID["context"] = oObjectPageContext.getPath();
+                    oID["contextObject"] = oObjectPageContext;
+                    oView.data(sFieldGroupId,oID);
+                }
+                //To make sure that all the fields sideeffect would be triggered
+                const sSideEffectQualifier = oTemplateUtils.oServices.oApplicationController._getSideEffectsQualifier(oID.name);
+                oTemplateUtils.oServices.oApplicationController.registerGroupChange(sSideEffectQualifier);
+            });
+
+
+            oView.triggerValidateFieldGroup([...aFieldGroupIdSet]);
+        }
+
         function getAIPopover() {
             return new Promise(async(resolve,reject) => {
                 const sFragmentname = "sap.suite.ui.generic.template.fragments.AINotice";
@@ -358,7 +407,7 @@ sap.ui.define([
             var oGroup = new Group({
                 title: (isTransient) ? oRb.getText("EASY_FILL_PROPOSED_VALUES") : oRb.getText("EASY_FILL_PREVIOUS_VALUES")
             });
-            
+
             for (const key of Object.keys(oDataFromLLM)) {
                 const oGroupElement = new GroupElement();
                 const oSmartField = new SmartField({
@@ -368,6 +417,9 @@ sap.ui.define([
                     contextEditable: isEditable,
                     change: onSmartFieldChange.bind(this)
                 });
+                if (isEditable) {
+                    aEditableFields.push(oSmartField);
+                }
                 const oSmartLabel = new SmartLabel();
                 oSmartLabel.setLabelFor(oSmartField);
                 oGroupElement.addElement(oSmartField);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/fragments/EasyFillDialog.fragment.xml

@@ -73,7 +73,7 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
             </FlexBox>
         </content>
         <beginButton>
-            <Button text="{i18n>EASY_FILL_SAVE}" enabled="{easyFillDialogModel>/isSaveEnabled}" press="onSaveFromEasyFillDialog" type="Emphasized"/>
+            <Button text="{i18n>EASY_FILL_CONFIRM}" enabled="{easyFillDialogModel>/isSaveEnabled}" press="onSaveFromEasyFillDialog" type="Emphasized"/>
         </beginButton>
         <endButton>
             <Button text="{i18n>CANCEL}" press="onCancelEasyFillDialog"/>

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';
 
     /*
@@ -333,24 +334,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);
                             });
@@ -366,6 +371,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
@@ -431,7 +459,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;
@@ -541,191 +568,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,
@@ -739,8 +585,7 @@ sap.ui.define([
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,
-            onDataFetcher,
-            getkeySpecifiedResultFromFilters
+            onDataFetcher
         };
     }
 
@@ -749,5 +594,5 @@ sap.ui.define([
             extend(this, getMethods(oState, oController, oTemplateUtils));
         }
     });
-    
+
 });