@openui5/sap.ui.fl 1.94.0 → 1.97.0

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

@@ -9,12 +9,11 @@ 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",
+	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/Change",
 	"sap/ui/fl/LayerUtils",
@@ -25,12 +24,11 @@ sap.ui.define([
 	_pick,
 	includes,
 	isEmptyObject,
-	merge,
 	ObjectPath,
-	each,
 	Log,
 	JsControlTreeModifier,
 	VariantsApplyUtil,
+	States,
 	FlexState,
 	Change,
 	LayerUtils,
@@ -45,14 +43,12 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @experimental Since 1.74
 	 * @since 1.74
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @private
 	 * @ui5-restricted
 	 */
 	var VariantManagementState = {};
 
-	var _mFakedStandardVariants = {};
-
 	function getReferencedChanges(mPropertyBag) {
 		var aReferencedVariantChanges = [];
 		if (mPropertyBag.variantData.content.variantReference) {
@@ -131,49 +127,35 @@ 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);
 	};
 
 	/**
 	 * Resets variant management state
 	 *
 	 * @param {string} sReference - Component reference
+	 * @param {string} sComponentId - Component instance ID
 	 *
 	 * @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);
 	};
 
 	/**
@@ -183,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
@@ -193,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();
@@ -446,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;
 		}, []);
@@ -572,11 +559,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/_internal/flexState/controlVariants/prepareVariantsMap.js

@@ -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

@@ -6,11 +6,19 @@
 
 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.94.0
+	 * @version 1.97.0
 	 * @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/FlexRuntimeInfoAPI.js

@@ -5,13 +5,23 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/ControlPersonalizationAPI",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/apply/_internal/ChangesController"
+	"sap/base/util/includes",
+	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/apply/_internal/controlVariants/Utils",
+	"sap/ui/fl/apply/_internal/ChangesController",
+	"sap/ui/fl/FlexControllerFactory",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/Utils"
 ], function(
-	OldControlPersonalizationAPI,
-	Utils,
-	ChangesController
+	includes,
+	Log,
+	JsControlTreeModifier,
+	VariantUtils,
+	ChangesController,
+	FlexControllerFactory,
+	Layer,
+	Utils
 ) {
 	"use strict";
 
@@ -25,7 +35,6 @@ sap.ui.define([
 	 * @ui5-restricted UI5 controls, OVP, tests
 	 */
 	var FlexRuntimeInfoAPI = /** @lends sap.ui.fl.apply.api.FlexRuntimeInfoAPI */{
-
 		/**
 		 * Checks if personalization changes exist for controls.
 		 *
@@ -39,25 +48,85 @@ sap.ui.define([
 		 * @ui5-restricted
 		 */
 		isPersonalized: function(mPropertyBag) {
-			return OldControlPersonalizationAPI.isPersonalized(mPropertyBag.selectors, mPropertyBag.changeTypes);
+			function logAndReject(sMessage) {
+				Log.error(sMessage);
+				return Promise.reject(sMessage);
+			}
+
+			function ifValidFileType(oChange) {
+				return oChange.getFileType() === "change";
+			}
+
+			function filterBySelectors(oAppComponent, aControls, oChange) {
+				var aIdsOfPassedControls = aControls.map(function (oControl) {
+					return oControl.id || oControl.getId();
+				});
+				var oSelector = oChange.getSelector();
+				var sControlId = JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent);
+				return includes(aIdsOfPassedControls, sControlId);
+			}
+
+			function filterByChangeType(aChangeTypes, oChange) {
+				return (Array.isArray(aChangeTypes) && aChangeTypes.length > 0)
+					? includes(aChangeTypes, oChange.getChangeType())
+					: true;
+			}
+
+			if (!mPropertyBag.selectors || mPropertyBag.selectors.length === 0) {
+				return logAndReject("At least one control ID has to be provided as a parameter");
+			}
+
+			var oAppComponent = mPropertyBag.selectors[0].appComponent || Utils.getAppComponentForControl(mPropertyBag.selectors[0]);
+			if (!oAppComponent) {
+				return logAndReject("App Component could not be determined");
+			}
+
+			var oFlexController = FlexControllerFactory.createForControl(oAppComponent);
+			return oFlexController.getComponentChanges({currentLayer: Layer.USER, includeCtrlVariants: true})
+			.then(function (aChanges) {
+				return aChanges
+					.filter(filterBySelectors.bind(this, oAppComponent, mPropertyBag.selectors))
+					.filter(filterByChangeType.bind(this, mPropertyBag.changeTypes))
+					.some(ifValidFileType);
+			}.bind(this));
 		},
 
 		/**
 		 * 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);
 		},
 
 		/**
@@ -85,7 +154,7 @@ sap.ui.define([
 		 * @ui5-restricted
 		 */
 		hasVariantManagement: function(mPropertyBag) {
-			return OldControlPersonalizationAPI.hasVariantManagement(mPropertyBag.element);
+			return VariantUtils.belongsToVariantManagement(mPropertyBag.element);
 		}
 	};
 

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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @experimental Since 1.46
 	 */
 	var BaseRename = {

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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @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.94.0
+	 * @version 1.97.0
 	 * @since 1.72
 	 * @private
 	 */
 	var UpdateIFrame = {};
 
-	var aUpdatableProperties = ["width", "height", "url"];
+	var aUpdatableProperties = ["width", "height", "url", "_settings"];
 
 	/**
 	 * Extract an IFrame control settings.
@@ -111,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,18 +20,21 @@ sap.ui.define([
 	 * @alias sap.ui.fl.codeExt.CodeExtManager
 	 * @since 1.40.0
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 */
 	var CodeExtManager;
 
 	CodeExtManager = {
 		/**
-		 * @param {string} oPropertyBag.id - change Id if not present it will be generated
-		 * @param {string} oPropertyBag.codeRef - relative path of code file
-		 * @param {string} oPropertyBag.controllerName - controller name
-		 * @param {string} oPropertyBag.appVariantId - appVariantId or componentName in which the context is present
+		 * @param {object} oPropertyBag - Object with properties
+		 * @param {string} oPropertyBag.id - Change ID. Will be generated if not present.
+		 * @param {string} oPropertyBag.codeRef - Relative path of code file
+		 * @param {string} oPropertyBag.controllerName - Controller name
+		 * @param {string} oPropertyBag.appVariantId - <code>AppVariantId</code> or <code>componentName</code> in which the context is present
+		 * @param {object} mOptions - Property bag of options for the codeExt change creation
 		 * @param {string} mOptions.transportId - Id of ABAP Transport which CodeExt change assigned to
 		 * @param {string} mOptions.packageName - Name of ABAP Package which CodeExt change assigned to
+		 * @returns {Promise} Resolves as soon as the writing was completed
 		 */
 		createOrUpdateCodeExtChange: function(oPropertyBag, mOptions) {
 			if (!oPropertyBag.content || !oPropertyBag.content.codeRef) {
@@ -57,11 +60,12 @@ sap.ui.define([
 		},
 
 		/**
-		 * @param {array} aChanges - list of changes need to be created
+		 * @param {array} aChanges - List of changes need to be created
 		 * @param {object} mOptions - Property bag of options for the codeExt change creation
-		 * @param {string} mOptions.codeRef - code reference which changes are associated with
-		 * @param {string} mOptions.transportId - id of ABAP transport on which the change is assigned to
-		 * @param {string} mOptions.packageName - name of ABAP package on which the change is assigned to
+		 * @param {string} mOptions.codeRef - Code reference which changes are associated with
+		 * @param {string} mOptions.transportId - ID of the ABAP transport to which the change is assigned
+		 * @param {string} mOptions.packageName - Name of the ABAP transport to which the change is assigned
+		 * @returns {Promise} Resolves as soon as the writing is completed
 		 */
 		createCodeExtChanges: function(aChanges, mOptions) {
 			aChanges = aChanges || [];
@@ -87,9 +91,11 @@ sap.ui.define([
 		},
 
 		/**
-		 * @param {sap.ui.fl.Change} oChange
+		 * @param {sap.ui.fl.Change} oChange - Change instance
+		 * @param {object} mOptions - Property bag of options for the codeExt change creation
 		 * @param {string} mOptions.transportId - ID of ABAP Transport which CodeExt change assigned to
 		 * @param {string} mOptions.packageName - Name of ABAP Package which CodeExt change assigned to
+		 * @returns {Promise} Resolves as soon as the deletion is completed
 		 */
 		deleteCodeExtChange: function(oChange, mOptions) {
 			if (oChange.changeType !== "codeExt" || oChange.fileType !== "change") {