@sapui5/sap.suite.ui.generic.template 1.134.2 → 1.136.0

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

@@ -220,6 +220,10 @@ sap.ui.define(["sap/ui/base/Object",
 		function getText(sKey, aArguments, bIgnoreKeyFallback) {
 			var oComponent = oController.getOwnerComponent();
 			oResourceBundle = oResourceBundle || oComponent.getModel("i18n").getResourceBundle();
+			// "aArguments" should be an array
+			if (aArguments && !Array.isArray(aArguments)) {
+				aArguments = [aArguments];
+			}
 			// with  bIgnoreKeyFallback =true, resourceBundle does not write a console error and returns undefined instead of the key, if the text doesn't exist
 			// currently only used for the texts that can be overridden more specific than per page in getContextText
 			return oResourceBundle.getText(sKey, aArguments, bIgnoreKeyFallback);
@@ -1394,7 +1398,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var aLinksToCheck = [], aInternalLinks = [];
 			var oAppComponent = oComponent.getAppComponent();
 			var UshellContainer = sap.ui.require("sap/ushell/Container");
-			var oXApplNavigation = UshellContainer && UshellContainer.getServiceAsync("Navigation");
+			var oXAppNavigation = UshellContainer && UshellContainer.getServiceAsync("Navigation");
 			var oSupportedIntents = oTemplatePrivateModel.getProperty("/generic/supportedIntents/");
 			var aToolbarContent = oToolbar.getContent();
 			var iButtonsNumber = aToolbarContent.length;
@@ -1415,51 +1419,51 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 
-			if (aLinksToCheck.length > 0 && oXApplNavigation) {
-				oXApplNavigation.then(function(oCrossAppNavigator) {
-					var oDeferredLinks = oCrossAppNavigator.getLinks(aLinksToCheck);
-					oDeferredLinks.then(function(aLinks) {
-						oSupportedIntents = oTemplatePrivateModel.getProperty("/generic/supportedIntents/");
-						var iLinksNumber = aLinks.length;
-						// Entries in aLinks should correspond to aInternalLinks: if a link is not supported an empty object is returned by the method getLinks
-						var aHrefPromises = [];
-						for (var i = 0; i < iLinksNumber; i++) {
-							if (aLinks[i].length > 0) {
-								var sHref = oCrossAppNavigator.getHref({ target: { shellHash: aLinks[i][0].intent } }, oAppComponent);
-								aHrefPromises.push(sHref);
+			if (!aLinksToCheck.length || !oXAppNavigation) {
+				return;
+			}
+			oXAppNavigation.then(function(oCrossAppNavigator) {
+				var oDeferredLinks = oCrossAppNavigator.getLinks(aLinksToCheck);
+				oDeferredLinks.then(function(aLinks) {
+					oSupportedIntents = oTemplatePrivateModel.getProperty("/generic/supportedIntents/");
+					var iLinksNumber = aLinks.length;
+					// Entries in aLinks should correspond to aInternalLinks: if a link is not supported an empty object is returned by the method getLinks
+					var aHrefPromises = [],
+					aHrefLinks = [];
+					for (var i = 0; i < iLinksNumber; i++) {
+						if (aLinks[i].length > 0) {
+							var sHref = oCrossAppNavigator.getHref({ target: { shellHash: aLinks[i][0].intent } }, oAppComponent);
+							aHrefPromises.push(sHref);
+							// Store value in separate array. Count in aHrefLinks and in aInternalLinks may differs
+							aHrefLinks.push(aInternalLinks[i]);
+						}
+					}
+					Promise.all(aHrefPromises).then(function(aResponses) {
+						for (var j = 0; j < aResponses.length; j++) {
+							if (aResponses[j]) {
+								aHrefLinks[j].bLinkIsSupported = true;
 							}
 						}
-						Promise.all(aHrefPromises).then(function(aResponses) {
-							for (var j = 0; j < aResponses.length; j++) {
-								if (aResponses[j]) {
-									aInternalLinks[j].bLinkIsSupported = true;
-								}
-									// add the value to the model
-								var sSemObj = aInternalLinks[j].semanticObject;
-								var sAction = aInternalLinks[j].action;
-
-								var oSemObjProp = oTemplatePrivateModel.getProperty("/generic/supportedIntents/" + sSemObj);									if (!oSemObjProp) {  // no semantic object in the model yet
-									oSupportedIntents[sSemObj] = {};
-									oSupportedIntents[sSemObj][sAction] =
-									{
-										"visible" :aInternalLinks[j].bLinkIsSupported
-									};
-								} else if (!oSemObjProp[sAction]) {  // no action in the model yet
-									oSemObjProp[sAction] =
-									{
-										"visible" :aInternalLinks[j].bLinkIsSupported
-									};
-								} else {
-									oSemObjProp[sAction]["visible"] = aInternalLinks[i].bLinkIsSupported;
-								}
+					}).then(function() {
+						aInternalLinks.forEach(function(entry) {
+							// add the value to the model
+							var sSemObj = entry.semanticObject,
+								sAction = entry.action,
+								oSemObjProp = oTemplatePrivateModel.getProperty("/generic/supportedIntents/" + sSemObj);
+
+							if (!oSemObjProp) {  // no semantic object in the model yet
+								oSupportedIntents[sSemObj] = {};
+								oSupportedIntents[sSemObj][sAction] = { "visible" :entry.bLinkIsSupported };
+							} else if (!oSemObjProp[sAction]) {  // no action in the model yet
+								oSemObjProp[sAction] = { "visible" :entry.bLinkIsSupported };
+							} else {
+								oSemObjProp[sAction]["visible"] = entry.bLinkIsSupported;
 							}
-						}).then(function() {
-							oTemplatePrivateModel.updateBindings();
 						});
+						oTemplatePrivateModel.updateBindings();
 					});
 				});
-
-			}
+			});
 		}
 
 		// This function executes the given handler fnHandler if preconditions are given

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

@@ -10,7 +10,8 @@ sap.ui.define([
 	"sap/base/util/isEmptyObject",
 	"sap/suite/ui/generic/template/genericUtilities/FeError",
 	"sap/suite/ui/generic/template/lib/CommandComponentUtils",
-	"sap/suite/ui/generic/template/lib/ViewCreationHelper"
+	"sap/suite/ui/generic/template/lib/ViewCreationHelper",
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
 ], function(
 	BaseObject,
 	ManagedObjectModel,
@@ -23,7 +24,8 @@ sap.ui.define([
 	isEmptyObject,
 	FeError,
 	CommandComponentUtils,
-	ViewCreationHelper
+	ViewCreationHelper,
+	testableHelper
 ) {
 	"use strict";
 	var	sClassName = "lib.ComponentUtils";
@@ -424,6 +426,12 @@ sap.ui.define([
 				change: fnChange
 			});
 			sLogicalBindingPath = sBindingPath;
+			let mRoutingTree = oComponentRegistryEntry.oTemplateContract.mRoutingTree;
+			let oAncestorNode = mRoutingTree[oTreeNode.parentRoute];
+			while (oAncestorNode.level > 0) {
+				oAncestorNode.bindElement(oComponentRegistryEntry.oTemplateContract.oNavigationHost, null, true);
+				oAncestorNode = mRoutingTree[oAncestorNode.parentRoute];
+			}
 			//In case the component needs to reset anything
 			if (oComponentRegistryEntry.methods.afterRebind) {
 				oComponentRegistryEntry.methods.afterRebind();
@@ -902,13 +910,15 @@ sap.ui.define([
 							oViewState[sKey] = oState[sKey];
 						}
 					}
-					(oComponentRegistryEntry.methods.applyState || Function.prototype)(oViewState, bIsSameAsLast);
+					// The result of "applyState" can be a Promise or undefined.
+					var vStateAppliedResult = (oComponentRegistryEntry.methods.applyState || Function.prototype)(oViewState, bIsSameAsLast);
 					var fnApplyReuseInfo = function(oProxy, sMyKey){
 						if (oProxy.component.stApplyState){
 							oProxy.component.stApplyState(oEmbeddedStates[sMyKey] || Object.create(null), bIsSameAsLast);
 						}
 					};
 					Promise.all([oComponentRegistryEntry.oViewRenderedPromise, oHeaderDataAvailablePromise]).then(fnExecuteForAllReuseComponents.bind(null, mReuseComponentProxies, fnApplyReuseInfo));
+					return vStateAppliedResult;
 				},
 				oComponent: oComponent
 			}, oStatePreserverSettings);
@@ -1116,6 +1126,7 @@ sap.ui.define([
 			return oComponentRegistryEntry.oTemplateContract.oNavigationControllerProxy.getTargetIdentityForContext(oTreeNode, oNavigationContext);
 		}
 
+		testableHelper.testableStatic(fnRebindHeaderData, "filterHelper_fnRebindHeaderData");
 		return {
 			getBusyHelper: function() {
 				return oComponentRegistryEntry.oApplication.getBusyHelper();

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

@@ -0,0 +1,66 @@
+sap.ui.define(
+	[
+		"sap/ui/base/Object",
+		"sap/base/util/extend",
+		"sap/suite/ui/generic/template/genericUtilities/controlHelper"
+	],
+	function (BaseObject, extend, controlHelper) {
+		"use strict";
+
+		/**
+		 * Helper class for handling focus on controller level.
+		 * Used to save and restore focus of specific control
+		 *
+		 * Should be accessible from controller getRestoreFocusHelper() method.
+		 *
+		 * Then necessary store current focus information with rememberFocus() method
+		 * Restoring focus is done thorough invoking restoreFocus() method. After restoring focus, it will be reset.
+		 */
+
+		function getMethods() {
+			var sControlIdWithLastFocus = null;
+
+			/**
+			 * Store control id which have focus
+			 * @param {string} control is that have focus
+			 */
+			function rememberFocus(sFocusId) {
+				sControlIdWithLastFocus = sFocusId;
+			}
+
+			/**
+			 * Restores focus to previously remembered control Id
+			 * @returns undefined
+			 */
+			function restoreFocus() {
+				if (!sControlIdWithLastFocus) {
+					return;
+				}
+				controlHelper.focusControl(sControlIdWithLastFocus);
+				resetFocus();
+			}
+
+			/**
+			 * Clear currently saved previously focused control id
+			 */
+			function resetFocus() {
+				sControlIdWithLastFocus = null;
+			}
+
+			return {
+				rememberFocus: rememberFocus,
+				restoreFocus: restoreFocus,
+				resetFocus: resetFocus
+			};
+		}
+
+		return BaseObject.extend(
+			"sap.suite.ui.generic.template.lib.RestoreFocusHelper",
+			{
+				constructor: function () {
+					extend(this, getMethods());
+				}
+			}
+		);
+	}
+);

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

@@ -1,8 +1,9 @@
 sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 "sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
 "sap/base/util/deepExtend",
-"sap/ui/comp/util/SharedUtil"
-], function(AnnotationHelper, metadataAnalyser, deepExtend, SharedUtil) {
+"sap/ui/comp/util/SharedUtil",
+"sap/suite/ui/generic/template/genericUtilities/controlHelper"
+], function(AnnotationHelper, metadataAnalyser, deepExtend, SharedUtil, controlHelper) {
 	"use strict";
 	var SideEffectSourcePropertyType = {
 		SINGLE_SOURCE_ONLY : "OnlySingleSource",
@@ -33,7 +34,6 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 		return oSmartField._calculateFieldGroupIDs(oClonedMetaData);
 	}
 	function fnComputeFieldGroupAndTriggerSideEffect(oSmartField, sSideEffectSourcePropertyType) {
-
 		var aFieldGroupIds;
 		var fnTriggerValidateFieldGroupEvent = function() {
 			if (aFieldGroupIds) {
@@ -99,7 +99,9 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 			return;
 		}
 		var oSmartField = oEvent.getParameter("changeEvent") && oEvent.getParameter("changeEvent").getSource ? oEvent.getParameter("changeEvent").getSource() : oEvent.getSource();
-
+		if (!controlHelper.isSmartField(oSmartField)) {
+			return;
+		}
 		if (bIsSideEffectTypeComputed) { // For FE rendered smart fields the side effect type is computed at the templating time
 			var sSideEffectSourcePropertyTypeCustomData = oSmartField.getCustomData().find(function (oCustomData) {
 				return oCustomData.getKey() === "SideEffectSourcePropertyType";

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

@@ -89,13 +89,21 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/FeError"],functio
 	return {
 		parameters: ["sQuickVariantKey", "sFacet", "sSmartTableId", "sProperty", "sTarget", "sSemanticObject", "sAction", "sEntitySet", "sFacetExtensionKey", "sRecordType", "sAnnotationPath", "sAnnotationId", "sReuseComponentName", "sReuseComponentUsage", "sReuseComponentKey", "bIsHeaderFacet", "sIsPartOfPreview", "sDataField"],
 		types: {
+			ALP: {
+				DynamicPage: {
+					value: "template::Page"
+				},
+				DynamicPageTitle: {
+					value: "template::ALPDynamicPageTitle"
+				}
+			},
 			ListReportPage: {
 				DynamicPage: {
 					value: "page"
 				},
 				DynamicPageTitle: {},
 				DynamicPageHeader: {},
-				PageTitle: {
+				DynamicPageTitleVariant: {
 					value: "template::DynamicPageTitle"
 				}
 			},

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

@@ -286,13 +286,16 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 		}
 
-		function fnRealizeStatePromise(bIsSameAsLast, oNewState){
+		async function fnRealizeStatePromise(bIsSameAsLast, oNewState){
 			fnTransferStateToAnalyzedState(oNewState);
 			var oState = Object.create(null);
 			for (var sKey in oNewState){
 				oState[sKey] = oNewState[sKey].data;
 			}
-			oSettings.applyState(oState, bIsSameAsLast);
+			// Wait until the app state is applied to the page
+			// and then proceed with storing the latest app state.
+			await oSettings.applyState(oState, bIsSameAsLast);
+			
 			if (fnNotifyRealizedAppStateConsistent){
 				fnNotifyRealizedAppStateConsistent();
 				fnNotifyRealizedAppStateConsistent = null;

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

@@ -289,6 +289,7 @@ sap.ui.define([
 							oLogger.info("Skip Init view as AppComponent is no longer active");
 							return;
 						}
+						oTemplateUtils.oServices.controllerServices = Object.freeze(oMethods.controllerServices || {});
 						oTemplateUtils.oServices.oApplicationController.registerView(oView);
 						oTemplateUtils.oServices.oDataLossHandler = oAppRegistryEntry.oTemplateContract.oDataLossHandler;
 						oTemplateUtils.oServices.oInsightsFECardProvider = oAppRegistryEntry.oTemplateContract.oInsightsFECardProvider;
@@ -338,7 +339,7 @@ sap.ui.define([
 				//   ~ onSuspend: This method is called after the keep alive application is left and becoming hidden
 				//   ~ onRestore: This method is called after the keep alive application is opened again by the user
 				//   ~ getCurrentState, getInitialState, applyState: functions that are used by the StatePreserver attached to this component.
-				//   ~ getStatePreserverSettings: Provide additional settings for the StatePreserver (curently only callAlways) is used 
+				//   ~ getStatePreserverSettings: Provide additional settings for the StatePreserver (curently only callAlways) is used
 				//   ~ executeAfterInvokeActionFromExtensionAPI: This method is called from CommonUtils fnInvokeActionsForExtensionAPI as callback to execute floorplan specific
 				//     code after invokeactions is called.
 				//   ~ getUrlParameterInfo a function that allows the instance to pass its current state into url parameters. getUrlParameterInfo must return
@@ -435,7 +436,7 @@ sap.ui.define([
 
 					oComponentDefinition.onBeforeRendering = function() {
 						var sComponentId = this.getId();
-						oLogger.info("BeforeRendering called for TemplateComponent " + sComponentId);						
+						oLogger.info("BeforeRendering called for TemplateComponent " + sComponentId);
 						var oComponentRegistryEntry = getComponentRegistryEntry(this);
 						(TemplateComponent.prototype.onBeforeRendering || Function.prototype).bind(this, oComponentRegistryEntry).apply(this, arguments);
 						var oMethods = oComponentRegistryEntry.methods;
@@ -445,7 +446,7 @@ sap.ui.define([
 
 					oComponentDefinition.onAfterRendering = function() {
 						var sComponentId = this.getId();
-						oLogger.info("AfterRendering called for TemplateComponent " + sComponentId);						
+						oLogger.info("AfterRendering called for TemplateComponent " + sComponentId);
 						var oComponentRegistryEntry = getComponentRegistryEntry(this);
 						if (oComponentRegistryEntry.fnViewRenderdResolve && !oComponentRegistryEntry.fnViewRegisteredResolve){
 							oComponentRegistryEntry.fnViewRenderdResolve();
@@ -477,7 +478,7 @@ sap.ui.define([
 					};
 
 					oComponentDefinition.onDeactivate = Function.prototype;
-					
+
 					return TemplateComponent.extend(sComponentNameFull, oComponentDefinition);
 				},
 

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

@@ -3,8 +3,10 @@ sap.ui.define([
     "sap/base/util/extend",
     "sap/suite/ui/generic/template/lib/filterHelper",
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/ui/model/FilterOperator"
-], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator) {
+    "sap/ui/model/FilterOperator",
+    'sap/ui/model/Filter',
+    'sap/suite/ui/generic/template/js/AnnotationHelper'
+], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper) {
     'use strict';
 
     /*
@@ -452,12 +454,18 @@ sap.ui.define([
                                 if (bOperatorAvailable) {
                                     aEasyFilterTokens.forEach(function(oToken) {
                                         if (oToken.operator === oFilterItem.sOperator) {
-                                            oToken.selectedValues.push(oFilterItem.oValue1);
+                                            oToken.selectedValues.push({
+                                                value: oFilterItem.oValue1,
+                                                description: oFilterItem.oValue1
+                                            });
                                         }
                                     });
                                 } else {
                                     oPropertyToken.operator = oFilterItem.sOperator;
-                                    oPropertyToken.selectedValues.push(oFilterItem.oValue1);
+                                    oPropertyToken.selectedValues.push({
+                                        value: oFilterItem.oValue1,
+                                        description: oFilterItem.oValue1
+                                    });
                                     aEasyFilterTokens.push(oPropertyToken);
                                 }
                             }
@@ -485,6 +493,184 @@ 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 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;
+                    //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 {
             getEasyFilterBar : fnGetEasyFilterBar,
             initialiseEasyFilterBar : fnInitialiseEasyFilterBar,
@@ -497,7 +683,9 @@ sap.ui.define([
 			onTokensChanged: fnTokensChanged,
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
-            handleVariantLoad : fnHandleVariantLoad
+            handleVariantLoad : fnHandleVariantLoad,
+            onDataFetcher,
+            getkeySpecifiedResultFromFilters
         };
     }