@sapui5/sap.suite.ui.generic.template 1.145.1 → 1.147.0

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

@@ -0,0 +1,108 @@
+sap.ui.define([
+	"sap/suite/ui/generic/template/genericUtilities/FeLogger"
+], function (
+	FeLogger
+) {
+	"use strict";
+	var oLogger = new FeLogger("lib.BaseNoDataHandler").getLogger();
+
+	/**
+ * Base handler for setting no data messages on smart controls
+ * @param {object} oController - The controller instance
+ * @param {object} oTemplateUtils - Template utilities
+ * @param {object} oNoDataConfig - Configuration object mapping scenarios to i18n keys
+ * @param {object} parentMethods - Methods provided by subclass
+ * @returns {object} Public API with setNoDataMessage method
+ */
+	function BaseNoDataHandler(oController, oTemplateUtils, oConfig) {
+		var sNoDataRepresentation = oController.getOwnerComponent().getAppComponent().getNoDataRepresentation();
+		var oNoDataConfig = oConfig.oNoDataConfig;
+		var parentMethods = oConfig.methods;
+
+		function fnSetNoDataMessage (oSmartCtrl, sScenario) {
+			if (sNoDataRepresentation === "textOnly" && !oConfig.isIllustrationOnlyMode) {
+				fnSetTextMessage(oSmartCtrl, sScenario);
+			} else if (["illustration", "illustrationWithFallback"].includes(sNoDataRepresentation) || oConfig.isIllustrationOnlyMode) {
+				fnSetIllustratedMessage(oSmartCtrl, sScenario);
+			}
+		}
+
+		// Sets "text" based no data message
+		function fnSetTextMessage (oSmartCtrl, sScenario) {
+			var sSmartCtrlId = oSmartCtrl.getId();
+			var sI18nKey = oNoDataConfig[sScenario].i18nKey;
+			var sNoDataText = oTemplateUtils.oCommonUtils.getContextText(sI18nKey, sSmartCtrlId);
+			oSmartCtrl.setNoData(sNoDataText);
+		}
+
+		// Sets "illustration" based no data message
+		function fnSetIllustratedMessage (oSmartCtrl, sScenario) {
+			var sSmartCtrlId = oSmartCtrl.getId();
+			var sI18nPrefix = oNoDataConfig[sScenario].i18nKey;
+			// Derive title key from base key
+			var sTitleI18nKey = sI18nPrefix + "_ILLUSTRATION_TITLE";
+			// Get title from resource bundle.
+			var sTitle = oTemplateUtils.oCommonUtils.getContextText(sTitleI18nKey, sSmartCtrlId);
+			// Find description (this logic varies between "illustration" and "illustrationWithFallback")
+			var sDescription = fnDeriveIllustrationDescription(sI18nPrefix, sSmartCtrlId);
+			// Get illustration type from config
+			var sIllustrationType = oNoDataConfig[sScenario].illustrationType;
+
+			var oNoDataIllustratedMessage = parentMethods.getIllustratedMessage(oSmartCtrl);
+			// oSmartTable.getNoData should actually return an illustrated message.
+			//
+			// Sometimes, app changes the no data message into text message using custom coding.
+			// Hence, adding this type check as a safety measure.
+			if ( !(oNoDataIllustratedMessage?.isA?.("sap.m.IllustratedMessage")) ) {
+				oLogger.error(`Unable to update the no data message of smart control ${oSmartCtrl.getId()} as it's not an IllustratedMessage`);
+				return;
+			}
+			// Table already has illustrated no data message. Just update the attributes
+			oNoDataIllustratedMessage.setIllustrationType(sIllustrationType);
+			oNoDataIllustratedMessage.setTitle(sTitle);
+			oNoDataIllustratedMessage.setDescription(sDescription);
+		}
+
+		/**
+		 * Calculates the illustrated message's description based on the manifest flag "noDataRepresentation" value
+		 * 1. If manifest flag is "illustration"
+		 * 	  - Just returns text for the new i18n key (legacy key + "_ILLUSTRATION_DESCRIPTION")
+		 * 	  - The text can be found on either app or FE
+		 * 2. If flag is "illustrationWithFallback"
+		 * 	  a. Checks the app if customized text available for (legacy i18n key | ctrlId) (for e.g. "NOITEMS_LR_SMARTTABLE|C_SalesOrder")
+		 * 	   	 - If found, returns it.
+		 * 	  b. Checks the app if customized text available just for legacy i18n key (for e.g. "NOITEMS_LR_SMARTTABLE")
+		 * 	   	 - If found, returns it.
+		 * 	  c. Returns the text for the new i18n key (Same as "Case 1" above).
+		 */
+		function fnDeriveIllustrationDescription (sI18nPrefix, sSmartCtrlId) {
+			var sLatestDescriptionI18nKey = sI18nPrefix + "_ILLUSTRATION_DESCRIPTION";
+			var sLatestDescription = oTemplateUtils.oCommonUtils.getContextText(sLatestDescriptionI18nKey, sSmartCtrlId);
+			if (sNoDataRepresentation === "illustration" || (oConfig.isIllustrationOnlyMode && sNoDataRepresentation === "textOnly")) {
+				return sLatestDescription;
+			}
+			// Below logic is for noDataRepresentation = "illustrationWithFallback"
+			var sLegacyDescription = null;
+			var sLegacyI18nKey = sI18nPrefix;
+			var sCtrlSpecificI18nSuffix = oTemplateUtils.oCommonUtils.getSpecificI18nKeyForSmartControl(sSmartCtrlId);
+			sCtrlSpecificI18nSuffix = (sCtrlSpecificI18nSuffix === "|") ? "" : sCtrlSpecificI18nSuffix; // Omit the suffix "|"
+			// If table specific i18n key is available, get the customized text for that.
+			if (sCtrlSpecificI18nSuffix) {
+				sLegacyDescription = oTemplateUtils.oCommonUtils.getCustomizedTextFromApp(sLegacyI18nKey + "|" + sCtrlSpecificI18nSuffix);
+			}
+			// If the description is not yet found, get the customized text just for the generic i18n key.
+			if (!sLegacyDescription) {
+				sLegacyDescription = oTemplateUtils.oCommonUtils.getCustomizedTextFromApp(sLegacyI18nKey);
+			}
+			// If legacy text is found, return it.
+			// Otherwise, return the latest one.
+			return sLegacyDescription || sLatestDescription;
+		}
+
+		return {
+			setNoDataMessage: fnSetNoDataMessage
+		};
+	}
+
+	return BaseNoDataHandler;
+});

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

@@ -0,0 +1,37 @@
+sap.ui.define([
+	"sap/base/util/extend",
+	"sap/ui/base/Object",
+	"sap/suite/ui/generic/template/lib/BaseNoDataHandler"
+], function (
+	extend,
+	BaseObject,
+	BaseNoDataHandler
+) {
+	"use strict";
+
+	function getMethods() {
+		function fnGetIllustratedMessage(oSmartCtrl) {
+			return oSmartCtrl.getNoDataIllustratedMessage();
+		}
+
+		return {
+			getIllustratedMessage: fnGetIllustratedMessage
+		};
+	}
+
+	return BaseObject.extend("sap.suite.ui.generic.template.lib.ChartNoDataHandler", {
+		constructor: function (oController, oTemplateUtils, oNoDataConfig) {
+			extend(this, new BaseNoDataHandler(oController, oTemplateUtils, {
+				oNoDataConfig: oNoDataConfig,
+				methods: getMethods(),
+				// SmartChart now only support no dato information with IllustratedMessage,
+				// only text messages are not possible to provide.
+				// Thats why is for SmartChart turned on illustration only mode.
+				// If it will be necessary to revert it back:
+				//   1) Switch isIllustrationOnlyMode:false
+				//	 2) Add necessary messages to templates. See how it's impl. for SmartTable templates.
+				isIllustrationOnlyMode: true
+			}));
+		}
+	});
+});

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

@@ -1389,6 +1389,31 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 		}
 
+		function fnAddMultiEditFieldGroupProperties(oEntityType, sAnnotationPath, aProperties) {
+			if (!sAnnotationPath) { return; }
+			
+			// Remove leading '@' if present
+			var sPath = sAnnotationPath.charAt(0) === "@" 
+				? sAnnotationPath.substring(1) 
+				: sAnnotationPath;
+			
+			var oFieldGroup = oEntityType[sPath];
+			
+			if (oFieldGroup && oFieldGroup.Data && Array.isArray(oFieldGroup.Data)) {
+				oFieldGroup.Data
+					.map(function(oField) { 
+						return oField.Value && oField.Value.Path; 
+					})
+					.filter(Boolean)
+					.forEach(function(sProp) {
+						// Avoid duplicates
+						if (aProperties.indexOf(sProp) === -1) {
+							aProperties.push(sProp);
+						}
+					});
+			}
+		}
+
 		// callback for the onBeforeRebindTable event of a smart table
 		// oEvent is the original event
 		// oCallbacks is an optional object which contains additional callbacks to be called.
@@ -1622,6 +1647,9 @@ sap.ui.define(["sap/ui/base/Object",
 							}
 						}
 					}
+					
+					fnAddMultiEditFieldGroupProperties(oEntityType, oCallbacks.multiEditAnnotationPath, aProperties);
+					
 				}
 				// sortOrder Annotation of presentation variant - only relevant for sap.m.Table
 				var oVariant = oSmartTable.fetchVariant();
@@ -2688,28 +2716,63 @@ sap.ui.define(["sap/ui/base/Object",
 			return (isObjectPage && oSmartTable) ? oCommonUtils.getContextText(sI18NKey, oSmartTable.getId(), null, aParams) : oCommonUtils.getText(sI18NKey, aParams);
 		}
 
+
+		/**
+		 * Function modifies dataUrl, where we remove all 1:n properties from dataUrl.
+		 * 
+		 * @param {*} oExportEvent - event handler for export.
+		 * @param {*} aNavRestriction - list of 1:n navigation properties
+		 */
+		function modifyDataSourceUrl(oExportEvent, aNavRestriction) {
+			let aSplitDataUrl = oExportEvent.mParameters.exportSettings.dataSource.dataUrl.split("&$");
+			const idxSelect = aSplitDataUrl.findIndex(data => data.startsWith("select"));
+			const idxExpand = aSplitDataUrl.findIndex(data => data.startsWith("expand"));
+			// reconsturct select query from URL.
+			let aSelectQuery = decodeURIComponent(aSplitDataUrl[idxSelect]).split(",");
+			aSelectQuery[0] = aSelectQuery[0].replace("select=", "");
+			aSelectQuery = aSelectQuery.filter(data => aNavRestriction.findIndex(nav => data.includes(nav)) === -1);
+			aSplitDataUrl[idxSelect] = "select=" + encodeURIComponent(aSelectQuery);
+			// reconstruct expand query from URL.
+			if (idxExpand > -1) {
+				let aExpandQuery = decodeURIComponent(aSplitDataUrl[idxExpand]).split(",");
+				aExpandQuery[0] = aExpandQuery[0].replace("expand=", "");
+				aExpandQuery = aExpandQuery.filter(data => aNavRestriction.findIndex(nav => (data + "/").includes(nav)) === -1);
+				if (aExpandQuery.length) {
+					aSplitDataUrl[idxExpand] = "expand=" + encodeURIComponent(aExpandQuery);
+				} else {
+					aSplitDataUrl.splice(idxExpand, 1);
+				}
+			}
+			oExportEvent.mParameters.exportSettings.dataSource.dataUrl = aSplitDataUrl.join("&$");
+		}
+
 		/**
 		 * This method remove the unsupported columns to get exported like 1/n navigation columns.
 		 *
 		 * @param {Object} oExportEvent - event handler for export.
 		 */
 		function removeUnsupportedColumnsToExport(oExportEvent) {
-			var sEntitySet = oExportEvent.oSource.getEntitySet();
-			var oTable = oExportEvent.oSource.getTable();
-			var isSplitCell = oExportEvent.mParameters.exportSettings.fileType === "PDF" || (oExportEvent.mParameters.exportSettings.fileType === "XLSX" && oExportEvent.mParameters.userExportSettings.splitCells);
+			let sEntitySet = oExportEvent.oSource.getEntitySet();
+			let oTable = oExportEvent.oSource.getTable();
+			let isSplitCell = oExportEvent.mParameters.exportSettings.fileType === "PDF" || (oExportEvent.mParameters.exportSettings.fileType === "XLSX" && oExportEvent.mParameters.userExportSettings.splitCells);
+			let aNavRestriction = [];
 			if (!isSplitCell) {
 				// without split cells
 				for (let i = 0; i < oExportEvent.mParameters.exportSettings.workbook.columns.length;) {
 					var oColumn = oExportEvent.mParameters.exportSettings.workbook.columns[i];
 					if (typeof oColumn.property === "string") {
-						if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property)) {
+						const sNavProperty = metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property);
+						if (sNavProperty) {
 							oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 1);
+							aNavRestriction.push(sNavProperty);
 							continue;
 						}
 					} else {
 						var aProperty = oColumn.property;
-						if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, aProperty[0]) || metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, aProperty[1])) {
+						const sNavProperty = metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, aProperty[0]) || metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, aProperty[1]);
+						if (sNavProperty) {
 							oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 1);
+							aNavRestriction.push(sNavProperty);
 							continue;
 						}
 					}
@@ -2724,13 +2787,17 @@ sap.ui.define(["sap/ui/base/Object",
 						// in general, additional column don't have column Id.
 						var bHasAdditionalColumns = i < oExportEvent.mParameters.exportSettings.workbook.columns.length - 2 && !oExportEvent.mParameters.exportSettings.workbook.columns[i + 1].columnId;
 						if (bHasAdditionalColumns) {
-							if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property) || metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oExportEvent.mParameters.exportSettings.workbook.columns[i + 1].property)) {
+							const sNavProperty = metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property) || metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oExportEvent.mParameters.exportSettings.workbook.columns[i + 1].property);
+							if (sNavProperty) {
 								oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 2);
+								aNavRestriction.push(sNavProperty);
 								continue;
 							}
 						} else {
-							if (metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property)) {
+							const sNavProperty = metadataAnalyser.checkFor1ToNProperty(oTable, sEntitySet, oColumn.property);
+							if (sNavProperty) {
 								oExportEvent.mParameters.exportSettings.workbook.columns.splice(i, 1);
+								aNavRestriction.push(sNavProperty);
 								continue;
 							}
 						}
@@ -2738,6 +2805,7 @@ sap.ui.define(["sap/ui/base/Object",
 					i++;
 				}
 			}
+			modifyDataSourceUrl(oExportEvent, aNavRestriction);
 		}
 
 		/**
@@ -2826,6 +2894,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var getPaginatorInfo = testableHelper.testable(getPaginatorInfo, "getPaginatorInfo");
 		var fnRenderTeamsContactCollabOptions = testableHelper.testable(fnRenderTeamsContactCollabOptions, "fnRenderTeamsContactCollabOptions");
 		var removeUnsupportedColumnsToExport = testableHelper.testable(removeUnsupportedColumnsToExport, "removeUnsupportedColumnsToExport");
+		var fnAddMultiEditFieldGroupProperties = testableHelper.testable(fnAddMultiEditFieldGroupProperties,"fnAddMultiEditFieldGroupProperties");
 		/* eslint-enable */
 
 		return {

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

@@ -354,7 +354,12 @@ sap.ui.define([
 				MessageBox.warning(sWarningMessage);
 				return;
 			}
-
+			//check if the controller has implemented "onListNavigationExtensionFromContextMenu" and call it to give the chance to restrict the open in new tab from context menu based on the application specific logic. This is to be used by application developers when they want to use the same handler for open in new tab from both item press and context menu, but with different logic to restrict the open in new tab based on the entry point.
+			var bOnListNavigationExtensionFromContextMenuFound = oController.hasOwnProperty("onListNavigationExtensionFromContextMenu");
+			var aContext = oFocusInfo.applicableContexts;
+			if (bOnListNavigationExtensionFromContextMenuFound && oController.onListNavigationExtensionFromContextMenu(aContext)){
+				return;
+			}
 			var oSynchronizeDraftPromise = oSourceControl.getModel().hasPendingChanges() ? oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync() : Promise.resolve();
 			oSynchronizeDraftPromise.then(function () {
 				aNavigableContexts.forEach(function (oContext) {
@@ -375,30 +380,31 @@ sap.ui.define([
 		 * So that, "Open in new tab" option isn't added in context menu.
 		 *   a. Navigation is not supported by the table
 		 *   b. Direct edit flow (when the edit icon is pressed on row, the object is opened with draft record) is configured.  
-		 *   c. The controller is configured with onListNavigationExtension (i.e custom navigation logic written by app).
-		 *   d. If ushell container is unavailable
+		 *   c. If ushell container is unavailable
+		 * 	 d. Introducing a new check bOnListNavigationExtensionFromContextMenuFound to Open in New Tab from context menu(to be added/used by application developers)
 		 * 
 		 * @param {sap.suite.ui.generic.template.lib.ContextMenuHandler.FocusInfo} oFocusInfo 
 		 * @returns {Promise<Function|undefined>} Promise which resolves the handler method
 		 */
-		function getHandlePromiseForOpenInNewTab (oFocusInfo) {
-			var getHandler = function (bEnabled, oFocusInfo, aNavigableContexts) {
-				return bEnabled && fnOpenNavigableContextsInNewTab.bind(null, oFocusInfo, aNavigableContexts);
-			};
-
-			var bDirectEdit = oTemplateUtils.oServices.oApplication.getEditFlowOfRoot() === "direct";
-			var bOnListNavigationExtensionFound = oController.hasOwnProperty("onListNavigationExtension");
-			var UshellContainer = sap.ui.require("sap/ushell/Container");
-			if (!bNavigationSupported || bDirectEdit || bOnListNavigationExtensionFound || !UshellContainer) {
-				return;
-			}
-
-			// Enable the context menu entry only if at least one navigable context is available
-			var aNavigableContexts = oFocusInfo.applicableContexts.filter(fnIsContextNavigable);
-			var bEnabled = aNavigableContexts.length > 0;
-
-			return Promise.resolve(getHandler(bEnabled, oFocusInfo, aNavigableContexts));
-		}
+        function getHandlePromiseForOpenInNewTab (oFocusInfo) {
+            var getHandler = function (bEnabled, oFocusInfo, aNavigableContexts) {
+                return bEnabled && fnOpenNavigableContextsInNewTab.bind(null, oFocusInfo, aNavigableContexts);
+            };
+            var aNavigableContexts = oFocusInfo.applicableContexts.filter(fnIsContextNavigable);
+            var bDirectEdit = oTemplateUtils.oServices.oApplication.getEditFlowOfRoot() === "direct";
+            var UshellContainer = sap.ui.require("sap/ushell/Container");
+            var bIsSingleSelect = aNavigableContexts && aNavigableContexts.length === 1;
+            var bOnListNavigationExtensionFound = oController.hasOwnProperty("onListNavigationExtension");
+            var bOnListNavigationExtensionFromContextMenuFound = oController.hasOwnProperty("onListNavigationExtensionFromContextMenu");
+            var bRestrictOpenFromContextMenu = bOnListNavigationExtensionFound && (!bOnListNavigationExtensionFromContextMenuFound || !bIsSingleSelect);
+            if (!bNavigationSupported || bDirectEdit || !UshellContainer || bRestrictOpenFromContextMenu) {
+                return;
+            }
+
+            // Enable the context menu entry only if at least one navigable context is available
+            var bEnabled = aNavigableContexts.length > 0;
+            return Promise.resolve(getHandler(bEnabled, oFocusInfo, aNavigableContexts));
+        }
 
 		/**
 		 * Adds "Open in wew tab/window" entry to context menu

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

@@ -1,107 +1,30 @@
 sap.ui.define([
-    "sap/base/util/extend",
-    "sap/ui/base/Object",
-    "sap/suite/ui/generic/template/genericUtilities/FeLogger"
+	"sap/base/util/extend",
+	"sap/ui/base/Object",
+	"sap/suite/ui/generic/template/lib/BaseNoDataHandler"
 ], function (
-    extend,
-    BaseObject,
-    FeLogger
+	extend,
+	BaseObject,
+	BaseNoDataHandler
 ) {
-    "use strict";
-    var oLogger = new FeLogger("lib.TableNoDataHandler").getLogger();
+	"use strict";
 
-    function getMethods(oController, oTemplateUtils, oNoDataConfig) {
-        var sNoDataRepresentation = oController.getOwnerComponent().getAppComponent().getNoDataRepresentation();
+	function getMethods() {
+		function fnGetIllustratedMessage(oSmartCtrl) {
+			return oSmartCtrl.getNoData();
+		}
 
-        function fnSetNoDataMessage (oSmartTable, sScenario) {
-            if (sNoDataRepresentation === "textOnly") {
-                fnSetTextMessage(oSmartTable, sScenario);
-            } else if (["illustration", "illustrationWithFallback"].includes(sNoDataRepresentation)) {
-                fnSetIllustratedMessage(oSmartTable, sScenario);
-            }
-        }
+		return {
+			getIllustratedMessage: fnGetIllustratedMessage
+		};
+	}
 
-        // Sets "text" based no data message
-        function fnSetTextMessage (oSmartTable, sScenario) {
-            var sSmartTableId = oSmartTable.getId();
-            var sI18nKey = oNoDataConfig[sScenario].i18nKey;
-            var sNoDataText = oTemplateUtils.oCommonUtils.getContextText(sI18nKey, sSmartTableId);
-            oSmartTable.setNoData(sNoDataText);
-        }
-
-        // Sets "illustration" based no data message
-        function fnSetIllustratedMessage (oSmartTable, sScenario) {
-            var sSmartTableId = oSmartTable.getId();
-            var sI18nPrefix = oNoDataConfig[sScenario].i18nKey;
-            // Derive title key from base key
-            var sTitleI18nKey = sI18nPrefix + "_ILLUSTRATION_TITLE";
-            // Get title from resource bundle.
-            var sTitle = oTemplateUtils.oCommonUtils.getContextText(sTitleI18nKey, sSmartTableId);
-            // Find description (this logic varies between "illustration" and "illustrationWithFallback")
-            var sDescription = fnDeriveIllustrationDescription(sI18nPrefix, sSmartTableId);
-            // Get illustration type from config
-            var sIllustrationType = oNoDataConfig[sScenario].illustrationType;
-
-            
-            var oNoDataIllustratedMessage = oSmartTable.getNoData();
-            // oSmartTable.getNoData should actually return an illustrated message.
-            //
-            // Sometimes, app changes the no data message into text message using custom coding. 
-            // Hence, adding this type check as a safety measure.
-            if ( !(oNoDataIllustratedMessage?.isA?.("sap.m.IllustratedMessage")) ) {
-                oLogger.error(`Unable to update the no data message of smart table ${oSmartTable.getId()} as it's not an IllustratedMessage`);
-                return;
-            }
-            // Table already has illustrated no data message. Just update the attributes
-            oNoDataIllustratedMessage.setIllustrationType(sIllustrationType);
-            oNoDataIllustratedMessage.setTitle(sTitle);
-            oNoDataIllustratedMessage.setDescription(sDescription);
-        }
-
-        /**
-         * Calculates the illustrated message's description based on the manifest flag "noDataRepresentation" value
-         * 1. If manifest flag is "illustration"
-         * 	  - Just returns text for the new i18n key (legacy key + "_ILLUSTRATION_DESCRIPTION")
-         * 	  - The text can be found on either app or FE
-         * 2. If flag is "illustrationWithFallback"
-         * 	  a. Checks the app if customized text available for (legacy i18n key | tableId) (for e.g. "NOITEMS_LR_SMARTTABLE|C_SalesOrder")
-         * 	   	 - If found, returns it.
-         * 	  b. Checks the app if customized text available just for legacy i18n key (for e.g. "NOITEMS_LR_SMARTTABLE")
-         * 	   	 - If found, returns it.
-         * 	  c. Returns the text for the new i18n key (Same as "Case 1" above).
-         */
-        function fnDeriveIllustrationDescription (sI18nPrefix, sSmartTableId) {
-            var sLatestDescriptionI18nKey = sI18nPrefix + "_ILLUSTRATION_DESCRIPTION";
-            var sLatestDescription = oTemplateUtils.oCommonUtils.getContextText(sLatestDescriptionI18nKey, sSmartTableId);
-            if (sNoDataRepresentation === "illustration") {
-                return sLatestDescription;
-            }
-            // Below logic is for noDataRepresentation = "illustrationWithFallback"
-            var sLegacyDescription = null;
-            var sLegacyI18nKey = sI18nPrefix;
-            var sTableSpecificI18nSuffix = oTemplateUtils.oCommonUtils.getSpecificI18nKeyForSmartControl(sSmartTableId);
-            sTableSpecificI18nSuffix = (sTableSpecificI18nSuffix === "|") ? "" : sTableSpecificI18nSuffix; // Omit the suffix "|"
-            // If table specific i18n key is available, get the customized text for that.
-            if (sTableSpecificI18nSuffix) {
-                sLegacyDescription = oTemplateUtils.oCommonUtils.getCustomizedTextFromApp(sLegacyI18nKey + "|" + sTableSpecificI18nSuffix);
-            }
-            // If the description is not yet found, get the customized text just for the generic i18n key.
-            if (!sLegacyDescription) {
-                sLegacyDescription = oTemplateUtils.oCommonUtils.getCustomizedTextFromApp(sLegacyI18nKey);
-            }
-            // If legacy text is found, return it.
-            // Otherwise, return the latest one.
-            return sLegacyDescription || sLatestDescription;
-        }
-        
-        return {
-            setNoDataMessage: fnSetNoDataMessage
-        };
-    }
-
-    return BaseObject.extend("sap.suite.ui.generic.template.lib.TableNoDataHandler", {
-        constructor: function (oController, oTemplateUtils, oNoDataConfig) {
-            extend(this, getMethods(oController, oTemplateUtils, oNoDataConfig));
-        }
-    });
-});
+	return BaseObject.extend("sap.suite.ui.generic.template.lib.TableNoDataHandler", {
+		constructor: function (oController, oTemplateUtils, oNoDataConfig) {
+			extend(this, new BaseNoDataHandler(oController, oTemplateUtils, {
+				oNoDataConfig: oNoDataConfig,
+				methods: getMethods()
+			}));
+		}
+	});
+});

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

@@ -48,6 +48,8 @@ sap.ui.define([
                     isSaveEnabled: false,
                     stateType: "Initial",
                     feedbackEnabled: true,
+                    feedbackPressedUp: false,
+                    feedbackPressedDown: false,
                     isEasyFillButtonEnabled: false
                   };
 
@@ -121,11 +123,11 @@ sap.ui.define([
                     oEasyFillDialog.close();
                 },
                 onEasyFillSubmitInputToAI : async function (oEvent) {  
-                    resetEasyFill();
                     const easyFillDialogModel = oController.getView().getModel("easyFillDialogModel");
                     easyFillDialogModel.setProperty("/isBusy",true);
                     let mFieldMapping = getEntitySetMapForLLM();
                     let aiCallResult = await  oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFill.extractFieldValuesFromText(oController.byId("EasyFillInputTextArea").getValue(), mFieldMapping);
+                    resetEasyFill();
                     aEditableFields = [];
                     easyFillDialogModel.setProperty("/isBusy",false);
                     formatDateValues(aiCallResult,mFieldMapping);       
@@ -290,6 +292,8 @@ sap.ui.define([
             easyFillDialogModel.setProperty("/isSaveEnabled",false);
             easyFillDialogModel.setProperty("/stateType","Initial");
             easyFillDialogModel.setProperty("/feedbackEnabled",true);
+            easyFillDialogModel.setProperty("/feedbackPressedUp",false);
+            easyFillDialogModel.setProperty("/feedbackPressedDown",false);
             if (bRemoveTextAreaValue) {
                 oController.byId("EasyFillInputTextArea").setValue("");
                 easyFillDialogModel.setProperty("/isEasyFillButtonEnabled",false);

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/fragments/EasyFillDialog.fragment.xml

@@ -5,10 +5,11 @@ xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1"
 xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 >
 
-    <Dialog id="EasyFillDialog" class = "sapSmartTemplatesObjectPageEasyFill" contentHeight="49.3125rem" title="{i18n>EASY_FILL_TITLE}" titleAlignment="Start" horizontalScrolling="false" verticalScrolling="false">
+    <Dialog id="EasyFillDialog" class = "sapSmartTemplatesObjectPageEasyFill" contentHeight="49.3125rem" title="{i18n>EASY_FILL_TITLE}"
+        titleAlignment="Start" horizontalScrolling="false" verticalScrolling="false" draggable="true" resizable="true">
         <content>
             <FlexBox id="EasyFillMainFlex" direction="Row" renderType="Bare" width="100%" height="100%">
-                <FlexBox 
+                <FlexBox
                 direction="Column" renderType="Bare" width="40%" class = "sapSmartTemplatesObjectPageEasyFillInputArea"
                 >
                     <FlexBox id="EasyFillInputArea" direction="Column" renderType="Bare" width="100%" gap="36px">
@@ -18,10 +19,10 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
                         </VBox>
                         <TextArea
                             id="EasyFillInputTextArea"
-                            growing = "true" 
+                            growing = "true"
                             growingMaxLines = "30"
                             maxLength = "2000"
-                            liveChange="onLiveChange"
+                            liveChange=".onLiveChange"
                             placeholder = "{i18n>EASY_FILL_TEXTAREA_PLACEHOLDER}"
                             rows = "20"
                             width="100%"
@@ -38,12 +39,12 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
                             icon="sap-icon://ai"
                             fesr:press="fe2:ef:analyzeText"
                             enabled="{easyFillDialogModel>/isEasyFillButtonEnabled}"
-                            press="onEasyFillSubmitInputToAI">
+                            press=".onEasyFillSubmitInputToAI">
                         </Button>
                         <Button
                             id="EasyFillClearAll"
                             type = "Transparent"
-                            press="onEasyFillClearAll"
+                            press=".onEasyFillClearAll"
                             fesr:press="fe2:ef:clearAll"
                             text="{i18n>EASYFILL_CLEAR_ALL}">
                         </Button>
@@ -58,10 +59,10 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
                         description = "{path: 'easyFillDialogModel>/stateType', formatter: '.formatIllustrationDescription'}"/>
                     <ScrollContainer vertical = "true" visible="{= ${easyFillDialogModel>/isUpdatableVisible} || ${easyFillDialogModel>/isNonUpdatableVisible} }">
                         <HBox gap="0.5rem" justifyContent = "End" alignItems = "Center" renderType="Bare" class="sapSmartTemplatesObjectPageEasyFillReviewAreaBanner">
-                            <Link text="{i18n>AI_LINK_NOTICE_TITLE}" press="onLinkPress"/>
+                            <Link text="{i18n>AI_LINK_NOTICE_TITLE}" press=".onLinkPress"/>
                             <Label text="{i18n>AI_WARNING_TEXT}"/>
-                            <Button icon = "sap-icon://thumb-up" type = "Transparent" fesr:press="fe2:ef:thumbsup" enabled="{easyFillDialogModel>/feedbackEnabled}" press="onFeedbackPress"/>
-                            <Button icon = "sap-icon://thumb-down" type="Transparent" fesr:press="fe2:ef:thumbsdown" enabled="{easyFillDialogModel>/feedbackEnabled}" press="onFeedbackPress"/>
+                            <ToggleButton icon = "sap-icon://thumb-up" type = "Transparent" fesr:press="fe2:ef:thumbsup" pressed="{easyFillDialogModel>/feedbackPressedUp}" enabled="{easyFillDialogModel>/feedbackEnabled}" press=".onFeedbackPress"/>
+                            <ToggleButton icon = "sap-icon://thumb-down" type="Transparent" fesr:press="fe2:ef:thumbsdown" pressed="{easyFillDialogModel>/feedbackPressedDown}" enabled="{easyFillDialogModel>/feedbackEnabled}" press=".onFeedbackPress"/>
                         </HBox>
                         <VBox class="sapSmartTemplatesObjectPageEasyFillReviewAreaSmartFormWrapper" renderType = "Bare" visible="{easyFillDialogModel>/isUpdatableVisible}">
                             <core:Fragment fragmentName="sap.suite.ui.generic.template.lib.ai.EasyFill.fragments.EasyFillUpdatebleSmartForm" type="XML"/>
@@ -75,10 +76,10 @@ xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
             </FlexBox>
         </content>
         <beginButton>
-            <Button text="{i18n>EASY_FILL_CONFIRM}"  fesr:press="fe2:ef:confirm" enabled="{easyFillDialogModel>/isSaveEnabled}" press="onSaveFromEasyFillDialog" type="Emphasized"/>
+            <Button text="{i18n>EASY_FILL_CONFIRM}"  fesr:press="fe2:ef:confirm" enabled="{easyFillDialogModel>/isSaveEnabled}" press=".onSaveFromEasyFillDialog" type="Emphasized"/>
         </beginButton>
         <endButton>
-            <Button text="{i18n>CANCEL}"  press="onCancelEasyFillDialog" fesr:press="fe2:ef:cancel"/>
+            <Button text="{i18n>CANCEL}"  press=".onCancelEasyFillDialog" fesr:press="fe2:ef:cancel"/>
         </endButton>
    </Dialog>
 </core:FragmentDefinition>

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

@@ -450,10 +450,10 @@ sap.ui.define([
         }
 
 		function fnClearFilters(oEvent) {
-			var oSmartFilterbar = oState.oSmartFilterbar;
-            oSmartFilterbar.search();
-			// Do not clear the SFB as this is applicable only for the EasyFilter
-            //oSmartFilterbar.clear();
+            //Making the SmartTable in dirty state
+            var  oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+            oTemplatePrivateModel.setProperty("/listReport/firstSelection", true);
+            oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
 		}
 
 		function fnAfterQueryProcessing(oEvent) {
@@ -467,7 +467,11 @@ sap.ui.define([
 			oTemplateUtils.oComponentUtils.getBusyHelper().setBusy(oQueryPromise);
 		}
 
-                function fnTokensChanged(oEvent) {
+        function fnTokensChanged(oEvent) {
+            //When reset button is clicked no batch call should be triggered
+            if (oEvent.getParameter("reset")) {
+                return;
+            }
 			var oSmartFilterbar = oState.oSmartFilterbar;
 			var oFiltersFromAI = oEvent.getParameter("tokens");
 			var sSmartFilterBarId = oSmartFilterbar.getId();