@openui5/sap.ui.fl 1.108.0 → 1.109.0

package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js

@@ -27,16 +27,73 @@ function(
 		}
 	}
 
+	function getFlexReference(mPropertyBag) {
+		var oManifest = mPropertyBag.manifest;
+		var oComponentData = mPropertyBag.componentData || {};
+
+		// support of old app variants
+		if (oComponentData.startupParameters) {
+			if (Array.isArray(oComponentData.startupParameters["sap-app-id"])) {
+				return oComponentData.startupParameters["sap-app-id"][0];
+			}
+		}
+
+		var oSapUi5Entry = oManifest.getEntry ? oManifest.getEntry("sap.ui5") : oManifest["sap.ui5"];
+		if (oSapUi5Entry) {
+			if (oSapUi5Entry.appVariantId) {
+				return oSapUi5Entry.appVariantId;
+			}
+
+			if (oSapUi5Entry.componentName) {
+				return appendComponentToReference(oSapUi5Entry.componentName);
+			}
+		}
+
+		return appendComponentToReference(getAppIdFromManifest(oManifest));
+	}
+
+	function getAppIdFromManifest(oManifest) {
+		if (oManifest) {
+			var APP_ID_AT_DESIGN_TIME = "${pro" + "ject.art" + "ifactId}"; //avoid replaced by content of ${project.artifactId} placeholder at build steps
+			var oSapApp = (oManifest.getEntry) ? oManifest.getEntry("sap.app") : oManifest["sap.app"];
+			var sAppId = oSapApp && oSapApp.id;
+			if (sAppId === APP_ID_AT_DESIGN_TIME) {
+				if (oManifest.getComponentName) {
+					return oManifest.getComponentName();
+				}
+				if (oManifest.name) {
+					return oManifest.name;
+				}
+			}
+			return sAppId;
+		}
+
+		throw new Error("No Manifest received, descriptor changes are not possible");
+	}
+
 	/**
 	 * Provides utility functions for handling manifests; All function work with Manifest Objects or raw manifests
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 */
 	var ManifestUtils = {
+		/**
+		 * Returns the descriptor Id, which is always the reference for descriptor changes
+		 *
+		 * @param {object|sap.ui.core.Manifest} oManifest - Manifest of the component
+		 * @returns {string} Version of application if it is available in the manifest, otherwise an empty string
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl
+		 */
+		getAppIdFromManifest: getAppIdFromManifest,
+
+		getFlexReference: getFlexReference,
+
 		/** Determines the flex reference for a given control by
 		 * identifying the application component and analyzing the manifest of this component.
 		 *
@@ -45,37 +102,12 @@ function(
 		 */
 		getFlexReferenceForControl: function (oControl) {
 			var oAppComponent = Utils.getAppComponentForControl(oControl);
-			return oAppComponent && ManifestUtils.getFlexReference({
+			return oAppComponent && getFlexReference({
 				manifest: oAppComponent.getManifestObject(),
 				componentData: oAppComponent.getComponentData()
 			});
 		},
 
-		getFlexReference: function(mPropertyBag) {
-			var oManifest = mPropertyBag.manifest;
-			var oComponentData = mPropertyBag.componentData || {};
-
-			// support of old app variants
-			if (oComponentData.startupParameters) {
-				if (Array.isArray(oComponentData.startupParameters["sap-app-id"])) {
-					return oComponentData.startupParameters["sap-app-id"][0];
-				}
-			}
-
-			var oSapUi5Entry = oManifest.getEntry ? oManifest.getEntry("sap.ui5") : oManifest["sap.ui5"];
-			if (oSapUi5Entry) {
-				if (oSapUi5Entry.appVariantId) {
-					return oSapUi5Entry.appVariantId;
-				}
-
-				if (oSapUi5Entry.componentName) {
-					return appendComponentToReference(oSapUi5Entry.componentName);
-				}
-			}
-
-			return appendComponentToReference(Utils.getAppIdFromManifest(oManifest));
-		},
-
 		getOvpEntry: function (oManifest) {
 			return oManifest.getEntry ? oManifest.getEntry("sap.ovp") : oManifest["sap.ovp"];
 		},
@@ -100,13 +132,12 @@ function(
 			if (oFlAsyncHint) {
 				return false;
 			}
-
 			return true;
 		},
 
 		getBaseComponentNameFromManifest: function(oManifest) {
 			var oSapUi5Entry = oManifest.getEntry ? oManifest.getEntry("sap.ui5") : oManifest["sap.ui5"];
-			return oSapUi5Entry && oSapUi5Entry.componentName || Utils.getAppIdFromManifest(oManifest);
+			return oSapUi5Entry && oSapUi5Entry.componentName || getAppIdFromManifest(oManifest);
 		},
 
 		isFlexExtensionPointHandlingEnabled: function (oView) {

package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @experimental Since 1.75
 	 * @since 1.75
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/appDescriptorChanges/prepareAppDescriptorMap.js

@@ -5,9 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/Change"
+	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory"
 ], function(
-	Change
+	FlexObjectFactory
 ) {
 	"use strict";
 
@@ -31,7 +31,7 @@ sap.ui.define([
 		//TODO: add filtering for condensable changeTypes once necessary
 
 		var aChanges = aChangeDefinitions.map(function(oChangeDefinition) {
-			return new Change(oChangeDefinition);
+			return FlexObjectFactory.createFromFileContent(oChangeDefinition);
 		});
 		return {
 			appDescriptorChanges: aChanges

package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -245,7 +245,7 @@ sap.ui.define([
 	/**
 	 * Adds a change to the map and adds the dependencies to the changes map
 	 *
-	 * @param {sap.ui.fl.changeObject} oChange - Change instance
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
 	 * @param {sap.ui.core.UIComponent} oAppComponent - Component instance to get the whole ID for the control
 	 * @param {object} mChangesMap - Map with changes and dependencies
 	 */
@@ -257,9 +257,9 @@ sap.ui.define([
 	/**
 	 * Insert Change into changes map positioned right after the referenced change
 	 *
-	 * @param {sap.ui.fl.changeObject} oChange - Change instance
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
 	 * @param {object} mChangesMap - Map with changes and dependencies
-	 * @param {sap.ui.fl.changeObject} oReferenceChange - Refernce change. New change is positioned right after this one in the changes map
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oReferenceChange - Refernce change. New change is positioned right after this one in the changes map
 	 */
 	DependencyHandler.insertChange = function(oChange, mChangesMap, oReferenceChange) {
 		var iIndex = mChangesMap && mChangesMap.aChanges && mChangesMap.aChanges.indexOf(oReferenceChange);
@@ -271,7 +271,7 @@ sap.ui.define([
 	/**
 	 * Adds a change to the map during runtime and adds the dependencies to the initial changes map
 	 *
-	 * @param {sap.ui.fl.changeObject} oChange - Change instance
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change instance
 	 * @param {sap.ui.core.UIComponent} oAppComponent - Component instance to get the whole ID for the control
 	 * @param {object} mChangesMap - Map with changes and dependencies
 	 * @param {object} mInitialChangesMap - Initial map with changes and dependencies
@@ -301,7 +301,7 @@ sap.ui.define([
 	 * Saves a function in the dependency that will be called as soon as the dependency is resolved.
 	 *
 	 * @param {object} mChangesMap - Changes map
-	 * @param {sap.ui.fl.Change} sChangeId - Change ID
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} sChangeId - Change ID
 	 * @param {function} fnCallback - Function that will be saved in the dependency
 	 */
 	DependencyHandler.addChangeApplyCallbackToDependency = function(mChangesMap, sChangeId, fnCallback) {
@@ -417,7 +417,7 @@ sap.ui.define([
 	 * @param {object} mChangesMap - Map with changes and dependencies
 	 * @param {object} sControlId - ID of the control
 	 * @param {sap.ui.core.Component} oAppComponent - Application component instance that is currently loading
-	 * @returns {sap.ui.fl.Change[]} Array of all open dependent changes for the control
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} Array of all open dependent changes for the control
 	 */
 	DependencyHandler.getOpenDependentChangesForControl = function(mChangesMap, sControlId, oAppComponent) {
 		var aDependentChanges = [];

package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @experimental Since 1.79
 	 * @since 1.79
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -67,7 +67,7 @@ sap.ui.define([
 			if (bOriginalSelectorNeedsToBeAdjusted) {
 				oChange.originalSelectorToBeAdjusted = mOriginalSelector;
 			} else {
-				oChange.setDependentSelector({originalSelector: mOriginalSelector});
+				oChange.setDependentSelectors({originalSelector: mOriginalSelector});
 			}
 			oChange.setContent({boundAggregation: oExtensionPoint.closestAggregationBinding});
 		} else {
@@ -158,7 +158,9 @@ sap.ui.define([
 								//Set correct selector from extension point targetControl's ID
 								replaceChangeSelector(oRuntimeOnlyChange, mExtensionPointInfo, true);
 								oRuntimeOnlyChange.setExtensionPointInfo(mExtensionPointInfo);
-								oRuntimeOnlyChange.setModuleName(oChange.getModuleName());
+								var oFlexObjectMetadata = oRuntimeOnlyChange.getFlexObjectMetadata();
+								oFlexObjectMetadata.moduleName = oChange.getFlexObjectMetadata().moduleName;
+								oRuntimeOnlyChange.setFlexObjectMetadata(oFlexObjectMetadata);
 								oRuntimeOnlyChange.setCreation(oChange.getCreation());
 								oChangePersistence.addChangeAndUpdateDependencies(mPropertyBag.appComponent, oRuntimeOnlyChange, oChange);
 							})

package/src/sap/ui/fl/apply/_internal/flexState/changes/prepareChangesMap.js

@@ -5,9 +5,7 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/Change"
 ], function(
-	Change
 ) {
 	"use strict";
 
@@ -23,16 +21,7 @@ sap.ui.define([
 	 *
 	 * @param {object} mPropertyBag - Contains additional data needed for preparing the map
 	 * @param {object} mPropertyBag.storageResponse - Storage response with the flex data
-	 * @returns {object} The prepared map for changes
 	 */
-	return function(mPropertyBag) {
-		var aChangeDefinitions = mPropertyBag.storageResponse.changes.changes;
-		var aChanges = aChangeDefinitions.map(function(oChangeDefinition) {
-			return new Change(oChangeDefinition);
-		});
-		// TODO create dependency map and return it
-		return {
-			changes: aChanges
-		};
+	return function(/* mPropertyBag */) {
 	};
 });

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js

@@ -117,7 +117,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -182,7 +182,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.108.0
+		 * @version 1.109.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

package/src/sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap.js

@@ -59,9 +59,9 @@ sap.ui.define([
 			if (sSubSection === "variants") {
 				oFlexObject = FlexObjectFactory.createCompVariant(oCompVariantChangeDefinition);
 			} else {
-				oFlexObject = new UpdatableChange(oCompVariantChangeDefinition);
+				oFlexObject = FlexObjectFactory.createFromFileContent(oCompVariantChangeDefinition, UpdatableChange);
 			}
-			oFlexObject.setState(States.PERSISTED); // prevent persisting these anew
+			oFlexObject.setState(States.LifecycleState.PERSISTED); // prevent persisting these anew
 			return oFlexObject;
 		});
 

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js

@@ -91,7 +91,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -15,7 +15,6 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/Change",
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils"
 ], function(
@@ -29,7 +28,6 @@ sap.ui.define([
 	VariantsApplyUtil,
 	States,
 	FlexState,
-	Change,
 	LayerUtils,
 	Utils
 ) {
@@ -41,7 +39,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -172,7 +170,7 @@ sap.ui.define([
 	 * @param {string} mPropertyBag.reference - Component reference
 	 * @param {boolean} [mPropertyBag.includeDirtyChanges] - Whether dirty changes of the current session should be included, <code>true</code> by default
 	 *
-	 * @returns {object[]|sap.ui.fl.Change[]} All changes of the variant
+	 * @returns {object[]|sap.ui.fl.apply._internal.flexObjects.FlexObject[]} All changes of the variant
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -183,7 +181,7 @@ sap.ui.define([
 			aResult = oVariant.controlChanges.filter(function(oChange) {
 				return (
 					mPropertyBag.includeDirtyChanges !== false
-					|| oChange.getState() === Change.states.PERSISTED
+					|| oChange.getState() === States.LifecycleState.PERSISTED
 				);
 			});
 		}
@@ -287,7 +285,7 @@ sap.ui.define([
 	 * Removes a variant from a variant management reference.
 	 *
 	 * @param {object} mPropertyBag - Object with the necessary properties
-	 * @param {sap.ui.fl.Variant} mPropertyBag.variant - Variant to be removed
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlVariant} mPropertyBag.variant - Variant to be removed
 	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {string} mPropertyBag.reference - Component reference
 	 *
@@ -350,7 +348,7 @@ sap.ui.define([
 	 * Add a control change to a variant.
 	 *
 	 * @param {object} mPropertyBag - Object with the necessary properties
-	 * @param {sap.ui.fl.Change} mPropertyBag.change - Control change
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} mPropertyBag.change - Control change
 	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {string} mPropertyBag.vReference - Variant reference
 	 * @param {string} mPropertyBag.reference - Component reference
@@ -377,7 +375,7 @@ sap.ui.define([
 	 * Removes a control change from a variant.
 	 *
 	 * @param {object} mPropertyBag - Object with the necessary properties
-	 * @param {sap.ui.fl.Change} mPropertyBag.change - Control change
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} mPropertyBag.change - Control change
 	 * @param {string} mPropertyBag.vmReference - Variant management reference
 	 * @param {string} mPropertyBag.vReference - Variant reference
 	 * @param {string} mPropertyBag.reference - Component reference
@@ -533,7 +531,7 @@ sap.ui.define([
 	 * @param {object} mPropertyBag - Object with the necessary properties
 	 * @param {string} mPropertyBag.reference - Flex reference
 	 * @param {string} mPropertyBag.content - Variant section content
-	 * @param {sap.ui.fl.Change | sap.ui.fl.Variant} mPropertyBag.changeToBeAddedOrDeleted - Flex object to be added or deleted
+	 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject | sap.ui.fl.apply._internal.flexObjects.FlVariant} mPropertyBag.changeToBeAddedOrDeleted - Flex object to be added or deleted
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -553,10 +551,10 @@ sap.ui.define([
 
 		if (mPropertyBag.changeToBeAddedOrDeleted) {
 			switch (mPropertyBag.changeToBeAddedOrDeleted.getState()) {
-				case States.NEW:
+				case States.LifecycleState.NEW:
 					addChange(mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent(), oFlexObjects);
 					break;
-				case States.DELETE:
+				case States.LifecycleState.DELETE:
 					deleteChange(mPropertyBag.changeToBeAddedOrDeleted.convertToFileContent(), oFlexObjects);
 					break;
 				default:

package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/prepareVariantsMap.js

@@ -14,8 +14,9 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
-	"sap/ui/fl/Change",
-	"sap/ui/fl/LayerUtils"
+	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/registry/Settings"
 ], function(
 	each,
 	includes,
@@ -26,8 +27,9 @@ sap.ui.define([
 	Log,
 	VariantsApplyUtil,
 	FlexObjectFactory,
-	Change,
-	LayerUtils
+	States,
+	LayerUtils,
+	Settings
 ) {
 	"use strict";
 
@@ -50,8 +52,8 @@ sap.ui.define([
 	function addVariantDependentControlChanges(oVariantsMap, aVariantDependentChanges, sReference) {
 		var oVariantsMapClone = merge({}, oVariantsMap);
 		aVariantDependentChanges.forEach(function(oChange) {
-			var oChangeInstance = new Change(oChange);
-			oChangeInstance.setState(Change.states.PERSISTED);
+			var oChangeInstance = FlexObjectFactory.createFromFileContent(oChange);
+			oChangeInstance.setState(States.LifecycleState.PERSISTED);
 			var oVariantEntry = oVariantsMapClone[oChange.variantReference];
 			oVariantEntry = oVariantEntry || createStandardVariant(oChange.variantReference, sReference);
 			oVariantEntry.controlChanges.push(oChangeInstance);
@@ -124,6 +126,23 @@ sap.ui.define([
 		return oReferencedVariant;
 	}
 
+	// add missing user id (for variants created on the same session)
+	function addMissingUser(oVariantsMap) {
+		var oVariantsMapClone = merge({}, oVariantsMap);
+		values(oVariantsMapClone).forEach(function(oVariantEntry) {
+			var mSupportInformation = oVariantEntry.instance.getSupportInformation();
+			if (!mSupportInformation.user) {
+				var sUserId = Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().getUserId();
+				if (sUserId) {
+					mSupportInformation.user = sUserId;
+					oVariantEntry.instance.setSupportInformation(mSupportInformation);
+				}
+			}
+		});
+
+		return oVariantsMapClone;
+	}
+
 	// prepares initial map for variants
 	function getVariantsMap(oStorageResponse, sReference) {
 		var oVariantsMap = {};
@@ -133,6 +152,7 @@ sap.ui.define([
 		oVariantsMap = addVariantChanges(oVariantsMap, oStorageResponse.variantChanges, sReference);
 		oVariantsMap = filterInvisibleVariants(oVariantsMap);
 		oVariantsMap = resolveReferences(oVariantsMap, sReference);
+		oVariantsMap = addMissingUser(oVariantsMap);
 
 		return oVariantsMap;
 	}
@@ -300,7 +320,7 @@ sap.ui.define([
 
 	function getActiveChange(aChanges) {
 		if (aChanges.length > 0) {
-			return new Change(aChanges[aChanges.length - 1]);
+			return FlexObjectFactory.createFromFileContent(aChanges[aChanges.length - 1]);
 		}
 		return false;
 	}

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @experimental Since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

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

@@ -14,7 +14,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @experimental Since 1.47.0
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @experimental Since 1.43.0
 	 */
 	var RegistrationDelegator = {};

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @experimental Since 1.27.0
 	 */
 	var XmlPreprocessor = function() {};

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

@@ -10,7 +10,6 @@ sap.ui.define([
 	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
-	"sap/ui/fl/variants/VariantManagement",
 	"sap/ui/fl/Utils"
 ], function(
 	Log,
@@ -18,21 +17,30 @@ sap.ui.define([
 	Core,
 	Element,
 	URLHandler,
-	VariantManagement,
 	Utils
 ) {
 	"use strict";
 
+	var VARIANT_MODEL_NAME = "$FlexVariants";
+
 	/**
 	 * Provides an API for applications to work with control variants. See also {@link sap.ui.fl.variants.VariantManagement}.
 	 *
 	 * @name sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @experimental Since 1.67
 	 * @since 1.67
-	 * @version 1.108.0
+	 * @version 1.109.0
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{
+		/**
+		 * Returns the name of the Variant Model
+		 *
+		 * @returns {string} Name of the Variant Model
+		 */
+		getVariantModelName: function() {
+			return VARIANT_MODEL_NAME;
+		},
 
 		/**
 		 * Clears URL technical parameter <code>sap-ui-fl-control-variant-id</code> for control variants.
@@ -48,7 +56,7 @@ sap.ui.define([
 		clearVariantParameterInURL: function (mPropertyBag) {
 			var aUpdatedVariantParameters;
 			var oAppComponent = Utils.getAppComponentForControl(mPropertyBag.control);
-			var oVariantModel = oAppComponent && oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
+			var oVariantModel = oAppComponent && oAppComponent.getModel(VARIANT_MODEL_NAME);
 			if (!oVariantModel) {
 				//technical parameters are not updated, only URL hash is updated
 				Log.error("Variant model could not be found on the provided control");
@@ -56,7 +64,7 @@ sap.ui.define([
 			}
 
 			//check if variant for the passed variant management control is present
-			if (mPropertyBag.control instanceof VariantManagement) {
+			if (mPropertyBag.control.isA("sap.ui.fl.variants.VariantManagement")) {
 				var sVariantManagementReference = oVariantModel.getLocalId(mPropertyBag.control.getId(), oAppComponent);
 				var mCleansedParametersWithIndex = URLHandler.removeURLParameterForVariantManagement({
 					model: oVariantModel,
@@ -112,7 +120,7 @@ sap.ui.define([
 				return logAndReject(Error("A valid variant management control or component (instance or ID) should be passed as parameter"));
 			}
 
-			var oVariantModel = oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
+			var oVariantModel = oAppComponent.getModel(VARIANT_MODEL_NAME);
 			if (!oVariantModel) {
 				return logAndReject(Error("No variant management model found for the passed control or application component"));
 			}
@@ -155,7 +163,7 @@ sap.ui.define([
 		attachVariantApplied: function(mPropertyBag) {
 			var oControl = mPropertyBag.selector.id && sap.ui.getCore().byId(mPropertyBag.selector.id) || mPropertyBag.selector;
 			var oAppComponent = Utils.getAppComponentForControl(oControl);
-			var oVariantModel = oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
+			var oVariantModel = oAppComponent.getModel(VARIANT_MODEL_NAME);
 
 			oVariantModel.attachVariantApplied({
 				vmControlId: mPropertyBag.vmControlId,
@@ -177,7 +185,7 @@ sap.ui.define([
 		detachVariantApplied: function(mPropertyBag) {
 			var oControl = mPropertyBag.selector.id && sap.ui.getCore().byId(mPropertyBag.selector.id) || mPropertyBag.selector;
 			var oAppComponent = Utils.getAppComponentForControl(oControl);
-			var oVariantModel = oAppComponent.getModel(Utils.VARIANT_MODEL_NAME);
+			var oVariantModel = oAppComponent.getModel(VARIANT_MODEL_NAME);
 			oVariantModel.detachVariantApplied(mPropertyBag.vmControlId, oControl.getId());
 		}
 	};