@openui5/sap.ui.fl 1.96.1 → 1.97.1

package/src/sap/ui/fl/apply/_internal/controlVariants/Utils.js

@@ -1,17 +1,19 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"sap/base/util/includes",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/fl/Variant"
+	"sap/ui/core/Core",
+	"sap/ui/fl/Variant",
+	"sap/ui/fl/Utils"
 ], function(
-	includes,
 	JsControlTreeModifier,
-	Variant
+	Core,
+	Variant,
+	Utils
 ) {
 	"use strict";
 
@@ -26,6 +28,21 @@ sap.ui.define([
 		return getAssociatedControlId(aAssociatedControlIds, oControl.getParent());
 	}
 
+	function getVariantManagementControlIds(oControl, bUseStaticArea) {
+		var oAppComponent = Utils.getAppComponentForControl(oControl);
+		var oRootControl = oAppComponent.getRootControl();
+		var aVMControls = [];
+		if (!bUseStaticArea && oRootControl.getDomRef()) {
+			aVMControls = Array.from(oRootControl.getDomRef().querySelectorAll(".sapUiFlVarMngmt"));
+		}
+		if (bUseStaticArea || aVMControls.length === 0) {
+			aVMControls = Array.from(Core.getStaticAreaRef().querySelectorAll(".sapUiFlVarMngmt"));
+		}
+		return aVMControls.map(function (oVariantManagementNode) {
+			return oVariantManagementNode.id;
+		});
+	}
+
 	var VariantsApplyUtil = {
 		DEFAULT_AUTHOR: "SAP",
 
@@ -54,11 +71,11 @@ sap.ui.define([
 		/**
 		 * Create a variant
 		 *
-		 * @param {object} mPropertyBag
+		 * @param {object} mPropertyBag - Property Bag
 		 * @param {object} mPropertyBag.variantSpecificData - Property bag (nvp) holding the variant information (see sap.ui.fl.Variant#createInitialFileContentoPropertyBag).
 		 * The property "mPropertyBag.variantSpecificData.content.packageName" is set to $TMP internally since flex changes are always local when they are created.
 		 * @param {sap.ui.fl.variants.VariantModel} mPropertyBag.model - Variant model
-		 * @returns {sap.ui.fl.Variant} the created variant
+		 * @returns {sap.ui.fl.Variant} The created variant
 		 * @public
 		 */
 		createVariant: function(mPropertyBag) {
@@ -87,13 +104,17 @@ sap.ui.define([
 		 * A prerequisite for this to work is that the variant management control is reachable via the <code>getParent</code> function.
 		 *
 		 * @param {sap.ui.core.Control} oControl - Control instance
-		 * @param {string[]} aVMControlIds - Array of variant management control IDs
+		 * @param {string[]} [aVMControlIds] - Array of variant management control IDs. If not given the IDs are derived from the DOM structure.
+		 * @param {boolean} [bUseStaticArea=false] - If flag is set to true then the static area is used to determine the variant management control
 		 * @returns {string} The ID of the responsible variant management control
 		 */
-		getRelevantVariantManagementControlId: function(oControl, aVMControlIds) {
+		getRelevantVariantManagementControlId: function(oControl, aVMControlIds, bUseStaticArea) {
 			var oAssociatedControls = {};
+			if (!aVMControlIds || !aVMControlIds.length) {
+				aVMControlIds = getVariantManagementControlIds(oControl, bUseStaticArea);
+			}
 			var aAssociatedControlIds = aVMControlIds.reduce(function(aCurrentControlIds, sVMControlId) {
-				var oVMControl = sap.ui.getCore().byId(sVMControlId);
+				var oVMControl = Core.byId(sVMControlId);
 				var aForControls = oVMControl.getFor();
 				aForControls.forEach(function(sControlId) {
 					oAssociatedControls[sControlId] = sVMControlId;
@@ -103,6 +124,15 @@ sap.ui.define([
 
 			var sAssociatedVMControlId = getAssociatedControlId(aAssociatedControlIds, oControl);
 			return oAssociatedControls[sAssociatedVMControlId];
+		},
+
+		belongsToVariantManagement: function(oElement) {
+			var aVMControlIds = getVariantManagementControlIds(oElement);
+			return !!VariantsApplyUtil.getRelevantVariantManagementControlId(oElement, aVMControlIds);
+		},
+
+		getAllVariantManagementControlIds: function(oElement) {
+			return getVariantManagementControlIds(oElement);
 		}
 	};
 

package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js

@@ -1,6 +1,6 @@
 /*!
 * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
 */
 
@@ -32,7 +32,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 */
 	var Processor;
 

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariantRevertData.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/apply/_internal/flexObjects/RevertData.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/fl/apply/_internal/flexObjects/States.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([], function () {

package/src/sap/ui/fl/apply/_internal/flexObjects/UpdatableChange.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -404,6 +404,7 @@ sap.ui.define([
 	 * The next initialize call will add it again.
 	 *
 	 * @param {string} sReference - Flex reference of the app
+	 * @param {string} sComponentId - Component instance ID
 	 */
 	FlexState.clearFilteredResponse = function(sReference, sComponentId) {
 		if (

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -34,25 +34,18 @@ sap.ui.define([
 				mFlexData.variantDependentControlChanges,
 				mFlexData.variantManagementChanges
 			].forEach(function (aFlexItems) {
-				// a for is used due to the alteration of the array and its length
-				for (var i = aFlexItems.length - 1; i >= 0; i--) {
-					var oFlexItem = aFlexItems[i];
+				aFlexItems.forEach(function (oFlexItem) {
 					if (!oFlexItem.selector.idIsLocal) {
-						// ensure the UID stays the same to send the correct ID on a condensing request (delete section)
-						var oFlexItemCopy = deepClone(oFlexItem);
-						oFlexItem.cloned = true;
-						oFlexItemCopy.selector = getIdIsLocalTrueObject(oFlexItemCopy.selector);
+						oFlexItem.selector = getIdIsLocalTrueObject(oFlexItem.selector);
 
-						// do the same for dependentSelectors
-						if (oFlexItemCopy.dependentSelector) {
-							Object.keys(oFlexItemCopy.dependentSelector).forEach(function (oFlexItemCopy, sCategory) {
-								oFlexItemCopy.dependentSelector[sCategory] = oFlexItemCopy.dependentSelector[sCategory].map(getIdIsLocalTrueObject);
-							}.bind(undefined, oFlexItemCopy));
+						if (oFlexItem.dependentSelector) {
+							Object.keys(oFlexItem.dependentSelector).forEach(function (sCategory) {
+								oFlexItem.dependentSelector[sCategory] =
+                                    oFlexItem.dependentSelector[sCategory].map(getIdIsLocalTrueObject);
+							});
 						}
-
-						aFlexItems.splice(i, 0, oFlexItemCopy);
 					}
-				}
+				});
 			});
 		}
 
@@ -77,7 +70,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -37,7 +37,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 */
 	var ManifestUtils = {

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -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.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Prepares the AppDescriptorMap from the flex response
 	 *
-	 * @param {object} mPropertyBag
+	 * @param {object} mPropertyBag - Property Bag
 	 * @param {object} [mPropertyBag.storageResponse.changes.appDescriptorChanges] - All app descriptor changes
 	 *
 	 * @returns {object} The prepared map of App Descriptors

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @experimental Since 1.79
 	 * @since 1.79
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -114,7 +114,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -179,7 +179,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.96.1
+		 * @version 1.97.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -54,9 +54,9 @@ sap.ui.define([
 	}
 
 	function buildSectionMap(mCompSection, sSubSection, mCompVariants) {
-		var oClass = sSubSection === "variants" ? CompVariant : UpdatableChange;
+		var Class = sSubSection === "variants" ? CompVariant : UpdatableChange;
 		var aFlexObjects = mCompSection[sSubSection].map(function (oCompVariantChangeDefinition) {
-			var oFlexObject = new oClass(oCompVariantChangeDefinition);
+			var oFlexObject = new Class(oCompVariantChangeDefinition);
 			oFlexObject.setState(States.PERSISTED); // prevent persisting these anew
 			return oFlexObject;
 		});

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

@@ -1,16 +1,14 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"sap/base/util/includes",
 	"sap/base/util/restricted/_pick",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/changes/Reverter"
 ], function(
-	includes,
 	_pick,
 	VariantManagementState,
 	Reverter
@@ -95,7 +93,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -103,7 +101,7 @@ sap.ui.define([
 		/**
 		 * Switches variants.
 		 *
-		 * @param {object} mPropertyBag
+		 * @param {object} mPropertyBag - Property Bag
 		 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - Flex controller
 		 * @param {string} mPropertyBag.vmReference - Variant management reference
 		 * @param {string} mPropertyBag.reference - Flex reference

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -9,9 +9,7 @@ sap.ui.define([
 	"sap/base/util/restricted/_pick",
 	"sap/base/util/includes",
 	"sap/base/util/isEmptyObject",
-	"sap/base/util/merge",
 	"sap/base/util/ObjectPath",
-	"sap/base/util/each",
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
@@ -26,9 +24,7 @@ sap.ui.define([
 	_pick,
 	includes,
 	isEmptyObject,
-	merge,
 	ObjectPath,
-	each,
 	Log,
 	JsControlTreeModifier,
 	VariantsApplyUtil,
@@ -47,7 +43,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -151,6 +147,7 @@ sap.ui.define([
 	 * Resets variant management state
 	 *
 	 * @param {string} sReference - Component reference
+	 * @param {string} sComponentId - Component instance ID
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -168,6 +165,7 @@ sap.ui.define([
 	 * @param {String} mPropertyBag.vmReference - Variant management reference
 	 * @param {String} mPropertyBag.vReference - ID of the variant
 	 * @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
 	 * @param {boolean} [mPropertyBag.changeInstance] <code>true</code> if each change has to be an instance of <code>sap.ui.fl.Change</code>
 	 *
 	 * @returns {object[]|sap.ui.fl.Change[]} All changes of the variant
@@ -178,7 +176,12 @@ sap.ui.define([
 		var aResult = [];
 		var oVariant = VariantManagementState.getVariant(mPropertyBag);
 		if (oVariant) {
-			aResult = oVariant.controlChanges;
+			aResult = oVariant.controlChanges.filter(function(oChange) {
+				return (
+					mPropertyBag.includeDirtyChanges !== false
+					|| oChange.getState() === Change.states.PERSISTED
+				);
+			});
 			if (!mPropertyBag.changeInstance) {
 				aResult = aResult.map(function(oChange) {
 					return oChange.getDefinition();
@@ -431,15 +434,14 @@ sap.ui.define([
 				|| !mPropertyBag.vmReference
 			) {
 				var sCurrentVReference = oVariantsMap[sVMReference].currentVariant ? "currentVariant" : "defaultVariant";
-				var mArguments = {
+				var mArguments = Object.assign({}, mPropertyBag, {
 					vmReference: sVMReference,
 					vReference: oVariantsMap[sVMReference][sCurrentVReference],
-					reference: mPropertyBag.reference,
-					changeInstance: mPropertyBag.changeInstance
-				};
+					includeDirtyChanges: false
+				});
 
 				// Concatenate with the previous flex changes
-				return aInitialChanges.concat(VariantManagementState.getControlChangesForVariant(Object.assign({}, mPropertyBag, mArguments)));
+				return aInitialChanges.concat(VariantManagementState.getControlChangesForVariant(mArguments));
 			}
 			return aInitialChanges;
 		}, []);

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -337,7 +337,7 @@ sap.ui.define([
 	/**
 	 * Prepares the variants map from the flex response for the passed flex state
 	 *
-	 * @param {object} mPropertyBag
+	 * @param {object} mPropertyBag - Property bag
 	 * @param {object} mPropertyBag.storageResponse - Filtered flex response
 	 * @param {object} mPropertyBag.unfilteredStorageResponse - Unfiltered flex response
 	 * @param {string} mPropertyBag.componentId - Component id

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

@@ -1,16 +1,24 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/base/Log",
-	"sap/ui/fl/ControlPersonalizationAPI",
+	"sap/ui/core/Component",
+	"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,
-	OldControlPersonalizationAPI,
+	Component,
+	Core,
+	Element,
+	URLHandler,
+	VariantManagement,
 	Utils
 ) {
 	"use strict";
@@ -21,7 +29,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @experimental Since 1.67
 	 * @since 1.67
-	 * @version 1.96.1
+	 * @version 1.97.1
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{
@@ -38,7 +46,33 @@ sap.ui.define([
 		 * @public
 		 */
 		clearVariantParameterInURL: function (mPropertyBag) {
-			OldControlPersonalizationAPI.clearVariantParameterInURL(mPropertyBag.control);
+			var aUpdatedVariantParameters;
+			var oAppComponent = Utils.getAppComponentForControl(mPropertyBag.control);
+			var oVariantModel = oAppComponent && oAppComponent.getModel(Utils.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");
+				return;
+			}
+
+			//check if variant for the passed variant management control is present
+			if (mPropertyBag.control instanceof VariantManagement) {
+				var sVariantManagementReference = oVariantModel.getLocalId(mPropertyBag.control.getId(), oAppComponent);
+				var mCleansedParametersWithIndex = URLHandler.removeURLParameterForVariantManagement({
+					model: oVariantModel,
+					vmReference: sVariantManagementReference
+				});
+				aUpdatedVariantParameters = mCleansedParametersWithIndex.parameters;
+			}
+
+			//both technical parameters and URL hash updated
+			URLHandler.update({
+				parameters: aUpdatedVariantParameters || [],
+				updateURL: true,
+				updateHashEntry: !!oVariantModel,
+				model: oVariantModel || {},
+				silent: !oVariantModel
+			});
 		},
 
 		/**
@@ -49,12 +83,58 @@ sap.ui.define([
 		 * @param {sap.ui.base.ManagedObject|string} mPropertyBag.element - Component or control (instance or ID) on which the <code>variantModel</code> is set
 		 * @param {string} mPropertyBag.variantReference - Reference to the variant that needs to be activated
 		 *
-		 * @returns {Promise} Promise that resolves after the variant is updated, or is rejected if an error occurs
+		 * @returns {Promise} Resolves after the variant is activated or rejects if an error occurs
 		 *
 		 * @public
 		 */
 		activateVariant: function(mPropertyBag) {
-			return OldControlPersonalizationAPI.activateVariant(mPropertyBag.element, mPropertyBag.variantReference);
+			function logAndReject(oError) {
+				Log.error(oError);
+				return Promise.reject(oError);
+			}
+
+			var oElement;
+			if (typeof mPropertyBag.element === "string") {
+				oElement = Component.get(mPropertyBag.element);
+				if (!(oElement instanceof Component)) {
+					oElement = Core.byId(mPropertyBag.element);
+
+					if (!(oElement instanceof Element)) {
+						return logAndReject(Error("No valid component or control found for the provided ID"));
+					}
+				}
+			} else if (mPropertyBag.element instanceof Component || mPropertyBag.element instanceof Element) {
+				oElement = mPropertyBag.element;
+			}
+
+			var oAppComponent = Utils.getAppComponentForControl(oElement);
+			if (!oAppComponent) {
+				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);
+			if (!oVariantModel) {
+				return logAndReject(Error("No variant management model found for the passed control or application component"));
+			}
+			var sVariantManagementReference = oVariantModel.getVariantManagementReference(mPropertyBag.variantReference).variantManagementReference;
+			if (!sVariantManagementReference) {
+				return logAndReject(Error("A valid control or component, and a valid variant/ID combination are required"));
+			}
+
+			// sap/fe is using this API very early during app start, sometimes before FlexState is initialized
+			return oVariantModel.waitForVMControlInit(sVariantManagementReference)
+
+			.then(function() {
+				return oVariantModel.updateCurrentVariant({
+					variantManagementReference: sVariantManagementReference,
+					newVariantReference: mPropertyBag.variantReference,
+					appComponent: oAppComponent
+				});
+			})
+			.catch(function(oError) {
+				Log.error(oError);
+				throw oError;
+			});
 		},
 
 		/**

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

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */