@sapui5/sap.suite.ui.generic.template 1.124.2 → 1.124.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.124.2",
+  "version": "1.124.3",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.124.2</version>
+	<version>1.124.3</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

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

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

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.124.2"
+			"version": "1.124.3"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -22,9 +22,11 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/listTemplates/filterSettingsPreparationHelper",
 	"sap/m/table/Util",
 	"sap/suite/ui/generic/template/genericUtilities/filterHelper",
-	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport"
+	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport",
+	"sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler"
 ], function (Filter, ExtensionAPI, listUtils, MessageStripHelper, IappStateHandler, MultipleViewsHandler,
-	WorklistHandler, ShareUtils, controlHelper, FeLogger, testableHelper, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, CtxMenuHandler, MultiEditHandler, SelectionVariant, InsightsHandler, filterSettingsPreparationHelper, TableUtil, filterHelper, AnnotationHelperHiddenTermSupport) {
+	WorklistHandler, ShareUtils, controlHelper, FeLogger, testableHelper, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, CtxMenuHandler, MultiEditHandler, SelectionVariant, InsightsHandler, filterSettingsPreparationHelper, TableUtil, filterHelper, AnnotationHelperHiddenTermSupport,
+	EasyFilterBarHandler) {
 	"use strict";
 
 	var oLogger = new FeLogger("ListReport.controller.ControllerImplementation").getLogger();
@@ -529,6 +531,12 @@ sap.ui.define([
 					oState.oMultiEditHandler = new MultiEditHandler(oState, oController, oTemplateUtils);
 					oState.oInsightsHandler = new InsightsHandler(oState, oController, oTemplateUtils);
 
+					oTemplateUtils.oServices.oFioriAIHandler && oTemplateUtils.oServices.oFioriAIHandler.getFioriAIEnabledPromise().then(function() {
+						oState.oEasyFilterBarHandler = new EasyFilterBarHandler(oState, oController, oTemplateUtils);
+					});
+
+
+
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 
 					oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
@@ -537,6 +545,8 @@ sap.ui.define([
 
 					// Initialise headerExpanded property to true as a fix for incident 1770402849. Text of toggle filter button depends on this value.
 					oTemplatePrivateModel.setProperty("/listReport/isHeaderExpanded", true);
+					// Default SFB should be rendered. Only in AI enabled cases EasyFilter should be rendered
+					oTemplatePrivateModel.setProperty("/listReport/filterMode", "classic");
 
 					// set property for enable/disable of the Delete button
 					oTemplatePrivateModel.setProperty("/listReport/deleteEnabled", false);
@@ -667,6 +677,11 @@ sap.ui.define([
 
 					onSmartFilterBarInitialized: function () {
 						oState.oIappStateHandler.onSmartFilterBarInitialized();
+						// oTemplateUtils.oServices.oFioriAIHandler && oTemplateUtils.oServices.oFioriAIHandler.getFioriAIEnabledPromise().then(function() {
+						// 	// oEasyFilterBarHandler is already initialized in the controller onInit
+						// 	// Prepare the metadats upfront so that it is not triggered for each search
+						// 	oState.oEasyFilterBarHandler && oState.oEasyFilterBarHandler.getEasyFilterSearchMetadata();
+						// });
 					},
 
 					onAfterSFBVariantLoad: function (oEvent) {
@@ -677,7 +692,19 @@ sap.ui.define([
 						var oSmartList = oEvent.getSource();
 						fnOnDataReceived(oSmartList);
 					},
-
+					// Check if a new control can be created for the AI Input field so that the event handler can be removed from here
+					onEasyFilterEnterPress : function (oEvent) {
+						var oEasyFilter = oEvent.getSource();
+						oTemplateUtils.oCommonEventHandlers.onEasyFilterChange(oEasyFilter, oState);
+					},
+					onEasyFilterGoButtonPress : function() {
+						var oEasyFilter = oController.byId("easyFilter");
+						oTemplateUtils.oCommonEventHandlers.onEasyFilterChange(oEasyFilter, oState);
+					},
+					onEasyFilterChange : function(oEvent) {
+						var oEasyFilter = oEvent.getSource();
+						oEasyFilter.setValueState(sap.ui.core.ValueState.None);
+					},
 					onBeforeRebindTable: function (oEvent) {
 						var oSmartTable = oEvent.getSource();
 						setNoDataTextIfRequired(oSmartTable);

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

@@ -157,6 +157,22 @@ ST_CREATE_WITH_FILTERS=Create with filters
 
 #------------End of: template controller reuse texts-----------------------
 
+#------------Easy filter related text-----------------------
+# All the easy filter and filter mode related texts are defined here
+
+# XTIT,30: Title of the Filter modes in List Report
+ST_EASY_FILTER_TITLE=Filter Mode :
+
+# XBUT: Manual filter segmented button text
+ST_MANUAL_FILTER=Classic
+
+# XBUT: Easy filter segmented button text
+ST_EASY_FILTER=SAP Business AI
+
+#------------End of: Easy filter related text-----------------------
+
+
+
 #---Final block: texts to be redefined by the application ----------------------------------------
 
 # XTOL: shown as tooltip on plus or create sign; ; "object" to be redefined. example: Create New Product

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.124.2"
+			"version": "1.124.3"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/DefaultVariant.fragment.xml

@@ -4,11 +4,26 @@
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper'}">
 
 	<f:heading>
-		<!--if worklist, then hide execute on select/apply automatically option in variant management-->
-		<variants:SmartVariantManagement id="template::PageVariant" persistencyKey="{= ${parameter>/settings/smartVariantManagement} ? '_ST_SmartVariantManagement' : 'searchListReportVariant'}"
-			showShare="true" showExecuteOnSelection="{= !${parameter>/settings/isWorklist} }" displayTextForExecuteOnSelectionForStandardVariant="{= (${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === 'ifAnyFilterExist' || ${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === undefined) ? '{i18n>ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION}' : undefined}" headerLevel="H2"/>
+			<!--if worklist, then hide execute on select/apply automatically option in variant management-->
+			<variants:SmartVariantManagement id="template::PageVariant" persistencyKey="{= ${parameter>/settings/smartVariantManagement} ? '_ST_SmartVariantManagement' : 'searchListReportVariant'}"
+				showShare="true" showExecuteOnSelection="{= !${parameter>/settings/isWorklist} }" displayTextForExecuteOnSelectionForStandardVariant="{= (${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === 'ifAnyFilterExist' || ${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === undefined) ? '{i18n>ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION}' : undefined}" headerLevel="H2"/>
 	</f:heading>
 	<f:actions>
+		<!--Enable the filter switch only if the easy filter is enabled-->
+		<FlexBox renderType="Bare" visible="{= ${_templPriv>/listReport/isHeaderExpanded} &amp;&amp; ${_templPrivGlobal>/generic/fioriAI/isEasyFilterEnabled} }">
+				<Label text="{i18n>ST_EASY_FILTER_TITLE}" class="sapSmartTemplateEasyFilterInputPadding"></Label>
+				<SegmentedButton id = "template::FilterSwitchButton"
+					selectedKey="{_templPriv>/listReport/filterMode}"
+					selectionChange="._templateEventHandlers.onEasyFilterSwitch">
+					<layoutData>
+						<OverflowToolbarLayoutData priority="NeverOverflow"/>
+					</layoutData>
+					<items>
+						<SegmentedButtonItem text="{i18n>ST_MANUAL_FILTER}" key="classic"/>
+						<SegmentedButtonItem text="{i18n>ST_EASY_FILTER}" key="easyFilter"/>
+					</items>
+				</SegmentedButton>
+			</FlexBox>
 		<ToolbarSpacer/>
 		<!-- global breakout actions-->
 		<template:repeat list="{parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions/sap.suite.ui.generic.template.ListReport.view.ListReport/sap.ui.generic.app}" var="tmpEntitySet">

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/FullscreenPage.fragment.xml

@@ -38,6 +38,12 @@
 						visible="{= !${parameter>/settings/isWorklist}}">
 						<f:content>
 							<core:Fragment fragmentName="sap.suite.ui.generic.template.ListReport.view.fragments.SmartFilterBar" type="XML"/>
+							<!-- <VBox visible="{= ${_templPriv>/listReport/filterMode} === 'classic'}">
+								<core:Fragment fragmentName="sap.suite.ui.generic.template.ListReport.view.fragments.SmartFilterBar" type="XML"/>
+							</VBox>
+							<VBox visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
+								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.EasyFilter" type="XML"/>
+							</VBox> -->
 						</f:content>
 					</f:DynamicPageHeader>
 				</f:header>
@@ -58,7 +64,6 @@
 					</template:else>
 					</template:if>
 				</f:content>
-
 				<f:footer>
 					<OverflowToolbar id="template::FooterToolbar">
 						<ToolbarSpacer/>

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -32,7 +32,6 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/ObjectPage/controller/CtxMenuHandler",
 	"sap/suite/ui/generic/template/ObjectPage/controller/inlineCreationRows/InlineCreationRowsHelper",
 	"sap/suite/ui/generic/template/ObjectPage/controller/RelatedAppsHandler",
-	"sap/ui/core/Lib",
 	"sap/suite/ui/generic/template/ObjectPage/controller/PasteHandler",
 	"sap/suite/ui/generic/template/lib/insights/InsightsHandler",
 	"sap/suite/ui/generic/template/lib/cards/DTCardHelper"
@@ -42,7 +41,7 @@ sap.ui.define([
 	ResponsiveTable, ShareUtils, FeLogger, MultipleViewsHandler, MessageUtils, KeyCodes, merge, FilterProcessor,
 	StableIdHelper, extend, isEmptyObject, FeError,
 	CreateWithDialogHandler, Device, whitespaceReplacer, deepExtend, CtxMenuHandler,
-	InlineCreationRowsHelper, RelatedAppsHandler, Lib, PasteHandler, InsightsHandler, DTCardHelper
+	InlineCreationRowsHelper, RelatedAppsHandler, PasteHandler, InsightsHandler, DTCardHelper
 	) {
 	"use strict";
 	var sClassName = "ObjectPage.controller.ControllerImplementation";
@@ -392,16 +391,23 @@ sap.ui.define([
 					var oBindingParams = oEvent.getParameter("bindingParams");
 					if (oBindingParams.filters && oBindingParams.filters.length) {
 						/*
-						 * Add a new filter condition to always show all items that are just created. In case we are in a draft,
-						 * that just means to add "or HasActiveEntity = false". For active documents however, that condition
-						 * would always be true. Thus, we have to add
-						 * "or (HasActiveEntity = false and IsActiveEntity = false)".
-						 * However, this condition is not evaluated correctly by gateway, so we have to transform it to
-						 * (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
-						 * where x is the condition provided by the user
+						 *Handling of the filter condition during edit or display:
+						 * 	Add a new filter condition to always show all items that are just created. In case we are in a draft,
+						 * 	that just means to add "or HasActiveEntity = false". For active documents however, that condition
+						 * 	would always be true. Thus, we have to add
+						 * 	"or (HasActiveEntity = false and IsActiveEntity = false)".
+						 * 	However, this condition is not evaluated correctly by gateway, so we have to transform it to
+						 *  (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
+						 * 	where x is the condition provided by the user
+
+						 * Handling of the filter condition during create:
+						 *  checking the value of dispaly Mode , iDisplayMode = 4 for create 
+						 *  if it is a create the filter condition evaluates to the user filter x 
 						 */
 						var oUserFilter = FilterProcessor.groupFilters(oBindingParams.filters);
-						if (!oEvent.getParameter("messageFilterActive")) {
+						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+						var iDisplayMode = oTemplatePrivateModel.getProperty("/objectPage/displayMode");
+						if (!oEvent.getParameter("messageFilterActive") && !(iDisplayMode === 4) ){
 							oBindingParams.filters = new Filter({
 								filters: [
 									new Filter({
@@ -2394,12 +2400,7 @@ sap.ui.define([
 					},
 
 					onSummarize: function () {
-						var sUrl = oTemplateUtils.oServices.oApplication.getSummarizationLibraryUrl();
-						Lib.load({name: "ux.eng.fioriai.reuse", url: sUrl}).then(function() {
-							sap.ui.require(["ux/eng/fioriai/reuse/library"], function(fioriaiLib) {
-								fioriaiLib.summarize({view: oController.getView()});
-							});
-						});
+						oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.summarize({view: oController.getView()});
 					},
 
 					onEdit: function (oEvent) {

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

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

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/Actions.fragment.xml

@@ -130,7 +130,7 @@
 		ariaHasPopup="Dialog"
 		fesr:press="fe:sum:summarize"
 		type="Ghost"
-		visible="{_templPrivGlobal>/generic/isSummarizationEnabled}" />
+		visible="{_templPrivGlobal>/generic/fioriAI/isSummarizationEnabled}" />
 
 	<template:if test="{parameter>/settings/showRelatedApps}">
 		<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'RelatedApps'}) }"

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.124.2"
+			"version": "1.124.3"
 		},
 		"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.124.2"
+		"version": "1.124.3"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -0,0 +1,24 @@
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
+    <VBox >
+        <MessageStrip
+            text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
+            showIcon="true"
+            showCloseButton="true"
+            class="sapUiSmallMarginBottom"/>
+        <FlexBox renderType="Bare">
+            <Input id="easyFilter"
+            width="100%" class="sapUiSmallMarginEnd"
+            placeholder="{i18n>ST_EASY_FILTER_INPUT_PLACEHOLDER}"
+            change="._templateEventHandlers.onEasyFilterChange"
+            showClearIcon="true"
+            maxLength="100"
+            submit="._templateEventHandlers.onEasyFilterEnterPress">
+            </Input>
+            <Button text="{i18n>ST_EASY_FILTER_GO_BUTTON_TEXT}"
+                    type="Emphasized"
+                    icon="sap-icon://ai"
+                    press="._templateEventHandlers.onEasyFilterGoButtonPress">
+            </Button>
+        </FlexBox>
+    </VBox>
+</core:FragmentDefinition>

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

@@ -105,6 +105,17 @@ sap.ui.define([
 		return { edmType: undefined, sSemantic: undefined, sSapUnit: undefined };
 	};
 
+	var fnGetVisiblePathForFC = function (oControl) {
+		var visiblePathwithFormat = "";
+		var oParent = oControl.getParent();
+		if (oControl.getBindingPath("visible")) {
+			visiblePathwithFormat = "${" + oControl.getBindingPath("visible") + " !=0}";
+		} else if (oParent.getBindingPath("visible")) {
+			visiblePathwithFormat = "${(" + oParent.getBindingPath("visible") + " == false || " + oParent.getBindingPath("visible") + " == '' || " + oParent.getBindingPath("visible") + " == 0)}";
+		}
+		return visiblePathwithFormat;
+    };
+
 	var fnExtractDataFromDataPoint = function (item, controller) {
 		if (item.getItems().length > 1) {
 			var oDataPointData = {
@@ -116,10 +127,12 @@ sap.ui.define([
 				paths: {},
 				objectStatus: "",
 				color: "",
-				edmType: ""
+				edmType: "",
+				visiblePath: ""
 			};
 			var aControls = item.getItems();
 			oDataPointData.path = aControls[1].getBindingPath("value");
+			oDataPointData.visiblePath = fnGetVisiblePathForFC(aControls[1]);
 			if (isPotentiallySensitive(oDataPointData.path, controller)) {
 				return null;
 			}
@@ -178,11 +191,13 @@ sap.ui.define([
 				type: "PlainTextVBox",
 				label: "",
 				value: "",
-				path: ""
+				path: "",
+				visiblePath: ""
 			};
 			var aControls = item.getItems();
 			oPlainTextData.label = aControls[0].getText && aControls[0].getText();
 			oPlainTextData.path = aControls[1].getBindingPath("text");
+			oPlainTextData.visiblePath = fnGetVisiblePathForFC(aControls[1]);
 			// if (isPotentiallySensitive(oDataPointData.path, controller)) {
 			// 	return;
 			// }
@@ -218,11 +233,12 @@ sap.ui.define([
 					expand: "",
 					objectStatus: "",
 					color: "",
-					edmType: ""
+					edmType: "",
+                    visiblePath: ""
 				};
 				var aFieldControls = element.getItems();
 				oFieldData.label = aFieldControls[0].getText && aFieldControls[0].getText();
-
+				oFieldData.visiblePath = fnGetVisiblePathForFC(aFieldControls[1]);
 				if (aFieldControls[1].getText) {
 					oFieldData.path = aFieldControls[1].getBindingPath("text");
 					oFieldData.value = aFieldControls[1].getText();
@@ -306,7 +322,7 @@ sap.ui.define([
 	 * @returns {string} String MS accepted conditional binding
 	 */
 	var fnHandleDefaultValueForPath = function (sPath) {
-		return fnGetNullishPathCheckString(sPath) + " ? '\\\\-' : " + sPath;
+		return fnGetNullishPathCheckString(sPath) + " ? '−' : " + sPath;
 	};
 
 	/**
@@ -335,14 +351,14 @@ sap.ui.define([
 		}
 		var sValue =  oField.edmType === "Edm.Decimal" ? "formatNumber(float(" + oField.path + "), 2)" : oField.path;
 		var sDefaultPathValue = fnHandleDefaultValueForPath(oField.path);
-		var sId = "";
-		var sDescription = "";
+		var sId = null;
+		var sDescription = null;
 		var sPath;
 		var sSapUnitConditionalPath = "";
 		if (oField.semantic === oSapSemantics.unitOfMeasure) {
-			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + sValue + " + ' ' + '\\\\-' : " + "";
+			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + sValue + " + ' ' + '−' : " + "";
 		} else if (oField.semantic === oSapSemantics.currencyCode) {
-			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + " '\\\\-' : " + "";
+			sSapUnitConditionalPath = "(" + fnGetNullishPathCheckString(oField.sapUnit) + ")" + ' ? ' + " '−' : " + "";
 		}
 		if (aPaths.length > 1) {
 			var aDescriptionText = aPaths.filter(function(oPath) {
@@ -593,43 +609,53 @@ sap.ui.define([
 								var oField = aFields[j];
 								oColumnClone = deepClone(oColumn);
 								if (!oField) {
-									oColumnSetClone.columns.push(oColumnClone);
+                                                                        oColumnSetClone.columns.push(oColumnClone);
 									continue;
 								}
-								// console.log(oField);
-								oFormFieldHeaderClone = deepClone(oFormFieldHeader);
-								oFormFieldHeaderClone.text = oField.label;
-								oColumnClone.items.push(oFormFieldHeaderClone);
-								oFormFieldValueClone = deepClone(oFormFieldValue);
-								oFormFieldValueClone.text = fnSetPath(oField);
-								oFormFieldValueClone.color = oField.color ? oField.color : "Default";
-								oColumnClone.items.push(oFormFieldValueClone);
-								oColumnSetClone.columns.push(oColumnClone);
+								if (oField.label) {
+                                                                        // console.log(oField);
+                                                                        oFormFieldHeaderClone = deepClone(oFormFieldHeader);
+                                                                        oFormFieldHeaderClone.text = oField.label;
+                                                                        oColumnClone.items.push(oFormFieldHeaderClone);
+                                                                        oFormFieldValueClone = deepClone(oFormFieldValue);
+                                                                        oFormFieldValueClone.text = fnSetPath(oField);
+                                                                        oFormFieldValueClone.color = oField.color ? oField.color : "Default";
+                                                                        oColumnClone.items.push(oFormFieldValueClone);
+                                                                        oColumnClone["$when"] = oField.visiblePath;
+                                                                        oColumnSetClone.columns.push(oColumnClone);
+                                                                }
 							}
 							oAdaptiveCardJSON.body.push(oColumnSetClone);
 						}
 						break;
 					case "PlainTextVBox":
-						oFormTitleClone = deepClone(oFormHeading);
-						oFormTitleClone.text = element.label;
-						oAdaptiveCardJSON.body.push(oFormTitleClone);
-						oFormFieldValueClone = deepClone(oFormFieldValue);
-						oFormFieldValueClone.text = fnSetPath(element);
-						oAdaptiveCardJSON.body.push(oFormFieldValueClone);
+						if (element.label) {
+                                                      oFormTitleClone = deepClone(oFormHeading);
+                                                      oFormTitleClone.text = element.label;
+                                                      oAdaptiveCardJSON.body.push(oFormTitleClone);
+                                                      oFormFieldValueClone = deepClone(oFormFieldValue);
+                                                      oFormFieldValueClone.text = fnSetPath(element);
+                                                      oAdaptiveCardJSON.body.push(oFormFieldValueClone);
+                                                      oFormTitleClone["$when"] = element.visiblePath;
+                                                      oFormFieldValueClone["$when"] = element.visiblePath;
+                                                }
 						break;
 					case "DataPoint":
 						if (!oDataPointColumnSet) {
 							oDataPointColumnSet = deepClone(oColumSet);
 						}
-						oColumnClone = deepClone(oColumn);
-						oFormTitleClone = deepClone(oFormHeading);
-						oFormTitleClone.text = element.label;
-						oColumnClone.items.push(oFormTitleClone);
-						oFormFieldValueClone = deepClone(oFormFieldValue);
-						oFormFieldValueClone.text = fnSetPath(element);
-						oFormFieldValueClone.color = element.color ? element.color : "Default";
-						oColumnClone.items.push(oFormFieldValueClone);
-						oDataPointColumnSet.columns.push(oColumnClone);
+                                                if (element.label) {
+                                                      oColumnClone = deepClone(oColumn);
+                                                      oFormTitleClone = deepClone(oFormHeading);
+                                                      oFormTitleClone.text = element.label;
+                                                      oColumnClone.items.push(oFormTitleClone);
+                                                      oFormFieldValueClone = deepClone(oFormFieldValue);
+                                                      oFormFieldValueClone.text = fnSetPath(element);
+                                                      oFormFieldValueClone.color = element.color ? element.color : "Default";
+                                                      oColumnClone.items.push(oFormFieldValueClone);
+                                                      oColumnClone["$when"] = element.visiblePath;
+                                                      oDataPointColumnSet.columns.push(oColumnClone);
+                                                }
 						break;
 					default:
 						break;
@@ -735,7 +761,7 @@ sap.ui.define([
 			oAdaptiveCardJSON.body.push(oActionSetClone);
 		}
 
-		// console.log(oAdaptiveCardJSON);
+		//console.log(oAdaptiveCardJSON);
 		return oAdaptiveCardJSON;
 	};
 
@@ -1012,4 +1038,4 @@ sap.ui.define([
 	};
 
 	return AdaptiveCardHelper;
-});
+});

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

@@ -54,6 +54,7 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/lib/insights/InsightsFECardProvider",
 	"sap/ui/core/service/ServiceFactoryRegistry",
 	"sap/ui/VersionInfo",
+	"sap/suite/ui/generic/template/lib/ai/FioriAIHandler",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters"  // just to make sure that this class is loaded
 ], function(
 	extend, 
@@ -88,7 +89,8 @@ sap.ui.define([
 	CardHelper,
 	InsightsFECardProvider,
 	ServiceFactoryRegistry,
-	VersionInfo) {
+	VersionInfo,
+	FioriAIHandler) {
 	"use strict";
 	var	sClassName = "lib.AppComponent";
 
@@ -175,8 +177,7 @@ sap.ui.define([
 			                                  // The implementation of this infrastructure is done in class BusyHelper.
 			bEnablePlaceholder: bShellConfigPlaceholderEnabled, //holds the value of placeholder enablement shell and URL (URL enablement will be added in constructor code of NavigationController).
 			bStateHandlingSuspended: false, // holds the RTA or Key user mode
-			nDelayedDraftTimerInSeconds: 20, // holds the timer interval value for draft data save and by default, the value is 20 seconds
-			sSummarizationLibraryUrl: "" // property hold the Url for the Summarization service library
+			nDelayedDraftTimerInSeconds: 20 // holds the timer interval value for draft data save and by default, the value is 20 seconds
 		};
 		oTemplateContract.oDataLossHandler = new DataLossHandler(oTemplateContract); // an object which expose methods that can be used to bring data loss popup at app level
 		oTemplateContract.oPageLeaveHandler = new PageLeaveHandler(oTemplateContract);
@@ -285,8 +286,11 @@ sap.ui.define([
 					shellServiceUnavailable: false,
 					// experimental: not yet used
 					forceFullscreenCreate: false,
-					// Check Summarization is enabled
-					isSummarizationEnabled: false
+					// Check FioriAI servce is enabled
+					"fioriAI": {
+						isSummarizationEnabled : false,
+						isEasyFilterEnabled : false
+					}
 			});
 			oAppComponent.setModel(oTemplateContract.oTemplatePrivateGlobalModel, "_templPrivGlobal");
 			oTemplateContract.oShellServicePromise.catch(function(){
@@ -297,14 +301,6 @@ sap.ui.define([
 			var oParsingServicePromise;
 			if (UShellContainer) {
 				oParsingServicePromise = UShellContainer.getServiceAsync("URLParsing");
-				UShellContainer.getServiceAsync("Navigation").then(function(oNavigationService) {
-					oNavigationService.resolveIntent("#IntelligentPrompt-summarize").then(function(sUrl) {
-						oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/isSummarizationEnabled", !!sUrl);
-						oTemplateContract.sSummarizationLibraryUrl = sUrl;
-					}).catch(function() {
-						oLogger.warning("No intelligent summarization capability enabled on the tenant");
-					});
-				});
 			}
 			
 			Promise.allSettled([oCurrentUrlPromise, oParsingServicePromise]).then(function(aResult) {
@@ -323,8 +319,13 @@ sap.ui.define([
 			CollaborationHelper.isTeamsModeActive().then(function(bIsActive) {
                 oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/isTeamsModeActive", bIsActive);
             }).finally(function(bIsActive) {
-				// If MSTeams mode is active and in ghostApp init scenario do not load the insights service
+				// If MSTeams mode is active and in ghostApp init scenario do not load
 				if (!bIsActive && !oTemplateContract.ghostapp) {
+					// Load the FioriAI library
+					oTemplateContract.oFioriAIHandler = new FioriAIHandler(oTemplateContract);
+					oTemplateContract.oFioriAIHandler.loadAILibrary();
+
+					// Load the Insights library
 					CardHelper.getServiceAsync("UIService").then(function(oInstance) {
 						oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/insights", {
 							"oInsightsInstance": oInstance,
@@ -919,7 +920,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.124.3
 	 * @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/Application.js

@@ -925,10 +925,7 @@ sap.ui.define(["sap/ui/base/Object",
 				setNextFocus: oFocusHelper.setNextFocus,
 				getIntentPromise: getIntentPromise,
 				getComponentUtilsIfLoaded: getComponentUtilsIfLoaded,
-				preloadComponent: fnPreloadComponent,
-				getSummarizationLibraryUrl : function() {
-					return oTemplateContract.sSummarizationLibraryUrl;
-				}
+				preloadComponent: fnPreloadComponent
 			};
 		}
 

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

@@ -2644,6 +2644,47 @@ sap.ui.define(["sap/ui/base/Object",
 			oController.onBeforeExportTableExtension(oExportParams);
 		}
 
+		/**
+		 * This method is called when the user interacts with EasyFilter field (Enter on the input field or Go button press).
+		 * The AI easy filter is triggered and the result filters are applied to the SmartFilterBar.
+		 * @param {object} oEasyFilterInputField - The EasyFilter input field which has the value entered by the user
+		 * @param {object} oState - oState of the component
+		 */
+		function fnHandleEasyFilterChange(oEasyFilterInputField, oState) {
+
+			var oSmartFilterbar = oState.oSmartFilterbar;
+			FESRHelper.setSemanticStepname(oEasyFilterInputField, "press", "fe2:ai:search");
+			var oAIFilterQueryHandlerPromise = oState.oEasyFilterBarHandler.triggerEasyFilterQuery(oEasyFilterInputField, oSmartFilterbar);
+
+			oAIFilterQueryHandlerPromise.then(function(oFiltersFromAI) {
+
+				var sSmartFilterBarId = oSmartFilterbar.getId();
+				var oSmartFilterBarWrapper = oCommonUtils.getControlStateWrapperById(sSmartFilterBarId, "SmartFilterBar");
+				var oSmartFilterBarVariant = oSmartFilterBarWrapper.getState();
+				var oVariantDataFromAI = oState.oEasyFilterBarHandler.getSFBVariantData(oFiltersFromAI);
+
+				// restore the custom filters to the initial state for now
+				// To check if other objects in oSmartFilterBarVariant needs to be modified
+				var aAppExtension = Object.keys(oSmartFilterBarVariant.customFilters.appExtension);
+				if ( aAppExtension.length > 0 ) {
+					aAppExtension.forEach(function(sKey) {
+						oSmartFilterBarVariant.customFilters.appExtension[sKey] = "";
+					});
+				}
+				oSmartFilterBarVariant.selectOptions = oVariantDataFromAI.aSelectOptions;
+				if (oComponentUtils.isDraftEnabled()) {
+					oSmartFilterBarVariant.customFilters.editState = oVariantDataFromAI.oEditStateFilter;
+				}
+
+				oSmartFilterBarWrapper.setState(oSmartFilterBarVariant);
+				oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
+				oSmartFilterbar.search();
+			}, function(oError) {
+				oLogger.error("Error occurred while applying the AI filters", oError);
+			});
+			oComponentUtils.getBusyHelper().setBusy(oAIFilterQueryHandlerPromise);
+		}
+
 		/* eslint-disable */
 		var fnBuildSelectionVariantForNavigation = testableHelper.testable(fnBuildSelectionVariantForNavigation, "fnBuildSelectionVariantForNavigation");
 		var fnEvaluateParameters = testableHelper.testable(fnEvaluateParameters, "fnEvaluateParameters");
@@ -2694,7 +2735,8 @@ sap.ui.define(["sap/ui/base/Object",
 			handleSideEffectForField: fnHandleSideEffectForField,
 			onSmartFieldModeToggled: onSmartFieldModeToggled,
 			onRenderTeamsContactCollabOptions: fnRenderTeamsContactCollabOptions,
-			hideTableCells: fnHideTableCells
+			hideTableCells: fnHideTableCells,
+			onEasyFilterChange: fnHandleEasyFilterChange
 		};
 	}
 

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

@@ -272,6 +272,7 @@ sap.ui.define(["sap/ui/core/mvc/ControllerExtension",
 						oTemplateUtils.oServices.oApplicationController.registerView(oView);
 						oTemplateUtils.oServices.oDataLossHandler = oAppRegistryEntry.oTemplateContract.oDataLossHandler;
 						oTemplateUtils.oServices.oInsightsFECardProvider = oAppRegistryEntry.oTemplateContract.oInsightsFECardProvider;
+						oTemplateUtils.oServices.oFioriAIHandler = oAppRegistryEntry.oTemplateContract.oFioriAIHandler;
 						oTemplateUtils.oCommonUtils = new CommonUtils(oRet, oTemplateUtils.oServices, oTemplateUtils.oComponentUtils);
 						oTemplateUtils.oInfoObjectHandler = new InfoObjectHandler(oRet, oTemplateUtils);
 						oTemplateUtils.oServices.oCRUDManager = new CRUDManager(oRet,

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

@@ -0,0 +1,323 @@
+sap.ui.define([
+    "sap/ui/base/Object",
+    "sap/base/util/extend",
+    "sap/suite/ui/generic/template/lib/filterHelper",
+    "sap/ui/core/library"
+], function(BaseObject, extend, filterHelper, SapCoreLibrary) {
+    'use strict';
+
+    /*
+     * This is a handler class for EasyFilterBar.
+     * It gets initialized when the Fiori AI is enabled and provides the EasyFilterBar capabilities to the floorplan.
+     * 
+     */
+    var oEasyFilterMetadata;
+
+    function getMethods(oState, oController, oTemplateUtils) {
+        var ValueState = SapCoreLibrary.ValueState;
+        var mCodeList = {};
+
+        /**
+         * This method prepares the metadata calculation after the smart filter bar is initialized
+         * @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);
+                    }
+                });
+            }
+        }
+        /**
+         * This method prepares the metadata for each filterable field from the smart filter bar
+         *
+         * @returns Filterbar metadata which is required for the EasyFilter search
+         */
+        function fnPrepareSearchMetadata()  {
+
+            var aPromise = [];
+            var oOwnerFilterControl = oState.oSmartFilterbar;
+            var oSFBModel = oOwnerFilterControl.getModel();
+            var oSFBMetaModel = oSFBModel.getMetaModel();
+            var oEditStateFilterItem;
+            var sEntitySet = oController.getOwnerComponent().getEntitySet();
+
+            var mFilterProperties = {}; // todo : Add the properties from navigation entites
+            var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
+            oEntityType.property.map(function (oProperty) {
+                if (filterHelper.isPropertyFilterable(oProperty)) {
+                    var bIsCodeListRequired = "";
+                    oProperty.extensions && oProperty.extensions.forEach(function(oExtension) {
+                        if (oExtension.name === "value-list" && oExtension.value === "fixed-values") {
+                            bIsCodeListRequired = true;
+                        }
+                    });
+                    mFilterProperties[oProperty.name] = {
+                        name: oProperty.name,
+                        //label: oProperty.label,  Name is added from the filter item control
+                        dataType: oProperty.type,
+                        filterable: true,
+                        sortable: false,
+                        codeList : bIsCodeListRequired
+                        //,required: oProperty.required (TO-DO)
+                    };
+                }
+            });
+
+            oEasyFilterMetadata = {
+                version: 1,
+                entitySet: sEntitySet,
+                fields : []
+            };
+
+            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) {
+                    oFilterItemForQuery.label = oFilterItem.getLabel();
+                    // codeList is set to true for fixed value list and codelist is fetched
+                    if (oFilterItemForQuery.codeList) {
+                        var oProperty = oSFBMetaModel.getODataProperty(oEntityType, oFilterItemForQuery.name , true);
+                        var oPropertyContext = oSFBMetaModel.createBindingContext(oProperty);
+                        var oVHPromise = oSFBMetaModel.getODataValueLists(oPropertyContext);
+                        aPromise.push(oVHPromise);
+                        oVHPromise.then(function(oValueList) {
+                            if (mCodeList[oFilterItemForQuery.name]) {
+                                oFilterItemForQuery.codeList = mCodeList[oFilterItemForQuery.name];
+                            } else {
+                                oFilterItemForQuery.codeList = function() {
+                                    return fnGetValueListValues(oFilterItemForQuery, oValueList, oSFBModel);
+                                };
+                            }
+                            oEasyFilterMetadata.fields.push(oFilterItemForQuery);
+                        });
+                    } else {
+                        oEasyFilterMetadata.fields.push(oFilterItemForQuery);
+                    }
+                } else if (oFilterItem.getName() === "EditState") {// For draft scenarios
+                    oEditStateFilterItem = oFilterItem;
+                }
+            });
+
+             // Adding Editing status filter
+             if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
+                var oEditStateControl = oController.byId("editStateFilter");
+                if (oEditStateControl) {
+                    var oEditingStatusCodeList = oEditStateControl.getItems().map(function(oItem) {
+                        return {
+                            value : oItem.getKey(),
+                            description : oItem.getText()
+                        };
+                    });
+                   var oEditStateFilterMetadata = {
+                        name: oEditStateFilterItem.getName(),
+                        label: oEditStateFilterItem.getLabel(),
+                        dataType: "Edm.String",
+                        filterable: true,
+                        required: false,
+                        sortable: false,
+                        codeList : oEditingStatusCodeList
+                    };
+                    oEasyFilterMetadata.fields.push(oEditStateFilterMetadata);
+                }
+            }
+
+            return Promise.allSettled(aPromise).then(function() {
+                return oEasyFilterMetadata;
+            });
+        }
+
+        /**
+         * This method is used to trigger the EasyFilter search of the fiori AI reuse library
+         * @param {*} oEasyFilterControl EasyFilter control of the floorplan
+         * @returns Promise which resolves to AI filters
+         */
+        function fnTriggerEasyFilterQuery(oEasyFilterControl) {
+
+            var sEasyFilterQuery = oEasyFilterControl.getValue();
+            if (sEasyFilterQuery.length === 0) {
+                // Resolving with an empty array will reset the SFB filters and trigger a fresh GET call
+                return Promise.resolve([]);
+            } else {
+                var oEasyFilterMetadataPromise = fnGetEasyFilterSearchMetadata();
+                var oResultPromise = new Promise(function(fnResolve, fnReject) {
+                    oEasyFilterMetadataPromise.then(function(oEasyFilterMetadata) {
+                        var oFioriAIFilterQueryPromise =  oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFilter.easyFilter(sEasyFilterQuery, oEasyFilterMetadata);
+                        oFioriAIFilterQueryPromise.then(function(oResponse) {
+                            if (oResponse.success) {
+                                if (oResponse.data.version === 1) {
+                                    // In cases where user filters with some random string and the no valuable filter is availabel then simply reject
+                                    if (oResponse.data.unclear || !oResponse.data.filter) {
+                                        var sUnclearInputMessage = oResponse.data.unclear ? "Unclear input: " + oResponse.data.unclear : "Unclear input";
+                                        oEasyFilterControl.setValueStateText(sUnclearInputMessage);
+                                        oEasyFilterControl.setValueState(ValueState.Warning);
+                                        fnReject(oResponse);
+                                    } else if (oResponse.data.filter) {
+                                        // Commenting out for v4 parity
+                                        //oEasyFilterControl.setValueState(ValueState.Success);
+                                        fnResolve(oResponse.data.filter);
+                                    }
+                                } else if (oResponse.data.version === 2) {
+                                    // to-do for version 2
+                                }
+                            }  else {
+                                oEasyFilterControl.setValueStateText(oResponse.message);
+                                oEasyFilterControl.setValueState(ValueState.Warning);
+                                fnReject(oResponse);
+                            }
+                        },fnReject);
+                    });
+                });
+                return oResultPromise;
+            }
+        }
+
+        /**
+         * This method reads the values of the valuehelp entity from the backend and fills the code list of each property.
+         * Once the values are filled then the fioriAI uses it for getting the ID of the user entered description in the search field
+         * Later the key field is set in the SFB and table is filtered with the same. Description cannot be used for filtering.
+         * @param {*} oFilterItemForQuery A Property from the easy filter metadata
+         * @param {*} oValueList Value list object of the filter item
+         * @returns
+         */
+        function fnGetValueListValues(oFilterItemForQuery, oValueList, oSFBModel) {
+
+            if (mCodeList[oFilterItemForQuery.name]) {
+                return mCodeList[oFilterItemForQuery.name];
+            }
+
+            return new Promise(function(fnResolve, fnReject) {
+
+                var oValueListDefaultBinding = oValueList[""];
+                // Cases where the default binding is not available ignore for now
+                if (oValueListDefaultBinding) {
+                    var sSelect = oValueListDefaultBinding.Parameters && oValueListDefaultBinding.Parameters.map(function(oParam) {
+                        return oParam.ValueListProperty.String;
+                    }).join(",");
+
+                    var fnSuccess = function(oResponse) {
+                        var mValueListData = [];
+                        oResponse.results && oResponse.results.forEach(function(oItem) {
+                            mValueListData.push({
+                                value : oItem[sValueProperty],
+                                description : sDescriptionProperty ? oItem[sDescriptionProperty] : undefined
+                            });
+                        });
+                        mCodeList[oFilterItemForQuery.name] = mValueListData;
+                        oEasyFilterMetadata.fields.forEach(function (oField) {
+                            if (oField.name === oFilterItemForQuery.name) {
+                                oField.codeList = mValueListData;
+                            }
+                         });
+                        fnResolve(mValueListData);
+                    };
+
+                    oSFBModel.read("/" + oValueListDefaultBinding.CollectionPath.String, {
+                        $select : sSelect,
+                        success : fnSuccess,
+                        error : fnReject
+                    });
+
+                    var sValueProperty;
+                    var sDescriptionProperty;
+
+                    oValueListDefaultBinding.Parameters && oValueListDefaultBinding.Parameters.forEach(function(oParam) {
+                        if (oParam.LocalDataProperty && (oParam.LocalDataProperty.PropertyPath === oFilterItemForQuery.name)) {
+                            sValueProperty = oParam.ValueListProperty.String;
+                        } else {
+                            sDescriptionProperty = oParam.ValueListProperty.String;
+                        }
+                    });
+                }
+            });
+        }
+
+        /**
+         * This method is used to convert the AI filters to the selectOptions for the SmartFilterBar
+         * It also identifies the values of edit state filter in case of draft
+         * @param {*} oAIFilters
+         * @returns array of selectOptions
+         */
+        function fnGetSFBVariantData(oAIFilters) {
+
+            // Each filter from AI will be converted to a selectOption and added to the SmartVariantManagement state
+            // Case 1 : AI Query "Show P1 = a"
+            // ------- AI response "P1 = Ranges [a]" .
+            // ------- Converted to selectOptions [ {Property = P1, Ranges = [ a ] } ].
+            // ------- Filtered as P1 = a.
+            // Case 1.a : AI Query "Show P1 = a , b"
+            // ------- AI response "P1 = Ranges [a, b]" .
+            // ------- Converted to selectOptions [ {Property = P1, Ranges = [ a, b ] } ] .
+            // ------- FE filters as "a or b".
+            // Case 1.b : AI Query "Show P1 between a and b"
+            // ------- AI response  " [P1 = Ranges [a] , P1 = Ranges [b]]".
+            // ------- Converted to selectOptions [ {Property = P1, Ranges = [ a ] } , {Property = P2, Ranges = [ b ] } ] .
+            // ------- FE filters as "a and b" but (todo) currently it is "a or b".
+            // Case 2 : AI Query "Show P1 = a and P2 = b"
+            // ------- AI response "[P1 = Ranges [a] , P2 = Ranges [b]]"
+            // ------- Convert to selectOptions [ {Property = P1, Ranges = [ a ] } , {Property = P2, Ranges = [ b ] } ].
+            // ------- FE filters as "a and b".
+
+            var aSelectOptions = [];
+            var oEditStateFilter = 0;
+            oAIFilters.forEach(function(oFilterItem) {
+
+                if ( oFilterItem.name === "EditState") {
+                    oEditStateFilter  = oFilterItem.values[0]; // Edit state generally should not have more than one filter value
+                } else {
+                    var oFilter = {
+                        PropertyName : oFilterItem.name,
+                        Ranges : []
+                    };
+                    oFilterItem.values.forEach(function (oValue) {
+                        var oRange = {
+                            Sign : "I", // currently not considering "E"
+                            High : "" // Usually for "BT" High is required, but AI provides two separate filters (LT and GT) and FE converts it to two separate selectOptions
+                            // But this results in OR condition
+                            // todo : check if AI can provide BT filter or FE should handle it
+                        };
+                        if (oFilterItem.operator === "Contains") { // need to check for other operators if special handling is required
+                            oRange.Option = "CP";
+                        } else {
+                            oRange.Option = oFilterItem.operator;
+                        }
+                        oRange.Low = oValue;
+                        oFilter.Ranges.push(oRange);
+                    });
+                    aSelectOptions.push(oFilter);
+                }
+            });
+            return {
+                aSelectOptions: aSelectOptions,
+                oEditStateFilter : oEditStateFilter
+            };
+        }
+        return {
+            triggerEasyFilterQuery : fnTriggerEasyFilterQuery,
+            getSFBVariantData : fnGetSFBVariantData,
+            getEasyFilterSearchMetadata : fnGetEasyFilterSearchMetadata
+        };
+    }
+
+    return BaseObject.extend("sap.suite.ui.generic.template.lib.ai.EasyFilterBarHandler", {
+        constructor: function (oState, oController, oTemplateUtils) {
+            extend(this, getMethods(oState, oController, oTemplateUtils));
+        }
+    });
+    
+});

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

@@ -0,0 +1,77 @@
+sap.ui.define([
+    "sap/ui/base/Object",
+    "sap/base/util/extend",
+    "sap/ui/core/Lib",
+    "sap/suite/ui/generic/template/genericUtilities/FeLogger"
+], function(BaseObject, extend, Lib, FeLogger) {
+    'use strict';
+    var sAIIntent = "#IntelligentPrompt-summarize"; // For now the intent is common for all the AI scenarios
+    var sFioriAILibrary = "ux.eng.fioriai.reuse";
+    var UShellContainer = sap.ui.require("sap/ushell/Container");
+    var oLogger = new FeLogger("js.FioriAIHandler").getLogger();
+    /*
+     * This is a handler class for Fiori AI. It is used to load the Fiori AI library and provide it to the template for template consumption.
+     * 
+     */
+
+    function getMethods(oTemplateContract) {
+        
+        var fnResolveInit = null;
+        var fnRejectInit = null;
+        var oFioriAILoaderPromise = new Promise(function(fnResolve, fnReject) {
+            fnResolveInit = fnResolve;
+            fnRejectInit = fnReject;
+        });
+
+        /**
+         * This method is used to load the Fiori AI library and make the available AI capabilities to the template contract
+         */
+        function fnLoadAILibrary() {
+            var that = this;
+            UShellContainer && UShellContainer.getServiceAsync("Navigation").then(function(oNavigationService) {
+                oNavigationService.resolveIntent(sAIIntent).then(function(sUrl) {
+                    Lib.load({name: sFioriAILibrary, url: sUrl}).then(function() {
+                        // To-Do : load the summarize from reuse/summary
+                        sap.ui.require(["ux/eng/fioriai/reuse/library", "ux/eng/fioriai/reuse/easyfilter/EasyFilter"], function(fioriaiLib, EasyFilter) {
+                            that.fioriaiLib.summarize = fioriaiLib.summarize;
+                            that.fioriaiLib.EasyFilter = EasyFilter;
+                            that.isFioriAIEnabled = true;
+                            // Each AI capability will be enabled separately. Currently there is no separation for beta , but in future it will be
+                            oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/fioriAI/isSummarizationEnabled", !!sUrl);
+                            // isEasyFilterEnabled property controls the visibility of the EasyFilterBar
+                            oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/fioriAI/isEasyFilterEnabled", false);
+                            fnResolveInit();
+                        });
+                    });
+                }).catch(function() {
+                    oLogger.warning("No intelligent capability enabled on the tenant");
+                    fnRejectInit();
+                });
+            }, fnRejectInit);
+        }
+
+        /**
+         * 
+         * @returns Promise which resolves to true if the AI is enabled
+         */
+        function fnGetFioriAIEnabledPromise() {
+            return this.isFioriAIEnabled ? Promise.resolve() : oFioriAILoaderPromise;
+        }
+
+        return {
+            loadAILibrary: fnLoadAILibrary,
+            getFioriAIEnabledPromise: fnGetFioriAIEnabledPromise
+        };
+    }
+    return BaseObject.extend("sap.suite.ui.generic.template.lib.ai.FioriAIHandler", {
+        constructor: function (oTemplateContract) {
+            // If the AI intent is available then later the library will be loaded
+            this.fioriaiLib = {
+                summarize: null,
+                EasyFilter: null
+            };
+            this.isFioriAIEnabled = false;
+			extend(this, getMethods(oTemplateContract));
+		}
+    });
+});

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

@@ -606,6 +606,40 @@ sap.ui.define([
         }
     }
 
+    function getCommonFilterProperties(aEntityProp, aParameters) {
+		var aCommonPropKeys = aEntityProp.filter(function(oProperty) {
+            return isPropertyFilterable(oProperty);
+        }) || [];
+        if (aParameters && aParameters.length > 0) {
+            aEntityProp.forEach(function(oEntityProp){
+                var sPropertyNameWithPrefix = "P_" + oEntityProp.name;
+                if (aParameters.includes(sPropertyNameWithPrefix)) {
+                    aCommonPropKeys.push(oEntityProp);
+                }
+            });
+        }
+        return aCommonPropKeys;
+    }
+
+	function isPropertyFilterable(oProperty) {
+        return oProperty["sap:filterable"] ? oProperty["sap:filterable"] !== "false" : true;
+    }
+
+    /**
+     * This function will create a selection variant object from the filter object
+     * @param {*} aFilters
+     * @returns {object} oSelectionVariant
+     */
+    function fnCreateSVFromFilter(aFilters) {
+        var oSelectionVariant = new SelectionVariant();
+        aFilters && aFilters.forEach(function(oFilter) {
+            // to-do: handle multiple values
+            var aFilters = oFilter.values;
+            oSelectionVariant.addSelectOption(oFilter.name, "I", oFilter.operator, aFilters[0].toString(), "");
+        });
+		return oSelectionVariant;
+	}
+
     return {
         enhanceVariant: enhanceVariant,
         updateRangeValue: updateRangeValue,
@@ -621,6 +655,9 @@ sap.ui.define([
         getRelatedTextToRange: getRelatedTextToRange,
         setFilterRestrictionToSemanticDateRange: setFilterRestrictionToSemanticDateRange,
         addDateRangeValueToSV: addDateRangeValueToSV,
-        getDateRangeDefaultValue: getDateRangeDefaultValue
+        getDateRangeDefaultValue: getDateRangeDefaultValue,
+        getCommonFilterProperties: getCommonFilterProperties,
+        isPropertyFilterable: isPropertyFilterable,
+        createSVFromFilter : fnCreateSVFromFilter
     };
 });

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

@@ -302,6 +302,19 @@ ST_CARD_CREATION_FAILURE_REASON_SEMANTIC_DATE_FILTERS=Card creation isn\u2019t p
 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-----------------------
+
 #---Final block: texts to be redefined by the application ----------------------------------------------
 
 #--- a) Texts that are only relevant for the object page of the root object

package/src/sap/suite/ui/generic/template/lib/insights/InsightsCardHelper.js

@@ -246,7 +246,7 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
             return !aParameterKeys.includes(key);
         });
         if (oEntityType && oEntityType.property) {
-            aCommonFilterProperties = getCommonFilterProperties(oEntityType.property, aParameterProperties);
+            aCommonFilterProperties = filterHelper.getCommonFilterProperties(oEntityType.property, aParameterProperties);
         }
         for (var i = 0; i < aCommonFilterProperties.length; i++) {
             var oFilterProp = aCommonFilterProperties[i],
@@ -359,25 +359,6 @@ sap.ui.define(["sap/suite/ui/generic/template/genericUtilities/metadataAnalyser"
         });
     };
 
-	var getCommonFilterProperties = function (aEntityProp, aParameters) {
-		var aCommonPropKeys = aEntityProp.filter(function(oProperty) {
-            return isPropertyFilterable(oProperty);
-        }) || [];
-        if (aParameters && aParameters.length > 0) {
-            aEntityProp.forEach(function(oEntityProp){
-                var sPropertyNameWithPrefix = "P_" + oEntityProp.name;
-                if (aParameters.includes(sPropertyNameWithPrefix)) {
-                    aCommonPropKeys.push(oEntityProp);
-                }
-            });
-        }
-        return aCommonPropKeys;
-    };
-
-	var isPropertyFilterable = function (oProperty) {
-        return oProperty["sap:filterable"] ? oProperty["sap:filterable"] !== "false" : true;
-    };
-
 	var getRelatedEntityProperty = function(oFilterProp, aEntityProperties) {
         if (aEntityProperties && aEntityProperties.length) {
             var aEntityProperty = aEntityProperties.filter(function(oEntityProperty) {

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3055,7 +3055,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.124.2
+	 * @version 1.124.3
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/library.js

@@ -62,7 +62,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.124.2",
+		version: "1.124.3",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/themes/base/base.less

@@ -5,3 +5,7 @@
 .sapSmartTemplatesCreateDialog {
 	max-width: fit-content;
 }
+
+.sapSmartTemplateEasyFilterInputPadding {
+  padding: 0.5rem 1rem;
+}