@openui5/sap.ui.fl 1.139.0 → 1.141.0

package/src/sap/ui/fl/apply/_internal/init.js

@@ -0,0 +1,47 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/fl/apply/_internal/DelegateMediator",
+	"sap/ui/fl/changeHandler/ChangeAnnotation",
+	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration"
+], function(
+	DelegateMediator,
+	ChangeAnnotation,
+	ChangeHandlerRegistration
+) {
+	"use strict";
+
+	/**
+	 * Initialization of the apply bundle - takes care of registering change handlers
+ 	 * This module must be loaded by every publicly used module of the apply bundle.
+	 *
+	 * @name sap.ui.fl.apply._internal.init
+	 * @author SAP SE
+	 * @version 1.141.0
+	 * @since 1.141.0
+	 * @private
+	 */
+	ChangeHandlerRegistration.registerPredefinedChangeHandlers();
+	ChangeHandlerRegistration.getChangeHandlersOfLoadedLibsAndRegisterOnNewLoadedLibs();
+	ChangeHandlerRegistration.registerAnnotationChangeHandler({
+		changeHandler: ChangeAnnotation,
+		isDefaultChangeHandler: true
+	});
+
+	DelegateMediator.registerReadDelegate({
+		modelType: "sap.ui.model.odata.v4.ODataModel",
+		delegate: "sap/ui/fl/write/_internal/delegates/ODataV4ReadDelegate"
+	});
+	DelegateMediator.registerReadDelegate({
+		modelType: "sap.ui.model.odata.v2.ODataModel",
+		delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate"
+	});
+	DelegateMediator.registerReadDelegate({
+		modelType: "sap.ui.model.odata.ODataModel",
+		delegate: "sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate"
+	});
+});

package/src/sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks.js

@@ -12,9 +12,9 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/descriptor/InlineApplier",
 	"sap/ui/fl/apply/_internal/changes/Applier",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/variants/VariantModel",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
@@ -29,9 +29,9 @@ sap.ui.define([
 	InlineApplier,
 	ChangesApplier,
 	FlexState,
-	ManifestUtils,
 	ControlVariantApplyAPI,
 	ChangeHandlerRegistration,
+	ManifestUtils,
 	VariantModel,
 	Layer,
 	Utils,
@@ -41,6 +41,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	// TODO: Move to initial and make dependencies to apply lazy
 	/**
 	 * @namespace sap.ui.fl.apply._internal.preprocessors.ComponentLifecycleHooks
 	 * @since 1.114
@@ -240,6 +241,10 @@ sap.ui.define([
 		// the functionality still works without component Id, but the FlexState will be initialized again
 		// once the component Id is set. This will happen in the instanceCreated hook.
 		// This can only be improved once the generated component instance Id is available in the factory config
+		if (!oPropertyBag.factoryConfig) {
+			Log.error("Could not fetch Annotation changes. This can be caused by creating a component in an unsupported way");
+			return [];
+		}
 		const sAppComponentId = oPropertyBag.owner?.id || oPropertyBag.factoryConfig.id || oPropertyBag.factoryConfig.settings?.id;
 
 		const oComponentData = oOwnerComponent?.getComponentData()
@@ -264,11 +269,16 @@ sap.ui.define([
 
 			const aReturn = [];
 			for (const oAnnotationChange of aRelevantAnnotationChanges) {
-				const oChangeHandler = await ChangeHandlerRegistration.getAnnotationChangeHandler({
-					changeType: oAnnotationChange.getChangeType()
-				});
-				aReturn.push(await oChangeHandler.applyChange(oAnnotationChange));
-				oAnnotationChange._appliedOnModel = true;
+				try {
+					const oChangeHandler = await ChangeHandlerRegistration.getAnnotationChangeHandler({
+						changeType: oAnnotationChange.getChangeType()
+					});
+					aReturn.push(await oChangeHandler.applyChange(oAnnotationChange));
+					oAnnotationChange._appliedOnModel = true;
+				} catch (oError) {
+					// Continue with next change
+					Log.error(`Annotation change with id ${oAnnotationChange.getId()} could not be applied to the model`, oError);
+				}
 			}
 			return aReturn;
 		} catch (oError) {

package/src/sap/ui/fl/apply/api/AnnotationChangeHandlerAPI.js

@@ -5,7 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration"
+	"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	ChangeHandlerRegistration
 ) {

package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js

@@ -6,17 +6,26 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/core/Component",
 	"sap/ui/core/Element",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
+	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	Log,
+	JsControlTreeModifier,
 	Component,
 	Element,
 	URLHandler,
+	VariantUtil,
 	VariantManagementState,
+	FlexObjectState,
+	ManifestUtils,
 	Utils
 ) {
 	"use strict";
@@ -41,6 +50,68 @@ sap.ui.define([
 		});
 	}
 
+	function handleInitialLoadScenario(sVMReference, oVariantManagementControl, sFlexReference) {
+		const aVariantChangesForVariant = VariantManagementState.getVariantChangesForVariant({
+			vmReference: sVMReference,
+			reference: sFlexReference
+		});
+
+		const sDefaultVariantReference = VariantManagementState.getDefaultVariantReference({
+			vmReference: sVMReference,
+			reference: sFlexReference
+		});
+
+		if (
+			oVariantManagementControl.getExecuteOnSelectionForStandardDefault()
+			&& sDefaultVariantReference === sVMReference
+			&& !aVariantChangesForVariant.some((oVariantChange) => oVariantChange.getChangeType() === "setExecuteOnSelect")
+		) {
+			const oStandardVariant = VariantManagementState.getVariant({
+				vmReference: sVMReference,
+				reference: sFlexReference,
+				vReference: sVMReference
+			});
+			// set executeOnSelect without creating a change
+			oStandardVariant.instance.setExecuteOnSelection(true);
+			VariantManagementState.updateVariant({
+				reference: sFlexReference,
+				variant: oStandardVariant.instance
+			});
+			return true;
+		}
+		return false;
+	}
+
+	function waitForInitialVariantChanges(mPropertyBag) {
+		const aCurrentVariantChanges = VariantManagementState.getInitialUIChanges({
+			vmReference: mPropertyBag.vmReference,
+			reference: mPropertyBag.reference
+		});
+		const aSelectors = aCurrentVariantChanges.reduce((aCurrentControls, oChange) => {
+			const oSelector = oChange.getSelector();
+			const oControl = JsControlTreeModifier.bySelector(oSelector, mPropertyBag.appComponent);
+			if (oControl && Utils.indexOfObject(aCurrentControls, { selector: oControl }) === -1) {
+				aCurrentControls.push({ selector: oControl });
+			}
+			return aCurrentControls;
+		}, []);
+		return aSelectors.length ? FlexObjectState.waitForFlexObjectsToBeApplied(aSelectors) : Promise.resolve();
+	}
+
+	function waitForControlToBeRendered(oControl) {
+		return new Promise((resolve) => {
+			if (oControl.getDomRef()) {
+				resolve();
+			} else {
+				oControl.addEventDelegate({
+					onAfterRendering() {
+						resolve();
+					}
+				});
+			}
+		});
+	}
+
 	/**
 	 * Provides an API for applications to work with control variants. See also {@link sap.ui.fl.variants.VariantManagement}.
 	 *
@@ -64,7 +135,7 @@ sap.ui.define([
 		/**
 		 * Returns a promise that resolves to the variant model once it is available
 		 *
-		 * @param {object} oAppComponent - Application component
+		 * @param {sap.ui.core.Component} oAppComponent - Application component
 		 * @returns {Promise} Promise resolving to the Variant Model
 		 *
 		 * @private
@@ -74,10 +145,26 @@ sap.ui.define([
 			return waitForVariantModel(oAppComponent);
 		},
 
+		/**
+		 * Returns the variant management control instance for a variant management reference.
+		 *
+		 * @param {string} sVariantManagementReference - Reference to the variant management control
+		 * @param {sap.ui.core.Component} oAppComponent - Application component
+		 * @returns {sap.ui.fl.variants.VariantManagement} The variant management control instance
+		 */
+		getVariantManagementControlByVMReference(sVariantManagementReference, oAppComponent) {
+			const sVMControlId = oAppComponent.byId(sVariantManagementReference)
+				? oAppComponent.createId(sVariantManagementReference)
+				: sVariantManagementReference;
+			return Element.getElementById(sVMControlId);
+		},
+
 		/**
 		 * Clears URL technical parameter <code>sap-ui-fl-control-variant-id</code> for control variants.
-		 * Use this method in case you normally want the variant parameter in the URL, but have a few special navigation patterns where you want to clear it.
-		 * If you don't want that parameter in general, set the <code>updateVariantInURL</code> parameter on your variant management control to <code>false</code>. SAP Fiori elements use this method.
+		 * Use this method in case you normally want the variant parameter in the URL,
+		 * but have a few special navigation patterns where you want to clear it.
+		 * If you don't want that parameter in general, set the <code>updateVariantInURL</code> parameter
+		 * on your variant management control to <code>false</code>. SAP Fiori elements use this method.
 		 * If a variant management control is given as a parameter, only parameters specific to that control are cleared.
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
@@ -116,11 +203,11 @@ sap.ui.define([
 		},
 
 		/**
-		 *
-		 * Activates the passed variant applicable to the passed control/component.
-		 * If the Variant is not available and the backend supports lazy loading, a backend request is made to fetch the variant.
-		 * If the flag standardVariant is set to true, the standard variant is activated and the variantReference is ignored.
-		 * In this scenario the passed element must be the variant management control.
+		 * Activates the passed variant applicable to the passed control/component. The corresponding variant management control must be
+		 * available when this function is called.
+		 * If the variant is not found and the backend supports lazy loading, a backend request is made to fetch the variant.
+		 * If the flag standardVariant is set to true, the standard variant is activated and the variantReference is ignored: in this
+		 * scenario, the passed element must be the variant management control.
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
 		 * @param {sap.ui.base.ManagedObject|string} mPropertyBag.element - Component or control (instance or ID) on which the <code>variantModel</code> is set
@@ -132,9 +219,9 @@ sap.ui.define([
 		 * @public
 		 */
 		async activateVariant(mPropertyBag) {
-			function logAndReject(oError) {
+			function logAndThrowError(oError) {
 				Log.error(oError);
-				return Promise.reject(oError);
+				throw oError;
 			}
 
 			let oElement;
@@ -144,7 +231,7 @@ sap.ui.define([
 					oElement = Element.getElementById(mPropertyBag.element);
 
 					if (!(oElement instanceof Element)) {
-						return logAndReject(Error("No valid component or control found for the provided ID"));
+						logAndThrowError(Error("No valid component or control found for the provided ID"));
 					}
 				}
 			} else if (mPropertyBag.element instanceof Component || mPropertyBag.element instanceof Element) {
@@ -152,52 +239,71 @@ sap.ui.define([
 			}
 
 			const oAppComponent = Utils.getAppComponentForControl(oElement);
+			const sFlexReference = ManifestUtils.getFlexReferenceForControl(oElement);
 			if (!oAppComponent) {
-				return logAndReject(Error("A valid variant management control or component (instance or ID) should be passed as parameter"));
+				logAndThrowError(
+					Error("A valid variant management control or component (instance or ID) should be passed as parameter")
+				);
 			}
 
 			const oVariantModel = oAppComponent.getModel(VARIANT_MODEL_NAME);
 			if (!oVariantModel) {
-				return logAndReject(Error("No variant management model found for the passed control or application component"));
+				logAndThrowError(Error("No variant management model found for the passed control or application component"));
 			}
 
 			if (mPropertyBag.standardVariant && !oElement.isA("sap.ui.fl.variants.VariantManagement")) {
-				return logAndReject(Error("With using standardVariant and no variantReference, a variant management control must be passed as element"));
+				logAndThrowError(
+					Error("With using standardVariant and no variantReference, a variant management control must be passed as element")
+				);
 			}
 
-			const sVariantReference = mPropertyBag.standardVariant
-				? oVariantModel.getVariantManagementReferenceForControl(mPropertyBag.element)
-				: mPropertyBag.variantReference;
+			let sVariantManagementReference;
+			let sVariantReference;
+			let oVMControl;
+			if (mPropertyBag.standardVariant) {
+				sVariantManagementReference = oElement.getVariantManagementReference();
+				sVariantReference = sVariantManagementReference;
+				oVMControl = oElement;
+			} else {
+				sVariantManagementReference = VariantManagementState.getVariantManagementReferenceForVariant(
+					sFlexReference,
+					mPropertyBag.variantReference
+				);
+				sVariantReference = mPropertyBag.variantReference;
 
-			// if the variant management reference is not available, the variant is not yet loaded
-			if (!oVariantModel.getVariantManagementReference(sVariantReference).variantManagementReference) {
-				try {
-					await VariantManagementState.loadVariant({
-						reference: oVariantModel.sFlexReference,
-						variantReference: sVariantReference
-					});
-				} catch (oError) {
-					return logAndReject(Error(`Variant with reference '${sVariantReference}' could not be found`));
-				}
-			}
+				if (!sVariantManagementReference) {
+					// if the variant management reference is not available, the variant is maybe not yet loaded
+					try {
+						await VariantManagementState.loadVariant({
+							reference: sFlexReference,
+							variantReference: sVariantReference
+						});
 
-			const sVariantManagementReference = oVariantModel.getVariantManagementReference(sVariantReference).variantManagementReference;
-			if (!sVariantManagementReference) {
-				return logAndReject(Error("A valid control or component, and a valid variant/ID combination are required"));
+						sVariantManagementReference = VariantManagementState.getVariantManagementReferenceForVariant(
+							sFlexReference,
+							mPropertyBag.variantReference
+						);
+					} catch (oError) {
+						logAndThrowError(Error(`Variant with reference '${sVariantReference}' could not be found`));
+					}
+					if (!sVariantManagementReference) {
+						logAndThrowError(Error("Variant management reference not found. Check the passed element and variantReference"));
+					}
+				}
+				oVMControl = this.getVariantManagementControlByVMReference(sVariantManagementReference, oAppComponent);
 			}
 
 			// sap/fe is using this API very early during app start, sometimes before FlexState is initialized
-			await oVariantModel.waitForVMControlInit(sVariantManagementReference);
+			await oVMControl.waitForInit();
 
 			try {
-				return oVariantModel.updateCurrentVariant({
+				await oVariantModel.updateCurrentVariant({
 					variantManagementReference: sVariantManagementReference,
 					newVariantReference: sVariantReference,
 					appComponent: oAppComponent
 				});
 			} catch (oError) {
-				Log.error(oError);
-				throw oError;
+				logAndThrowError(oError);
 			}
 		},
 
@@ -216,18 +322,49 @@ sap.ui.define([
 		 *
 		 * @public
 		 */
-		attachVariantApplied(mPropertyBag) {
-			var oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
-			var oAppComponent = Utils.getAppComponentForControl(oControl);
-
-			waitForVariantModel(oAppComponent).then(function(oVariantModel) {
-				oVariantModel.attachVariantApplied({
-					vmControlId: mPropertyBag.vmControlId,
-					control: oControl,
-					callback: mPropertyBag.callback,
-					callAfterInitialVariant: mPropertyBag.callAfterInitialVariant
+		async attachVariantApplied(mPropertyBag) {
+			const oVariantManagementControl = Element.getElementById(mPropertyBag.vmControlId);
+			await oVariantManagementControl.waitForInit();
+
+			const oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
+			const oAppComponent = Utils.getAppComponentForControl(oControl);
+			const sVMReference = oVariantManagementControl.getVariantManagementReference();
+			const sFlexReference = ManifestUtils.getFlexReferenceForControl(oVariantManagementControl);
+
+			const bInitialLoad = handleInitialLoadScenario(sVMReference, oVariantManagementControl, sFlexReference);
+			// if the parameter callAfterInitialVariant or initialLoad is true call the function without check
+			if (mPropertyBag.callAfterInitialVariant || bInitialLoad) {
+				waitForInitialVariantChanges({
+					appComponent: oAppComponent,
+					reference: sFlexReference,
+					vmReference: sVMReference
+				}).then(() => {
+					const sCurrentVariantReference = VariantManagementState.getCurrentVariantReference({
+						vmReference: sVMReference,
+						reference: sFlexReference
+					});
+					const oVariant = VariantManagementState.getVariant({
+						vmReference: sVMReference,
+						reference: sFlexReference,
+						vReference: sCurrentVariantReference
+					});
+					mPropertyBag.callback(oVariant);
 				});
-			});
+			}
+
+			// first check if the passed vmControlId is correct, then save the callback
+			// for this check the control has to be in the control tree already
+			await waitForControlToBeRendered(oControl);
+			if (VariantUtil.getRelevantVariantManagementControlId(oControl) === mPropertyBag.vmControlId) {
+				// showExecuteOnSelection is only relevant when a control can react to the variant applied event
+				// e.g. for ListReport, Table, etc.
+				oVariantManagementControl.setShowExecuteOnSelection(true);
+				oVariantManagementControl._addVariantAppliedListener(oControl, mPropertyBag.callback);
+			} else {
+				Log.error(
+					"Error in attachVariantApplied: The passed VariantManagement ID doesn't match the responsible VariantManagement control"
+				);
+			}
 		},
 
 		/**
@@ -239,12 +376,12 @@ sap.ui.define([
 		 *
 		 * @public
 		 */
-		detachVariantApplied(mPropertyBag) {
-			var oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
-			var oAppComponent = Utils.getAppComponentForControl(oControl);
-			waitForVariantModel(oAppComponent).then(function(oVariantModel) {
-				oVariantModel.detachVariantApplied(mPropertyBag.vmControlId, oControl.getId());
-			});
+		async detachVariantApplied(mPropertyBag) {
+			const oVariantManagementControl = Element.getElementById(mPropertyBag.vmControlId);
+			const oControl = mPropertyBag.selector.id && Element.getElementById(mPropertyBag.selector.id) || mPropertyBag.selector;
+			// Ensure that the variant attach process is finished before removing the listener
+			await Promise.all([oVariantManagementControl.waitForInit(), waitForControlToBeRendered(oControl)]);
+			oVariantManagementControl._removeVariantAppliedListener(oControl);
 		}
 	};
 

package/src/sap/ui/fl/apply/api/DelegateMediatorAPI.js

@@ -5,7 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/DelegateMediator"
+	"sap/ui/fl/apply/_internal/DelegateMediator",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	DelegateMediator
 ) {
@@ -89,6 +90,21 @@ sap.ui.define([
 				mPropertyBag.control,
 				mPropertyBag.modifier
 			);
+		},
+
+		/**
+		 * Registers a handler for adjusting XML fragments. The handler will be stored without reference to the app,
+		 * and will therefore be available for all apps.
+		 *
+		 * @param {object} mPropertyBag - Property bag
+		 * @param {string} mPropertyBag.key - Key for the handler
+		 * @param {function} mPropertyBag.handler - Handler function returning the adjusted fragment or a Promise resolving with the adjusted fragment
+		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 */
+		registerAddXMLAdjustFragmentHandler(mPropertyBag) {
+			DelegateMediator.registerAddXMLAdjustFragmentHandler(mPropertyBag);
 		}
 	};
 

package/src/sap/ui/fl/apply/api/ExtensionPointRegistryAPI.js

@@ -5,7 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/extensionPoint/Registry"
+	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	ExtensionPointRegistry
 ) {

package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js

@@ -10,25 +10,26 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexObjectState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexConfiguration",
 	"sap/ui/fl/initial/_internal/FlexInfoSession",
-	"sap/ui/fl/initial/api/InitialFlexAPI",
+	"sap/ui/fl/initial/_internal/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Settings",
+	"sap/ui/fl/initial/api/InitialFlexAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
-	"sap/ui/VersionInfo"
+	"sap/ui/VersionInfo",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	Log,
 	JsControlTreeModifier,
 	VariantUtils,
 	FlexObjectState,
 	FlexState,
-	ManifestUtils,
 	FlexConfiguration,
 	FlexInfoSession,
-	InitialFlexAPI,
+	ManifestUtils,
 	Settings,
+	InitialFlexAPI,
 	Layer,
 	Utils,
 	VersionInfo

package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js

@@ -6,47 +6,20 @@
 
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState",
-	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/initial/_internal/ManifestUtils",
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/apply/_internal/init"
 ], function(
 	CompVariantManagementState,
-	CompVariantMerger,
 	CompVariantUtils,
 	FlexState,
 	ManifestUtils,
-	LayerUtils,
 	Utils
 ) {
 	"use strict";
 
-	function getCompEntities(mPropertyBag) {
-		var oControl = mPropertyBag.control;
-		var oVMControl = oControl.getVariantManagement?.() || oControl;
-		var sSVMControlId = oVMControl.getId();
-
-		return FlexState.initialize({
-			reference: mPropertyBag.reference,
-			componentData: {},
-			manifest: Utils.getAppDescriptor(oControl),
-			componentId: Utils.getAppComponentForControl(oControl).getId()
-		}).then(function() {
-			var mCompVariantsMap = FlexState.getCompVariantsMap(mPropertyBag.reference);
-			// Store external input data to FlexState so they can be restored after invalidating cache
-			FlexState.setInitialNonFlCompVariantData(
-				mPropertyBag.reference,
-				mPropertyBag.persistencyKey,
-				mPropertyBag.standardVariant,
-				mPropertyBag.variants,
-				sSVMControlId
-			);
-			return mCompVariantsMap._initialize(mPropertyBag.persistencyKey, mPropertyBag.variants, sSVMControlId);
-		});
-	}
-
 	/**
 	 * Object containing data for a SmartVariantManagement control.
 	 *
@@ -101,7 +74,7 @@ sap.ui.define([
 		 * 	sap.ui.comp.smarttable.SmartTable|
 		 * 	sap.ui.comp.smartchart.SmartChart} mPropertyBag.control - Variant management control to load variants for
 		 * @param {sap.ui.fl.apply.api.SmartVariantManagementApplyAPI.LoadVariantsInput} mPropertyBag.standardVariant - The standard variant of the control;
-		 * a standard variant is created into the response but may be replaced later if data is loaded afterwards
+		 * a standard variant is created into the response but may be replaced later if data is loaded afterward
 		 * instructing the SVM to do so
 		 * @param {sap.ui.fl.apply.api.SmartVariantManagementApplyAPI.LoadVariantsInput[]} mPropertyBag.variants - Variant data from other data providers like an OData service
 		 * @returns {Promise<sap.ui.fl.apply.api.SmartVariantManagementApplyAPI.LoadVariantsResponse>} Object with the standard variant and the variants
@@ -110,24 +83,51 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.comp
 		 */
 		async loadVariants(mPropertyBag) {
-			mPropertyBag.reference = ManifestUtils.getFlexReferenceForControl(mPropertyBag.control);
-			mPropertyBag.persistencyKey = CompVariantUtils.getPersistencyKey(mPropertyBag.control);
+			const oControl = mPropertyBag.control;
+			const sReference = ManifestUtils.getFlexReferenceForControl(oControl);
+			const sPersistencyKey = CompVariantUtils.getPersistencyKey(oControl);
 
-			const mCompMaps = await getCompEntities(mPropertyBag);
+			const mProperties = Object.assign({
+				reference: sReference,
+				persistencyKey: sPersistencyKey,
+				componentId: Utils.getAppComponentForControl(oControl).getId()
+			}, mPropertyBag);
 
-			const mMergedCompVariants = CompVariantMerger.merge(
-				mPropertyBag.persistencyKey,
-				mCompMaps,
-				mPropertyBag.standardVariant,
-				mPropertyBag.control
-			);
+			await FlexState.initialize({
+				componentId: mProperties.componentId
+			});
+			FlexState.addSVMControl(sReference, oControl);
+			CompVariantManagementState.addExternalVariants(mProperties);
 
-			mMergedCompVariants.defaultVariantId = CompVariantManagementState.getDefaultVariantId({
-				persistencyKey: mPropertyBag.persistencyKey,
-				reference: mPropertyBag.reference,
-				variants: mMergedCompVariants.variants
+			const aVariants = CompVariantManagementState.assembleVariantList(mProperties);
+
+			const sDefaultVariantId = CompVariantManagementState.getDefaultVariantId({
+				persistencyKey: sPersistencyKey,
+				reference: sReference,
+				variants: aVariants
 			});
-			return mMergedCompVariants;
+
+			const aVariantsWithoutStandard = [];
+			let oStandardVariant;
+
+			aVariants.forEach((oVariant) => {
+				if (oVariant.getStandardVariant()) {
+					oStandardVariant = oVariant;
+				} else {
+					aVariantsWithoutStandard.push(oVariant);
+				}
+
+				// the default is always visible and thus a favorite
+				if (oVariant.getVariantId() === sDefaultVariantId) {
+					oVariant.setFavorite(true);
+				}
+			});
+
+			return {
+				defaultVariantId: sDefaultVariantId,
+				variants: aVariantsWithoutStandard,
+				standardVariant: oStandardVariant
+			};
 		}
 	};