@openui5/sap.ui.fl 1.92.0 → 1.95.0

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -17,6 +17,8 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	var Reverter = {};
+
 	function _waitForApplyIfNecessary(oChange) {
 		if (!oChange.isApplyProcessFinished() && oChange.hasApplyProcessStarted()) {
 			// wait for the change to be applied
@@ -30,98 +32,102 @@ sap.ui.define([
 		return Promise.resolve();
 	}
 
-	var Reverter = {
-		/**
-		 * Reverts a specific change on the passed control if it is currently applied.
-		 *
-		 * @param {sap.ui.fl.Change} oChange - Change object that should be reverted on the passed control
-		 * @param {sap.ui.core.Control} oControl - Control which is the target of the passed change
-		 * @param {object} mPropertyBag - Object with parameters as properties
-		 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Component instance that is currently loading
-		 * @param {object} mPropertyBag.appDescriptor - App descriptor containing the metadata of the current application
-		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Polymorph reuse operations handling the changes on the given view type
-		 * @param {sap.ui.core.mvc.View} mPropertyBag.view - View to process
-		 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Resolving Promise/FakePromise with either the control (success) or <code>false</code> (failure) as value
-		 */
-		revertChangeOnControl: function(oChange, oControl, mPropertyBag) {
-			var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
-			var oChangeHandler;
-
-			return Utils.getChangeHandler(oChange, mControl, mPropertyBag).then(function(oReturnedChangeHandler) {
-				oChangeHandler = oReturnedChangeHandler;
-			})
-
-			.then(_waitForApplyIfNecessary.bind(null, oChange))
-
-			.then(function() {
-				if (oChange.isApplyProcessFinished()) {
-					oChange.startReverting();
-					return oChangeHandler.revertChange(oChange, mControl.control, mPropertyBag);
-				}
-				throw Error("Change was never applied");
+	function revertAndDeleteChangeOnControl(oChange, oControl, mRevertProperties, mPropertyBag) {
+		return Reverter.revertChangeOnControl(oChange, oControl, mRevertProperties)
+			.then(function(vRevertResult) {
+				return FlexCustomData.destroyAppliedCustomData(vRevertResult || oControl, oChange, mPropertyBag.modifier)
+					.then(function () {
+						return !!vRevertResult;
+					});
 			})
-
-			.then(function() {
-				// After revert the relevant control for the change might have changed, therefore it must be retrieved again (e.g. stashing)
-				mControl.control = mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent, mPropertyBag.view);
-				if (mControl.bTemplateAffected) {
-					mPropertyBag.modifier.updateAggregation(mControl.control, oChange.getContent().boundAggregation);
+			.then(function(bSuccess) {
+				if (bSuccess) {
+					// TODO should be changed as soon as new flex persistence is in place
+					mPropertyBag.flexController._oChangePersistence._deleteChangeInMap(oChange);
 				}
-				oChange.markRevertFinished();
-				return mControl.control;
-			})
-
-			.catch(function(oError) {
-				var sErrorMessage = "Change could not be reverted: " + oError.message;
-				Log.error(sErrorMessage);
-				oChange.markRevertFinished(sErrorMessage);
-				return false;
 			});
-		},
+	}
 
-		/**
-		 * Reverts all given changes in one app component.
-		 *
-		 * @param {sap.ui.fl.Change[]} aChanges - Array of changes to be reverted
-		 * @param {object} mPropertyBag - Object with additional properties
-		 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Component instance that is currently loading
-		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Polymorph reuse operations handling the changes on the given view type
-		 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - Instance of the flex controller the change is saved in
-		 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Promise/FakePromise that resolves as soon as all changes are reverted
-		 */
-		revertMultipleChanges: function(aChanges, mPropertyBag) {
-			var aPromiseStack = [];
-			aChanges.forEach(function(oChange) {
-				// Queued 'state' will be removed once the revert process is done
-				oChange.setQueuedForRevert();
-				aPromiseStack.push(function() {
-					var oSelector = oChange.getSelector && oChange.getSelector();
-					var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
-					if (!oControl) {
-						Log.warning("A flexibility change tries to revert changes on a nonexistent control with id " + oSelector.id);
-						return new FlUtils.FakePromise();
-					}
-					var mRevertProperties = {
-						modifier: mPropertyBag.modifier,
-						appComponent: mPropertyBag.appComponent,
-						view: FlUtils.getViewForControl(oControl)
-					};
+	/**
+	 * Reverts a specific change on the passed control if it is currently applied.
+	 *
+	 * @param {sap.ui.fl.Change} oChange - Change object that should be reverted on the passed control
+	 * @param {sap.ui.core.Control} oControl - Control which is the target of the passed change
+	 * @param {object} mPropertyBag - Object with parameters as properties
+	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Component instance that is currently loading
+	 * @param {object} mPropertyBag.appDescriptor - App descriptor containing the metadata of the current application
+	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Polymorph reuse operations handling the changes on the given view type
+	 * @param {sap.ui.core.mvc.View} mPropertyBag.view - View to process
+	 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Resolving Promise/FakePromise with either the control (success) or <code>false</code> (failure) as value
+	 */
+	Reverter.revertChangeOnControl = function(oChange, oControl, mPropertyBag) {
+		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
+		var oChangeHandler;
 
-					return Reverter.revertChangeOnControl(oChange, oControl, mRevertProperties).then(function(vRevertResult) {
-						FlexCustomData.destroyAppliedCustomData(vRevertResult || oControl, oChange, mPropertyBag.modifier);
-						return !!vRevertResult;
-					})
-					.then(function(bSuccess) {
-						if (bSuccess) {
-							// TODO should be changed as soon as new flex persistence is in place
-							mPropertyBag.flexController._oChangePersistence._deleteChangeInMap(oChange);
-						}
-					});
-				});
+		return Utils.getChangeHandler(oChange, mControl, mPropertyBag).then(function(oReturnedChangeHandler) {
+			oChangeHandler = oReturnedChangeHandler;
+		})
+		.then(_waitForApplyIfNecessary.bind(null, oChange))
+		.then(function() {
+			if (oChange.isApplyProcessFinished()) {
+				oChange.startReverting();
+				return oChangeHandler.revertChange(oChange, mControl.control, mPropertyBag);
+			}
+			throw Error("Change was never applied");
+		})
+		.then(function() {
+			// After revert the relevant control for the change might have changed, therefore it must be retrieved again (e.g. stashing)
+			mControl.control = mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent, mPropertyBag.view);
+			if (mControl.bTemplateAffected) {
+				return mPropertyBag.modifier.updateAggregation(mControl.control, oChange.getContent().boundAggregation);
+			}
+			return undefined;
+		})
+		.then(function () {
+			oChange.markRevertFinished();
+			return mControl.control;
+		})
+		.catch(function(oError) {
+			var sErrorMessage = "Change could not be reverted: " + oError.message;
+			Log.error(sErrorMessage);
+			oChange.markRevertFinished(sErrorMessage);
+			return false;
+		});
+	};
+
+	/**
+	 * Reverts all given changes in one app component.
+	 *
+	 * @param {sap.ui.fl.Change[]} aChanges - Array of changes to be reverted
+	 * @param {object} mPropertyBag - Object with additional properties
+	 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Component instance that is currently loading
+	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Polymorph reuse operations handling the changes on the given view type
+	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - Instance of the flex controller the change is saved in
+	 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Promise/FakePromise that resolves as soon as all changes are reverted
+	 */
+	Reverter.revertMultipleChanges = function(aChanges, mPropertyBag) {
+		var aPromiseStack = [];
+		aChanges.forEach(function(oChange) {
+			// Queued 'state' will be removed once the revert process is done
+			oChange.setQueuedForRevert();
+			aPromiseStack.push(function() {
+				var oSelector = oChange.getSelector && oChange.getSelector();
+				var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
+				if (!oControl) {
+					Log.warning("A flexibility change tries to revert changes on a nonexistent control with id " + oSelector.id);
+					return new FlUtils.FakePromise();
+				}
+				var mRevertProperties = {
+					modifier: mPropertyBag.modifier,
+					appComponent: mPropertyBag.appComponent,
+					view: FlUtils.getViewForControl(oControl)
+				};
+				return revertAndDeleteChangeOnControl(oChange, oControl, mRevertProperties, mPropertyBag);
 			});
+		});
 
-			return FlUtils.execPromiseQueueSequentially(aPromiseStack);
-		}
+		return FlUtils.execPromiseQueueSequentially(aPromiseStack);
 	};
+
 	return Reverter;
 });

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

@@ -20,11 +20,20 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.connectors.changes.Utils
 	 * @since 1.70
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
 
+	 function isDependencyStillValid(oChange, bHasChangeApplyFinishedCustomData) {
+		// if change is already applied OR if apply process has started,
+		// then dependency is no more valid
+		if (bHasChangeApplyFinishedCustomData || oChange.hasApplyProcessStarted()) {
+			return false;
+		}
+		return true;
+	}
+
 	var Utils = {
 		/**
 		 * Returns the control map containing control, controlType, bTemplateAffected and originalControl
@@ -87,16 +96,18 @@ sap.ui.define([
 			});
 		},
 
-		checkIfDependencyIsStillValid: function(oAppComponent, oModifier, mChangesMap, sChangeId) {
+		checkIfDependencyIsStillValidSync: function(oAppComponent, oModifier, mChangesMap, sChangeId) {
 			var oChange = FlUtils.getChangeFromChangesMap(mChangesMap.mChanges, sChangeId);
 			var oControl = oModifier.bySelector(oChange.getSelector(), oAppComponent);
+			var bHasChangeApplyFinishedCustomData = FlexCustomData.sync.hasChangeApplyFinishedCustomData(oControl, oChange);
+			return isDependencyStillValid(oChange, bHasChangeApplyFinishedCustomData);
+		},
 
-			// if change is already applied OR if apply process has started,
-			// then dependency is no more valid
-			if (FlexCustomData.hasChangeApplyFinishedCustomData(oControl, oChange, oModifier) || oChange.hasApplyProcessStarted()) {
-				return false;
-			}
-			return true;
+		checkIfDependencyIsStillValid: function(oAppComponent, oModifier, mChangesMap, sChangeId) {
+			var oChange = FlUtils.getChangeFromChangesMap(mChangesMap.mChanges, sChangeId);
+			var oControl = oModifier.bySelector(oChange.getSelector(), oAppComponent);
+			return FlexCustomData.hasChangeApplyFinishedCustomData(oControl, oChange, oModifier)
+				.then(isDependencyStillValid.bind(null, oChange));
 		}
 	};
 

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @experimental
 	 * @since 1.77
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -34,7 +34,8 @@ sap.ui.define([
 		appdescr_ui5_setFlexExtensionPointEnabled: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled"),
 		appdescr_ui5_addNewModel: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel"),
 		appdescr_app_addAnnotationsToOData: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData"),
-		appdescr_app_changeInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound")
+		appdescr_app_changeInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound"),
+		appdescr_fiori_setAbstract: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract")
 	};
 
 	var RegistrationCopy = Object.assign({}, Registration);

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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+     * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

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

@@ -0,0 +1,52 @@
+
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/base/util/ObjectPath"
+], function(
+	ObjectPath
+) {
+	"use strict";
+
+	/**
+	 * Descriptor change merger for change type <code>appdescr_fiori_setAbstract</code>.
+	 * Sets and overwrites boolean flag (only to <code>false</code>) for <code>sap.fiori/abstract</code>.
+	 *
+	 * Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
+	 *
+	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
+	 * @experimental
+	 * @version 1.95.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl.apply._internal
+	 */
+	var SetAbstract = /** @lends sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract */ {
+		/**
+		 * Method to apply the <code>appdescr_fiori_setAbstract</code> change to the manifest.
+		 * @param {object} oManifest - Original manifest
+		 * @param {object} oChange - Change with type <code>appdescr_fiori_setAbstract</code>
+		 * @param {boolean} oChange.content.abstract - Boolean flag (only allowed value is <code>false</code>)
+		 * @returns {object} Updated manifest with changed <code>appdescr_fiori_setAbstract</code>
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl.apply._internal
+		 */
+		applyChange: function(oManifest, oChange) {
+			if (!oChange.getContent().hasOwnProperty("abstract")) {
+				throw new Error("No abstract in change content provided");
+			}
+
+			if (oChange.getContent().abstract !== false) {
+				throw new Error("The current change value of property abstract is '" + oChange.getContent().abstract + "'. Only allowed value for property abstract is boolean 'false'");
+			}
+
+			ObjectPath.set(["sap.fiori", "abstract"], oChange.getContent().abstract, oManifest);
+			return oManifest;
+		}
+	};
+	return SetAbstract;
+});

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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

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

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

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

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @experimental
 	 * @since 1.73
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -97,6 +97,7 @@ sap.ui.define([
 			pathInResponse: ["comp.variants", "comp.standardVariants", "comp.defaultVariants", "comp.changes"]
 		}
 	};
+	var _mExternalCompVariantInputData = {};
 
 	function updateComponentData(mPropertyBag) {
 		var oComponent = Component.get(mPropertyBag.componentId);
@@ -332,6 +333,17 @@ sap.ui.define([
 		}
 	};
 
+	FlexState.setInitialNonFlCompVariantData = function(sReference, sPersistencyKey, oStandardVariant, aVariants) {
+		_mExternalCompVariantInputData[sReference] = {};
+		_mExternalCompVariantInputData[sReference][sPersistencyKey] = {};
+		_mExternalCompVariantInputData[sReference][sPersistencyKey].standardVariant = oStandardVariant;
+		_mExternalCompVariantInputData[sReference][sPersistencyKey].variants = aVariants;
+	};
+
+	FlexState.getInitialNonFlCompVariantData = function(sReference) {
+		return _mExternalCompVariantInputData[sReference];
+	};
+
 	/**
 	 * Removes the saved filtered storage response and internal maps for the given reference.
 	 * The next initialize call will add it again.

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

@@ -5,17 +5,65 @@
  */
 
 sap.ui.define([
+	"sap/base/util/deepClone",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/Storage",
 	"sap/ui/fl/Utils"
 ], function(
+	deepClone,
 	ManifestUtils,
 	ApplyStorage,
 	Utils
 ) {
 	"use strict";
 
-	function _formatFlexData(mFlexData) {
+	function getIdIsLocalTrueObject(vSelector) {
+		if (typeof vSelector === "string") {
+			vSelector = {id: vSelector};
+		}
+		vSelector.idIsLocal = true;
+
+		return vSelector;
+	}
+
+	function migrateSelectorFlags(bMigrationNeeded, mFlexData) {
+		if (bMigrationNeeded) {
+			[
+				mFlexData.changes,
+				mFlexData.variantChanges,
+				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];
+					if (!oFlexItem.selector.idIsLocal) {
+						var oFlexItemCopy = deepClone(oFlexItem);
+						// ensure a UID of the change for dependency handling
+						oFlexItemCopy.fileName = oFlexItemCopy.fileName + "_localIdClone";
+						oFlexItemCopy.selector = getIdIsLocalTrueObject(oFlexItemCopy.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));
+						}
+
+						aFlexItems.splice(i, 0, oFlexItemCopy);
+					}
+				}
+			});
+		}
+
+		return mFlexData;
+	}
+
+	function isMigrationNeeded(oManifest) {
+		return oManifest && !!ManifestUtils.getOvpEntry(oManifest);
+	}
+
+	function formatFlexData(mFlexData) {
 		// TODO: rename "changes" everywhere to avoid oResponse.changes.changes calls
 		return {
 			changes: mFlexData,
@@ -29,7 +77,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */
@@ -60,7 +108,7 @@ sap.ui.define([
 					reference: mPropertyBag.reference,
 					componentName: sComponentName,
 					partialFlexData: mPropertyBag.partialFlexData
-				}).then(_formatFlexData);
+				}).then(formatFlexData);
 			}
 
 			// the cache key cannot be used in case of a reinitialization
@@ -74,7 +122,7 @@ sap.ui.define([
 				appDescriptor: mPropertyBag.manifest.getRawJson ? mPropertyBag.manifest.getRawJson() : mPropertyBag.manifest,
 				version: mPropertyBag.version,
 				allContexts: mPropertyBag.allContexts
-			}).then(_formatFlexData);
+			}).then(migrateSelectorFlags.bind(undefined, isMigrationNeeded(mPropertyBag.manifest))).then(formatFlexData);
 		}
 	};
 });

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

@@ -37,7 +37,7 @@ function(
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @experimental
 	 * @since 1.74
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 * @private
 	 */
 	var ManifestUtils = {
@@ -80,6 +80,10 @@ function(
 			return appendComponentToReference(Utils.getAppIdFromManifest(oManifest));
 		},
 
+		getOvpEntry: function (oManifest) {
+			return oManifest.getEntry ? oManifest.getEntry("sap.ovp") : oManifest["sap.ovp"];
+		},
+
 		getCacheKeyFromAsyncHints: function(sReference, oAsyncHints) {
 			if (oAsyncHints && oAsyncHints.requests && Array.isArray(oAsyncHints.requests)) {
 				var oFlAsyncHint = getFlAsyncHint(oAsyncHints);