@sapui5/sap.suite.ui.generic.template 1.108.48 → 1.108.50

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;
-});
+});

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

@@ -4,47 +4,71 @@ sap.ui.define([
 
     /**
      * Constructor for SmartTableChartCommon
-     * ...
-     * @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) 
-     * @returns
+     * @param {sap.ui.core.Control} oControl - The SmartTable or SmartChart control
+     * @param {object} oController - The controller instance
+     * @param {object} oFactory - The ControlStateWrapperFactory instance
+     * @param {string} sInitializationEvent - The initialization event name (e.g., "initialise")
+     * @param {object} [mExtensions] - Optional extension functions for control-specific state handling
+     * @param {function} [mExtensions.fnExtendGetUiState] - Function to extend UiState during getState
+     *   Called with (oStateUiState, oControlUiState) where modifications to oStateUiState add to the state
+     * @param {function} [mExtensions.fnExtendSetUiState] - Function to extend UiState during setState
+     *   Called with (oStateUiState, oControlUiState) where oStateUiState contains the state to apply
+     * @returns {object}
      */
 
-    // deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button 
+    // deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button
     // (does not contain a state from SFB point of view - however, we remember whether it was pressed once
     // to restore data - this information is not considered being part of SFB)
-    function SmartTableChartCommon(vTarget, oController, oFactory, sInitializationEvent) {
-        var oSmartControl, oVariantManagementControl, bVariantManagementActive;
-        var oControlAssignedResolve, oPreliminaryState, bSmartControlInitialized;
+    function SmartTableChartCommon(oControl, oController, oFactory, sInitializationEvent, mExtensions) {
+        var oSmartControl = oControl;
+        var oVariantManagementControl, bVariantManagementActive;
         var oSmartControlStateWrapper;
         var oVariantManagementStateWrapper;
+        var oVariantManagementInitializedResolve;
+        var fnResolveReady;
 
-        var oControlAssignedPromise = new Promise(function (resolve) {
-            oControlAssignedResolve = resolve;
+        var oVariantManagementInitializedPromise = new Promise(function(resolve){
+            oVariantManagementInitializedResolve = resolve;
         });
 
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
+        var oReadyPromise = new Promise(function(resolve) {
+            fnResolveReady = resolve;
+        });
+
+        // Initialize control state wrapper and check if control is already initialized
+        oSmartControlStateWrapper = getControlWrapper(oSmartControl);
+        if (!oSmartControl.isInitialised()) {
+            // In case Smart Chart/Table is not yet initialized
+            // listen to the initialize event & then initialize the wrapper
+            oSmartControl.attachEvent(sInitializationEvent, fnControlInitialized);
+        } else {
+            fnControlInitialized();
         }
 
         // creates a simple wrapper for a SmartTable or SmartChart (a control using UIState) (ignoring initialization and vm)
         function getControlWrapper(oControl) {
             var bIsApplying = false;		// avoid forwarding change event when caused by us applying a state
             function fnGetState() {
-                var oUiState = oControl.getUiState(); // unfortunately not serializable, but a managed object
+                var oControlUiState = oControl.getUiState(); // unfortunately not serializable, but a managed object
+                var oStateUiState = {
+                    oPresentationVariant: oControlUiState.getPresentationVariant(),
+                    oSelectionVariant: oControlUiState.getSelectionVariant()
+                };
+
+                // Allow extension to add control-specific properties (e.g., tableSettings for SmartTable)
+                if (mExtensions && mExtensions.fnExtendGetUiState) {
+                    mExtensions.fnExtendGetUiState(oStateUiState, oControlUiState);
+                }
+
                 return {
-                    oUiState: {
-                        oPresentationVariant: oUiState.getPresentationVariant(),
-                        oSelectionVariant: oUiState.getSelectionVariant()
-                    }
+                    oUiState: oStateUiState
                 };
             }
 
             function fnSetState(oState) {
                 if (oState) {
                     if (!oState.oUiState) {
-                        // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM 
+                        // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM
                         oState = {
                             oUiState: oState
                         };
@@ -52,11 +76,17 @@ sap.ui.define([
                     bIsApplying = true;
                     // don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
                     // interfere with them
-                    var oUiState = oControl.getUiState();
-                    if (!oUiState.getProperty("variantName")){
-                        oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
-                        oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
-                        oControl.setUiState(oUiState);
+                    var oControlUiState = oControl.getUiState();
+                    if (!oControlUiState.getProperty("variantName")){
+                            oControlUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
+                            oControlUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
+
+                            // Allow extension to set control-specific properties (e.g., tableSettings for SmartTable)
+                            if (mExtensions && mExtensions.fnExtendSetUiState) {
+                                mExtensions.fnExtendSetUiState(oState.oUiState, oControlUiState);
+                            }
+
+                            oControl.setUiState(oControlUiState);
                     }
                     bIsApplying = false;
                 } else {
@@ -82,71 +112,59 @@ sap.ui.define([
                 getState: fnGetState,
                 setState: fnSetState,
                 getLocalId: fnGetLocalId,
-                bVMConnection: false,
-                attachStateChanged: fnAttachStateChanged
+                bVMConnection: oControl && oControl.getSmartVariant && !!oControl.getSmartVariant(),
+                attachStateChanged: fnAttachStateChanged,
+                onAfterVariantInitialise: oVariantManagementInitializedResolve
             };
         }
 
         function fnGetState() {
-            if (bSmartControlInitialized) {
-                if (oVariantManagementStateWrapper) {
-                    // oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized 
-                    // or VariantManagement is not enabled. 
-                    return oVariantManagementStateWrapper.getState();
-                }
-                
-                if (oSmartControlStateWrapper && !bVariantManagementActive) {
-                    // VariantManagement is not turned on & SmartControlStateWrapper instance 
-                    return oSmartControlStateWrapper.getState();
-                }
+            if (oVariantManagementStateWrapper) {
+                // Variant management is active
+                return oVariantManagementStateWrapper.getState();
             }
-            
-            // Control is not available and StateWrapper is not initialized 
-            return oPreliminaryState;
+
+            // No variant management - return control state directly
+            return oSmartControlStateWrapper.getState();
         }
 
         function fnSetState(oState) {
-            oPreliminaryState = oState;
-            oControlAssignedPromise.then(function () {
-                // map legacy states - before separating VM state from state of managed control, inner state information 
-                // (presentation variant and selection variant) were put as oUiState on the same level as VM state 
-                // information (variant id and dirty indicator), now they are contained in map managedControlStates
-                if (oState && oState.oUiState && !oState.managedControlStates){
-                    oState.managedControlStates = Object.create(null);
-                    oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
-                    oState.modified = oState.bVariantModified;
-                    oState.variantId = oState.sVariantId;
-                }
-
+            if (!oState) {
+                // If no state provided, set standard variant on control
                 if (bVariantManagementActive) {
-                    // In case VariantManagement is configured
-                    oVariantManagementStateWrapper.setState(oPreliminaryState);
-                    return;
+                    oVariantManagementStateWrapper.setState(oState);
+                } else {
+                    oSmartControlStateWrapper.setState(oState);
                 }
-
-                // SmartTable/Chart shall be used 
-                oSmartControlStateWrapper.setState(oPreliminaryState);
-            });
-        }
-
-        function fnSetControl(oControl) {
-            oSmartControl = oControl;
-            oSmartControlStateWrapper = getControlWrapper(oSmartControl);
-            if (!oSmartControl.isInitialised()) {
-                // In case Smart Chart/Table is not yet initialized
-                // listen to the initialize event & then resolve the control
-                oSmartControl.attachEvent(sInitializationEvent, fnControlInitialized);
                 return;
             }
 
-            fnControlInitialized();
+            // Map legacy states - before separating VM state from state of managed control, inner state information
+            // (presentation variant and selection variant) were put as oUiState on the same level as VM state
+            // information (variant id and dirty indicator), now they are contained in map managedControlStates
+            if (oState.oUiState && !oState.managedControlStates) {
+                oState.managedControlStates = Object.create(null);
+                oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
+            }
+            if (oState.bVariantModified !== undefined) {
+                oState.modified = oState.bVariantModified;
+            }
+            if (oState.sVariantId !== undefined) {
+                oState.variantId = oState.sVariantId;
+            }
+
+            if (bVariantManagementActive) {
+                // In case VariantManagement is configured
+                oVariantManagementStateWrapper.setState(oState);
+            } else {
+                // SmartTable/Chart shall be used
+                oSmartControlStateWrapper.setState(oState);
+            }
         }
 
         function fnControlInitialized() {
-            bSmartControlInitialized = true;
-
             // deal with VM
-            // 3 possibilties with respect to VM
+            // 3 possibilities with respect to VM
             // a) no VM (relevant for this control) at all
             // b) control managed as part of page wide variant management
             // c) control creates own VM
@@ -155,7 +173,7 @@ sap.ui.define([
             // in each case) -thus, we better create and return a vm wrapper here, passing the inner wrapper (the same, we would create in the other cases).
             // Additionally, this simplifies the adaptation to the change of format (formerly, variant data and control data were mixed on same level)
 
-            // to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not 
+            // to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not
             // in OP, as they could be different per section. Checking control's properties would also incorporate UI changes, however, these properties are anyway not allowed to be changed.)
             // values:	smartVariant	useVariantManagement
             // a)			null			false				on LR currently: truthy (id of VM) and true - but PageVM is not created, and thus being ignored => adapt how properties are set in xml
@@ -170,39 +188,35 @@ sap.ui.define([
                     oVariantManagementStateWrapper = oFactory.getControlStateWrapper(oVariantManagementControl, {
                         managedControlWrappers: [ oSmartControlStateWrapper ]
                     });
-                    oControlAssignedResolve();
+                    fnResolveReady();
                 } else {
-                    // Resolve the ControlAssignedPromise only once the VariantManagement is
-                    // also initialized
+                    // Wait for VariantManagement to be initialized
                     oSmartControl.attachAfterVariantInitialise(fnControlInitialized);
                 }
-
-                return;
+            } else {
+                // No variant management or page-level variant management - ready immediately
+                fnResolveReady();
             }
-            // There is no VariantManagement configured for this SmartChart/SmartTable
-            oControlAssignedResolve(oSmartControl);
         }
 
         function fnAttachStateChanged(fnHandler) {
-            oControlAssignedPromise.then(function () {
-                if (bVariantManagementActive) {
-                    oVariantManagementStateWrapper.attachStateChanged(fnHandler);
-                    return;
-                }
-
+            if (bVariantManagementActive) {
+                oVariantManagementStateWrapper.attachStateChanged(fnHandler);
+            } else {
                 oSmartControlStateWrapper.attachStateChanged(fnHandler);
-
-            });
+            }
         }
 
         return {
             getState: fnGetState,
             setState: fnSetState,
-            setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged,
-            bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant()
+            bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant(),
+            oVariantManagementInitializedPromise: oVariantManagementInitializedPromise,
+            onAfterVariantInitialise: oVariantManagementInitializedResolve,
+            oReadyPromise: oReadyPromise
         };
     }
 
     return SmartTableChartCommon;
-});
+});

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

@@ -2,10 +2,18 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon"
 ], function(SmartTableChartCommon) {
 	"use strict";
-	
+
+	/**
+	 * Constructor for SmartTableWrapper
+	 * @param {sap.ui.comp.smarttable.SmartTable} oSmartTable - The SmartTable control
+	 * @param {object} oController - The controller instance
+	 * @param {object} oFactory - The ControlStateWrapperFactory instance
+	 * @returns {object} Wrapper object for SmartTable
+	 */
 	function SmartTableWrapper(oSmartTable, oController, oFactory){
+		// SmartTable extends SmartTableChartCommon with tableSettings support
 		return new SmartTableChartCommon(oSmartTable, oController, oFactory, "initialise");
 	}
 
 	return SmartTableWrapper;
-});
+});