@sapui5/sap.suite.ui.generic.template 1.150.1 → 1.151.0

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

@@ -28,6 +28,12 @@ sap.ui.define([
 		var oSmartFilterBar = oControl;
 		var oEasyFilterCallbacks = null;
 		var oPendingEasyFilterState = null;
+		// Holds SVM callbacks once setSVMWrapperCallbacks is called. The afterVariantLoad handler
+		// is attached eagerly (in fnInitialize) so it fires even when setSVMWrapperCallbacks has
+		// not yet been called (race condition on second navigation: bAllControlsInitialized=true
+		// causes fnApplyVariantState to run synchronously, triggering afterVariantLoad before the
+		// Promise.all in SmartVariantManagementWrapper resolves and calls setSVMWrapperCallbacks).
+		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -42,34 +48,11 @@ sap.ui.define([
 
 			// Initialize variant management promise
 			oVariantManagementInitializedPromise = oSmartFilterBar.getInitializedPromise();
-		}
-
-		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
-		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
-		// - standard filters: handled directly by SFB
-		// - extension filters: provided from mParams.oCustomFiltersWrapper
-		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
-		function setSVMWrapperCallbacks(oSVMWrapperCallbacks){
-			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
-			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
-			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
-			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
-			oSmartFilterBar.attachBeforeVariantFetch(function(){
-				var oCustomData = Object.create(null);
-				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
-				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
-				if (oEasyFilterCallbacks) {
-					var oEFState = oEasyFilterCallbacks.getState();
-					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
-					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
-				}
-				oSmartFilterBar.setCustomFilterData(oCustomData);
-			});
 
-			// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
-			// in SFB instead of SVM where it would make more sense.
-			// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
-			// after this has happened, we can get the custom data from SFB.
+			// Attach afterVariantLoad eagerly so custom filter state is restored regardless of
+			// when setSVMWrapperCallbacks is called. setManagedControlStates is only called if
+			// SVM callbacks are already available; otherwise those controls are restored via the
+			// iAppState path (SmartVariantManagementWrapper.fnSetManagedControlStates).
 			oSmartFilterBar.attachAfterVariantLoad(function(){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
 				var oGenericData;
@@ -102,7 +85,9 @@ sap.ui.define([
 					};
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-				oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
+				if (oSVMWrapperCallbacks) {
+					oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
+				}
 				if (oEasyFilterCallbacks) {
 					oEasyFilterCallbacks.setState({
 						filterMode: oGenericData.filterMode,
@@ -115,7 +100,34 @@ sap.ui.define([
 					};
 				}
 			});
+		}
 
+		// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
+		// in SFB instead of SVM where it would make more sense.
+		// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
+		// after this has happened, we can get the custom data from SFB.
+		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
+		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
+		// - standard filters: handled directly by SFB
+		// - extension filters: provided from mParams.oCustomFiltersWrapper
+		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
+		function setSVMWrapperCallbacks(oCallbacks){
+			oSVMWrapperCallbacks = oCallbacks;
+			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
+			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
+			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
+			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
+			oSmartFilterBar.attachBeforeVariantFetch(function(){
+				var oCustomData = Object.create(null);
+				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
+				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
+				if (oEasyFilterCallbacks) {
+					var oEFState = oEasyFilterCallbacks.getState();
+					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
+					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
+				}
+				oSmartFilterBar.setCustomFilterData(oCustomData);
+			});
 		}
 
 		function fnGetState() {

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

@@ -85,7 +85,14 @@ sap.ui.define([
 					setManagedControlStates: function(oState){
 						aWrapperInfo.forEach(function(oInfo){
 							if (!oInfo.bVMConnection) {
-								oInfo.wrapper.setState(oState[oInfo.wrapper.getLocalId()]);
+								// Defer setState until the control is ready (oReadyPromise resolves after the
+								// control fires its initialise event and its inner table/chart is created).
+								// Without this guard, afterVariantLoad can call setState before SmartTable._oTable
+								// exists, causing getUiState() to crash with a null-dereference on getTable().
+								var oReady = oInfo.wrapper.oReadyPromise || Promise.resolve();
+								oReady.then(function() {
+									oInfo.wrapper.setState(oState[oInfo.wrapper.getLocalId()]);
+								});
 							}
 						});
 					}

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.150.1
+	 * @version 1.151.0
 	 * @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.
@@ -570,23 +564,10 @@ sap.ui.define(["sap/ui/base/Object",
 						var aMessagesAfterSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
 						var aAllMessages = aMessagesAfterSave.map(function(oMessage){
 							if (!mMessagesBeforeSave[oMessage.getId()]) { // if this is a new message
-								// Create a new Message instance instead of mutating the original object.
-								// The original object may be held by ODataMessageParser._lastMessages; mutating it
-								// in-place causes _propagateMessages to treat the message as non-persistent on the
-								// next successful OData response and silently remove it before the popover opens.
-								var oNewMessage = new Message({
-									message: oMessage.getMessage(),
-									type: oMessage.getType(),
-									target: oMessage.getTargets ? oMessage.getTargets() : [oMessage.getTarget()],
-									processor: oMessage.getMessageProcessor(),
-									persistent: false,
-									technical: false,
-									code: oMessage.getCode(),
-									description: oMessage.getDescription(),
-									technicalDetails: oMessage.getTechnicalDetails()
-								});
-								bWarningOccured = bWarningOccured || oNewMessage.technicalDetails.statusCode === "412" && oNewMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
-								aNewMessages.push(oNewMessage);
+								oMessage.persistent = false;
+								oMessage.technical = false;
+								bWarningOccured = bWarningOccured || oMessage.technicalDetails.statusCode === "412" && oMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
+								aNewMessages.push(oMessage);
 							}
 							return oMessage;
 						});

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

@@ -1020,7 +1020,6 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSelectionVariant, sSelectionVariantPrepared, sParameter, sSemanticObject, aSelVariantPropertyNames, aSelOptionPropertyNames, aParameterNames;
 			var oEventParameters = oEvent.getParameters();
 			var oNavigationHandler = oServices.oApplication.getNavigationHandler();
-			var SuppressionBehavior = FENavLibrary.SuppressionBehavior;
 			// fill oSelectionVariant with the selectOptions from sSelectionVariant
 			oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant({}, sSelectionVariant);
 			//Invoke the "beforeSmartLinkPopoverOpensExtension" method to determine whether FE can process the event.
@@ -1068,7 +1067,16 @@ sap.ui.define(["sap/ui/base/Object",
 					}
 				});
 				// add the resulting selectOptions and parameters (if any!) in oSelectionVariant with the ones of the semanticObject in oEventParameters as selectOptions to oSelectionVariant
-				oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant(mSemanticAttributesOfEventSemanticObject, oSelectionVariant.toJSONString(), SuppressionBehavior.ignoreEmptyString);
+				// Only suppress empty-string properties that are not present in the empty-string semantic object bucket.
+				// Properties in oSemObjEmpty are genuine entity key fields (e.g. MaintenanceOrderSubOperation:"") and must be kept.
+				// Properties absent from oSemObjEmpty but present with "" in the event semantic object are spurious cache-inflated values and must be dropped.
+				var mSemanticAttrsFiltered = Object.assign({}, mSemanticAttributesOfEventSemanticObject);
+				Object.keys(mSemanticAttrsFiltered).forEach(function(sKey) {
+					if (mSemanticAttrsFiltered[sKey] === "" && !(sKey in oSemObjEmpty)) {
+						delete mSemanticAttrsFiltered[sKey];
+					}
+				});
+				oSelectionVariant = oNavigationHandler.mixAttributesAndSelectionVariant(mSemanticAttrsFiltered, oSelectionVariant.toJSONString());
 				// Remove sensitive data from the context
 				oSelectionVariant = fnRemovePropertiesFromNavigationContext(oSelectionVariant, oEvent.getSource(), oState);
 				var oObjectInfo = {

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

@@ -32,7 +32,6 @@ xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1">
                                         placeholder="{i18n>EASY_FILL_TEXTAREA_PLACEHOLDER}"
                                         rows="20"
                                         width="100%"
-                                        height="17.5rem"
                                         showExceededText="true"
                                         ariaLabelledBy="EasyFillInputArea"/>
                                 </FlexBox>

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

@@ -132,6 +132,10 @@ sap.ui.define([
                             sFilterRestriction = oExtension.value;
                         }
                     });
+                    // sap:hidden-filter extension may be absent when only the vocabulary annotation is set
+                    if (!bIsHiddenFilter && oProperty["com.sap.vocabularies.UI.v1.HiddenFilter"]) {
+                        bIsHiddenFilter = oProperty["com.sap.vocabularies.UI.v1.HiddenFilter"].Bool === "true";
+                    }
                     if ((oProperty.type === "Edm.DateTime" && oProperty["sap:display-format"] === "Date") ||
                         (oProperty.type === "Edm.String" && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"] && oProperty["com.sap.vocabularies.Common.v1.IsCalendarDate"].Bool === "true")) {
                         sTokenType = "Calendar";
@@ -577,6 +581,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 +710,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 +735,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 +772,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 +814,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 +1032,6 @@ sap.ui.define([
             onQueryChanged : fnQueryChanged,
 			onTokensChanged: fnTokensChanged,
             onTokensChangedByUser: fnTokensChangedByUser,
-			onSortersChanged: fnSortersChanged,
-			onGroupLevelsChanged: fnGroupLevelsChanged,
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,