@sapui5/sap.suite.ui.generic.template 1.108.46 → 1.108.49

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

@@ -2,67 +2,35 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-    function DynamicPageWrapper(vTarget) {
-        var oDynamicPage;
-        var oPreliminaryState;
-        var oControlAssignedResolve;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
-        
+    function DynamicPageWrapper(oDynamicPage) {
         // Returns the state of the dynamic page
-        // Right now we only consider the pinned status of the dynamic page header 
+        // Right now we only consider the pinned status of the dynamic page header
         function fnGetState() {
-            if (oDynamicPage) {
-                var oControlState = {};
-                oControlState.headerPinned = oDynamicPage.getHeaderPinned();
-                return oControlState;
-            }
-
-            return oPreliminaryState;
+            var oControlState = {};
+            oControlState.headerPinned = oDynamicPage.getHeaderPinned();
+            return oControlState;
         }
 
         function fnSetState(oState) {
-            // Store the state till the control is initialized
-            oPreliminaryState = oState;
-            oControlAssignedPromise.then(function() {
-                if (oPreliminaryState && oPreliminaryState.headerPinned) {
-                    // There is a possibility that the header is collapsed at this point. Make sure it is expanded if we know the header is to be pinned.
-                    oDynamicPage.setHeaderExpanded(true);
-                    oDynamicPage.setHeaderPinned(true);
-                } else {
-                    oDynamicPage.setHeaderPinned(false);
-                }
-            });
+            if (oState && oState.headerPinned) {
+                // There is a possibility that the header is collapsed at this point. Make sure it is expanded if we know the header is to be pinned.
+                oDynamicPage.setHeaderExpanded(true);
+                oDynamicPage.setHeaderPinned(true);
+            } else {
+                oDynamicPage.setHeaderPinned(false);
+            }
         }
 
         function fnAttachStateChanged(fnHandler) {
-            oControlAssignedPromise.then(function() {
-                oDynamicPage.attachPinnedStateChange(fnHandler);
-            });
-        }
-
-        function fnSetControl(oControl) {
-            oDynamicPage = oControl;
-            oControlAssignedResolve(oDynamicPage);
-        }
-
-        function fnSetHeaderState(oController, bHeaderToBeExpanded) {
-            oController.getOwnerComponent().getModel("_templPriv").setProperty("/listReport/isHeaderExpanded", bHeaderToBeExpanded);
+            oDynamicPage.attachPinnedStateChange(fnHandler);
         }
 
-        return {
-            getState: fnGetState,
-            setState: fnSetState,
-            setControl: fnSetControl,
-            attachStateChanged: fnAttachStateChanged,
-            setHeaderState: fnSetHeaderState
-        };
+		return {
+			getState: fnGetState,
+			setState: fnSetState,
+			attachStateChanged: fnAttachStateChanged
+		};
     }
 
     return DynamicPageWrapper;
-});
+});

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

@@ -2,57 +2,35 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-    function ObjectPageLayoutWrapper(vTarget) {
-        var oObjectPageLayout, oControlAssignedResolve, oPreliminaryState;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
+    function ObjectPageLayoutWrapper(oControl) {
+        var oObjectPageLayout = oControl;
 
         // Returns the state of the ObjectPageLayout
-        // Right now we only consider the pinned status of the ObjectPageLayout 
+        // Right now we only consider the pinned status of the ObjectPageLayout
         function fnGetObjectPageLayoutState() {
-            if (!oObjectPageLayout) {
-                return oPreliminaryState;
-            }
-
             var oControlState = {};
             oControlState.headerPinned = oObjectPageLayout.getHeaderContentPinned();
             return oControlState;
         }
 
         function fnSetObjectPageLayoutState(oState) {
-            oPreliminaryState = oState;
-            oControlAssignedPromise.then(function() {
-                if (oPreliminaryState && oPreliminaryState.headerPinned) {
-                    oObjectPageLayout.setHeaderContentPinned(true);
-                } else {
-                    oObjectPageLayout.setHeaderContentPinned(false);
-                }
-            });
+            if (oState && oState.headerPinned) {
+                oObjectPageLayout.setHeaderContentPinned(true);
+            } else {
+                oObjectPageLayout.setHeaderContentPinned(false);
+            }
         }
 
         function fnAttachStateChanged(fnHandler) {
-            oControlAssignedPromise.then(function() {
-                oObjectPageLayout.attachHeaderContentPinnedStateChange(fnHandler);
-            });
-        }
-
-        function fnSetControl(oControl) {
-            oObjectPageLayout = oControl;
-            oControlAssignedResolve(oObjectPageLayout);
+            oObjectPageLayout.attachHeaderContentPinnedStateChange(fnHandler);
         }
 
         return {
             getState: fnGetObjectPageLayoutState,
             setState: fnSetObjectPageLayoutState,
-            setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged
         };
     }
 
     return ObjectPageLayoutWrapper;
-});
+});

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

@@ -0,0 +1,144 @@
+sap.ui.define([
+], function() {
+	"use strict";
+
+	/**
+	 * PreliminaryWrapper - Acts as a proxy wrapper before the real control is available.
+	 *
+	 * This wrapper is created when a control state wrapper is requested by ID and type,
+	 * but the actual control instance doesn't exist yet (e.g., due to lazy loading on ObjectPage).
+	 * It stores state operations and event handler registrations, then transfers them to the
+	 * real wrapper once the control is assigned via setControl().
+	 *
+	 * @param {string} sId - The local ID of the control
+	 * @param {string} sType - The type of the control (e.g., "SmartTable", "SmartChart")
+	 * @param {function} fnCreateRealWrapper - Function to create the real wrapper, injected by factory
+	 * @param {object} oController - The controller instance
+	 * @param {object} mParams - Additional parameters to pass to the real wrapper constructor
+	 * @returns {object} Preliminary wrapper object that will delegate to real wrapper once control is set
+	 */
+	function PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams) {
+		var oLatestState;
+		var oRealWrapper;
+		var fnResolveRealWrapperReady;
+		var oRealWrapperReadyPromise = new Promise(function(resolve) {
+			fnResolveRealWrapperReady = resolve;
+		});
+
+		return {
+			/**
+			 * Get the current state. Returns stored state before control is set,
+			 * delegates to real wrapper afterwards.
+			 * @returns {object} The current state
+			 */
+			getState: function() {
+				return oRealWrapper ? oRealWrapper.getState() : oLatestState;
+			},
+
+			/**
+			 * Set the state. Stores state before control is set,
+			 * delegates to real wrapper afterwards.
+			 * @param {object} oState - The state to set
+			 */
+			setState: function(oState) {
+				if (oRealWrapper) {
+					oRealWrapper.setState(oState);
+				} else {
+					oLatestState = oState;
+				}
+			},
+
+		/**
+		 * Assign the actual control and create the real wrapper.
+		 * This triggers the creation of the real wrapper, applies any stored state,
+		 * and resolves the promise that queues event handler attachments.
+		 * @param {sap.ui.core.Control} oControl - The control instance
+		 */
+		setControl: function(oControl) {
+			// Create the real wrapper using injected function
+			var oCreatedWrapper = fnCreateRealWrapper(oControl, sType, mParams);
+
+			// Check if wrapper needs time to initialize
+			var oWrapperReadyPromise = oCreatedWrapper.oReadyPromise || Promise.resolve();
+
+			// Wait for wrapper to be ready before setting oRealWrapper
+			oWrapperReadyPromise.then(function() {
+				oRealWrapper = oCreatedWrapper;
+
+				// Apply stored state if any
+				if (oLatestState !== undefined) {
+					oRealWrapper.setState(oLatestState);
+				}
+
+				// Resolve the promise - this triggers all queued attachStateChanged calls
+				fnResolveRealWrapperReady(oRealWrapper);
+			});
+		},
+
+		/**
+		 * Attach a state change handler. Uses promise to queue attachment
+		 * until the real wrapper is available and ready.
+		 * @param {function} fnHandler - The event handler function
+		 */
+		attachStateChanged: function(fnHandler) {
+			// Use promise to defer attachment until real wrapper is available and ready
+			oRealWrapperReadyPromise.then(function(oWrapper) {
+				oWrapper.attachStateChanged(fnHandler);
+			});
+		},
+
+		/**
+		 * Detach a state change handler. Forwards to real wrapper once available and ready.
+		 * @param {function} fnHandler - The event handler function to detach
+		 */
+		detachStateChanged: function(fnHandler) {
+			// Forward to real wrapper once available and ready
+			oRealWrapperReadyPromise.then(function(oWrapper) {
+				oWrapper.detachStateChanged(fnHandler);
+			});
+		},
+
+			/**
+			 * Get the local ID of the control.
+			 * @returns {string} The local ID
+			 */
+			getLocalId: function() {
+				return sId;
+			},
+
+			/**
+			 * Check if the provided state matches the current state.
+			 * @param {object} oState - The state to compare
+			 * @returns {boolean} True if states match
+			 */
+			isCurrentState: function(oState) {
+				return oRealWrapper ? oRealWrapper.isCurrentState(oState) :
+					JSON.stringify(oState) === JSON.stringify(oLatestState);
+			},
+
+		/**
+		 * Called after variant is initialized (for SmartTable/SmartChart wrappers).
+		 * Delegates to real wrapper once control is set and ready.
+		 * Note: When this is called, the control always exists (event fired by control),
+		 * so the promise will already be resolved.
+		 */
+		onAfterVariantInitialise: function() {
+			oRealWrapperReadyPromise.then(function(oWrapper) {
+				if (oWrapper.onAfterVariantInitialise) {
+					oWrapper.onAfterVariantInitialise();
+				}
+			});
+		},
+
+		/**
+		 * Promise that resolves to the bVMConnection flag value once the real wrapper is ready.
+		 * This indicates whether the control is connected to page-wide variant management.
+		 */
+		oVMConnectionPromise: oRealWrapperReadyPromise.then(function(oWrapper) {
+			return oWrapper.bVMConnection;
+		})
+		};
+	}
+
+	return PreliminaryWrapper;
+});

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

@@ -2,54 +2,32 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-	function SearchFieldWrapper(vTarget) {
-		var oSearchField, oControlAssignedResolve, oPreliminaryState;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
+	function SearchFieldWrapper(oControl) {
+		var oSearchField = oControl;
 
 		function fnGetState() {
-			if (!oSearchField) {
-				return oPreliminaryState;
-			}
-
 			return {
 				searchString: oSearchField.getValue()
 			};
 		}
 
 		function fnSetState(oState) {
-			oPreliminaryState = oState;
-			oControlAssignedPromise.then(function() {
-				oSearchField.setValue(oState.searchString);
-				// original implementation also called fireSearch. Seems to be superfluous (would fire the search event, on which worklisthandler is registered and finally calls rebindTable
-				// when restoring from an appState of a worklist, always data should be shown at time of saving the state and thus automatically search would be triggered again
-				// oSearchField.fireSearch();
-			});
+			oSearchField.setValue(oState.searchString);
+			// original implementation also called fireSearch. Seems to be superfluous (would fire the search event, on which worklisthandler is registered and finally calls rebindTable
+			// when restoring from an appState of a worklist, always data should be shown at time of saving the state and thus automatically search would be triggered again
+			// oSearchField.fireSearch();
 		}
 
 		function fnAttachStateChanged(fnHandler) {
-			oControlAssignedPromise.then(function() {
-				oSearchField.attachLiveChange(fnHandler);
-			});
+			oSearchField.attachLiveChange(fnHandler);
 		}
 
-		function fnSetControl(oControl) {
-            oSearchField = oControl;
-            oControlAssignedResolve(oSearchField);
-        }
-
 		return {
 			getState: fnGetState,
 			setState: fnSetState,
-			setControl: fnSetControl,
 			attachStateChanged: fnAttachStateChanged
 		};
 	}
 
 	return SearchFieldWrapper;
-});
+});

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

@@ -4,12 +4,12 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartFilterBarWrapper
-	 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} vTarget - The SmartFilterBar control 
+	 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} vTarget - The SmartFilterBar control
 	 * or the Id of control for which this wrapper is created
 	 * @param {object} oFactory - the controlStateWrapperFactory
-	 * @param {object} mParams 
+	 * @param {object} mParams
 	 * @param mParams.oCustomFiltersWrapper - wrapper for custom filters (from SFB point of view)
-	 *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB) 
+	 *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB)
 	 * @returns
 	 */
 
@@ -20,29 +20,36 @@ sap.ui.define([
 	var dataPropertyNameCustom = "sap.suite.ui.generic.template.customData",
 	dataPropertyNameExtension = "sap.suite.ui.generic.template.extensionData",
 	dataPropertyNameGeneric = "sap.suite.ui.generic.template.genericData";
-	
-	function SmartFilterBarWrapper(vTarget, oFactory, mParams) {
+
+	/**
+	 * Constructor for SmartFilterBarWrapper
+	 * @param {sap.ui.comp.smartfilterbar.SmartFilterBar} vTarget - The SmartFilterBar control
+	 * or the Id of control for which this wrapper is created
+	 * @param {object} oFactory - the controlStateWrapperFactory
+	 * @param {object} mParams
+	 * @param {Object} mParams.oCustomFiltersWrapper - wrapper for custom filters (from SFB point of view)
+	 *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB)
+	 * @returns {object}
+	 * @alias sap.suite.ui.generic.template.genericUtilities.controlStateWrapperFactory.SmartFilterBarWrapper
+	 */
+	function SmartFilterBarWrapper(oControl, oFactory, mParams) {
 		var bIsApplying = false;
 		var aBasicFilters = [];
-		var oSmartFilterBar, oControlAssignedResolve, oPreliminaryState;
-		var oControlAssignedPromise = new Promise(function (resolve) {
-			oControlAssignedResolve = resolve;
-		});
+		var oSmartFilterBar = oControl;
+
+		var oVariantManagementInitializedPromise;
 
 		function fnInitialize() {
-			if (typeof vTarget !== "string") {
-				fnSetControl(vTarget);
-			}
-	
-			// Filters visible initially (after initialization). Stored here to be 
-			// able to compare with currently visible ones to identify added and 
-			// removed ones	without need to instantiate all possible filter items 
+			// Filters visible initially (after initialization). Stored here to be
+			// able to compare with currently visible ones to identify added and
+			// removed ones	without need to instantiate all possible filter items
 			// (which would harm performance). Can only be retrieved in initialized event.
-			oControlAssignedPromise.then(function () {
-				oSmartFilterBar.getInitializedPromise().then(function () {
-					aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
-				});
+			oSmartFilterBar.getInitializedPromise().then(function () {
+				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 			});
+
+			// 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.
@@ -53,7 +60,7 @@ sap.ui.define([
 		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 
+			// 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);
@@ -61,14 +68,14 @@ sap.ui.define([
 				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
 				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. 
-			oSmartFilterBar.attachAfterVariantLoad(function(oEvent){
+			// after this has happened, we can get the custom data from SFB.
+			oSmartFilterBar.attachAfterVariantLoad(function(){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
-				// variant stored with 1.103 or later: all customFilter data stored in property customFilters 
+				// variant stored with 1.103 or later: all customFilter data stored in property customFilters
 				// legacy variant stored with 1.102 or earlier: customFilters (from storing point of view) separated according to their origin
 				var oCustomFiltersState = oCustomData[dataPropertyNameGeneric].customFilters || {
 						editState: oCustomData[dataPropertyNameGeneric].editStateFilter,
@@ -78,18 +85,10 @@ sap.ui.define([
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
 				oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
-				/* SFB header state of a variant (standard or custom) gets determined by the Apply Automatically checkbox's value of the corresponding
-				   variant i.e. if the checkbox is checked, then the header should be collapsed and vice versa. */
-				oSVMWrapperCallbacks.setHeaderState(!oEvent.getParameter("executeOnSelect"));
 			});
 
 		}
-		
 		function fnGetState() {
-			if (!oSmartFilterBar) {
-				return oPreliminaryState;
-			}
-
 			var oUiState = oSmartFilterBar.getUiState();
 			// UiState is not Serializable, but a managed object, containing information only partly relevant
 			// relevant information are
@@ -100,14 +99,14 @@ sap.ui.define([
 			// added/removedFilterItems: selectOptions only contains values/ranges, not the information, whether the filter should be shown directly ("visibleInFilterBar"). SFB just assumes any items to
 			//		be shown that contain values (plus those shown per default), which is wrong in two directions: items made visible but without a value are missed, items with a value, but not shown are
 			//		added additionally
-			//		Remark: 
+			//		Remark:
 			//			- When saving as variant, the information seems to be passed to VM directly - but for appState, it would still be missing
 			//			- Storing added (not in BASIC group but made visible by user) and removed (the other way round) separately to not disconnect the user (using e.g. a saved tile) from future changes
 			//				in the application (e.g. adding a new property to selection fields)
 			//		(Remark: old logic (see iAppStateHandler.getByDefaultNonVisibleCustomFilterNames) seems to provide this data only for custom fields. Assumption: Even in VM it was only available for
 			//		standard fields some time back - now, this seems to be solved from SFB/SVM, but still it's missing for appState)
 			var oSelectOptions = oUiState.getSelectionVariant().SelectOptions; // again, data contained in SelectionVaraint is only partly relevant
-			// In beforeVariantFetch we need to provide the custom (from SVMs point of view) control's state data to the SFB. However, SFB also tries to interpret this data as 
+			// In beforeVariantFetch we need to provide the custom (from SVMs point of view) control's state data to the SFB. However, SFB also tries to interpret this data as
 			// name-value pairs (implicitly stringifying them and assuming name to be a name of a filter), thus whenever the beforeVariantFetch has occured before getting the state
 			// here, the selectionVariant contains a superfluous select option for the property sap.suite.ui.generic.template.genericData (filtering for the value [object Object]).
 			// Note: beforeVariantFetch is even called on initial startup, i.e. without explicetly removing it, the superfluous select option would always be there.
@@ -154,49 +153,46 @@ sap.ui.define([
 
 		function fnSetState(oState) {
 			// Don't cause side effects (filter change event), if setting state is no real change.
-			// If this comparison fails for state that actually are identically, maybe it needs to be enhanced (e.g. ignoring order in some arrays might be needed) 
+			// If this comparison fails for state that actually are identically, maybe it needs to be enhanced (e.g. ignoring order in some arrays might be needed)
 			if (JSON.stringify(oState) === JSON.stringify(fnGetState())){
 				return;
 			}
-			
+
 			bIsApplying = true;
-			oPreliminaryState = oState;
 
-			oControlAssignedPromise.then(function() {
-				// SFB expects a UIState object - not serializable, but a managed object, actually containing also information not belonging to SFBs state
-				// => get current UIState object from SFB, replace only relevant information, and set it again
-				var oUiState = oSmartFilterBar.getUiState(),
-					oSmartVariant = oSmartFilterBar.getSmartVariant(),
-					bIsCurrentVariantModifiedBeforeSetState = oSmartVariant.currentVariantGetModified();
+			// SFB expects a UIState object - not serializable, but a managed object, actually containing also information not belonging to SFBs state
+			// => get current UIState object from SFB, replace only relevant information, and set it again
+			var oUiState = oSmartFilterBar.getUiState(),
+				oSmartVariant = oSmartFilterBar.getSmartVariant(),
+				bIsCurrentVariantModifiedBeforeSetState = oSmartVariant.currentVariantGetModified();
 
-				oUiState.getSelectionVariant().SelectOptions = oPreliminaryState && oPreliminaryState.selectOptions;
-				oUiState.getSelectionVariant().Parameters = oPreliminaryState && oPreliminaryState.parameters;
-				oUiState.setSemanticDates(oPreliminaryState && oPreliminaryState.semanticDates);
-				// setState is meant to set the state absolutely, no merge needed => replace and strictMode can be set to true. 
-				// (replace=false can be used to set additional selectOptions but keeping the existing ones. strictMode=false is used to map filters to parameters. Both might make sense in navigation
-				// scenarios (navigation parameter to be merged with defaults, property used in source app as filter but in target as parameter), but not when just restoring to a state (provided from the 
-				// same control))
-				oSmartFilterBar.setUiState(oUiState, {replace: true, strictMode: true});
+			oUiState.getSelectionVariant().SelectOptions = oState && oState.selectOptions;
+			oUiState.getSelectionVariant().Parameters = oState && oState.parameters;
+			oUiState.setSemanticDates(oState && oState.semanticDates);
+			// setState is meant to set the state absolutely, no merge needed => replace and strictMode can be set to true.
+			// (replace=false can be used to set additional selectOptions but keeping the existing ones. strictMode=false is used to map filters to parameters. Both might make sense in navigation
+			// scenarios (navigation parameter to be merged with defaults, property used in source app as filter but in target as parameter), but not when just restoring to a state (provided from the
+			// same control))
+			oSmartFilterBar.setUiState(oUiState, {replace: true, strictMode: true});
 
-				mParams.oCustomFiltersWrapper.setState(oPreliminaryState && oPreliminaryState.customFilters);
-				
-				// set visibility
-				// TODO: 
-				// - How to deal with old states (not containing all information about visibility) -> legacy state handler?
-				// - restoring from old state when annotation has changed (new selection fields)?
-				oSmartFilterBar.getAllFilterItems().forEach(function(oFilterItem){
-					if (oPreliminaryState && oPreliminaryState.addedFilterItems && oPreliminaryState.addedFilterItems.includes(oFilterItem.getName())){
-						oFilterItem.setVisibleInFilterBar();
-					}
-					if (oPreliminaryState && oPreliminaryState.removedFilterItems && oPreliminaryState.removedFilterItems.includes(oFilterItem.getName())){
-						oFilterItem.setVisibleInFilterBar(false);
-					}
-				});
+			mParams.oCustomFiltersWrapper.setState(oState && oState.customFilters);
 
-				// Retaining the old value of "modified" flag in the smart variant
-				oSmartVariant.currentVariantSetModified(bIsCurrentVariantModifiedBeforeSetState);
+			// set visibility
+			// TODO:
+			// - How to deal with old states (not containing all information about visibility) -> legacy state handler?
+			// - restoring from old state when annotation has changed (new selection fields)?
+			oSmartFilterBar.getAllFilterItems().forEach(function(oFilterItem){
+				if (oState && oState.addedFilterItems && oState.addedFilterItems.includes(oFilterItem.getName())){
+					oFilterItem.setVisibleInFilterBar();
+				}
+				if (oState && oState.removedFilterItems && oState.removedFilterItems.includes(oFilterItem.getName())){
+					oFilterItem.setVisibleInFilterBar(false);
+				}
 			});
 
+			// Retaining the old value of "modified" flag in the smart variant
+			oSmartVariant.currentVariantSetModified(bIsCurrentVariantModifiedBeforeSetState);
+
 			// Apparently, SFB does not always correctly adapt the adapt filters count automatically. The following method has been provided espacially to trigger the same.
 			// TODO: Verify, whether this is really needed (or was rather an artifact of old structure) - if yes, this API should be made public, if no, we should remove the call.
 			oSmartFilterBar.refreshFiltersCount();
@@ -211,29 +207,15 @@ sap.ui.define([
 				}
 			}
 
-			oControlAssignedPromise.then(function () {
-				oSmartFilterBar.attachFilterChange(function () {
-					// Don't forward filter change event while dialog is open - changes should only be registered when dialog is closed
-					if (!oSmartFilterBar.isDialogOpen()) {
-						handleStateChanged();
-					}
-				});
-				// unclear, whether this is needed, or filterChange event is anyway raised again (after dialog is closed)
-				oSmartFilterBar.attachFiltersDialogClosed(handleStateChanged);
-
-				// do we need to provide and handle change events from custom filters?
-				// contra:
-				// - SFB raises filteChange event also for custom filters
-				// - maybe also needed to be suppressed while dialog is open
-				// pro:
-				// - cleaner from architectural perspective
-				// - SFB cannot deal correctly with unknown custom controls
-				// - existing method in extensionAPI (onCustomAppStateChange)
-				mParams.oCustomFiltersWrapper.attachStateChanged(handleStateChanged);
+			oSmartFilterBar.attachFilterChange(function () {
+				// Don't forward filter change event while dialog is open - changes should only be registered when dialog is closed
+				if (!oSmartFilterBar.isDialogOpen()) {
+					handleStateChanged();
+				}
 			});
 			// unclear, whether this is needed, or filterChange event is anyway raised again (after dialog is closed)
 			oSmartFilterBar.attachFiltersDialogClosed(handleStateChanged);
-			
+
 			// do we need to provide and handle change events from custom filters?
 			// contra:
 			// - SFB raises filteChange event also for custom filters
@@ -244,7 +226,7 @@ sap.ui.define([
 			// - existing method in extensionAPI (onCustomAppStateChange)
 			mParams.oCustomFiltersWrapper.attachStateChanged(function(){
 				handleStateChanged();
-				// When a custom filter value is changed by the user, not only the appState changes, but also the variant needs to be marked as dirty. For some known controls, this is 
+				// When a custom filter value is changed by the user, not only the appState changes, but also the variant needs to be marked as dirty. For some known controls, this is
 				// handled from the SFB (which informs the SVM directly). This logic is broken from architectural point of view, as it does not allow to use arbitrary own controls for
 				// extension filters (which is the general idea of an extension).
 				// However, when user selects a variant, custom filters also have to be restored, but that must not mark the selected variant as dirty. Ideally, this should be handled
@@ -257,27 +239,22 @@ sap.ui.define([
 			});
 		}
 
-		function fnSetControl(oControl) {
-			oSmartFilterBar = oControl;
-			oControlAssignedResolve(oSmartFilterBar);
-		}
-		
 		// check waiting for initialization (like in SmartTableWrapper/SmartChartWrapper)
 		// currently, whole appState restoring is waiting for initialized event from sfb - but probably it would be enough to wait for it here
 		fnInitialize();
-		
+
 		return {
-			// generic properties (provided by all state wrappers) 
+			// generic properties (provided by all state wrappers)
 			getState: fnGetState,
 			setState: fnSetState,
-			setControl: fnSetControl,
 			attachStateChanged: fnAttachStateChanged,
 			// specific properties (needed to workaround direct connection between SFB and SVM)
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
-			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar) // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here 
+			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here
+			oVariantManagementInitializedPromise: oVariantManagementInitializedPromise
 		};
 	}
 
 	return SmartFilterBarWrapper;
-});
+});