@sapui5/sap.suite.ui.generic.template 1.147.1 → 1.148.0

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

@@ -6,8 +6,9 @@ sap.ui.define([
     "sap/ui/model/FilterOperator",
     'sap/ui/model/Filter',
     'sap/suite/ui/generic/template/js/AnnotationHelper',
-    "./EasyFilterDataFetcherHelper"
-], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper,EasyFilterDataFetcherHelper) {
+    "./EasyFilterDataFetcherHelper",
+    "sap/suite/ui/generic/template/genericUtilities/controlHelper"
+], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper,EasyFilterDataFetcherHelper,controlHelper) {
     'use strict';
 
     /*
@@ -25,7 +26,34 @@ sap.ui.define([
         // used for busyHandling between query triggered and query resolved.
         var oQueryPromise, oQueryPromiseResolve;
         var fnValueHelpPromiseResolve;
+        // Guard flag to distinguish EasyFilter-initiated state changes from user-initiated ones
+        var bApplyingSorting = false;
+
+        var bApplyingGrouplevels = false;
+
         // fnValueHelpPromiseReject;
+        // Tracks the filterMode that was saved in the most recently loaded variant.
+        // Used in onFilterSwitch to compare against the current toggle state without
+        // relying on getCustomFilterData() which can be overwritten by intermediate
+        // beforeVariantFetch calls during the async Go press flow.
+        var sLoadedVariantFilterMode = "classic";
+        // Set to true when the user manually deletes or modifies a token, reset to false on
+        // variant load or Go press result. Used to suppress fnApplyEasyFilterVariantState from
+        // overwriting the stale-query (placeholder) state that fnTokensChanged put in place.
+        var bTokensModifiedByUser = false;
+
+        /**
+         * Calls setVariantCreationByUserAllowed(bAllowed) on the SmartVariantManagement control
+         * that owns the SmartFilterBar. Disabling creation blocks both Save and Save As in the VM
+         * popup. Re-enabling restores the default behaviour.
+         * @param {boolean} bAllowed
+         */
+        function fnSetCreationAllowed(bAllowed) {
+            var oSmartVariant = oState.oSmartFilterbar.getSmartVariant();
+            if (oSmartVariant) {
+                oSmartVariant.setVariantCreationByUserAllowed(bAllowed);
+            }
+        }
 
         /**
          * This method prepares the metadata calculation after the smart filter bar is initialized
@@ -59,8 +87,25 @@ sap.ui.define([
             var mFilterProperties = {}; // Now also includes 1:1 navigation properties
             var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
 
-            // Helper to add properties to mFilterProperties, with optional prefix
-            function addPropertiesFromEntityType(entityType, prefix) {
+            // Collect non-sortable properties from SortRestrictions annotation
+            var oEntitySetMeta = oSFBMetaModel?.getODataEntitySet && oSFBMetaModel?.getODataEntitySet(sEntitySet);
+            var oSortRestrictions = oEntitySetMeta && oEntitySetMeta["Org.OData.Capabilities.V1.SortRestrictions"];
+            var bEntitySetSortable = !oSortRestrictions || oSortRestrictions.Sortable !== "false";
+            var mNonSortableProperties = {};
+            if (oSortRestrictions && oSortRestrictions.NonSortableProperties) {
+                oSortRestrictions.NonSortableProperties.forEach(function(oProperty) {
+                    if (oProperty.PropertyPath) {
+                        mNonSortableProperties[oProperty.PropertyPath] = true;
+                    }
+                });
+            }
+
+            // Helper to add properties to mFilterProperties, with optional prefix.
+            // bOverrideSortable and mOverrideNonSortable allow callers (e.g. nav property processing)
+            // to pass entity-set-specific sort restrictions instead of the root entity set's.
+            function addPropertiesFromEntityType(entityType, prefix, bOverrideSortable, mOverrideNonSortable) {
+                var bEffectiveSortable = (bOverrideSortable !== undefined) ? bOverrideSortable : bEntitySetSortable;
+                var mEffectiveNonSortable = mOverrideNonSortable || mNonSortableProperties;
                 entityType.property.forEach(function (oProperty) {
                     var sTokenType = "ValueHelp";
                     if (filterHelper.isPropertyFilterable(oProperty)) {
@@ -90,12 +135,18 @@ sap.ui.define([
                             sTokenType = "Time";
                         }
                         var propName = prefix ? prefix + "." + oProperty.name : oProperty.name;
+                        // Determine sortability: property is sortable unless entity set is not sortable,
+                        // property is in NonSortableProperties, or property has sap:sortable="false"
+                        var bSortable = bEffectiveSortable && !mEffectiveNonSortable[oProperty.name] && oProperty["sap:sortable"] !== "false";
+                        // Groupable follows the same logic as sortable: a property is groupable if it is sortable
+                        var bGroupable = bSortable;
                         mFilterProperties[propName] = {
                             name: propName,
                             dataType: oProperty.type,
                             defaultValue : [],
                             filterable: true,
-                            sortable: false,
+                            sortable: bSortable,
+                            groupable: bGroupable,
                             codeList : bIsCodeListRequired,
                             type: sTokenType,
                             unit: oProperty["sap:unit"] || "",
@@ -137,7 +188,26 @@ sap.ui.define([
                             //var sShortType = sTargetType.split(".").pop();
                             var oTargetEntityType = oSFBMetaModel.getODataEntityType && oSFBMetaModel.getODataEntityType(sTargetType);
                             if (oTargetEntityType) {
-                                addPropertiesFromEntityType(oTargetEntityType, navProp.name);
+                                // Resolve SortRestrictions for the navigation target entity set,
+                                // mirroring the same check EasyFilterBar.tsx (V4) does for nav property bindings.
+                                var bNavSortable = bEntitySetSortable;
+                                var mNavNonSortable = {};
+                                var oAssocSetEnd = oSFBMetaModel.getODataAssociationSetEnd && oSFBMetaModel.getODataAssociationSetEnd(oEntityType, navProp.name);
+                                var oNavEntitySetMeta = oAssocSetEnd && oAssocSetEnd.entitySet && oSFBMetaModel.getODataEntitySet(oAssocSetEnd.entitySet);
+                                if (oNavEntitySetMeta) {
+                                    var oNavSortRestrictions = oNavEntitySetMeta["Org.OData.Capabilities.V1.SortRestrictions"];
+                                    if (oNavSortRestrictions) {
+                                        bNavSortable = oNavSortRestrictions.Sortable !== "false";
+                                        if (oNavSortRestrictions.NonSortableProperties) {
+                                            oNavSortRestrictions.NonSortableProperties.forEach(function(oProperty) {
+                                                if (oProperty.PropertyPath) {
+                                                    mNavNonSortable[oProperty.PropertyPath] = true;
+                                                }
+                                            });
+                                        }
+                                    }
+                                }
+                                addPropertiesFromEntityType(oTargetEntityType, navProp.name, bNavSortable, mNavNonSortable);
                             }
                         }
                     }
@@ -434,6 +504,43 @@ sap.ui.define([
             return oController.byId("template::easyFilterContainer");
         }
 
+        /**
+         * Applies EasyFilter variant state: sets the filterMode and, if easyFilter mode,
+         * restores the query string and triggers AI resolution to rebuild the token display.
+         * The SFB selectOptions are already restored by the variant mechanism — this only
+         * restores the visual state of the EasyFilter bar.
+         * @param {object} oVariantState - { filterMode: string, easyFilter: { query: string } }
+         */
+        function fnApplyEasyFilterVariantState(oVariantState) {
+            if (!oVariantState || !oVariantState.filterMode) {
+                return;
+            }
+            var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+            var oSmartFilterbar = oState.oSmartFilterbar;
+
+            oTempModel.setProperty("/listReport/filterMode", oVariantState.filterMode);
+
+            if (oVariantState.filterMode === "easyFilter") {
+                oSmartFilterbar.setVisible(false);
+                var sQuery = oVariantState.easyFilter && oVariantState.easyFilter.query;
+                if (sQuery) {
+                    // Tokens have been manually changed — the query in the input is intentionally
+                    // stale (shown as placeholder). Do not overwrite it with the saved query.
+                    if (!bTokensModifiedByUser) {
+                        var oEasyFilterBar = fnGetEasyFilterBar();
+                        if (oEasyFilterBar) {
+                            var sCurrentQuery = oEasyFilterBar.getQuery();
+                            if (!sCurrentQuery || sCurrentQuery === sQuery) {
+                                oEasyFilterBar.setQuery(sQuery);
+                            }
+                        }
+                    }
+                }
+            } else {
+                oSmartFilterbar.setVisible(true);
+            }
+        }
+
         /**
          * This method is used to initialise the EasyFilter control with the metadata from the smart filter bar
          */
@@ -446,6 +553,46 @@ sap.ui.define([
                 oEasyFilter.setAppId(oController.getOwnerComponent().getAppComponent().getManifestEntry("sap.app").id);
                 oEasyFilter.setFilterBarMetadata(oEasyFilterMetadata.fields);
                 oEasyFilter.easyfilter = oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFilter;
+
+                // Register callbacks on SmartFilterBarWrapper so filterMode and query are
+                // included in the genericData bucket when a variant is saved or loaded.
+                var sSmartFilterBarId = oState.oSmartFilterbar.getId();
+                var oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapperById(sSmartFilterBarId, "SmartFilterBar");
+                oSmartFilterBarWrapper.setEasyFilterCallbacks({
+                    getState: function() {
+                        var oTMModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+                        var oEFBar = fnGetEasyFilterBar();
+                        return {
+                            filterMode: oTMModel.getProperty("/listReport/filterMode"),
+                            easyFilter: {
+                                query: oEFBar ? oEFBar.getQuery() : undefined
+                            }
+                        };
+                    },
+                    setState: fnApplyEasyFilterVariantState
+                });
+
+                // Handle INIT timing gap: the "INIT" afterVariantLoad fires before this handler
+                // is created. Read whatever the variant already loaded into customFilterData now.
+                var oCustomData = oState.oSmartFilterbar.getCustomFilterData();
+                var oGenericData = oCustomData && oCustomData["sap.suite.ui.generic.template.genericData"];
+                if (oGenericData && oGenericData.filterMode) {
+                    sLoadedVariantFilterMode = oGenericData.filterMode;
+                    fnApplyEasyFilterVariantState({
+                        filterMode: oGenericData.filterMode,
+                        easyFilter: oGenericData.easyFilter
+                    });
+                    // If the default variant has AutoApply checked, trigger Go now.
+                    // The SFB would have called search() itself (IappStateHandler line ~773),
+                    // but EasyFilter is hidden so we need onGoPress instead.
+                    // areDataShownInTable() being true at this point is the same signal
+                    // the SFB uses to decide whether to auto-search on startup.
+                    if (oGenericData.filterMode === "easyFilter" &&
+                            oGenericData.easyFilter && oGenericData.easyFilter.query &&
+                            oState.oIappStateHandler.areDataShownInTable()) {
+                        oEasyFilter.onGoPress(oGenericData.easyFilter.query);
+                    }
+                }
             });
         }
 
@@ -470,10 +617,24 @@ sap.ui.define([
         function fnTokensChanged(oEvent) {
             //When reset button is clicked no batch call should be triggered
             if (oEvent.getParameter("reset")) {
+                fnSetCreationAllowed(true);
                 return;
             }
 			var oSmartFilterbar = oState.oSmartFilterbar;
 			var oFiltersFromAI = oEvent.getParameter("tokens");
+
+            // tokensChanged fires for both AI-resolved tokens (Go press result) and user
+            // manual token edits. tokensChangedByUser fires first on a user edit and sets
+            // bTokensModifiedByUser — use that to tell the two cases apart.
+            if (bTokensModifiedByUser) {
+                // User manually edited a token — tokensChangedByUser already disabled
+                // Save/SaveAs. Mark the variant dirty and stop; do not trigger search.
+                oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
+                return;
+            }
+            // AI-resolved result path: reset the user-edit flag and re-enable Save/SaveAs.
+            bTokensModifiedByUser = false;
+            fnSetCreationAllowed(true);
 			var sSmartFilterBarId = oSmartFilterbar.getId();
 			var oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapperById(sSmartFilterBarId, "SmartFilterBar");
 			var oSmartFilterBarVariant = oSmartFilterBarWrapper.getState();
@@ -505,24 +666,145 @@ sap.ui.define([
                     // If matching property found and has ranges
                     if (matchingSelectOption?.Ranges?.length > 0) {
                         var { Low: value1 = null, High: value2 = null } = matchingSelectOption.Ranges[0];
-                        // Update the semantic date data in the smart filter bar 
+                        // Update the semantic date data in the smart filter bar
                         var dateData = semanticDate.Data;
                         dateData.operation = "DATERANGE";
                         dateData.value1 = value1;
                         dateData.value2 = value2 || value1; // Use value1 if value2 is null/empty
-                    } 
+                    }
                 });
             }
 
 			oSmartFilterBarWrapper.setState(oSmartFilterBarVariant);
-			oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
+			// currentVariantSetModified intentionally omitted — pressing Go with the same
+			// query must not mark the variant as dirty.
+			// oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
 			oSmartFilterbar.search();
 		}
+
+        /**
+         * Event handler for the EasyFilterBarContainer's tokensChangedByUser event.
+         * Fired when the user manually deletes or modifies a token (distinct from AI-resolved tokens).
+         * Disables Save/SaveAs in the variant management popup until a fresh Go press resolves new tokens.
+         */
+        function fnTokensChangedByUser() {
+            bTokensModifiedByUser = true;
+            fnSetCreationAllowed(false);
+        }
+
+        /**
+		/**
+		 * Event handler for the EasyFilter control's sortersChanged event.
+		 * Applies the AI-determined sort order to the SmartTable via setUiState,
+		 * which updates the data binding, column sort indicators, and P13n state
+		 * through the PersonalizationController.
+		 * @param {sap.ui.base.Event} oEvent The sortersChanged event containing sort definitions
+		 */
+		function fnSortersChanged(oEvent) {
+            try {
+                var aSorters = oEvent.getParameter("sorters");
+    
+                var oPresentationControlHandler = oState.oPresentationControlHandler;
+                if (!oPresentationControlHandler) {
+                    oLogger.error("EasyFilterBarHandler.onSortersChanged: PresentationControlHandler not found.");
+                    return;
+                }
+    
+                var oControl = oPresentationControlHandler.getControl();
+                if (!oControl) {
+                    oLogger.error("EasyFilterBarHandler.onSortersChanged: Presentation control not found.");
+                    return;
+                }
+
+                if (!controlHelper.isSmartTable(oControl)) {
+                    oLogger.warning("EasyFilterBarHandler.onSortersChanged: Sorting is only supported for SmartTable.");
+                    return;
+                }
+    
+                var oUiState = oControl.getUiState();
+                var oPresentationVariant = oUiState.getPresentationVariant();
+    
+                oPresentationVariant.SortOrder = undefined; // Clear existing sort order before applying new one
+
+                // Set new sort order (empty array clears sorting)
+                if (aSorters?.length) {
+                    const aSortersMapped = aSorters.map(function(oSorter) {
+                    return {
+                        Property: oSorter.key,
+                        Descending: !!oSorter.descending
+                    };
+                    });
+                    oPresentationVariant.SortOrder = aSortersMapped;
+                    bApplyingSorting = true;
+                    try {
+                        oUiState.setPresentationVariant(oPresentationVariant);
+                        oControl.setUiState(oUiState);
+                    } finally {
+                        bApplyingSorting = false;
+                    }
+                }
+    
+            } catch (error) {
+                bApplyingSorting = false;
+                oLogger.warning("EasyFilterBar: unexpected error while handling sortersChanged", String(error));
+            }
+		}
+
+		/**
+		 * Event handler for the EasyFilter control's groupLevelsChanged event.
+		 * Applies the AI-determined group levels to the SmartTable via setUiState,
+		 * which updates the data binding and table grouping state
+		 * through the PersonalizationController.
+		 * @param {sap.ui.base.Event} oEvent The groupLevelsChanged event containing group level definitions
+		 */
+		function fnGroupLevelsChanged(oEvent) {
+            try {
+                var aGroupLevels = oEvent.getParameter("groupLevels");
+    
+                var oPresentationControlHandler = oState.oPresentationControlHandler;
+                if (!oPresentationControlHandler) {
+                    oLogger.error("EasyFilterBarHandler.onGroupLevelsChanged: PresentationControlHandler not found.");
+                    return;
+                }
+    
+                var oControl = oPresentationControlHandler.getControl();
+                if (!oControl) {
+                    oLogger.error("EasyFilterBarHandler.onGroupLevelsChanged: Presentation control not found.");
+                    return;
+                }
+
+                if (!controlHelper.isSmartTable(oControl)) {
+                    oLogger.warning("EasyFilterBarHandler.onGroupLevelsChanged: Grouping is only supported for SmartTable.");
+                    return;
+                }
+    
+                var oUiState = oControl.getUiState();
+                var oPresentationVariant = oUiState.getPresentationVariant();
+    
+                oPresentationVariant.GroupBy = undefined; // Clear existing group levels before applying new ones
+
+                // SmartTable supports grouping by only one column at a time,
+                // so we take only the first group level even if multiple are provided.
+                oPresentationVariant.GroupBy = (aGroupLevels && aGroupLevels.length) ? 
+                aGroupLevels?.flatMap(aGroup => Object.values(aGroup)) : undefined;
+    
+                bApplyingGrouplevels = true;
+                try {
+                    oControl.setUiState(oUiState);
+                } finally {
+                    bApplyingGrouplevels = false;
+                }
+            } catch (error) {
+                bApplyingGrouplevels = false;
+                oLogger.warning("EasyFilterBar: unexpected error while handling groupLevelsChanged", String(error));
+            }
+		}
+
 		/**
 		 * Event handler for the EasyFilter control's showValueHelp event.
 		 * Identifies the input field for which the value help is requested and triggers the value help opening from SFB.
-		 * @param {*} oEvent 
-		 * @param {*} oState 
+		 * @param {*} oEvent
+		 * @param {*} oState
 		 */
 		function fnShowValueHelp(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
@@ -540,6 +822,8 @@ sap.ui.define([
         function fnQueryChanged() {
             var oSmartFilterbar = oState.oSmartFilterbar;
 			oSmartFilterbar.fireFilterChange();
+            // Query string is now part of variant state — mark dirty so user is prompted to save
+            oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
         }
         // function fnUpdateEasyFilterBarTokens() {
         //     // todo : update the easy filter bar tokens with new values from the SFB VHD
@@ -602,18 +886,70 @@ sap.ui.define([
         }
 
         /**
-         *
-         * This method is called when the variant is loaded in SFB
-         * Always set the filterMode to classic when the variant is loaded as the variant filters are not supported in the EasyFilter
-         * */
+         * Called when a variant is loaded in SFB.
+         * Restores filterMode and EasyFilter query from the variant's genericData.
+         * Only reacts to user-initiated variant switches (context === undefined/null).
+         * INIT is handled separately in fnInitialiseEasyFilterBar by reading getCustomFilterData().
+         * Other contexts (CANCEL, RESET, SET_VM_ID, DATA_SUITE, KEY_USER) leave filterMode unchanged.
+         * @param {object} oEvent - The variant load event
+         */
         function fnHandleVariantLoad(oEvent) {
+            var sContext = oEvent.getParameter("context");
+
+            // Only handle user-initiated variant switch (context is undefined/null)
+            if (sContext) {
+                return;
+            }
+
+            // A variant switch always resets the "tokens modified" disable state —
+            // the incoming variant represents a fresh, valid saved state.
+            bTokensModifiedByUser = false;
+            fnSetCreationAllowed(true);
+
             var oTempModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-            // 'context' is undefined or null when the user switches variant , in this case switch to classic mode
-            // other values are "CANCEL" , "RESET" , "SET_VM_ID" , "DATA_SUITE" , "INIT" , "KEY_USER" etc : Do not switch filter mode in these cases
-            if (!oEvent.getParameter("context") && oTempModel.getProperty("/listReport/filterMode") !== "classic") {
-                var oSmartFilterbar = oState.oSmartFilterbar;
-                oTempModel.setProperty("/listReport/filterMode", "classic");
-                oSmartFilterbar.setVisible(true);
+            var oCustomData = oState.oSmartFilterbar.getCustomFilterData();
+            var oGenericData = oCustomData && oCustomData["sap.suite.ui.generic.template.genericData"];
+
+            var oEasyFilterBar = fnGetEasyFilterBar();
+            if (oGenericData && oGenericData.filterMode === "easyFilter") {
+                // Genuine user-initiated variant switch — restore the saved query
+                // unconditionally (no getQuery guard needed here, unlike the
+                // afterVariantLoad path which fires spuriously from setUiState calls).
+                sLoadedVariantFilterMode = "easyFilter";
+                oTempModel.setProperty("/listReport/filterMode", "easyFilter");
+                oState.oSmartFilterbar.setVisible(false);
+                var sQuery = oGenericData.easyFilter && oGenericData.easyFilter.query;
+                if (oEasyFilterBar) {
+                    if (sQuery) {
+                        oEasyFilterBar.setQuery(sQuery);
+                        // Only auto-trigger Go if "Apply Automatically" is checked on the variant.
+                        // If not checked, only the search string is restored — no search triggered.
+                        var bExecuteOnSelect = oEvent.getParameter("executeOnSelect");
+                        if (bExecuteOnSelect) {
+                            oEasyFilterBar.onGoPress(sQuery);
+                        }
+                    } else {
+                        oEasyFilterBar.resetState(false);
+                    }
+                }
+            } else if (oGenericData && oGenericData.filterMode) {
+                sLoadedVariantFilterMode = oGenericData.filterMode;
+                fnApplyEasyFilterVariantState({
+                    filterMode: oGenericData.filterMode,
+                    easyFilter: oGenericData.easyFilter
+                });
+            } else {
+                // Variant has no EasyFilter state → implicitly classic
+                sLoadedVariantFilterMode = "classic";
+                if (oTempModel.getProperty("/listReport/filterMode") !== "classic") {
+                    oTempModel.setProperty("/listReport/filterMode", "classic");
+                    oState.oSmartFilterbar.setVisible(true);
+                }
+                // Clear the EasyFilter input and tokens so the old query is not shown
+                // when the user switches back to a classic variant.
+                if (oEasyFilterBar) {
+                    oEasyFilterBar.resetState(false);
+                }
             }
         }
 
@@ -621,6 +957,51 @@ sap.ui.define([
             return EasyFilterDataFetcherHelper.fetchDataForKey(key, keySpecificSelectedResult, oState, oController, oTemplateUtils);
         }
 
+        /**
+         * Handles SmartTable uiStateChange events to detect user-initiated sort/group changes.
+         * When the user changes sort/group via column menu or P13n dialog (not triggered by EasyFilter),
+         * notifies the EasyFilterBarContainer so it can mark the filter input as dirty.
+         */
+        function fnOnSmartTableUiStateChange() {
+            if (bApplyingSorting || bApplyingGrouplevels) {
+                return;
+            }
+            var oEasyFilter = fnGetEasyFilterBar();
+            if (oEasyFilter && typeof oEasyFilter.notifyExternalTableStateChange === "function") {
+                oEasyFilter.notifyExternalTableStateChange();
+            }
+        }
+
+        /**
+         * Attaches the uiStateChange handler to the SmartTable to track external sort/group changes.
+         * Should be called after SmartTable is initialized.
+         */
+        function fnAttachSmartTableStateChangeHandler() {
+            var oPresentationControlHandler = oState.oPresentationControlHandler;
+            if (!oPresentationControlHandler) {
+                return;
+            }
+            var oSmartTable = oPresentationControlHandler.getControl();
+            if (oSmartTable && typeof oSmartTable.attachUiStateChange === "function") {
+                oSmartTable.attachUiStateChange(fnOnSmartTableUiStateChange);
+            }
+        }
+
+        /**
+         * Detaches the uiStateChange handler from the SmartTable.
+         * Should be called on cleanup/destroy.
+         */
+        function fnDetachSmartTableStateChangeHandler() {
+            var oPresentationControlHandler = oState.oPresentationControlHandler;
+            if (!oPresentationControlHandler) {
+                return;
+            }
+            var oSmartTable = oPresentationControlHandler.getControl();
+            if (oSmartTable && typeof oSmartTable.detachUiStateChange === "function") {
+                oSmartTable.detachUiStateChange(fnOnSmartTableUiStateChange);
+            }
+        }
+
         return {
             getEasyFilterBar : fnGetEasyFilterBar,
             initialiseEasyFilterBar : fnInitialiseEasyFilterBar,
@@ -631,10 +1012,16 @@ sap.ui.define([
 			onBeforeQueryProcessing: fnBeforeQueryProcessing,
             onQueryChanged : fnQueryChanged,
 			onTokensChanged: fnTokensChanged,
+            onTokensChangedByUser: fnTokensChangedByUser,
+			onSortersChanged: fnSortersChanged,
+			onGroupLevelsChanged: fnGroupLevelsChanged,
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,
-            onDataFetcher
+            onDataFetcher,
+            getLoadedVariantFilterMode: function() { return sLoadedVariantFilterMode; },
+            attachSmartTableStateChangeHandler: fnAttachSmartTableStateChangeHandler,
+            detachSmartTableStateChangeHandler: fnDetachSmartTableStateChangeHandler
         };
     }
 

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

@@ -828,3 +828,24 @@ EASYFILL_RESULT_FEEDBACK=Feedback sent
 
 # XBUT: EasyFill clear all
 EASYFILL_CLEAR_ALL=Clear All
+
+# XTXT: EasyFill informational message for staged table row updates
+EASY_FILL_TABLE_UPDATES_INFO = Table row updates were detected and will be applied when you confirm.
+
+# XBUT: EasyFill table preview previous values segment
+EASY_FILL_TABLE_VIEW_PREVIOUS = Previous
+
+# XBUT: EasyFill table preview new values segment
+EASY_FILL_TABLE_VIEW_NEW = New
+
+# XTXT: EasyFill table row label used in validation messages
+EASY_FILL_TABLE_ROW_LABEL = Row {0}
+
+# XTXT: EasyFill table value-help validation error summary
+EASY_FILL_TABLE_VALIDATION_MESSAGE = Some table values are invalid for value help: {0}. Update your request and try again.
+
+# XTXT: EasyFill suffix shown in table preview cells with invalid value-help values
+EASY_FILL_TABLE_INVALID_CELL_SUFFIX =  (invalid)
+
+# XTIT: EasyFill Section Title
+EASY_FILL_SECTION_HEADER =  Header

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

@@ -263,7 +263,7 @@ UNNAMED_OBJECT=\u540D\u524D\u306E\u306A\u3044\u30AA\u30D6\u30B8\u30A7\u30AF\u30C
 
 NOITEMS_SMARTTABLE=\u5229\u7528\u53EF\u80FD\u306A\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u305B\u3093
 
-NOITEMS_SMARTTABLE_ILLUSTRATION_TITLE=\u30A8\u30F3\u30C8\u30EA\u304C\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u3002
+NOITEMS_SMARTTABLE_ILLUSTRATION_TITLE=\u30A8\u30F3\u30C8\u30EA\u304C\u307E\u3060\u3042\u308A\u307E\u305B\u3093
 
 NOITEMS_SMARTTABLE_ILLUSTRATION_DESCRIPTION=\u3042\u308B\u5834\u5408\u306F\u3001\u3053\u3053\u306B\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 
@@ -281,7 +281,7 @@ NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON_ILLUSTRATION_DESCRIPTION=\u30
 
 NOITEMS_SMARTCHART=\u30C7\u30FC\u30BF\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 
-NOITEMS_SMARTCHART_ILLUSTRATION_TITLE=\u30A8\u30F3\u30C8\u30EA\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u3002
+NOITEMS_SMARTCHART_ILLUSTRATION_TITLE=\u30A8\u30F3\u30C8\u30EA\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093
 
 NOITEMS_SMARTCHART_ILLUSTRATION_DESCRIPTION=\u3042\u308B\u5834\u5408\u306F\u3001\u3053\u3053\u306B\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 
@@ -293,7 +293,7 @@ NOITEMS_LR_SMARTCHART_ILLUSTRATION_DESCRIPTION=\u30D3\u30E5\u30FC\u307E\u305F\u3
 
 NOITEMS_SMARTCHART_WITH_FILTER=\u30C7\u30FC\u30BF\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30D5\u30A3\u30EB\u30BF\u30D1\u30E9\u30E1\u30FC\u30BF\u306E\u8ABF\u6574\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-NOITEMS_SMARTCHART_WITH_FILTER_ILLUSTRATION_TITLE=\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+NOITEMS_SMARTCHART_WITH_FILTER_ILLUSTRATION_TITLE=\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
 
 NOITEMS_SMARTCHART_WITH_FILTER_ILLUSTRATION_DESCRIPTION=\u30D5\u30A3\u30EB\u30BF\u57FA\u6E96\u306E\u5909\u66F4\u3092\u8A66\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
@@ -305,7 +305,7 @@ SMARTCHART_INITIAL_NODATA_ILLUSTRATION_DESCRIPTION=\u691C\u7D22\u307E\u305F\u306
 
 NOITEMS_LR_SMARTTABLE=\u30C7\u30FC\u30BF\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 
-NOITEMS_LR_SMARTTABLE_ILLUSTRATION_TITLE=\u30A8\u30F3\u30C8\u30EA\u304C\u307E\u3060\u3042\u308A\u307E\u305B\u3093\u3002
+NOITEMS_LR_SMARTTABLE_ILLUSTRATION_TITLE=\u30A8\u30F3\u30C8\u30EA\u304C\u307E\u3060\u3042\u308A\u307E\u305B\u3093
 
 NOITEMS_LR_SMARTTABLE_ILLUSTRATION_DESCRIPTION=\u3042\u308B\u5834\u5408\u306F\u3001\u3053\u3053\u306B\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 
@@ -506,7 +506,7 @@ EASY_FILL_SECOND_LABEL_TEXT=\u30B9\u30D7\u30EC\u30C3\u30C9\u30B7\u30FC\u30C8\u30
 
 EASY_FILL_TEXTAREA_PLACEHOLDER=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u4F7F\u7528\u3059\u308B\u304B\u3001\u624B\u52D5\u3067\u3001\u5FC5\u8981\u306A\u60C5\u5831\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-EASY_FILL_ILLUSTRATION_TITLE_INITIAL=\u4E00\u90E8\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+EASY_FILL_ILLUSTRATION_TITLE_INITIAL=\u4E00\u90E8\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_INITIAL=\u6700\u521D\u306B\u5FC5\u8981\u306A\u60C5\u5831\u3092\u5165\u529B\u3059\u308B\u3068\u3001\u7D50\u679C\u304C\u63D0\u6848\u3055\u308C\u3001\u8868\u793A\u3055\u308C\u307E\u3059\u3002
 
@@ -514,7 +514,7 @@ EASY_FILL_ILLUSTRATION_TITLE_NO_ENTRIES=\u5165\u529B\u3055\u308C\u305F\u30D5\u30
 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_NO_ENTRIES=\u30AF\u30A8\u30EA\u304C\u65E2\u5B58\u306E\u3069\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u3082\u5408\u81F4\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002
 
-EASY_FILL_ILLUSTRATION_TITLE_ERROR=\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5165\u529B\u3067\u304D\u307E\u305B\u3093\u3002
+EASY_FILL_ILLUSTRATION_TITLE_ERROR=\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u5165\u529B\u3067\u304D\u307E\u305B\u3093
 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_ERROR=\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u305F\u3088\u3046\u3067\u3059\u3002\u518D\u8A66\u884C\u3057\u3001\u305D\u308C\u3067\u3082\u89E3\u6C7A\u3067\u304D\u306A\u3044\u5834\u5408\u306F\u3001\u7BA1\u7406\u8005\u306B\u554F\u3044\u5408\u308F\u305B\u3066\u304F\u3060\u3055\u3044\u3002
 

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

@@ -265,7 +265,7 @@ NOITEMS_SMARTTABLE=\u041D\u0435\u043C\u0430\u0454 \u0434\u043E\u0441\u0442\u0443
 
 NOITEMS_SMARTTABLE_ILLUSTRATION_TITLE=\u0417\u0430\u043F\u0438\u0441\u0456\u0432 \u0449\u0435 \u043D\u0435\u043C\u0430\u0454
 
-NOITEMS_SMARTTABLE_ILLUSTRATION_DESCRIPTION=\u041E\u0434\u0440\u0430\u0437\u0443 \u043F\u0456\u0441\u043B\u044F \u043F\u043E\u044F\u0432\u0438 \u0432\u0438 \u043F\u043E\u0431\u0430\u0447\u0438\u0442\u0435 \u0457\u0445 \u0442\u0443\u0442.
+NOITEMS_SMARTTABLE_ILLUSTRATION_DESCRIPTION=\u041A\u043E\u043B\u0438 \u0432\u043E\u043D\u0438 \u0437\u2019\u044F\u0432\u043B\u044F\u0442\u044C\u0441\u044F, \u0432\u0438 \u043F\u043E\u0431\u0430\u0447\u0438\u0442\u0435 \u0457\u0445 \u0442\u0443\u0442.
 
 NOITEMS_SMARTTABLE_WITH_FILTER=\u041F\u043E\u0437\u0438\u0446\u0456\u0457 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0456. \u0421\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0441\u043A\u043E\u0440\u0438\u0433\u0443\u0432\u0430\u0442\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043F\u043E\u0448\u0443\u043A\u0443 \u0430\u0431\u043E \u0444\u0456\u043B\u044C\u0442\u0440\u0430\u0446\u0456\u0457
 
@@ -283,7 +283,7 @@ NOITEMS_SMARTCHART=\u0414\u0430\u043D\u0456 \u043D\u0435 \u0437\u043D\u0430\u043
 
 NOITEMS_SMARTCHART_ILLUSTRATION_TITLE=\u0417\u0430\u043F\u0438\u0441\u0456\u0432 \u0449\u0435 \u043D\u0435\u043C\u0430\u0454
 
-NOITEMS_SMARTCHART_ILLUSTRATION_DESCRIPTION=\u041E\u0434\u0440\u0430\u0437\u0443 \u043F\u0456\u0441\u043B\u044F \u043F\u043E\u044F\u0432\u0438 \u0432\u0438 \u043F\u043E\u0431\u0430\u0447\u0438\u0442\u0435 \u0457\u0445 \u0442\u0443\u0442.
+NOITEMS_SMARTCHART_ILLUSTRATION_DESCRIPTION=\u041A\u043E\u043B\u0438 \u0432\u043E\u043D\u0438 \u0437\u2019\u044F\u0432\u043B\u044F\u0442\u044C\u0441\u044F, \u0432\u0438 \u043F\u043E\u0431\u0430\u0447\u0438\u0442\u0435 \u0457\u0445 \u0442\u0443\u0442.
 
 NOITEMS_LR_SMARTCHART=\u041D\u0435\u043C\u0430\u0454 \u0434\u0430\u043D\u0438\u0445 \u0434\u043B\u044F \u0432\u0438\u0431\u0440\u0430\u043D\u0438\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0456\u0457\u0432 \u0444\u0456\u043B\u044C\u0442\u0440\u0430 \u0456 \u043F\u043E\u0434\u0430\u043D\u043D\u044F \u0434\u0456\u0430\u0433\u0440\u0430\u043C\u0438.
 
@@ -307,7 +307,7 @@ NOITEMS_LR_SMARTTABLE=\u0414\u0430\u043D\u0456 \u043D\u0435 \u0437\u043D\u0430\u
 
 NOITEMS_LR_SMARTTABLE_ILLUSTRATION_TITLE=\u0417\u0430\u043F\u0438\u0441\u0456\u0432 \u0449\u0435 \u043D\u0435\u043C\u0430\u0454
 
-NOITEMS_LR_SMARTTABLE_ILLUSTRATION_DESCRIPTION=\u041E\u0434\u0440\u0430\u0437\u0443 \u043F\u0456\u0441\u043B\u044F \u043F\u043E\u044F\u0432\u0438 \u0432\u0438 \u043F\u043E\u0431\u0430\u0447\u0438\u0442\u0435 \u0457\u0445 \u0442\u0443\u0442.
+NOITEMS_LR_SMARTTABLE_ILLUSTRATION_DESCRIPTION=\u041A\u043E\u043B\u0438 \u0432\u043E\u043D\u0438 \u0437\u2019\u044F\u0432\u043B\u044F\u0442\u044C\u0441\u044F, \u0432\u0438 \u043F\u043E\u0431\u0430\u0447\u0438\u0442\u0435 \u0457\u0445 \u0442\u0443\u0442.
 
 NOITEMS_LR_SMARTTABLE_WITH_FILTER=\u0414\u0430\u043D\u0456 \u043D\u0435 \u0437\u043D\u0430\u0439\u0434\u0435\u043D\u0456. \u0421\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u043F\u043E\u0448\u0443\u043A \u0430\u0431\u043E \u043A\u0440\u0438\u0442\u0435\u0440\u0456\u0457 \u0444\u0456\u043B\u044C\u0442\u0440\u0430.