@sapui5/sap.suite.ui.generic.template 1.142.5 → 1.142.7

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

@@ -4,18 +4,16 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartVariantManagementWrapper
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control
-	 * or the Id of control for which this wrapper is created
+	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} oControl - The SmartVariantManagement control
 	 * @param {object} oController - the controller of the current component
 	 * @param {object} oFactory - the controlStateWrapperFactory
 	 * @param {object} mParams
 	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
 	 * (currently also including SFB wrapper - to be removed)
-	 * @param {Object} mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
 	 * @returns {object}
 	 */
 
-	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
+	function SmartVariantManagementWrapper(oControl, oController, oFactory, mParams) {
 		// Special handling of SmartFilterBarWrapper for several reasons:
 		// - Suppress selection when restoring a variant. Selection is solely triggered according to information in appState. Otherwise, erroneous selection could be triggered in
 		//		a few situations:
@@ -26,14 +24,10 @@ sap.ui.define([
 		//	- Store and restore extension state (extension implemented in SFB instead of SVM, which would be more appropriate from architectural point of view)
 		// flag to control whether we are currently in the process of applying a state to suppress the event to inform about a new state´
 		// only needed when setting the variant itself - for managed controls, their wrappers should avoid firing the event themselves
-		var oSmartVariantManagement, fnResolveControlAssigned, oPreliminaryState;
-		var oControlAssignedPromise = new Promise(function (resolve) {
-			fnResolveControlAssigned = resolve;
-		});
-
-		if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
+		var oSmartVariantManagement = oControl;
+		var oPreliminaryState;
+		var bIsApplyingVariant = false;
+		var bAllControlsInitialized = false;
 
 		// Handles the state of the variant management itself (i.e. which variant is selected and whether it's dirty), including the state of the managed controls.
 		// Is responsible esp. to restore this state with correct dependency resp. in correct order
@@ -50,69 +44,72 @@ sap.ui.define([
 		// For these controls, a real user changes are already handled by the direct connection. On the other hand, these controls also fire their change events, if their state is
 		// changed from SVM (by the same connection) - setting variant dirty here would be wrong.
 		mParams.managedControlWrappers.forEach(function(oWrapper){
-			if (!oWrapper.bVMConnection){
-				oWrapper.attachStateChanged(function(){
-					oSmartVariantManagement.currentVariantSetModified(true);
-				});
-			}
+			(oWrapper.oVMConnectionPromise || Promise.resolve(oWrapper.bVMConnection)).then(function(bVMConnection) {
+				if (!bVMConnection) {
+					oWrapper.attachStateChanged(function(){
+						oSmartVariantManagement.currentVariantSetModified(true);
+					});
+				}
+			});
 		});
 
 
 
-		function fnSetControl(oControl) {
-			oSmartVariantManagement = oControl;
-			fnResolveControlAssigned(oSmartVariantManagement);
-		}
-
 		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
 			return oWrapper.setSVMWrapperCallbacks;
 		});
 
-		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
+		// provide callbacks needed for SFB wrapper to store/restore extension state with variant
 		if (oSmartFilterBarWrapper){
-			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
-				getManagedControlStates: function(){
-					var mManagedControlStates = Object.create(null);
-					mParams.managedControlWrappers.forEach(function(oWrapper){
-						if (!oWrapper.bVMConnection){
-							mManagedControlStates[oWrapper.getLocalId()] = oWrapper.getState();
-						}
-					});
-					return mManagedControlStates;
-				},
-				setManagedControlStates: function(oState){
-					mParams.managedControlWrappers.forEach(function(oWrapper){
-						if (!oWrapper.bVMConnection){
-							oWrapper.setState(oState[oWrapper.getLocalId()]);
-						}
-					});
-				},
-				setHeaderState: function(bHeaderToBeExpanded) {
-					mParams.dynamicPageWrapper.setHeaderState(oController, bHeaderToBeExpanded);
-				}
+			// Build array with wrapper + bVMConnection info once all wrappers are ready
+			Promise.all(mParams.managedControlWrappers.map(function(oWrapper){
+				return (oWrapper.oVMConnectionPromise || Promise.resolve(oWrapper.bVMConnection)).then(function(bVMConnection){
+					return {
+						wrapper: oWrapper,
+						bVMConnection: bVMConnection
+					};
+				});
+			})).then(function(aWrapperInfo) {
+				oSmartFilterBarWrapper.setSVMWrapperCallbacks({
+					getManagedControlStates: function(){
+						var mManagedControlStates = Object.create(null);
+						aWrapperInfo.forEach(function(oInfo){
+							if (!oInfo.bVMConnection) {
+								mManagedControlStates[oInfo.wrapper.getLocalId()] = oInfo.wrapper.getState();
+							}
+						});
+						return mManagedControlStates;
+					},
+					setManagedControlStates: function(oState){
+						aWrapperInfo.forEach(function(oInfo){
+							if (!oInfo.bVMConnection) {
+								oInfo.wrapper.setState(oState[oInfo.wrapper.getLocalId()]);
+							}
+						});
+					}
+				});
 			});
 		}
 
+		// Create promise that resolves when all managed controls' variant management is ready
+		// This ensures getState() can query controls even if setState() is never called (e.g., app starts from scratch)
+		var oAllControlsInitializedPromise = Promise.all(
+			mParams.managedControlWrappers.map(function(oWrapper){
+				return oWrapper.oVariantManagementInitializedPromise || Promise.resolve();
+			})
+		);
+
+		// Set flag when all controls are initialized
+		oAllControlsInitializedPromise.then(function() {
+			bAllControlsInitialized = true;
+		});
+
 		// Wrapper is intended to set a state to the ui, but not to trigger a selection (which should happen only after all (relevant) parts of ui state is set to the correct state
 		// are set correct. Therefore, setting variant from here should never trigger a selection.
 		function fnSetVariant(sVariantId){
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(true);
 			}
-			var sId = mParams.managedControlWrappers[0].getLocalId();
-			var oControl = oController.getView().byId(sId);
-			if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
-				oControl.attachAfterVariantInitialise(function() {
-					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
-					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && sVariantId !== '') {
-						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
-							oControl.setCurrentVariantId(sVariantId);
-						}
-						oSmartVariantManagement.setModified(false);
-					}
-				});
-			}
 			oSmartVariantManagement.setCurrentVariantId(sVariantId);
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(false);
@@ -133,7 +130,11 @@ sap.ui.define([
 		}
 
 		function getState() {
-			if (!oSmartVariantManagement) {
+			// Return preliminary state if managed controls not fully initialized
+			// Note: If early getState() calls become an issue (controls not initialized yet), we could enhance this to:
+			// - Store only SVM-specific data (variantId, modified) in oPreliminaryState
+			// - Always query managed control wrappers directly (they handle their own preliminary state via PreliminaryWrapper)
+			if (!bAllControlsInitialized) {
 				return oPreliminaryState;
 			}
 
@@ -150,22 +151,23 @@ sap.ui.define([
 
 		function setState(oState) {
 			oPreliminaryState = oState;
-			oControlAssignedPromise.then(function() {
+
+			// Wait for all managed controls to be initialized before applying state
+			oAllControlsInitializedPromise.then(function() {
+				bIsApplyingVariant = true;
 				if (!oPreliminaryState) {
 					// if no state is provided set default variant (not modified)
 					// use cases:
 					// - LR: if appStateKey in the URL that cannot be read
 					// - OP: if switching to different object instance (in discovery mode always, in persistency mode when page was not shown)
 					fnSetVariant(oSmartVariantManagement.getDefaultVariantId());
-					return;
-				}
-				if (oPreliminaryState.modified) {
+				} else if (oPreliminaryState.modified) {
 					// Special logic according to UX: If variant was modified anyway, there's no benefit for the user to see the name (but it could be confusing), so standard variant (not default!) should be
 					// set (which is achieved by empty string)
 					fnSetVariant("");
+					oSmartVariantManagement.currentVariantSetModified(true);
 					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
 					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
-					oSmartVariantManagement.currentVariantSetModified(true);
 					fnSetManagedControlStates(oPreliminaryState);
 				} else {
 					fnSetVariant(oPreliminaryState.variantId);
@@ -183,6 +185,7 @@ sap.ui.define([
 						}
 					}
 				}
+				bIsApplyingVariant = false;
 			});
 		}
 
@@ -190,26 +193,30 @@ sap.ui.define([
 			// state of variant management itself can be changed directly (user selects a different variant or stores current state as (new) variant), or indirectly (user changes some
 			// data of a control managed by VM, e.g. some filter values in SFB)
 
-			oControlAssignedPromise.then(function() {
-				// state change when user selects a different variant
-				oSmartVariantManagement.attachSelect(fnHandler);
+			// Wrap the handler to suppress events when applying a variant
+			var fnSuppressibleHandler = function() {
+				if (!bIsApplyingVariant) {
+					fnHandler();
+				}
+			};
+
+			// state change when user selects a different variant
+			oSmartVariantManagement.attachSelect(fnSuppressibleHandler);
 
-				// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
-				// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
-				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
-				oSmartVariantManagement.attachAfterSave(fnHandler);
+			// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
+			// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
+			// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
+			oSmartVariantManagement.attachAfterSave(fnSuppressibleHandler);
 
-				// any change of a managed control is state change
-				mParams.managedControlWrappers.forEach(function(oWrapper){
-					oWrapper.attachStateChanged(fnHandler);
-				});
+			// any change of a managed control is state change
+			mParams.managedControlWrappers.forEach(function(oWrapper){
+				oWrapper.attachStateChanged(fnSuppressibleHandler);
 			});
 		}
 
 		return {
 			getState : getState,
 			setState : setState,
-			setControl: fnSetControl,
 			attachStateChanged : attachStateChanged
 		};
 	}

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.142.5
+	 * @version 1.142.7
 	 * @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/ai/EasyFilterBarHandler.js

@@ -435,7 +435,7 @@ sap.ui.define([
 			oTemplateUtils.oComponentUtils.getBusyHelper().setBusy(oQueryPromise);
 		}
 
-		function fnTokensChanged(oEvent) {
+                function fnTokensChanged(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
 			var oFiltersFromAI = oEvent.getParameter("tokens");
 			var sSmartFilterBarId = oSmartFilterbar.getId();
@@ -456,19 +456,32 @@ sap.ui.define([
 				oSmartFilterBarVariant.customFilters.editState = oVariantDataFromAI.oEditStateFilter;
 			}
 
-            if (oSmartFilterBarVariant.semanticDates) {
-                var { Low: value1, High: value2 } = oVariantDataFromAI.aSelectOptions[0].Ranges[0];
-                var dateData = oSmartFilterBarVariant.semanticDates.Dates[0].Data;
-                dateData.operation = "DATERANGE";
-                dateData.value1 = value1;
-                dateData.value2 = value2 || value1;
+            //checking if the variant of SFB has previous semantic dates and if there are new filter values from easy filter then update the SFB variant
+            if (oSmartFilterBarVariant.semanticDates?.Dates) {
+                oSmartFilterBarVariant.semanticDates.Dates.forEach(function (semanticDate) {
+                    var propertyName = semanticDate.PropertyName;
+
+                    // Find matching property in aSelectOptions
+                    var matchingSelectOption = oVariantDataFromAI.aSelectOptions.find(function (selectOption) {
+                        return selectOption.PropertyName === propertyName;
+                    });
+
+                    // 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 
+                        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);
 			oSmartFilterbar.search();
 		}
-
 		/**
 		 * 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.

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

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

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

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