@sapui5/sap.suite.ui.generic.template 1.135.0 → 1.136.1

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

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

@@ -9,7 +9,7 @@
  * It has options to handle the scenario when there is error coming from the backend and we still want to save in second try.
  */
 
- sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/base/util/extend", "sap/suite/ui/generic/template/lib/MessageUtils", "sap/ui/model/json/JSONModel", 
+ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/base/util/extend", "sap/suite/ui/generic/template/lib/MessageUtils", "sap/ui/model/json/JSONModel",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/message/MessageType",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger"
 ], function(BaseObject, Filter, FilterOperator, extend, MessageUtils, JSONModel, controlHelper, MessageType, FeLogger) {
@@ -122,12 +122,13 @@
 			}).then(function (oFragment) {
 				oRet = oFragment;
 				oLocalModel = oRet.getModel(sLocalModelName);
-				
+
 				var oMsgModel = aMessages ? new JSONModel(aMessages) : sap.ui.getCore().getMessageManager().getMessageModel();
+				oMsgModel.setSizeLimit(9999); // Increase limit for created binding count. This will ensure that all messages are visible.
 				oMessageView.setModel(oMsgModel, "msg");
 				oLocalModel.setProperty("/situation", iSituation);
 				oLocalModel.setProperty("/afterClose", Function.prototype);
-				
+
 
 				var oOverallFilter = oAtLeastWarningFilter;
 				var oErrorFilter = oBaseErrorFilter;
@@ -183,14 +184,14 @@
 					if (oItemBinding.filter(oErrorFilter).getLength() === 0) {
 						oLocalModel.setProperty("/situation", 4);
 					}
-					
+
 				}
 				oLocalModel.setProperty("/backbtnvisibility", false);
 				oItemBinding.filter(oOverallFilter);
 				if (oItemBinding.getLength() === 0){
 					return null; // no popup needed
 				}
-				var aMsg = oItemBinding.getAllCurrentContexts().map(function(oContext) { 
+				var aMsg = oItemBinding.getAllCurrentContexts().map(function(oContext) {
 					return oContext.getObject();
 				});
 				var oMsgDialogHeaderInfo = MessageUtils.getMessageDialogTitleAndSeverity(aMsg, oTemplateContract);

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

@@ -114,7 +114,7 @@ sap.ui.define(["sap/ui/base/Object",
 				return oComponentUtils.getMainComponentUtils().then(function(oMainUtils) {
 					var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(oMainUtils.entitySet, oModel, sAppId, oMainUtils.getRootExpand);
 					return oInfoForContentIdPromise.then(function(oInfoObject) {
-						return oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;                         
+						return oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
 					});
 				});
 			}
@@ -229,7 +229,7 @@ sap.ui.define(["sap/ui/base/Object",
 			// The resulting object may contain properties context/draftAdministrativeData and targetSiblingKey
 			// The object contains property 'draftAdministrativeData' when there exists a non-locking draft of another user (this can only be the case when bUnconditional is false)
 			// The property, 'draftAdministrativeData' contains the draft administrative data of the non-locking draft.
-			// When the editing can start, the object contains the property 'context',this property contains the context of the entity to be edited. 
+			// When the editing can start, the object contains the property 'context',this property contains the context of the entity to be edited.
 			// The object also holds 'targetSiblingKey' property containing the target sibling keys and treeNode info. in case of draft application and for non-draft application this property will hold value undefined
 			function editEntity(bUnconditional) {
 				if (oBusyHelper.isBusy()) {
@@ -439,7 +439,7 @@ sap.ui.define(["sap/ui/base/Object",
 						aSelectedContextPath.push(oContext.sContextPath);
 					});
 					var oParsedUpdateResult = fnParseResponse(aSelectedContextPath, aUpdateResults);
-					// The error and warning scenarios are handled via transient handling. 
+					// The error and warning scenarios are handled via transient handling.
 					// We only need to show message to user regarding records that are updated, Hence returning only successfull responses.
 					// In future if we need to show/use info about error and warning cases, oParsedUpdateResult contains that info as well.
 					var aSuccess = mapToArray(oParsedUpdateResult.mSuccess);
@@ -507,7 +507,7 @@ sap.ui.define(["sap/ui/base/Object",
 			function saveEntityImpl(resolve, reject, oCreateWithDialogFilters) {
 				var oMessageManager = sap.ui.getCore().getMessageManager();
 				var oModel = oController.getView().getModel();
-				
+
 				// Create mandatory check (not performed in case of Create with dialogue).
 				if (!oCreateWithDialogFilters) {
 					var aMandatoryFields = fnGetAllMandatoryFields(oModel),
@@ -519,7 +519,7 @@ sap.ui.define(["sap/ui/base/Object",
 						return;
 					}
 				}
-				
+
 				// Prepare message handling by storing information which messages have been available before saving
 				var oContextFilter =  oCreateWithDialogFilters ? oCreateWithDialogFilters : oServices.oTemplateCapabilities.oMessageButtonHelper && oServices.oTemplateCapabilities.oMessageButtonHelper.getContextFilter(false);
 				var aMessagesBeforeSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
@@ -615,7 +615,7 @@ sap.ui.define(["sap/ui/base/Object",
 
 			/*
 			 * Calls generic app layer to get default values. If oPredefinedValues are passed then it overrides the values returned from the default values function.
-			 * Default value function is invoked when the application is non-draft (or) inline creation rows feature enabled	
+			 * Default value function is invoked when the application is non-draft (or) inline creation rows feature enabled
 			 * @param {object} oEventSource to extract context and entityset
 			 * @param {object} mPredefinedValues existing predefined values
 			 * @param {boolean} bIsInlineCreationRowsEnabled is inline creation rows feature enabled
@@ -727,11 +727,15 @@ sap.ui.define(["sap/ui/base/Object",
 						isDraftEnabled: oComponentUtils.isDraftEnabled(),
 						contextIndependentParameterData: mContextIndependentParameterData,
 						expand: mParameters.sRootExpand,
-						operationGrouping: sOperationGrouping
+						operationGrouping: sOperationGrouping,
+						handleFocus: oServices.controllerServices && oServices.controllerServices.getRestoreFocusHelper
+								? oServices.controllerServices.getRestoreFocusHelper().rememberFocus
+								: null
 					});
 					oActionProcessor.call(bIsStrict).then(function(oResult){
 						var oSessionParams = {};
 						oSessionParams.actionLabel = sFunctionImportLabel;
+						oServices.oApplication.setNextFocus(Function.prototype);
 						oBusyHelper.setBusy(oResult.executionPromise, null, oSessionParams);
 						oResult.executionPromise.then(fnHandleResponse,fnHandleResponse);
 					}, fnActionPopUpReject);
@@ -812,6 +816,11 @@ sap.ui.define(["sap/ui/base/Object",
 									});
 								});
 								oServices.oApplication.navigateToDetailContextIfPossible(oResponseContext, false, oContextInfo.bIsDraft ? 2 * (1 + oContextInfo.bIsCreate) : 1, oContextInfo);
+							}	else {
+								// Restore focus, because we don't navigate out
+								oServices.oApplication.setNextFocus(function(oBeforeData, fnFallback){
+									fnFallback();
+								});
 							}
 							var oTableBindingInfo = oSourceControlHandler && oSourceControlHandler.getBindingInfo();
 							var oListBinding = oTableBindingInfo && oTableBindingInfo.binding;
@@ -906,7 +915,7 @@ sap.ui.define(["sap/ui/base/Object",
 				var oModel = oView.getModel();
 				var sEntitySet, sBindingPath;
 				var iViewLevel = oComponentUtils.getViewLevel();
-				if (iViewLevel > 0) { // Details page 
+				if (iViewLevel > 0) { // Details page
 					var sTableBindingPath = oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oCommonUtils.getOwnerPresentationControl(oTable)).getBindingInfo().path;
 					sEntitySet = oTable.getEntitySet();
 					// create binding path
@@ -922,14 +931,14 @@ sap.ui.define(["sap/ui/base/Object",
 					var fnSetBusy = function(oBusyPromise){
 						var oBusyHelper = oServices.oApplication.getBusyHelper();
 						oBusyHelper.setBusy(oBusyPromise);
-						oServices.oApplication.setNextFocus(Function.prototype); // Prevent default handling in error case. Focus for success should be set there. 
+						oServices.oApplication.setNextFocus(Function.prototype); // Prevent default handling in error case. Focus for success should be set there.
 					};
 					// Method will be called in case the create has to be performed on a DraftEntity. For better performance Fe would check
 					// whether the expand information in the PreProcessor data is stored in the localStorage. In case this is available Fe
 					// will pass the expand nodes and read the newly created instance information. PreProcessor data is always stored with
 					// a cache key which ensures Fe don't work with stale data
-					
-					
+
+
 					var oTargetComponentUtils = oServices.oApplication.getComponentUtilsIfLoaded(sEntitySet);
 					var getRootExpand = oTargetComponentUtils && oTargetComponentUtils.viewRegistered && !oTargetComponentUtils.fnViewRegisteredResolve && oTargetComponentUtils.getRootExpand;
 					var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, oAppComponent.getId(), getRootExpand);
@@ -942,7 +951,10 @@ sap.ui.define(["sap/ui/base/Object",
 							oController: oController,
 							oApplicationController: oServices.oApplicationController,
 							bUseNewActionForCreate: oSettings && oSettings.useNewActionForCreate,
-							fnSetBusy: fnSetBusy
+							fnSetBusy: fnSetBusy,
+							handleFocus: oServices.controllerServices && oServices.controllerServices.getRestoreFocusHelper
+									? oServices.controllerServices.getRestoreFocusHelper().rememberFocus
+									: null
 						};
 						var oCreatePromise = CRUDHelper.create(oServices.oDraftController,
 							sEntitySet,
@@ -982,7 +994,7 @@ sap.ui.define(["sap/ui/base/Object",
 					});
 				});
 			}
-			
+
 
 			/* eslint-disable */
 			var handleError = testableHelper.testable(handleError, "handleError");

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

@@ -987,7 +987,7 @@ sap.ui.define(["sap/ui/base/Object",
 							onTeamsCollabOptionPress: onTeamsCollabOptionPress.bind(this),
 							onContactDetails: onContactDetails.bind(this),
 							// Ignoring the below events since quick view forms don't handle side effects. Handle them if support is added in the future.
-							onSmartFieldModeToggled: Function.prototype, 
+							onSmartFieldModeToggled: Function.prototype,
 							onSmartFieldModelValueChanged: Function.prototype,
 							// Ignoring this event as SmartMultiInput isn't rendered in the quick view smart form.
 							submitChangesForSmartMultiInput: Function.prototype,
@@ -2039,8 +2039,8 @@ sap.ui.define(["sap/ui/base/Object",
 					oPrivModel.setProperty("/generic/controlProperties/" + "fileUploader/" + sEntitySet, oFileUploaderSettings);
 				}
 
-				// URLEncoded filenames are decoded by Chrome, Firefox browsers but Safari doesn't do this automatically. 
-				// Therefore, FE decodes it on our side & ensure actual file name is used for further processing. 
+				// URLEncoded filenames are decoded by Chrome, Firefox browsers but Safari doesn't do this automatically.
+				// Therefore, FE decodes it on our side & ensure actual file name is used for further processing.
 				oFileUploaderSettings.fileName = decodeURIComponent(oEvent.mParameters.fileName);
 				var fileType = oEvent.mParameters.requestHeaders.find(function(requestHeader) {
 					if (requestHeader.name === "Content-Type") {
@@ -2713,14 +2713,14 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * Performs intent based navigation and opens the given line item context in a new tab.
-		 * 
+		 *
 		 * @param {object} oOutbound The target outbound intent (contains semantic object and action)
 		 * @param {sap.ui.model.Context} oLineItemContext The line item context to be opened in new tab
 		 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} oSmartFilterBar The filter bar
 		 * @param {Function} fnHandleError The error handling function
 		 */
 		function fnNavigateIntentOnNewTab(oOutbound, oLineItemContext, oSmartFilterBar, fnHandleError) {
-			var sSelectionVariant, 
+			var sSelectionVariant,
 				oSelectionVariant,
 				sNavMode = "explace"; // "explace" is the navigation mode for opening in new tab
 			// Get selection variant from filter bar

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);

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

@@ -910,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);

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/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
         };
     }