@openui5/sap.ui.fl 1.93.3 → 1.96.1

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) {
+						// 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);
+
+						// 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.93.3
+	 * @version 1.96.1
 	 * @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.93.3
+	 * @version 1.96.1
 	 * @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);

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.93.3
+	 * @version 1.96.1
 	 * @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.93.3
+	 * @version 1.96.1
 	 * @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.93.3
+	 * @version 1.96.1
 	 * @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.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -179,7 +179,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -5,14 +5,14 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/Change",
-	"sap/ui/fl/apply/_internal/flexObjects/UpdatableChange",
 	"sap/ui/fl/apply/_internal/flexObjects/CompVariant",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
+	"sap/ui/fl/apply/_internal/flexObjects/UpdatableChange",
 	"sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger"
 ], function(
-	Change,
-	UpdatableChange,
 	CompVariant,
+	States,
+	UpdatableChange,
 	CompVariantMerger
 ) {
 	"use strict";
@@ -57,7 +57,7 @@ sap.ui.define([
 		var oClass = sSubSection === "variants" ? CompVariant : UpdatableChange;
 		var aFlexObjects = mCompSection[sSubSection].map(function (oCompVariantChangeDefinition) {
 			var oFlexObject = new oClass(oCompVariantChangeDefinition);
-			oFlexObject.setState(Change.states.PERSISTED); // prevent persisting these anew
+			oFlexObject.setState(States.PERSISTED); // prevent persisting these anew
 			return oFlexObject;
 		});
 

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

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

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"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",
@@ -31,6 +32,7 @@ sap.ui.define([
 	Log,
 	JsControlTreeModifier,
 	VariantsApplyUtil,
+	States,
 	FlexState,
 	Change,
 	LayerUtils,
@@ -45,14 +47,12 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted
 	 */
 	var VariantManagementState = {};
 
-	var _mFakedStandardVariants = {};
-
 	function getReferencedChanges(mPropertyBag) {
 		var aReferencedVariantChanges = [];
 		if (mPropertyBag.variantData.content.variantReference) {
@@ -131,35 +131,20 @@ sap.ui.define([
 	 * Returns variant management state for the passed component reference.
 	 *
 	 * @param {string} sReference - Component reference
-	 *
 	 * @returns {object} Variant management state
 	 * @private
 	 * @ui5-restricted
 	 */
 	VariantManagementState.getContent = function(sReference) {
-		var oVariantsState = FlexState.getVariantsState(sReference);
-		each(_mFakedStandardVariants[sReference], function(sVariantManagementReference, oContent) {
-			if (!oVariantsState[sVariantManagementReference]) {
-				oVariantsState[sVariantManagementReference] = oContent;
-			}
-		});
-		return oVariantsState;
+		return FlexState.getVariantsState(sReference);
 	};
 
-	VariantManagementState.addFakeStandardVariant = function(sReference, oStandardVariant) {
-		var oVariantsMap = VariantManagementState.getContent(sReference);
-		if (!oVariantsMap[Object.keys(oStandardVariant)[0]]) {
-			merge(oVariantsMap, oStandardVariant);
-
-			_mFakedStandardVariants[sReference] = _mFakedStandardVariants[sReference] || {};
-			merge(_mFakedStandardVariants[sReference], oStandardVariant);
-		} else {
-			Log.error("Error in VariantManagementState.addFakeStandardVariant: Variant already in map");
-		}
+	VariantManagementState.addFakeStandardVariant = function(sReference, sComponentId, oStandardVariant) {
+		FlexState.setFakeStandardVariant(sReference, sComponentId, oStandardVariant);
 	};
 
-	VariantManagementState.clearFakedStandardVariants = function(sReference) {
-		delete _mFakedStandardVariants[sReference];
+	VariantManagementState.clearFakedStandardVariants = function(sReference, sComponentId) {
+		FlexState.resetFakedStandardVariants(sReference, sComponentId);
 	};
 
 	/**
@@ -170,10 +155,10 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 */
-	VariantManagementState.resetContent = function(sReference) {
+	VariantManagementState.resetContent = function(sReference, sComponentId) {
 		// reset on component destroy() should be handled more centrally
 		// once all maps are prepared in flex state
-		FlexState.clearFilteredResponse(sReference);
+		FlexState.clearFilteredResponse(sReference, sComponentId);
 	};
 
 	/**
@@ -572,11 +557,11 @@ sap.ui.define([
 		var oFlexObjects = FlexState.getFlexObjectsFromStorageResponse(mPropertyBag.reference);
 
 		if (mPropertyBag.changeToBeAddedOrDeleted) {
-			switch (mPropertyBag.changeToBeAddedOrDeleted.getPendingAction()) {
-				case "NEW":
+			switch (mPropertyBag.changeToBeAddedOrDeleted.getState()) {
+				case States.NEW:
 					addChange(mPropertyBag.changeToBeAddedOrDeleted.getDefinition(), oFlexObjects);
 					break;
-				case "DELETE":
+				case States.DELETE:
 					deleteChange(mPropertyBag.changeToBeAddedOrDeleted.getDefinition(), oFlexObjects);
 					break;
 				default:

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

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

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

@@ -44,20 +44,40 @@ sap.ui.define([
 
 		/**
 		 * Resolves with a promise after all the changes for all controls that are passed have been processed.
-		 * You can either pass a single control or multiple, don't mix selectors and element parameters.
+		 * You can either pass a single control, multiple controls or an array with objects that may contain additional configuration.
+		 * Only use one of the possible parameters.
 		 *
 		 * @param {object} mPropertyBag - Object with parameters as properties
 		 * @param {sap.ui.fl.Selector} mPropertyBag.element - Control whose changes are being waited for, the control has to exist
 		 * @param {sap.ui.fl.Selector[]} mPropertyBag.selectors - An array of {@link sap.ui.fl.Selector}s, whose changes are being waited for, the controls have to exist
-		 * @returns {Promise} Promise that resolves when all changes on the control are processed
+		 * @param {object[]} mPropertyBag.complexSelectors - An array containing an object with {@link sap.ui.fl.Selector} and further configuration
+		 * @param {sap.ui.fl.Selector} mPropertyBag.complexSelectors.selector - A {@link sap.ui.fl.Selector}
+		 * @param {string[]} [mPropertyBag.complexSelectors.changeTypes] - An array containing the change types that will be considered. If empty no filtering will be done
+		 * @returns {Promise} Resolves when all changes on the control(s) are processed
 		 *
 		 * @private
 		 * @ui5-restricted
 		 */
 		waitForChanges: function(mPropertyBag) {
-			var oFirstElement = mPropertyBag.element || mPropertyBag.selectors[0];
-			var vWaitForSelector = mPropertyBag.element || mPropertyBag.selectors;
-			return ChangesController.getFlexControllerInstance(oFirstElement).waitForChangesToBeApplied(vWaitForSelector);
+			var aComplexSelectors;
+			var oFirstElement;
+			if (mPropertyBag.element) {
+				aComplexSelectors = [{
+					selector: mPropertyBag.element
+				}];
+				oFirstElement = mPropertyBag.element;
+			} else if (mPropertyBag.selectors) {
+				aComplexSelectors = mPropertyBag.selectors.map(function(oSelector) {
+					return {
+						selector: oSelector
+					};
+				});
+				oFirstElement = mPropertyBag.selectors[0];
+			} else if (mPropertyBag.complexSelectors) {
+				aComplexSelectors = mPropertyBag.complexSelectors;
+				oFirstElement = mPropertyBag.complexSelectors[0].selector;
+			}
+			return ChangesController.getFlexControllerInstance(oFirstElement).waitForChangesToBeApplied(aComplexSelectors);
 		},
 
 		/**

package/src/sap/ui/fl/changeHandler/AddIFrame.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/AddXML.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.54
 	 * @private
 	 * @experimental Since 1.54. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/Base.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Base functionality for all change handlers, which provides some reuse methods
 	 * @namespace sap.ui.fl.changeHandler.Base
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted change handlers
 	 */
@@ -54,7 +54,7 @@ sap.ui.define([
 		instantiateFragment: function(oChange, mPropertyBag) {
 			var sModuleName = oChange.getModuleName();
 			if (!sModuleName) {
-				throw new Error("The module name of the fragment is not set. This should happen in the backend");
+				return Promise.reject(new Error("The module name of the fragment is not set. This should happen in the backend"));
 			}
 			var sViewId = mPropertyBag.viewId ? mPropertyBag.viewId + "--" : "";
 			var sProjectId = oChange.getProjectId() || "";
@@ -68,12 +68,14 @@ sap.ui.define([
 
 			var oModifier = mPropertyBag.modifier;
 			var oView = mPropertyBag.view;
-			var sFragment = LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
-			try {
-				return oModifier.instantiateFragment(sFragment, sIdPrefix, oView);
-			} catch (oError) {
-				throw new Error("The following XML Fragment could not be instantiated: " + sFragment + " Reason: " + oError.message);
-			}
+			return Promise.resolve()
+				.then(function () {
+					var sFragment = LoaderExtensions.loadResource(sModuleName, {dataType: "text"});
+					return oModifier.instantiateFragment(sFragment, sIdPrefix, oView)
+						.catch(function (oError) {
+							throw new Error("The following XML Fragment could not be instantiated: " + sFragment + " Reason: " + oError.message);
+						});
+				});
 		},
 
 		/**

package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @public
 	 * @experimental Since 1.81
 	 */

package/src/sap/ui/fl/changeHandler/BaseAddXml.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.75
 	 * @private
 	 * @experimental Since 1.75. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/BaseRename.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.46
 	 */
 	var BaseRename = {
@@ -55,8 +55,11 @@ sap.ui.define([
 					return Promise.resolve()
 						.then(function() {
 							if (oChangeDefinition.texts && sText && typeof (sValue) === "string") {
-								oChange.setRevertData(oModifier.getPropertyBindingOrProperty(oControl, sPropertyName));
-								return oModifier.setPropertyBindingOrProperty(oControl, sPropertyName, sValue);
+								return oModifier.getPropertyBindingOrProperty(oControl, sPropertyName)
+									.then(function (vPropertyValue) {
+										oChange.setRevertData(vPropertyValue);
+										return oModifier.setPropertyBindingOrProperty(oControl, sPropertyName, sValue);
+									});
 							}
 							Log.error("Change does not contain sufficient information to be applied: [" + oChangeDefinition.layer + "]" + oChangeDefinition.namespace + "/" + oChangeDefinition.fileName + "." + oChangeDefinition.fileType);
 							//however subsequent changes should be applied

package/src/sap/ui/fl/changeHandler/HideControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.27.0
 	 */
 	var HideControl = {};

package/src/sap/ui/fl/changeHandler/MoveControls.js

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.46
 	 */
 	var MoveControls = { };

package/src/sap/ui/fl/changeHandler/MoveElements.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.34.0
 	 */
 	var MoveElements = { };

package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyBindingChange
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.38
 	 * @private
 	 * @experimental Since 1.38. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/PropertyChange.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyChange
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.36
 	 * @private
 	 * @experimental Since 1.36. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/fl/changeHandler/StashControl.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.27.0
 	 */
 	var StashControl = {};

package/src/sap/ui/fl/changeHandler/UnhideControl.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Change handler for unhiding of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnhideControl = {};

package/src/sap/ui/fl/changeHandler/UnstashControl.js

@@ -11,7 +11,7 @@ sap.ui.define([], function() {
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @experimental Since 1.27.0
 	 */
 	var UnstashControl = {};

package/src/sap/ui/fl/changeHandler/UpdateIFrame.js

@@ -16,13 +16,13 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.UpdateIFrame
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @since 1.72
 	 * @private
 	 */
 	var UpdateIFrame = {};
 
-	var aUpdatableProperties = ["width", "height", "url"];
+	var aUpdatableProperties = ["width", "height", "url", "_settings"];
 
 	/**
 	 * Extract an IFrame control settings.
@@ -79,10 +79,9 @@ sap.ui.define([
 	UpdateIFrame.applyChange = function(oChange, oControl, mPropertyBag) {
 		var oModifier = mPropertyBag.modifier;
 		var oChangeDefinition = oChange.getDefinition();
-		var oControlMetadata = oModifier.getControlMetadata(oControl);
 
-		return Promise.resolve()
-			.then(function() {
+		return oModifier.getControlMetadata(oControl)
+			.then(function (oControlMetadata) {
 				if (oControlMetadata.getName() !== "sap.ui.fl.util.IFrame") {
 					return Promise.reject(new Error("UpdateIFrame only for sap.ui.fl.util.IFrame"));
 				}
@@ -112,6 +111,10 @@ sap.ui.define([
 		return Promise.resolve()
 			.then(function() {
 				if (mRevertData) {
+					// If available, the URL is reverted to before parsing the parameters (saved in "_settings")
+					if (mRevertData.originalSettings._settings && mRevertData.originalSettings._settings.url) {
+						mRevertData.originalSettings.url = mRevertData.originalSettings._settings.url;
+					}
 					return applySettings(mPropertyBag.modifier, oControl, mRevertData.originalSettings);
 				}
 				return Promise.reject(new Error("Attempt to revert an unapplied change."));

package/src/sap/ui/fl/codeExt/CodeExtManager.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.codeExt.CodeExtManager
 	 * @since 1.40.0
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 */
 	var CodeExtManager;
 

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -128,7 +128,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */