@sapui5/sap.suite.ui.generic.template 1.148.4 → 1.148.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.148.4",
+  "version": "1.148.6",
   "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.148.4</version>
+	<version>1.148.6</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.148.4"
+			"version": "1.148.6"
 		},
 		"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.148.4"
+			"version": "1.148.6"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -919,12 +919,6 @@ sap.ui.define([
 					onEasyFilterTokensChangedByUser: function(oEvent) {
 						oState.oEasyFilterBarHandler.onTokensChangedByUser(oEvent);
 					},
-					onEasyFilterSortersChanged: function(oEvent) {
-						oState.oEasyFilterBarHandler.onSortersChanged(oEvent);
-					},
-					onEasyFilterGroupLevelsChanged: function(oEvent) {
-						oState.oEasyFilterBarHandler.onGroupLevelsChanged(oEvent);
-					},
 					onEasyFilterQueryChanged: function(oEvent) {
 						oState.oEasyFilterBarHandler.onQueryChanged(oEvent);
 					},

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

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

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

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

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

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

@@ -6,8 +6,6 @@
             queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
             tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
             tokensChangedByUser="._templateEventHandlers.onEasyFilterTokensChangedByUser"
-            sortersChanged="._templateEventHandlers.onEasyFilterSortersChanged"
-            groupLevelsChanged="._templateEventHandlers.onEasyFilterGroupLevelsChanged"
             beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
             afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
             clearFilters="._templateEventHandlers.onEasyFilterClearFilters"

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

@@ -38,6 +38,30 @@ sap.ui.define([
 			// (which would harm performance). Can only be retrieved in initialized event.
 			oSmartFilterBar.getInitializedPromise().then(function () {
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
+
+				// Cold-start recovery: setSVMWrapperCallbacks registers attachAfterVariantLoad
+				// after SVM has already fired afterVariantLoad("INIT"), so the _CUSTOM restore
+				// handler in setSVMWrapperCallbacks is never reached on first page load.
+				// By this point getInitializedPromise has resolved, setSVMWrapperCallbacks has
+				// run, and the variant is active — apply the _CUSTOM fallback now if
+				// getCustomFilterData() is still null (i.e. no beforeVariantFetch has run yet).
+				if (!oSmartFilterBar.getCustomFilterData()) {
+					try {
+						var oSVM = oSmartFilterBar.getSmartVariant();
+						var sVariantKey = oSVM && (oSVM.getCurrentVariantKey ? oSVM.getCurrentVariantKey() : oSVM.getStandardVariantKey());
+						var oVariantContent = oSVM && oSVM.getVariantContent(oSmartFilterBar, sVariantKey);
+						var oFilterBarVariant = oVariantContent && oVariantContent.filterBarVariant && JSON.parse(oVariantContent.filterBarVariant);
+						var oCustomSection = oFilterBarVariant && oFilterBarVariant._CUSTOM;
+						var oGenericData = (oCustomSection && oCustomSection[dataPropertyNameGeneric]) || Object.create(null);
+						var oCustomFiltersState = oGenericData.customFilters || {
+							editState: oGenericData.editStateFilter,
+							appExtension: oGenericData.appExtension
+						};
+						mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
+					} catch (e) {
+						// Silently skip — absence of _CUSTOM data is a valid state for new variants
+					}
+				}
 			});
 
 			// Initialize variant management promise
@@ -76,10 +100,11 @@ sap.ui.define([
 				if (oCustomData && oCustomData[dataPropertyNameGeneric]) {
 					oGenericData = oCustomData[dataPropertyNameGeneric];
 				} else {
-					// getCustomFilterData() returns null on cold start (no prior sap-iapp-state) because
-					// setCustomFilterData() is only called from beforeVariantFetch (variant save path),
-					// never during the initial LREP variant load. The _CUSTOM section is present in the
-					// variant content — fall back to reading it via getVariantContent().
+					// getCustomFilterData() returns null when no beforeVariantFetch has run yet for this
+					// variant (e.g. a named variant being switched to for the first time in the session).
+					// The _CUSTOM section is present in the variant content — fall back to reading it via getVariantContent().
+					// Note: the cold-start case (INIT event) is handled separately in fnInitialize via
+					// getInitializedPromise().then(), because this listener is registered after INIT fires.
 					try {
 						var oSVM = oSmartFilterBar.getSmartVariant();
 						// getCurrentVariantId() converts STANDARDVARIANTKEY to "" which _getVariantById can't look up.

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

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.148.4
+	 * @version 1.148.6
 	 * @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/CRUDManager.js

@@ -541,13 +541,7 @@ sap.ui.define(["sap/ui/base/Object",
 				var aMessagesBeforeSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
 				var mMessagesBeforeSave = Object.create(null);
 				aMessagesBeforeSave.forEach(function(oMessage){
-					// Exclude transition messages (persistent === false) left over from a prior 412 response.
-					// Including them causes false-positive deduplication on retry: the new 412 produces
-					// the same message IDs, they are filtered out of aNewMessages, and fnHandleWarning
-					// is never called.
-					if (oMessage.persistent !== false) {
-						mMessagesBeforeSave[oMessage.getId()] = oMessage;
-					}
+					mMessagesBeforeSave[oMessage.getId()] = oMessage;
 				});
 
 				// Handles the 412 Warning case.

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

@@ -107,12 +107,36 @@ sap.ui.define([
             // 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) {
+            // oEffectiveEntitySetMeta allows callers to pass the entity-set metadata for
+            // Capabilities.FilterRestrictions lookup; falls back to the root entity set's metadata.
+            function addPropertiesFromEntityType(entityType, prefix, bOverrideSortable, mOverrideNonSortable, oEffectiveEntitySetMeta) {
                 var bEffectiveSortable = (bOverrideSortable !== undefined) ? bOverrideSortable : bEntitySetSortable;
                 var mEffectiveNonSortable = mOverrideNonSortable || mNonSortableProperties;
+
+                // Capabilities.FilterRestrictions takes priority over sap:filterable (matches SFB behaviour).
+                var oCapFilterRestrictions = oEffectiveEntitySetMeta &&
+                    oEffectiveEntitySetMeta["Org.OData.Capabilities.V1.FilterRestrictions"];
+                var bEntityNonFilterable = !!oCapFilterRestrictions &&
+                    oCapFilterRestrictions.Filterable === "false";
+                var mCapNonFilterable = {};
+                if (oCapFilterRestrictions && oCapFilterRestrictions.NonFilterableProperties) {
+                    oCapFilterRestrictions.NonFilterableProperties.forEach(function(oEntry) {
+                        if (oEntry.PropertyPath) {
+                            mCapNonFilterable[oEntry.PropertyPath] = true;
+                        }
+                    });
+                }
+
                 entityType.property.forEach(function (oProperty) {
                     var sTokenType = "ValueHelp";
                     var bFilterable = filterHelper.isPropertyFilterable(oProperty);
+
+                    // When Capabilities.FilterRestrictions is present, its answer is authoritative.
+                    // A property absent from NonFilterableProperties is filterable even if sap:filterable="false".
+                    if (oCapFilterRestrictions) {
+                        bFilterable = !bEntityNonFilterable && !mCapNonFilterable[oProperty.name];
+                    }
+
                     var bIsCodeListRequired;
                     var bIsHidden = false;
                     var bIsHiddenFilter = false;
@@ -163,7 +187,7 @@ sap.ui.define([
             }
 
             // Add direct properties
-            addPropertiesFromEntityType(oEntityType, "");
+            addPropertiesFromEntityType(oEntityType, "", undefined, undefined, oEntitySetMeta);
 
             // Add 1:1 navigation properties' properties
             if (oEntityType.navigationProperty) {
@@ -210,7 +234,7 @@ sap.ui.define([
                                         }
                                     }
                                 }
-                                addPropertiesFromEntityType(oTargetEntityType, navProp.name, bNavSortable, mNavNonSortable);
+                                addPropertiesFromEntityType(oTargetEntityType, navProp.name, bNavSortable, mNavNonSortable, oNavEntitySetMeta);
                             }
                         }
                     }
@@ -577,6 +601,17 @@ sap.ui.define([
                     setState: fnApplyEasyFilterVariantState
                 });
 
+                // Sync sLoadedVariantFilterMode on afterSave (Save As path)
+                // so layout switches after saving correctly show the dirty indicator.
+                var oSVM = oState.oSmartFilterbar.getSmartVariant();
+                if (oSVM && oSVM.attachAfterSave) {
+                    oSVM.attachAfterSave(function() {
+                        var oTMModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+                        var sCurrentFilterMode = oTMModel.getProperty("/listReport/filterMode");
+                        sLoadedVariantFilterMode = sCurrentFilterMode;
+                    });
+                }
+
                 // 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();
@@ -695,6 +730,18 @@ sap.ui.define([
 			// currentVariantSetModified intentionally omitted — pressing Go with the same
 			// query must not mark the variant as dirty.
 			// oSmartFilterbar.getSmartVariant() && oSmartFilterbar.getSmartVariant().currentVariantSetModified(true);
+
+            // Apply sorters/groupLevels bundled with tokens after SFB state is set but
+            // before triggering search, to prevent a premature rebind with incomplete filters.
+            var aBundledSorters = oEvent.getParameter("sorters");
+            var aBundledGroupLevels = oEvent.getParameter("groupLevels");
+            if (aBundledSorters !== undefined) {
+                fnApplySortersToTable(aBundledSorters);
+            }
+            if (aBundledGroupLevels !== undefined) {
+                fnApplyGroupLevelsToTable(aBundledGroupLevels);
+            }
+
 			oSmartFilterbar.search();
 		}
 
@@ -708,42 +755,30 @@ sap.ui.define([
             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) {
+        function fnApplySortersToTable(aSorters) {
             try {
-                var aSorters = oEvent.getParameter("sorters");
-    
                 var oPresentationControlHandler = oState.oPresentationControlHandler;
                 if (!oPresentationControlHandler) {
-                    oLogger.error("EasyFilterBarHandler.onSortersChanged: PresentationControlHandler not found.");
+                    oLogger.error("EasyFilterBarHandler: PresentationControlHandler not found.");
                     return;
                 }
-    
+
                 var oControl = oPresentationControlHandler.getControl();
                 if (!oControl) {
-                    oLogger.error("EasyFilterBarHandler.onSortersChanged: Presentation control not found.");
+                    oLogger.error("EasyFilterBarHandler: Presentation control not found.");
                     return;
                 }
 
                 if (!controlHelper.isSmartTable(oControl)) {
-                    oLogger.warning("EasyFilterBarHandler.onSortersChanged: Sorting is only supported for SmartTable.");
+                    oLogger.warning("EasyFilterBarHandler: 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)
-                const aSortersMapped = (aSorters && aSorters.length ) ? aSorters.map(function (oSorter) {
+                oPresentationVariant.SortOrder = undefined;
+                var aSortersMapped = (aSorters && aSorters.length) ? aSorters.map(function(oSorter) {
                     return {
                         Property: oSorter.key,
                         Descending: !!oSorter.descending
@@ -757,51 +792,38 @@ sap.ui.define([
                 } 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) {
+        function fnApplyGroupLevelsToTable(aGroupLevels) {
             try {
-                var aGroupLevels = oEvent.getParameter("groupLevels");
-    
                 var oPresentationControlHandler = oState.oPresentationControlHandler;
                 if (!oPresentationControlHandler) {
-                    oLogger.error("EasyFilterBarHandler.onGroupLevelsChanged: PresentationControlHandler not found.");
+                    oLogger.error("EasyFilterBarHandler: PresentationControlHandler not found.");
                     return;
                 }
-    
+
                 var oControl = oPresentationControlHandler.getControl();
                 if (!oControl) {
-                    oLogger.error("EasyFilterBarHandler.onGroupLevelsChanged: Presentation control not found.");
+                    oLogger.error("EasyFilterBarHandler: Presentation control not found.");
                     return;
                 }
 
                 if (!controlHelper.isSmartTable(oControl)) {
-                    oLogger.warning("EasyFilterBarHandler.onGroupLevelsChanged: Grouping is only supported for SmartTable.");
+                    oLogger.warning("EasyFilterBarHandler: 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;
-    
+
+                oPresentationVariant.GroupBy = undefined;
+                oPresentationVariant.GroupBy = (aGroupLevels && aGroupLevels.length) ?
+                    aGroupLevels.flatMap(function(aGroup) { return Object.values(aGroup); }) : undefined;
+
                 bApplyingGrouplevels = true;
                 try {
                     oControl.setUiState(oUiState);
@@ -812,7 +834,7 @@ sap.ui.define([
                 bApplyingGrouplevels = false;
                 oLogger.warning("EasyFilterBar: unexpected error while handling groupLevelsChanged", String(error));
             }
-		}
+        }
 
 		/**
 		 * Event handler for the EasyFilter control's showValueHelp event.
@@ -1030,8 +1052,6 @@ sap.ui.define([
             onQueryChanged : fnQueryChanged,
 			onTokensChanged: fnTokensChanged,
             onTokensChangedByUser: fnTokensChangedByUser,
-			onSortersChanged: fnSortersChanged,
-			onGroupLevelsChanged: fnGroupLevelsChanged,
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,

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

@@ -3222,7 +3222,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.148.4
+	 * @version 1.148.6
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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