@sapui5/sap.suite.ui.generic.template 1.131.1 → 1.132.0

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

@@ -0,0 +1,168 @@
+sap.ui.define([
+  "sap/ui/base/Object",
+  "sap/base/util/extend",
+  "sap/f/FlexibleColumnLayout",
+  "sap/f/FlexibleColumnLayoutData",
+  "sap/f/FlexibleColumnLayoutDataForDesktop",
+  "sap/f/FlexibleColumnLayoutDataForTablet"
+], function (
+  BaseObject,
+  extend,
+  FlexibleColumnLayout,
+  FlexibleColumnLayoutData,
+  FlexibleColumnLayoutDataForDesktop,
+  FlexibleColumnLayoutDataForTablet
+) {
+  "use strict";
+
+  var appComponent;
+  var shellPersonalizationService;
+
+  function getMethods({ oAppComponent, oShellPersonalizationService }) {
+
+    appComponent = oAppComponent;
+    shellPersonalizationService = oShellPersonalizationService;
+
+    /**
+     * Retieves the FCL state from the personalization service.
+     * @returns The FCL state
+     */
+    async function getFCLPersonalizationData() {
+      var oEmptyFCLState = {
+        defaultLayouts: {},
+        columnsDistribution: {
+          desktop: {},
+          tablet: {}
+        }
+      };
+      return ((await shellPersonalizationService.getApplicationPersonalizationData("FCL-Personalization")) ?? oEmptyFCLState);
+    }
+
+    /**
+     * Sets the FCL state in the personalization service.
+     * @param fclState The FCL state
+     */
+    function setFCLPersonalizationData(fclState) {
+      shellPersonalizationService.setApplicationPersonalizationData("FCL-Personalization", fclState);
+    }
+
+    /**
+     * Requests the FCL state from the personalization service and sets the model accordingly.
+     */
+    async function setColumnDistributionModel() {
+      if (!shellPersonalizationService.hasInitialized()) {
+        return;
+      }
+      var oColumnsDistribution = (await getFCLPersonalizationData()).columnsDistribution;
+      if (oColumnsDistribution) {
+        var oTemplatePrivateGlobalModel = appComponent.getModel("_templPrivGlobal");
+        oTemplatePrivateGlobalModel.setProperty("/generic/FCL/FCLColumnsDistribution", oColumnsDistribution);
+      }
+    }
+
+    /**
+     * Gets the number of columns displayed in the FCL based on the layout.
+     * @param {LayoutTypeType} layout  The layout
+     * @returns {1 | 2 | 3 | null} The number of columns displayed
+     */
+    function getNumberOfColumnsFromLayout(layout) {
+      var iColumnsDisplayed = /^(One|Two|Three)Column/.exec(layout)?.[1];
+      switch (iColumnsDisplayed) {
+        case "One":
+          return 1;
+        case "Two":
+          return 2;
+        case "Three":
+          return 3;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Gets the layout stored in the personalization service based on the proposed layout.
+     * @param {LayoutTypeType | undefined } proposedLayout
+     * @returns The FCL layout stored in the personalization service
+     */
+    async function getStoredLayout(oProposedLayout) {
+      if (shellPersonalizationService.hasInitialized()) {
+        var iColumnsDisplayed = getNumberOfColumnsFromLayout(oProposedLayout);
+        if (iColumnsDisplayed) {
+          var defaultLayouts = (await getFCLPersonalizationData()).defaultLayouts;
+          return defaultLayouts?.[iColumnsDisplayed] ?? oProposedLayout;
+        }
+      }
+      return oProposedLayout;
+    }
+
+    /**
+     * Is called when the user changes the FCL columns distribution.
+     * Updates the FCL state in the personalization service.
+     * @param {Event<{ media: "tablet" | "desktop"; layout: LayoutTypeType; columnsSizes: string }>} event
+     */
+    async function onColumnsDistributionChange(event) {
+      if (!shellPersonalizationService.hasInitialized()) {
+        return;
+      }
+
+      var { media, layout, columnsSizes } = event.getParameters();
+
+      var oTemplatePrivateGlobalModel = appComponent.getModel("_templPrivGlobal");
+      oTemplatePrivateGlobalModel.setProperty(`/generic/FCL/FCLColumnsDistribution/${media}/${layout}`, columnsSizes);
+
+      var oFclState = await getFCLPersonalizationData();
+      var iColumnsDisplayed = getNumberOfColumnsFromLayout(layout);
+      if (iColumnsDisplayed) {
+        oFclState.defaultLayouts[iColumnsDisplayed] = layout;
+        oFclState.columnsDistribution[media][layout] = columnsSizes;
+        setFCLPersonalizationData(oFclState);
+      }
+    }
+
+    function initFlexibleColumnLayout() {
+      var oFCL = new FlexibleColumnLayout();
+
+      var oLayoutData = new FlexibleColumnLayoutData();
+      var oDesktopLayoutData = new FlexibleColumnLayoutDataForDesktop();
+      var oTabletLayoutData = new FlexibleColumnLayoutDataForTablet();
+
+      var sFCLColumnsDistributionPath = "_templPrivGlobal>/generic/FCL/FCLColumnsDistribution";
+      var sDesktopFCLColumnsDistributionPath = `${sFCLColumnsDistributionPath}/desktop`;
+      var sTabletFCLColumnsDistributionPath = `${sFCLColumnsDistributionPath}/tablet`;
+
+      oDesktopLayoutData.bindProperty("twoColumnsBeginExpanded", `${sDesktopFCLColumnsDistributionPath}/TwoColumnsBeginExpanded`);
+      oDesktopLayoutData.bindProperty("twoColumnsMidExpanded", `${sDesktopFCLColumnsDistributionPath}/TwoColumnsMidExpanded`);
+      oDesktopLayoutData.bindProperty("threeColumnsBeginExpandedEndHidden", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsBeginExpandedEndHidden`);
+      oDesktopLayoutData.bindProperty("threeColumnsEndExpanded", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsEndExpanded`);
+      oDesktopLayoutData.bindProperty("threeColumnsMidExpanded", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsMidExpanded`);
+      oDesktopLayoutData.bindProperty("threeColumnsMidExpandedEndHidden", `${sDesktopFCLColumnsDistributionPath}/ThreeColumnsMidExpandedEndHidden`);
+
+      oTabletLayoutData.bindProperty("twoColumnsBeginExpanded", `${sTabletFCLColumnsDistributionPath}/TwoColumnsBeginExpanded`);
+      oTabletLayoutData.bindProperty("twoColumnsMidExpanded", `${sTabletFCLColumnsDistributionPath}/TwoColumnsMidExpanded`);
+      oTabletLayoutData.bindProperty("threeColumnsBeginExpandedEndHidden", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsBeginExpandedEndHidden`);
+      oTabletLayoutData.bindProperty("threeColumnsEndExpanded", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsEndExpanded`);
+      oTabletLayoutData.bindProperty("threeColumnsMidExpanded", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsMidExpanded`);
+      oTabletLayoutData.bindProperty("threeColumnsMidExpandedEndHidden", `${sTabletFCLColumnsDistributionPath}/ThreeColumnsMidExpandedEndHidden`);
+
+      oLayoutData.setDesktopLayoutData(oDesktopLayoutData);
+      oLayoutData.setTabletLayoutData(oTabletLayoutData);
+      oFCL.setAggregation("layoutData", oLayoutData);
+
+      oFCL.attachColumnsDistributionChange(onColumnsDistributionChange);
+
+      return oFCL;
+    }
+
+    return {
+      initFlexibleColumnLayout: initFlexibleColumnLayout,
+      getStoredLayout: getStoredLayout,
+      setColumnDistributionModel: setColumnDistributionModel
+    };
+  }
+
+  return BaseObject.extend("sap.suite.ui.generic.template.lib.FlexibleColumnLayoutHelper", {
+    constructor: function (oTemplateContract) {
+      extend(this, getMethods(oTemplateContract));
+    }
+  });
+});

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

@@ -79,7 +79,7 @@ sap.ui.define([
 
 		// This is the public method that can be used to set or remove the message which is currently displayed for a tab or a collection of tabs.
 		// oMessage: The object which represents the message that should currently be displayed. If it is faulty no message should be shown for the specified tabs.
-		//           Otherwise it should be an object containing properties message (text of the message) and type (instance of sap.ui.core.MessageType).
+		//           Otherwise it should be an object containing properties message (text of the message) and type (instance of sap.ui.core.message.MessageType).
 		// vTab: Specifies the affected tabs: faulty -> all tabs affected, string -> identifies the affected tab, array -> lists the affected tabs
 		//       If more than one tab is specified in this way these tabs will be considered to belong together for the close feature of the message strip.
 		//       This means, that the message will be removed for all these tabs when the user closes the message strip.

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

@@ -0,0 +1,137 @@
+sap.ui.define([
+  "sap/ui/base/Object",
+  "sap/base/util/extend",
+  "sap/suite/ui/generic/template/genericUtilities/testableHelper",
+  "sap/suite/ui/generic/template/genericUtilities/FeLogger"
+], function (
+  BaseObject,
+  extend,
+  testableHelper,
+  FeLogger
+) {
+  "use strict";
+
+  function getMethods({ oAppComponent }) {
+
+    var shellPersonalizationService;
+    var applicationPersonalizers = {};
+
+    var sClassName = "lib.ShellPersonalizationService";
+    var oLogger = new FeLogger(sClassName).getLogger();
+
+    /**
+     * Gets the personalizer from the shell service.
+     * We set some defaults for the scope object.
+     * @param persId Personalization object
+     * @param scope Scope object
+     * @param component
+     * @returns {Promise<PersonalizerType> | undefined} Personalizer object which handles personalization
+     */
+    async function getPersonalizer(persId, scope, component) {
+      if (!hasInitialized()) {
+        oLogger.error("Personalization service is not initialized");
+        return;
+      }
+      scope = {
+        // merge some defaults
+        keyCategory: shellPersonalizationService.constants.keyCategory.FIXED_KEY,
+        writeFrequency: shellPersonalizationService.constants.writeFrequency.LOW,
+        clientStorageAllowed: false,
+        validity: Infinity,
+        ...scope
+      };
+      return shellPersonalizationService.getPersonalizer(persId, scope, component);
+    }
+
+    /**
+     * Prepares the container name for personalizer.
+     * @returns Container name
+     */
+    function getContainerName() {
+      // personalizer logs error if name longer than 40 symbols
+      var sContainer = `App#${(oAppComponent).getManifest()["sap.app"].id}`;
+      return sContainer;
+    }
+
+    /**
+     * Initializes the personalizer to access the Application data stored in the shell Personalization.
+     * @param {string} itemName The name of the item for which the personalizer is created.
+     * @returns {Promise<PersonalizerType>} A personalizer
+     */
+    async function getApplicationPersonalizer(itemName) {
+      if (!applicationPersonalizers[itemName]) {
+        applicationPersonalizers[itemName] = getPersonalizer(
+          {
+            container: getContainerName(),
+            item: itemName
+          },
+          {},
+          oAppComponent
+        );
+      }
+      return applicationPersonalizers[itemName];
+    }
+
+    /**
+     * Returns data from the personalization service.
+     * @param {string} itemName
+     * @returns {Promise<object | undefined>} Data
+     */
+    async function getApplicationPersonalizationData(itemName) {
+      var oAppPersonalizer = await getApplicationPersonalizer(itemName);
+      var oPersData = await oAppPersonalizer?.getPersData();
+      return oPersData;
+    }
+
+    /**
+     * Stores an object in the personalization service.
+     * @param {string} itemName
+     * @param {object} data
+     * @returns {Promise<void>} A promise
+     */
+    async function setApplicationPersonalizationData(itemName, data) {
+      var oAppPersonalizer = await getApplicationPersonalizer(itemName);
+      oAppPersonalizer.setPersData(data);
+    }
+
+    /**
+     * Checks whether the shell personalization service has been initialized
+     * @returns True or false
+     */
+    function hasInitialized() {
+      return !!shellPersonalizationService;
+    }
+
+    /**
+     * Initializes the shell personalization service
+     */
+    function init() {
+      var UShellContainer = sap.ui.require("sap/ushell/Container");
+      if (hasInitialized() || !UShellContainer) {
+        return Promise.resolve();
+      }
+      return UShellContainer.getServiceAsync("PersonalizationV2").then((oShellPersonalizationService) => {
+        setShellPersonalizationService(oShellPersonalizationService);
+      });
+    }
+
+    function setShellPersonalizationService(service) {
+      shellPersonalizationService = service;
+    }
+
+    var setShellPersonalizationService = testableHelper.testable(setShellPersonalizationService, "setShellPersonalizationService");
+
+    return {
+      init: init,
+      hasInitialized: hasInitialized,
+      getApplicationPersonalizationData: getApplicationPersonalizationData,
+      setApplicationPersonalizationData: setApplicationPersonalizationData
+    };
+  }
+
+  return BaseObject.extend("sap.suite.ui.generic.template.lib.ShellPersonalizationService", {
+    constructor: function (oTemplateContract) {
+      extend(this, getMethods(oTemplateContract));
+    }
+  });
+});

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

@@ -207,10 +207,65 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 		}
 	}
 
+	/**
+	* Configures a side effect for custom field.
+	* @param {Object} oView - The view instance of the object page.
+	* @param {Object} oControl - The control object for the custom field.
+	* @param {String} sProperty - The name of the property associated with the custom field.
+	* @param {String} sEntitySet - The entity set to which the custom field belongs.
+	* @param {String} oController - Object page controller.
+	*/
+	function registerCustomFieldForSideEffect(oControl, sProperty, sEntitySet, oController) {
+		var oMetaModel = oController.getView().getModel().getMetaModel();
+		var oEntitySet = oMetaModel.getODataEntitySet(sEntitySet);
+		var oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+		var oProperty = oMetaModel.getODataProperty(oEntityType, sProperty);
+		//The method SharedUtil.applyFieldGroupIDs takes in the control and its metadata, reads the Side Effect annotations configured for it 
+		//and assigns the fieldGroupID accordingly.
+		oController.extensionAPI.attachPageDataLoaded(() => {
+			SharedUtil.applyFieldGroupIDs(oControl, {
+				entitySet: oEntitySet,
+				entityType: oEntityType,
+				path: sProperty,
+				property: {
+					property: oProperty
+				}
+			});
+		});
+	}
+
+	/**
+	* Register field group Change.
+	* @param {object} oComponent
+	* @param {Object} oTemplateUtils
+	* @param {String} sFieldName - The name of the property associated with the custom field.
+	* @param {string} sEntitySet - EntitySet where side effect is defined.
+	*/
+	function fieldGroupChangeRegister(oComponent, oTemplateUtils, sFieldName, sEntitySet) {
+		var oEntitySet = oComponent.getModel().getMetaModel().getODataEntitySet(sEntitySet);
+		var oEntityType = oComponent.getModel().getMetaModel().getODataEntityType(oEntitySet.entityType);
+		for (var sProperty in oEntityType) {
+			if (sProperty.includes("com.sap.vocabularies.Common.v1.SideEffects")) {
+				var aSource = oEntityType[sProperty].SourceProperties;
+				if (!aSource) {
+					continue;
+				}
+				for (var i = 0; i < aSource.length; i++) {
+					if (aSource[i].PropertyPath === sFieldName) {
+						var sQualifier = sProperty.split("#")[1];
+						oTemplateUtils.oServices.oApplicationController.registerGroupChange(sQualifier);
+					}
+				}
+			}
+		}
+	}
+
 	return {
 		handleSideEffectForField : fnHandleSideEffectForField,
 		assignFieldGroupIds: fnAssignFieldGroupIds,
 		getPropsForLinkFields: fnGetPropsForLinkFields,
-		assignFieldGroupIdsToLinkField: fnAssignFieldGroupIdsToLinkField
+		assignFieldGroupIdsToLinkField: fnAssignFieldGroupIdsToLinkField,
+		registerCustomFieldForSideEffect: registerCustomFieldForSideEffect,
+		fieldGroupChangeRegister: fieldGroupChangeRegister
 	};
 });

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

@@ -15,9 +15,29 @@ sap.ui.define(["sap/ui/core/library",
 	"sap/suite/ui/generic/template/genericUtilities/CacheHelper",
 	"sap/suite/ui/generic/template/genericUtilities/FeError",
 	"sap/ui/core/mvc/XMLView",
-	"sap/m/IllustratedMessageType"
-], function(coreLibrary, Component, UIComponent, JSONModel, ResourceModel, Device,
-			reuseComponentHelper, CustomData, StableIdDefinition, StableIdHelper, FeLogger, AnnotationHelper, extend, deepExtend, CacheHelper, FeError, XMLView, IllustratedMessageType) {
+	"sap/m/IllustratedMessageType",
+	"sap/ui/core/Element"
+], function (
+	coreLibrary,
+	Component,
+	UIComponent,
+	JSONModel,
+	ResourceModel,
+	Device,
+	reuseComponentHelper,
+	CustomData,
+	StableIdDefinition,
+	StableIdHelper,
+	FeLogger,
+	AnnotationHelper,
+	extend,
+	deepExtend,
+	CacheHelper,
+	FeError,
+	XMLView,
+	IllustratedMessageType,
+	Element
+) {
 		"use strict";
         var	sClassName = "lib.TemplateComponent";
 	    var oLogger = new FeLogger(sClassName).getLogger();
@@ -242,7 +262,7 @@ sap.ui.define(["sap/ui/core/library",
 
 			var sViewId = fnDetermineViewId(oComponentRegistryEntry);
 
-			var oView = sap.ui.getCore().byId(sViewId);
+			var oView = Element.getElementById(sViewId);
 			if (oView){
 				oLogger.warning("View with ID: " + sViewId + " already exists - old view is getting destroyed now!");
 				try {

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

@@ -2,8 +2,9 @@ sap.ui.define([
     "sap/ui/base/Object",
     "sap/base/util/extend",
     "sap/suite/ui/generic/template/lib/filterHelper",
-    "sap/suite/ui/generic/template/genericUtilities/FeLogger"
-], function(BaseObject, extend, filterHelper, FeLogger) {
+    "sap/suite/ui/generic/template/genericUtilities/FeLogger",
+    "sap/ui/model/FilterOperator"
+], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator) {
     'use strict';
 
     /*
@@ -13,11 +14,11 @@ sap.ui.define([
      * Event handlers for the easy filter bar are also defined here
      * 
      */
-    var oEasyFilterMetadata;
     var oLogger = new FeLogger("lib.ai.EasyFilterBarHandler").getLogger();
 
     function getMethods(oState, oController, oTemplateUtils) {
         var mCodeList = {};
+        var oEasyFilterMetadata;
         // used for busyHandling between query triggered and query resolved.
         var oQueryPromise, oQueryPromiseResolve;
         var fnValueHelpPromiseResolve;
@@ -28,25 +29,13 @@ sap.ui.define([
          * @returns A promise which returns the prepared metadata
          */
         function fnGetEasyFilterSearchMetadata() {
-            if (oEasyFilterMetadata) {
-                return Promise.resolve(oEasyFilterMetadata);
-            } else {
-                return new Promise(function(fnResolve) {
-                    // In case the smart filter bar is already initialized then do not use "attachInitialized" as this event will never get triggered again
-                    if (oState.oSmartFilterbar.isInitialised()) {
-                        fnPrepareSearchMetadata().then(function(oMetadata){
-                                fnResolve(oMetadata);
-                            }
-                        );
-                    } else {
-                        oState.oSmartFilterbar.attachInitialized(function() {
-                            fnPrepareSearchMetadata().then(function(oMetadata) {
-                                fnResolve(oMetadata);
-                            });
-                        },this);
-                    }
+            return new Promise(function(fnResolve) {
+                oState.oIappStateHandler.onFEStartupInitialized().then(function() {
+                    fnPrepareSearchMetadata().then(function(oMetadata){
+                        fnResolve(oMetadata);
+                    });
                 });
-            }
+            });
         }
         /**
          * This method prepares the metadata for each filterable field from the smart filter bar
@@ -56,34 +45,48 @@ sap.ui.define([
         function fnPrepareSearchMetadata()  {
 
             var aPromise = [];
+            var oEditStateFilterItem;
+            var oDefaultValuesForEasyFilter = {};
             var oOwnerFilterControl = oState.oSmartFilterbar;
             var oSFBModel = oOwnerFilterControl.getModel();
             var oSFBMetaModel = oSFBModel.getMetaModel();
-            var oEditStateFilterItem;
+
             var sEntitySet = oController.getOwnerComponent().getEntitySet();
-            var sTokenType = "ValueHelp"; // Other values are "Calendar" | "Time" | "MenuWithCheckBox"
 
             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" | "MenuWithSingleSelect"
                 if (filterHelper.isPropertyFilterable(oProperty)) {
-                    var bIsCodeListRequired = "";
+
+                    var bIsCodeListRequired;
                     oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
                         if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
                             sTokenType = "MenuWithCheckBox";
                             bIsCodeListRequired = true;
                         }
                     });
+
+                    // Calculate the token type based on the property type and display format
+                    // It will be better if this is done at the control level
+                    if ((oProperty.type === "Edm.DateTime" && oProperty["sap:display-format"] === "Date") ||
+                    (oProperty.type === "Edm.String" && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"] && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"].Bool === "true")) {
+                        sTokenType = "Calendar";
+                    } else if (oProperty.type === "Edm.DateTimeOffset") {
+                        sTokenType = "Time";
+                    }
+
                     mFilterProperties[oProperty.name] = {
                         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
                         filterable: true,
                         sortable: false,
                         codeList : bIsCodeListRequired,
                         type: sTokenType,
                         unit: oProperty["sap:unit"] || "",
-                        required: oProperty["sap:required-in-filter"] ? true : false
+                        required: oProperty["sap:required-in-filter"] === "true" ? true : false
                     };
                 }
             });
@@ -93,12 +96,54 @@ sap.ui.define([
                 entitySet: sEntitySet,
                 fields : []
             };
-
+            oDefaultValuesForEasyFilter = oOwnerFilterControl.getFilterData() || {};
             oOwnerFilterControl.getAllFilterItems().forEach(function (oFilterItem) {
                 //check if the filter item from the filter control is a property of the entity type , if then push it to the easy filter metadata
                 // todo : Add the properties from navigation entites
                 var oFilterItemForQuery = mFilterProperties[oFilterItem.getName()];
                 if (oFilterItemForQuery) {
+                    var oDefaultFilterValue = oDefaultValuesForEasyFilter[oFilterItem.getName()];
+                    if (oDefaultFilterValue) {
+                        var aValues = [];
+                        // 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") {
+                                        return {
+                                            operator: FilterOperator.BT,
+                                            selectedValues: [{ value1: oRange.value1, value2: oRange.value2 }]
+                                        };
+                                    } else {
+                                        return {
+                                            operator: oRange.operation,
+                                            selectedValues: [oRange.value1]
+                                        };
+                                    }
+                               } else {
+                                    return {
+                                        operator: FilterOperator.NE,
+                                        selectedValues: [oRange.value1]
+                                    };
+                                }
+                            });
+                        } 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,
+                                    selectedValues: [oDefaultFilterValue]
+                                }
+                            ];
+                        }
+                        oFilterItemForQuery.defaultValue = aValues;
+                    }
                     oFilterItemForQuery.label = oFilterItem.getLabel();
                     // codeList is set to true for fixed value list and codelist is fetched
                     if (oFilterItemForQuery.codeList) {
@@ -128,7 +173,6 @@ sap.ui.define([
              if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
                 var oEditStateControl = oController.byId("editStateFilter");
                 if (oEditStateControl) {
-                    sTokenType = "MenuWithCheckBox";
                     var oEditingStatusCodeList = oEditStateControl.getItems().map(function(oItem) {
                         return {
                             value : oItem.getKey(),
@@ -142,7 +186,7 @@ sap.ui.define([
                         filterable: true,
                         required: false,
                         sortable: false,
-                        type: sTokenType,
+                        type: "MenuWithSingleSelect",
                         codeList : oEditingStatusCodeList
                     };
                     oEasyFilterMetadata.fields.push(oEditStateFilterMetadata);
@@ -308,17 +352,12 @@ sap.ui.define([
             var sEntitySet = oController.getOwnerComponent().getEntitySet();
             oEasyFilterMetadataPromise.then((oEasyFilterMetadata) => {
                 oEasyFilter.setContextPath(sEntitySet);
-                oEasyFilter.setAppId(oController.getOwnerComponent().getAppComponent().getManifestEntry("sap.app")).id;
+                oEasyFilter.setAppId(oController.getOwnerComponent().getAppComponent().getManifestEntry("sap.app").id);
                 oEasyFilter.setFilterBarMetadata(oEasyFilterMetadata.fields);
                 oEasyFilter.easyfilter = oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFilter;
             });
         }
 
-        function fnExecuteSearch(oEvent) {
-			var oSmartFilterbar = oState.oSmartFilterbar;
-			oSmartFilterbar.search();
-		}
-
 		function fnClearFilters(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
             oSmartFilterbar.search();
@@ -430,19 +469,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
         };
     }