@sapui5/sap.suite.ui.generic.template 1.130.3 → 1.130.5

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=Kreiranje s filtri
 
 
 
-ST_EASY_FILTER_TITLE=Na\u010Din filtriranja\:
-
 ST_MANUAL_FILTER=Klasi\u010Dno
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=Preprosti filter
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 \u0441 \u0444\
 
 
 
-ST_EASY_FILTER_TITLE=\u041D\u0430\u0447\u0438\u043D \u0444\u0438\u043B\u0442\u0435\u0440\u0430\:
-
 ST_MANUAL_FILTER=\u041A\u043B\u0430\u0441\u0438\u0447\u043D\u043E
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=\u0408\u0435\u0434\u043D\u043E\u0441\u0442\u0430\u0432\u043D\u0438 \u0444\u0438\u043B\u0442\u0435\u0440
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=Skapa med filter
 
 
 
-ST_EASY_FILTER_TITLE=Filtreringsl\u00E4ge\:
-
 ST_MANUAL_FILTER=Klassisk
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=Enkelt filter
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=\u0E2A\u0E23\u0E49\u0E32\u0E07\u0E42\u0E14\u0E22\u0E21\u0
 
 
 
-ST_EASY_FILTER_TITLE=\u0E42\u0E2B\u0E21\u0E14\u0E1F\u0E34\u0E25\u0E40\u0E15\u0E2D\u0E23\u0E4C\:
-
 ST_MANUAL_FILTER=\u0E04\u0E25\u0E32\u0E2A\u0E2A\u0E34\u0E01
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=\u0E1F\u0E34\u0E25\u0E40\u0E15\u0E2D\u0E23\u0E4C\u0E41\u0E1A\u0E1A\u0E07\u0E48\u0E32\u0E22
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=Filtreler ile yarat
 
 
 
-ST_EASY_FILTER_TITLE=Filtre modu\:
-
 ST_MANUAL_FILTER=Klasik
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=Kolay filtre
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0437 \
 
 
 
-ST_EASY_FILTER_TITLE=\u0420\u0435\u0436\u0438\u043C \u0444\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u043D\u043D\u044F\:
-
 ST_MANUAL_FILTER=\u041A\u043B\u0430\u0441\u0438\u0447\u043D\u0438\u0439
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=\u041F\u0440\u043E\u0441\u0442\u0438\u0439 \u0444\u0456\u043B\u044C\u0442\u0440
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=Ta\u0323o co\u0301 b\u00F4\u0323 lo\u0323c
 
 
 
-ST_EASY_FILTER_TITLE=Ch\u00EA\u0301 \u0111\u00F4\u0323 lo\u0323c\:
-
 ST_MANUAL_FILTER=C\u00F4\u0309 \u0111i\u00EA\u0309n
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=B\u1ED9 l\u1ECDc d\u1EC5 d\u00E0ng
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=\u4F7F\u7528\u8FC7\u6EE4\u5668\u521B\u5EFA
 
 
 
-ST_EASY_FILTER_TITLE=\u8FC7\u6EE4\u6A21\u5F0F\uFF1A
-
 ST_MANUAL_FILTER=\u7ECF\u5178
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=\u7B80\u6613\u8FC7\u6EE4\u5668
 
 
 

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

@@ -102,11 +102,9 @@ ST_CREATE_WITH_FILTERS=\u4F7F\u7528\u7BE9\u9078\u5EFA\u7ACB
 
 
 
-ST_EASY_FILTER_TITLE=\u7BE9\u9078\u6A21\u5F0F\uFF1A
-
 ST_MANUAL_FILTER=\u5178\u578B
 
-ST_EASY_FILTER=SAP Business AI
+ST_EASY_FILTER=\u7C21\u6613\u7BE9\u9078
 
 
 

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.130.3"
+			"version": "1.130.5"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

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

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

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

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

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

package/src/sap/suite/ui/generic/template/fragments/EasyFilter.fragment.xml

@@ -1,11 +1,6 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:feControls="sap.fe.controls.easyFilter">
     <!-- to check how to use a common model property instead of listReport/filterMode  which is specific to LR-->
     <VBox  visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
-         <MessageStrip
-            text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
-            showIcon="true"
-            showCloseButton="true"
-            class="sapUiSmallMarginBottom"/>
          <feControls:EasyFilterBarContainer id="template::easyFilterContainer"
 			showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
 			queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
@@ -13,7 +8,6 @@
 			beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
 			afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
 			clearFilters="._templateEventHandlers.onEasyFilterClearFilters"
-			executeSearch="._templateEventHandlers.onEasyFilterExecuteSearch"
 		/>
     </VBox>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -105,8 +105,10 @@ sap.ui.define([
 				oControl.attachAfterVariantInitialise(function() {
 					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
 					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
-						oControl.setCurrentVariantId(sVariantId);
+					if (sVariantId !== '*standard*') {
+						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
+							oControl.setCurrentVariantId(sVariantId);
+						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});

package/src/sap/suite/ui/generic/template/genericUtilities/filterHelper.js

@@ -5,8 +5,9 @@ sap.ui.define([
 	"sap/m/DynamicDateUtil",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
 	"sap/base/i18n/date/CalendarType",
-	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
-], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper) {
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
+	"sap/ui/model/Filter"
+], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper,Filter) {
     "use strict";
 
 	function getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, bAnd){
@@ -260,6 +261,71 @@ sap.ui.define([
 		};
 	}
 
+/**
+	 * function wraps the table level filters into single filter object
+	 * This is done to follow the same format as SFB and chart filters 
+	 * returns the updated aFilters
+	 * @param {Array} aFilters - It contains all the filters applied (in SFB , chart or table level filters)
+	 * @returns {Array} - returns array containing all the filters applied including the table filters wrapped as single filter object similar to SFB and chart filters
+	 */
+
+	function fnNormaliseControlFilters(aFilters) {
+		var aTableFilters = [];
+
+		var aChartAndSFBFilters = [];
+
+		aFilters.forEach((oFilter) => {
+			if (oFilter.aFilters) {
+				aChartAndSFBFilters.push(oFilter);
+			} else {
+				aTableFilters.push(oFilter);
+			}
+		});
+
+		if (aTableFilters && aTableFilters.length > 1) {
+			//Grouping the table level filters based on sPath
+			var aGroupedTableFilters = aTableFilters.reduce(
+				(aGroupedFilters, oCurrentfilter) => {
+					var path = oCurrentfilter.sPath;
+
+					if (!aGroupedFilters[path]) {
+						aGroupedFilters[path] = [];
+					}
+
+					aGroupedFilters[path].push(oCurrentfilter);
+
+					return aGroupedFilters;
+				},
+				{}
+			);
+
+			// Convert grouped table filters into nested filter groups
+
+			var aTableFilterGroups = Object.keys(aGroupedTableFilters).map(
+				(sPath) => {
+					return new Filter({
+						filters: aGroupedTableFilters[sPath],
+
+						and: false // OR logic within each group
+					});
+				}
+			);
+
+			// Forming a single top-level table filter
+
+			aTableFilters = new Filter({
+				filters: aTableFilterGroups,
+
+				and: true // AND logic for combining everything
+			});
+
+			// combining filters from chart , SFB , and table
+			aChartAndSFBFilters.push(aTableFilters);
+			return aChartAndSFBFilters;
+		}
+
+		return aFilters;
+	}
 	/**
      * Function returns filter params for service url
      * @param {object} sEntityTypeName
@@ -274,6 +340,7 @@ sap.ui.define([
 			oFilterData: oFilterData,
 			bIsStatic: false
 		};
+		aApplicationFilters = fnNormaliseControlFilters(aApplicationFilters);
 		// Here oParams.bIsStrict will change if SFB have custom semantic-date filter.
 		var sFilterParams = "$filter=" + getFilterString(aApplicationFilters, getFilterInfoForPropertyFilters.bind(null, oParams));
 		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
@@ -281,6 +348,7 @@ sap.ui.define([
 	}
 	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
+	testableHelper.testableStatic(fnNormaliseControlFilters, "filterHelper_fnNormaliseControlFilters");
     return {
 		getFilterParams: getFilterParams
     };

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

@@ -938,7 +938,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.130.3
+	 * @version 1.130.5
 	 * @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/CRUDHelper.js

@@ -216,7 +216,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						]);
 				var sEdit =  oResourceObject.getText("Edit");
 				var sCancel =  oResourceObject.getText("CANCEL");
-					MessageBox.warning(sWarningText, {
+				MessageBox.warning(sWarningText, {
 					title: oResourceObject.getText("ST_UNSAVED_CHANGES_TITLE"),
 					actions: [sEdit, sCancel],
 					emphasizedAction: sEdit,
@@ -224,7 +224,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						if (sAction === sEdit) {
 							resolve();
 						} else if (sAction === sCancel) {
-							if (bOpenInEditMode) {
+							if (bOpenInEditMode && oViewProxy && oViewProxy.navigateUp) {
 								oViewProxy.navigateUp();
 							}
 						}
@@ -368,7 +368,9 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 												});
 												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
 											};
-											var editRejection = Function.prototype;
+											var editRejection = reject({
+												cancelled: true
+											});
 											var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
 											unSavedChangesDialogPromise.then(editConfirmation,editRejection);
 										}

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

@@ -1663,6 +1663,10 @@ sap.ui.define(["sap/ui/base/Object",
 					if (oError.lockedByUser) {
 						var sLockText = oCommonUtils.getText("ST_GENERIC_DRAFT_LOCKED_BY_USER", [" ", oError.lockedByUser]);
 						MessageBox.error(sLockText);
+					} else if (oError.cancelled) {
+						if (oViewProxy && oViewProxy.navigateUp){
+							oViewProxy.navigateUp();
+						}
 					} else {
 						MessageUtils.handleError(MessageUtils.operations.editEntity, oController, oServices, oError);
 						if (oViewProxy && oViewProxy.navigateUp){

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

@@ -126,13 +126,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 					var oTreeNode = oTemplateContract.mEntityTree[sEntitySet];
 					if (oTreeNode && !oTreeNode.noOData){
 						if (aKeysFromIdentity){
+							// Get the root context's info for the current draft context
+							oRootContextInfo = getRootContextInfo(oTreeNode, aKeysFromIdentity);
+							// If the current context is a draft, register context info for the active sibling as well
 							if (oContextInfo.bIsDraft){
 								var aActiveKeys = [];
 								var oActiveFoundPromise = oTemplateContract.oApplicationProxy.fillSiblingKeyPromise(oTreeNode, aKeysFromIdentity, aActiveKeys);
 								oActiveFoundPromise.then(function(oReplaceNode){
 									var sReplacePath = oReplaceNode.getPath(3, aActiveKeys);
-									if (!mPath2ContextData[sReplacePath]){
-										mPath2ContextData[sReplacePath] = {
+									var oActiveContextData = mPath2ContextData[sReplacePath];
+									if (!oActiveContextData){
+										oActiveContextData = {
 											oContextInfo: {
 												bIsDraft: false,
 												bIsDraftSupported: true,
@@ -142,30 +146,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 											},
 											aKeysFromIdentity: aActiveKeys
 										};
+										// Finally add the active context data to the cache
+										mPath2ContextData[sReplacePath] = oActiveContextData;
+									}
+
+									// Fill rootContextInfo for the active context's data
+									if (!oActiveContextData.oRootContextInfo) {
+										oActiveContextData.oRootContextInfo = getRootContextInfo(oReplaceNode, aActiveKeys);
+										// Add the active context's data to root context info's children
+										oActiveContextData.oRootContextInfo.childContexts[sReplacePath] = oActiveContextData;
 									}
 								});	
 							}
-							if (oTreeNode && !oTreeNode.noOData){
-								var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
-								var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
-								if (!oActiveDraftInfoForDraftRoot){
-									oActiveDraftInfoForDraftRoot = {
-										treeNode: oMainObjectNode,
-										draftRoots: Object.create(null)
-									};
-									mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
-								}
-								var sRootKey = aKeysFromIdentity[1];
-								oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
-								if (!oRootContextInfo){
-									oRootContextInfo = {
-										treeNode: oMainObjectNode,
-										key: sRootKey,
-										childContexts: Object.create(null)
-									};
-									oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
-								}
-							}
 						}
 						var oModel = oContext.getModel();
 						var oMetaModel = oModel.getMetaModel();
@@ -201,6 +193,30 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 				return oContextInfo;
 			}
 
+			// Gets the root context's info for the given tree node
+			function getRootContextInfo(oTreeNode, aKeysFromIdentity) {
+				var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
+				var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
+				if (!oActiveDraftInfoForDraftRoot){
+					oActiveDraftInfoForDraftRoot = {
+						treeNode: oMainObjectNode,
+						draftRoots: Object.create(null)
+					};
+					mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
+				}
+				var sRootKey = aKeysFromIdentity[1];
+				var oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
+				if (!oRootContextInfo){
+					oRootContextInfo = {
+						treeNode: oMainObjectNode,
+						key: sRootKey,
+						childContexts: Object.create(null)
+					};
+					oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
+				}
+				return oRootContextInfo;
+			}
+
 			function getPathOfLastShownDraftRoot() {
 				for (var i = aPathOfLastShownDraftRoots.length - 1; i >= 0; i--) {
 					var oContext = mPath2ContextData[aPathOfLastShownDraftRoots[i]].oContext;

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

@@ -29,9 +29,11 @@ sap.ui.define([
          * @returns A promise which returns the prepared metadata
          */
         function fnGetEasyFilterSearchMetadata() {
-            if (oEasyFilterMetadata) {
-                return Promise.resolve(oEasyFilterMetadata);
-            } else {
+            // In a few cases the SFB is not properly initialized and the metadata available is not complete
+            // In such cases the metadata is prepared after the SFB is initialized
+            // if (oEasyFilterMetadata) {
+            //     return Promise.resolve(oEasyFilterMetadata);
+            // } else {
                 return new Promise(function(fnResolve) {
                     oState.oIappStateHandler.onFEStartupInitialized().then(function() {
                         fnPrepareSearchMetadata().then(function(oMetadata){
@@ -39,7 +41,7 @@ sap.ui.define([
                         });
                     });
                 });
-            }
+            //}
         }
         /**
          * This method prepares the metadata for each filterable field from the smart filter bar
@@ -60,7 +62,7 @@ sap.ui.define([
             var mFilterProperties = {}; // todo : Add the properties from navigation entites
             var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
             oEntityType.property.map(function (oProperty) {
-                var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox"
+                var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox" | "MenuWithSingleSelect"
                 if (filterHelper.isPropertyFilterable(oProperty)) {
 
                     var bIsCodeListRequired;
@@ -84,7 +86,7 @@ sap.ui.define([
                         name: oProperty.name,
                         //label: oProperty.label,  Name is added from the filter item control
                         dataType: oProperty.type,
-                        defaultValue : {}, // Fill values from FLP user defaults , SV or other sources
+                        defaultValue : [], // Fill values from FLP user defaults , SV or other sources
                         filterable: true,
                         sortable: false,
                         codeList : bIsCodeListRequired,
@@ -109,7 +111,8 @@ sap.ui.define([
                     var oDefaultFilterValue = oDefaultValuesForEasyFilter[oFilterItem.getName()];
                     if (oDefaultFilterValue) {
                         var aValues = [];
-                        if (oDefaultFilterValue.ranges) {
+                        // oDefaultFilterValue can have ranges or items or low or single value directly
+                        if (oDefaultFilterValue.ranges  && oDefaultFilterValue.ranges.length > 0) {
                             aValues = oDefaultFilterValue.ranges.map(function(oRange) {
                                 if (oRange.exclude === false) {
                                     if (oRange.operation === "BT") {
@@ -130,7 +133,14 @@ sap.ui.define([
                                     };
                                 }
                             });
-                        } else { // In cases where the default value is coming from the FLP user defaults and does not have ranges and the value is a single value
+                        } else if (oDefaultFilterValue.items && oDefaultFilterValue.items.length > 0) { // unrestricted/multi-value
+                            oDefaultFilterValue.items.forEach(function(oItem) {
+                                aValues.push({
+                                    operator: FilterOperator.EQ,
+                                    selectedValues: [oItem.key]
+                                });
+                            });
+                        } else if (oDefaultFilterValue) { // In cases where the default value is coming from the FLP user defaults and does not have ranges and the value is a single value
                             aValues = [
                                 {
                                     operator: FilterOperator.EQ,
@@ -182,7 +192,7 @@ sap.ui.define([
                         filterable: true,
                         required: false,
                         sortable: false,
-                        type: "MenuWithCheckBox",
+                        type: "MenuWithSingleSelect",
                         codeList : oEditingStatusCodeList
                     };
                     oEasyFilterMetadata.fields.push(oEditStateFilterMetadata);
@@ -354,11 +364,6 @@ sap.ui.define([
             });
         }
 
-        function fnExecuteSearch(oEvent) {
-			var oSmartFilterbar = oState.oSmartFilterbar;
-			oSmartFilterbar.search();
-		}
-
 		function fnClearFilters(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
             oSmartFilterbar.search();
@@ -470,19 +475,35 @@ sap.ui.define([
             }
         }
 
+        /**
+         *
+         * This method is called when the variant is loaded in SFB
+         * Always set the filterMode to classic when the variant is loaded as the variant filters are not supported in the EasyFilter
+         * */
+        function fnHandleVariantLoad(oEvent) {
+            var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+            // 'context' is undefined or null when the user switches variant , in this case switch to classic mode
+            // other values are "CANCEL" , "RESET" , "SET_VM_ID" , "DATA_SUITE" , "INIT" , "KEY_USER" etc : Do not switch filter mode in these cases
+            if (!oEvent.getParameter("context") && oTempModel.getProperty("/listReport/filterMode") !== "classic") {
+                var oSmartFilterbar = oState.oSmartFilterbar;
+                oTempModel.setProperty("/listReport/filterMode", "classic");
+                oSmartFilterbar.setVisible(true);
+            }
+        }
+
         return {
             getEasyFilterBar : fnGetEasyFilterBar,
             initialiseEasyFilterBar : fnInitialiseEasyFilterBar,
             getSFBVariantData : fnGetSFBVariantData,
             getEasyFilterSearchMetadata : fnGetEasyFilterSearchMetadata,
-			onExecuteSearch: fnExecuteSearch,
 			onClearFilters: fnClearFilters,
 			onAfterQueryProcessing: fnAfterQueryProcessing,
 			onBeforeQueryProcessing: fnBeforeQueryProcessing,
             onQueryChanged : fnQueryChanged,
 			onTokensChanged: fnTokensChanged,
 			onShowValueHelp: fnShowValueHelp,
-            onFilterChange : fnOnFilterChange
+            onFilterChange : fnOnFilterChange,
+            handleVariantLoad : fnHandleVariantLoad
         };
     }
 

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

@@ -304,20 +304,6 @@ ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS=Card creation isn\u2019t p
 #XMSG: Info text
 ST_CARD_NAVIGATION_FAILURE_INFO=Direct navigation to the object details isn’t possible from this insights card.
 
-
-#------------Easy filter related text-----------------------
-
-# YMSG, 200: Message shown when the user switches to Easy filter mode
-ST_EASY_FILTER_PROMPT_INFO=The Prompt-based filtering will create completely new filter criteria. Generated content may not always be accurate. Consider verifying it.
-
-# YMSG, 100: Placeholder text for the Easy Filter input field
-ST_EASY_FILTER_INPUT_PLACEHOLDER=Enter your query in natural language to filter the list
-
-# XBUT, 20: Text for the Go button in Easy Filter mode
-ST_EASY_FILTER_GO_BUTTON_TEXT=Go
-
-#------------End of: Easy filter related text-----------------------
-
 ST_AI_EE_BUTTON_LABEL=Generate Explanation
 
 #---Final block: texts to be redefined by the application ----------------------------------------------

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

@@ -196,15 +196,6 @@ ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS=\u0644\u0627 \u064A\u0645\
 
 ST_CARD_NAVIGATION_FAILURE_INFO=\u0627\u0644\u062A\u0646\u0642\u0644 \u0627\u0644\u0645\u0628\u0627\u0634\u0631 \u0625\u0644\u0649 \u062A\u0641\u0627\u0635\u064A\u0644 \u0627\u0644\u0643\u0627\u0626\u0646 \u063A\u064A\u0631 \u0645\u0645\u0643\u0646 \u0645\u0646 \u0628\u0637\u0627\u0642\u0629 \u0627\u0644\u0644\u0645\u062D\u0627\u062A \u0627\u0644\u0639\u0627\u0645\u0629 \u0647\u0630\u0647.
 
-
-
-ST_EASY_FILTER_PROMPT_INFO=\u062A\u0642\u0648\u0645 \u0627\u0644\u062A\u0635\u0641\u064A\u0629 \u0639\u0644\u0649 \u0623\u0633\u0627\u0633 \u0627\u0644\u0637\u0644\u0628 \u0627\u0644\u0641\u0648\u0631\u064A \u0628\u0625\u0646\u0634\u0627\u0621 \u0645\u0639\u0627\u064A\u064A\u0631 \u062A\u0635\u0641\u064A\u0629 \u062C\u062F\u064A\u062F\u0629 \u062A\u0645\u0627\u0645\u064B\u0627. \u0642\u062F \u0644\u0627 \u064A\u0643\u0648\u0646 \u0627\u0644\u0645\u062D\u062A\u0648\u0649 \u0627\u0644\u0630\u064A \u062A\u0645 \u0625\u0646\u0634\u0627\u0624\u0647 \u062F\u0642\u064A\u0642\u064B\u0627 \u062F\u0627\u0626\u0645\u064B\u0627. \u0641\u0643\u0631 \u0641\u064A \u0627\u0644\u062A\u062D\u0642\u0642 \u0645\u0646 \u0635\u062D\u062A\u0647.
-
-ST_EASY_FILTER_INPUT_PLACEHOLDER=\u0623\u062F\u062E\u0644 \u0627\u0633\u062A\u0639\u0644\u0627\u0645\u0643 \u0628\u0627\u0644\u0644\u063A\u0629 \u0627\u0644\u0637\u0628\u064A\u0639\u064A\u0629 \u0644\u062A\u0635\u0641\u064A\u0629 \u0627\u0644\u0642\u0627\u0626\u0645\u0629.
-
-ST_EASY_FILTER_GO_BUTTON_TEXT=\u0627\u0646\u062A\u0642\u0627\u0644
-
-
 ST_AI_EE_BUTTON_LABEL=\u0625\u0646\u0634\u0627\u0621 \u062A\u0648\u0636\u064A\u062D
 
 

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

@@ -196,15 +196,6 @@ ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS=\u0421\u044A\u0437\u0434\u
 
 ST_CARD_NAVIGATION_FAILURE_INFO=\u0414\u0438\u0440\u0435\u043A\u0442\u043D\u0430\u0442\u0430 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F \u043A\u044A\u043C \u043F\u043E\u0434\u0440\u043E\u0431\u043D\u0438\u0442\u0435 \u0434\u0430\u043D\u043D\u0438 \u043D\u0430 \u043E\u0431\u0435\u043A\u0442\u0430 \u043D\u0435 \u0435 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u0430 \u043E\u0442 \u0442\u0430\u0437\u0438 \u043A\u0430\u0440\u0442\u0430 \u043D\u0430 \u0430\u043D\u0430\u043B\u0438\u0437\u0438.
 
-
-
-ST_EASY_FILTER_PROMPT_INFO=\u0424\u0438\u043B\u0442\u0440\u0438\u0440\u0430\u043D\u0435\u0442\u043E \u043D\u0430 \u0431\u0430\u0437\u0430 \u0437\u0430\u043F\u0438\u0442\u0432\u0430\u043D\u0435 \u0441\u044A\u0437\u0434\u0430\u0432\u0430 \u043D\u0430\u043F\u044A\u043B\u043D\u043E \u043D\u043E\u0432\u0438 \u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0438 \u0437\u0430 \u0444\u0438\u043B\u0442\u0440\u0438\u0440\u0430\u043D\u0435. \u0412\u044A\u0437\u043C\u043E\u0436\u043D\u043E \u0435 \u0433\u0435\u043D\u0435\u0440\u0438\u0440\u0430\u043D\u043E\u0442\u043E \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 \u043D\u0435\u0432\u0438\u043D\u0430\u0433\u0438 \u0434\u0430 \u0435 \u0442\u043E\u0447\u043D\u043E. \u041F\u0440\u043E\u0432\u0435\u0440\u0435\u0442\u0435 \u0433\u043E.
-
-ST_EASY_FILTER_INPUT_PLACEHOLDER=\u0412\u044A\u0432\u0435\u0434\u0435\u0442\u0435 \u0437\u0430\u043F\u0438\u0442\u0432\u0430\u043D\u0435\u0442\u043E \u0441\u0438 \u043D\u0430 \u0435\u0441\u0442\u0435\u0441\u0442\u0432\u0435\u043D \u0435\u0437\u0438\u043A, \u0437\u0430 \u0434\u0430 \u0444\u0438\u043B\u0442\u0440\u0438\u0440\u0430\u0442\u0435 \u0441\u043F\u0438\u0441\u044A\u043A\u0430.
-
-ST_EASY_FILTER_GO_BUTTON_TEXT=\u0421\u0442\u0430\u0440\u0442
-
-
 ST_AI_EE_BUTTON_LABEL=\u0413\u0435\u043D\u0435\u0440\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043E\u0431\u044F\u0441\u043D\u0435\u043D\u0438\u0435
 
 

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

@@ -196,15 +196,6 @@ ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS=No es pot crear la targeta
 
 ST_CARD_NAVIGATION_FAILURE_INFO=No es pot accedir directament als detalls de l'objecte des d'aquesta targeta d'informaci\u00F3.
 
-
-
-ST_EASY_FILTER_PROMPT_INFO=El filtratge basat en preguntes crea uns criteris de filtre nous. Pot ser que el contingut generat no sigui sempre prec\u00EDs. Considereu verificar-lo.
-
-ST_EASY_FILTER_INPUT_PLACEHOLDER=Introdu\u00EFu una consulta en llenguatge natural per filtrar la llista.
-
-ST_EASY_FILTER_GO_BUTTON_TEXT=Anar
-
-
 ST_AI_EE_BUTTON_LABEL=Generar explicaci\u00F3