@openui5/sap.ui.fl 1.97.1 → 1.98.0

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -139,7 +139,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSouce
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js

@@ -25,7 +25,7 @@ sap.ui.define([
      *
      * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
      * @experimental
-     * @version 1.97.1
+     * @version 1.98.0
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @experimental
 	 * @since 1.86
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @experimental
 	 * @since 1.87
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
 	 * @experimental
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function () {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * Checks if the parsed shell hash contains outdated variant parameters.
 	 *
 	 * @param {array} aNewHashParameters - Variant URL Parameters
-	 * @param {sap.ui.fl.Model} oModel - Variant model
+	 * @param {sap.ui.fl.variants.VariantModel} oModel - Variant model
 	 *
 	 * @returns {object} oIfUpdateIsRequiredWithCurrentVariants
 	 * @returns {boolean} oIfUpdateIsRequiredWithCurrentVariants.updateRequired - If update is required
@@ -176,7 +176,10 @@ sap.ui.define([
 		var oParsedHash = oURLParsingService && oURLParsingService.parseShellHash(hasher.getHash());
 
 		if (oParsedHash && oParsedHash.params) {
-			var mTechnicalParameters = Utils.getTechnicalParametersForComponent(oModel.oAppComponent);
+			var mTechnicalParameters = oModel.oAppComponent
+				&& oModel.oAppComponent.getComponentData
+				&& oModel.oAppComponent.getComponentData()
+				&& oModel.oAppComponent.getComponentData().technicalParameters;
 			// if mTechnicalParameters are not available we write a warning and continue updating the hash
 			if (!mTechnicalParameters) {
 				Log.warning("Component instance not provided, so technical parameters in component data and browser history remain unchanged");
@@ -382,8 +385,7 @@ sap.ui.define([
 				// this promise is not returned since the component is getting destroyed,
 				// which will also destroy the variant model anyway,
 				// but this is just to ensure the model is in sync with the variants state (which is persisted)
-				mPropertyBag.model.resetMap(true)
-					.then(mPropertyBag.model.destroy.bind(mPropertyBag.model));
+				mPropertyBag.model.destroy();
 				mPropertyBag.model.oComponentDestroyObserver.unobserve(mPropertyBag.model.oAppComponent, {destroy: true});
 				mPropertyBag.model.oComponentDestroyObserver.destroy();
 			});

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

@@ -32,7 +32,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 */
 	var Processor;
 

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

@@ -34,14 +34,13 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Layer} sLayer - Layer of the variant
 	 * @param {sap.ui.fl.Layer} [sActiveLayer] - Layer in which the operation may take place
 	 * @param {string} sUserId - ID of the variants creator
-	 * @param {boolean} bAllowedForAnyLayer - Flag if the operation is also allowed on objects from any layers
 	 * @returns {boolean} <code>true</code> if the variant is read only
 	 *
 	 * @private
 	 */
-	 function checkLayerAndUserAuthorization(sLayer, sActiveLayer, sUserId, bAllowedForAnyLayer) {
+	 function checkLayerAndUserAuthorization(sLayer, sActiveLayer, sUserId) {
 		if (sActiveLayer) {
-			return bAllowedForAnyLayer || sLayer === sActiveLayer;
+			return sLayer === sActiveLayer;
 		} else if (sLayer === Layer.USER) {
 			return true;
 		}
@@ -181,14 +180,14 @@ sap.ui.define([
 	/**
 	 * Checks whenever the variant can be renamed updating the entity or crating an <code>updateChange</code>.
 	 *
-	 * @param {sap.ui.fl.Layer} sLayer - Layer in which the edition may take place
+	 * @param {sap.ui.fl.Layer} [sLayer] - Layer in which the edition may take place
 	 *
 	 * @returns {boolean} <code>true</code> if the variant can be updated
 	 *
 	 * @public
 	 */
 	CompVariant.prototype.isRenameEnabled = function (sLayer) {
-		return this.isEditEnabled(sLayer) && isRenameEnableDueToOriginalLanguage(this.getOriginalLanguage()) && !this.getStandardVariant();
+		return !this.getStandardVariant() && this.isEditEnabled(sLayer) && isRenameEnableDueToOriginalLanguage(this._oDefinition.content.originalLanguage);
 	};
 
 	/**
@@ -201,22 +200,23 @@ sap.ui.define([
 	 * @public
 	 */
 	CompVariant.prototype.isEditEnabled = function (sActiveLayer) {
-		return isOriginSystem(this.getSourceSystem(), this.getSourceClient())
-			&& checkLayerAndUserAuthorization(this.getLayer(), sActiveLayer, this.getOwnerId(), true)
-			&& (sActiveLayer && LayerUtils.isDeveloperLayer(sActiveLayer) || !this.getStandardVariant());
+		var bDeveloperLayer = sActiveLayer && LayerUtils.isDeveloperLayer(sActiveLayer);
+		var bOriginSystem = isOriginSystem(this._oDefinition.sourceSystem, this._oDefinition.sourceClient);
+		var bUserAuthorized = checkLayerAndUserAuthorization(this.getLayer(), sActiveLayer, this.getOwnerId());
+		return bDeveloperLayer || bOriginSystem && bUserAuthorized;
 	};
 
 	/**
 	 * Checks whenever the variant can be deleted.
 	 *
-	 * @param {sap.ui.fl.Layer} sLayer - Layer in which the deletion may take place
+	 * @param {sap.ui.fl.Layer} [sLayer] - Layer in which the deletion may take place
 	 *
 	 * @returns {boolean} <code>true</code> if the variant file can be deleted
 	 *
 	 * @public
 	 */
 	CompVariant.prototype.isDeleteEnabled = function (sLayer) {
-		return isOriginSystem(this.getSourceSystem(), this.getSourceClient())
+		return isOriginSystem(this._oDefinition.sourceSystem, this._oDefinition.sourceClient)
 			&& checkLayerAndUserAuthorization(this.getLayer(), sLayer, this.getOwnerId())
 			&& !this.getStandardVariant();
 	};
@@ -266,6 +266,11 @@ sap.ui.define([
 		return this.getProperty("content");
 	};
 
+
+	CompVariant.prototype.getOwnerId = function() {
+		return this._oDefinition.support ? this._oDefinition.support.user : "";
+	};
+
 	/**
 	 * Sets the content of the runtime instance as well as the persistent representation.
 	 * This results in setting the definition as well as flagging the entity as 'dirty'.

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.RevertData
 	 * @private
 	 * @ui5-restricted
-	 * @since Since 1.87.0
+	 * @since 1.87.0
 	 */
 	return RevertData.extend("sap.ui.fl.apply._internal.flexObjects.CompVariantRevertData", {
 		metadata: {

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @private
 	 * @ui5-restricted
-	 * @since Since 1.90.0
+	 * @since 1.90.0
 	 */
 	return ManagedObject.extend("sap.ui.fl.apply._internal.flexObjects.RevertData", {
 		metadata: {

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -83,6 +83,8 @@ sap.ui.define([
 	var _mInitPromises = {};
 	var _oShellNavigationService;
 	var _oURLParsingService;
+	var _oChangePersistenceFactory;
+	var _oFlexControllerFactory;
 	var _mFlexObjectInfo = {
 		appDescriptorChanges: {
 			prepareFunction: prepareAppDescriptorMap,
@@ -294,6 +296,22 @@ sap.ui.define([
 		return undefined;
 	}
 
+	// TODO: get rid of the following module dependencies as far as the change state
+	//       is migrated from changePersistenceFactory to the FlexState
+	function lazyLoadModules() {
+		return Promise.all([
+			Utils.requireAsync("sap/ui/fl/ChangePersistenceFactory"),
+			Utils.requireAsync("sap/ui/fl/FlexControllerFactory")
+		])
+			.then(function(aModules) {
+				_oChangePersistenceFactory = aModules[0];
+				_oFlexControllerFactory = aModules[1];
+			})
+			.catch(function(oError) {
+				Log.error("Error loading modules: " + oError.message);
+			});
+	}
+
 	/**
 	 * Initializes the FlexState for a given reference. A request for the flex data is sent to the Loader and the response is saved.
 	 * The FlexState can only be initialized once, every subsequent init call will just resolve as soon as it is initialized.
@@ -305,12 +323,15 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.rawManifest] - Raw JSON manifest that belongs to current component
 	 * @param {string} [mPropertyBag.componentData] - Component data of the current component
 	 * @param {object} [mPropertyBag.asyncHints] - Async hints passed from the app index to the component processing
-	 * @param {number} [mPropertyBag.version] - Number of the version in which the state should be initialized
+	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
 	 * @param {boolean} [mPropertyBag.partialFlexState=false] - if true state is initialized partially and does not include flex bundles
 	 * @returns {promise<undefined>} Resolves a promise as soon as FlexState is initialized
 	 */
 	FlexState.initialize = function(mPropertyBag) {
-		return loadUShellServices()
+		return Promise.all([
+			loadUShellServices(),
+			lazyLoadModules()
+		])
 			.then(function() {
 				enhancePropertyBag(mPropertyBag);
 				var sFlexReference = mPropertyBag.reference;
@@ -345,7 +366,7 @@ sap.ui.define([
 	 * @param {string} [mPropertyBag.reference] - Flex reference of the app
 	 * @param {object} [mPropertyBag.manifest] - Manifest that belongs to actual component
 	 * @param {string} [mPropertyBag.componentData] - Component data of the current component
-	 * @param {number} [mPropertyBag.version] - Number of the version in which the state should be initialized
+	 * @param {string} [mPropertyBag.version] - Number of the version in which the state should be initialized
 	 * @returns {promise<undefined>} Resolves a promise as soon as FlexState is initialized again
 	 */
 	FlexState.clearAndInitialize = function(mPropertyBag) {
@@ -362,6 +383,14 @@ sap.ui.define([
 			deRegisterMaxLayerHandler(sReference);
 			delete _mInstances[sReference];
 			delete _mInitPromises[sReference];
+			// TODO: get rid of the following deletes as far as the change state
+			//       is migrated from changePersistenceFactory to the FlexState
+			if (_oChangePersistenceFactory && _oChangePersistenceFactory._instanceCache) {
+				delete _oChangePersistenceFactory._instanceCache[sReference];
+			}
+			if (_oFlexControllerFactory && _oFlexControllerFactory._instanceCache) {
+				delete _oFlexControllerFactory._instanceCache[sReference];
+			}
 		} else {
 			Object.keys(_mInstances).forEach(function(sReference) {
 				deRegisterMaxLayerHandler(sReference);
@@ -461,6 +490,7 @@ sap.ui.define([
 				return _mInstances[sReference].unfilteredStorageResponse;
 			});
 		}
+		return undefined;
 	};
 	// temporary function until the maps are ready
 	FlexState.getFlexObjectsFromStorageResponse = function(sReference) {

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

@@ -40,8 +40,13 @@ sap.ui.define([
 
 						if (oFlexItem.dependentSelector) {
 							Object.keys(oFlexItem.dependentSelector).forEach(function (sCategory) {
-								oFlexItem.dependentSelector[sCategory] =
-                                    oFlexItem.dependentSelector[sCategory].map(getIdIsLocalTrueObject);
+								if (Array.isArray(oFlexItem.dependentSelector[sCategory])) {
+									oFlexItem.dependentSelector[sCategory] =
+										oFlexItem.dependentSelector[sCategory].map(getIdIsLocalTrueObject);
+								} else {
+									oFlexItem.dependentSelector[sCategory] =
+										getIdIsLocalTrueObject(oFlexItem.dependentSelector[sCategory]);
+								}
 							});
 						}
 					}
@@ -70,7 +75,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */
@@ -108,6 +113,7 @@ sap.ui.define([
 			var sCacheKey = mPropertyBag.reInitialize ? undefined : ManifestUtils.getCacheKeyFromAsyncHints(mPropertyBag.reference, mPropertyBag.asyncHints);
 
 			return ApplyStorage.loadFlexData({
+				preview: ManifestUtils.getPreviewSectionFromAsyncHints(mPropertyBag.asyncHints),
 				reference: mPropertyBag.reference,
 				componentName: sComponentName,
 				cacheKey: sCacheKey,

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

@@ -20,15 +20,11 @@ function(
 	}
 
 	function getFlAsyncHint(oAsyncHints) {
-		var oFlAsyncHint;
-
-		oAsyncHints.requests.some(function(oAsyncHint) {
-			if (oAsyncHint.name === "sap.ui.fl.changes") {
-				oFlAsyncHint = oAsyncHint;
-			}
-		});
-
-		return oFlAsyncHint;
+		if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
+			return oAsyncHints.requests.find(function(oAsyncHint) {
+				return oAsyncHint.name === "sap.ui.fl.changes";
+			});
+		}
 	}
 
 	/**
@@ -37,7 +33,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 */
 	var ManifestUtils = {
@@ -49,8 +45,8 @@ function(
 		 */
 		getFlexReferenceForControl: function (oControl) {
 			var oAppComponent = Utils.getAppComponentForControl(oControl);
-			return ManifestUtils.getFlexReference({
-				manifest: oAppComponent.getManifest(),
+			return oAppComponent && ManifestUtils.getFlexReference({
+				manifest: oAppComponent.getManifestObject(),
 				componentData: oAppComponent.getComponentData()
 			});
 		},
@@ -85,21 +81,24 @@ function(
 		},
 
 		getCacheKeyFromAsyncHints: function(sReference, oAsyncHints) {
-			if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
-				var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
-				if (oFlAsyncHint && oFlAsyncHint.reference === sReference) {
-					return oFlAsyncHint.cachebusterToken || "<NO CHANGES>";
-				}
+			var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
+			if (oFlAsyncHint && oFlAsyncHint.reference === sReference) {
+				return oFlAsyncHint.cachebusterToken || "<NO CHANGES>";
+			}
+		},
+
+		getPreviewSectionFromAsyncHints: function(oAsyncHints) {
+			var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
+			if (oFlAsyncHint) {
+				return oFlAsyncHint.preview;
 			}
 		},
 
 		getChangeManifestFromAsyncHints: function(oAsyncHints) {
 			// whenever there is a back end providing a fl async hint it is also not necessary to merge on client side
-			if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
-				var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
-				if (oFlAsyncHint) {
-					return false;
-				}
+			var oFlAsyncHint = getFlAsyncHint(oAsyncHints);
+			if (oFlAsyncHint) {
+				return false;
 			}
 
 			return true;

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.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted
 	 */

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.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -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.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -114,7 +114,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -179,7 +179,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

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

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -482,7 +482,8 @@ sap.ui.define([
 									favorite: oVariant.content.content.favorite,
 									executeOnSelect: oVariant.content.content.executeOnSelect,
 									visible: oVariant.content.content.visible,
-									author: ObjectPath.get("content.support.user", oVariant)
+									author: ObjectPath.get("content.support.user", oVariant),
+									contexts: oVariant.content.contexts
 								})
 							);
 					});
@@ -587,21 +588,16 @@ sap.ui.define([
 			reference: mPropertyBag.reference,
 			changeInstance: true
 		});
-		var aSelectors = aCurrentVariantChanges.reduce(function(aCurrentSelectors, oChange) {
-			if (Utils.indexOfObject(aCurrentSelectors, oChange.getSelector()) === -1) {
-				aCurrentSelectors.push(oChange.getSelector());
-			}
-			return aCurrentSelectors;
-		}, []);
-		var aControls = [];
-		aSelectors.map(function(oSelector) {
+		var aControls = aCurrentVariantChanges.reduce(function(aCurrentControls, oChange) {
+			var oSelector = oChange.getSelector();
 			var oControl = JsControlTreeModifier.bySelector(oSelector, mPropertyBag.appComponent);
-			if (oControl) {
-				aControls.push(oControl);
+			if (oControl && Utils.indexOfObject(aCurrentControls, {selector: oControl}) === -1) {
+				aCurrentControls.push({selector: oControl});
 			}
-		});
+			return aCurrentControls;
+		}, []);
 
-		return mPropertyBag.flexController.waitForChangesToBeApplied(aControls);
+		return aControls.length ? mPropertyBag.flexController.waitForChangesToBeApplied(aControls) : Promise.resolve();
 	};
 
 	return VariantManagementState;

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

@@ -285,6 +285,12 @@ sap.ui.define([
 						oVariantClone.content.content.visible = oActiveChange.getContent().visible;
 					}
 					break;
+				case "setContexts":
+					oActiveChange = getActiveChange(aChanges);
+					if (oActiveChange) {
+						oVariantClone.content.contexts = oActiveChange.getContent().contexts;
+					}
+					break;
 				default:
 					Log.error("No valid changes on variant " + oVariantClone.content.content.title + " available");
 			}

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @experimental Since 1.67
 	 * @since 1.67
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

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

@@ -81,4 +81,4 @@ sap.ui.define([
 	};
 
 	return DelegateMediatorAPI;
-}, /* bExport= */false);
+});