@openui5/sap.ui.fl 1.118.0 → 1.119.0

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

@@ -69,7 +69,7 @@ function(
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.ManifestUtils
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 */
 	var ManifestUtils = {

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.75
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.DependencyHandler
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.changes.ExtensionPointState
 	 * @since 1.79
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -123,7 +123,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
 	 * @since 1.86
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -208,7 +208,7 @@ sap.ui.define([
 		 *
 		 * @function
 		 * @since 1.89
-		 * @version 1.118.0
+		 * @version 1.119.0
 		 * @private
 		 * @ui5-restricted sap.ui.fl
 		 *

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

@@ -22,13 +22,18 @@ sap.ui.define([], function() {
 
 	/**
 	* Retrieves the default variant ID for a variant map.
+	* Removed variants are filtered out.
 	*
 	* @param {object} mCompVariantsMap Prepared map for compVariants
 	* @returns {string} ID of the default variant
 	*/
 	Utils.getDefaultVariantId = (mCompVariantsMap) => {
 		const aDefaultVariantChanges = mCompVariantsMap.defaultVariants;
-		const oChange = aDefaultVariantChanges[aDefaultVariantChanges.length - 1];
+		const oChange = aDefaultVariantChanges.toReversed().find((oChange) => {
+			return mCompVariantsMap.variants.some((oVariant) => {
+				return oChange?.getContent().defaultVariantName === oVariant.getId();
+			});
+		});
 		return oChange?.getContent().defaultVariantName || "";
 	};
 

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

@@ -90,7 +90,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.Switcher
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.controlVariants.VariantManagementState
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -51,13 +51,18 @@ sap.ui.define([
 			["technicalParameters", VariantsApplyUtil.VARIANT_TECHNICAL_PARAMETER],
 			oComponentData
 		) || [];
-		var aVariantIds = aVariants.map(function(oVariant) {
-			return oVariant.getId();
+
+		// Only visible variants can be current
+		var aVariantKeys = aVariants.filter((oVariant) => {
+			return oVariant.visible;
+		})
+		.map((oVariant) => {
+			return oVariant.key;
 		});
 
 		// Check if variant is set via url parameter
-		var sDesiredSelectedVariantId = aVariantIds.find(function(sVariantId) {
-			return aVariantReferencesFromUrl.includes(sVariantId);
+		var sDesiredSelectedVariantId = aVariantKeys.find((sVariantKey) => {
+			return aVariantReferencesFromUrl.includes(sVariantKey);
 		});
 		if (sDesiredSelectedVariantId) {
 			return sDesiredSelectedVariantId;
@@ -69,45 +74,16 @@ sap.ui.define([
 		// Default is set via applyVariantManagementChange instead
 		return aCtrlVariantManagementChanges
 		.reverse()
-		.map(function(oVariantManagementChange) {
+		.map((oVariantManagementChange) => {
 			return oVariantManagementChange.getContent().defaultVariant;
 		})
-		.find(function(sDesiredDefaultVariantId) {
-			return aVariantIds.includes(sDesiredDefaultVariantId);
+		.find((sDesiredDefaultVariantKey) => {
+			return aVariantKeys.includes(sDesiredDefaultVariantKey);
 		});
 	}
 
-	function createVariantManagement(aFlexObjects, aVariants, sReference, sVMReference) {
+	function createVariantManagement(aFlexObjects, sReference, sVMReference) {
 		var sCurrentVariantReference = (mCurrentVariantReferences[sReference] || {})[sVMReference];
-		var aRelevantVariants = aVariants.filter(function(oFlexObject) {
-			return sVMReference === oFlexObject.getVariantManagementReference();
-		});
-		if (
-			!sCurrentVariantReference
-			// Current variant might be unavailable due to layer filtering
-			// or because a component with a different id but the same flex reference was initalized
-			|| !aRelevantVariants.find(function(oVariant) {
-				return oVariant.getId() === sCurrentVariantReference;
-			})
-		) {
-			// Try to determine the initial variant from setDefault changes or the url params
-			var aCtrlVariantManagementChanges = aFlexObjects.filter(function(oFlexObject) {
-				return (
-					oFlexObject.getFileType() === "ctrl_variant_management_change"
-					&& sVMReference === oFlexObject.getSelector().id
-				);
-			});
-			sCurrentVariantReference = getInitialCurrentVariant(
-				sReference,
-				aCtrlVariantManagementChanges,
-				aRelevantVariants
-			) || sVMReference;
-			ObjectPath.set(
-				[sReference, sVMReference],
-				sCurrentVariantReference,
-				mCurrentVariantReferences
-			);
-		}
 		return {
 			defaultVariant: sVMReference,
 			currentVariant: sCurrentVariantReference,
@@ -121,6 +97,26 @@ sap.ui.define([
 		};
 	}
 
+	function findVariantInFlexObjects(aFlexObjects, sId) {
+		return aFlexObjects.find((oFlexObject) => {
+			return oFlexObject.getId() === sId;
+		});
+	}
+
+	function getAllReferencedVariantIds(aFlexObjects, oVariant) {
+		const aVariants = [];
+		let oCurrentVariant = oVariant;
+		let oFoundVariant;
+		do {
+			oFoundVariant = findVariantInFlexObjects(aFlexObjects, oCurrentVariant.getVariantReference());
+			if (oFoundVariant) {
+				aVariants.push(oCurrentVariant);
+				oCurrentVariant = oFoundVariant;
+			}
+		} while (oFoundVariant);
+		return aVariants.map((oVariant) => oVariant.getId());
+	}
+
 	function createVariantEntry(aFlexObjects, oVariantInstance) {
 		return {
 			instance: oVariantInstance,
@@ -136,7 +132,8 @@ sap.ui.define([
 					return false;
 				}
 				var bOwnControlChange = oFlexObject.getVariantReference() === oVariantInstance.getId();
-				var bControlChangeOfReferencedVariant = oFlexObject.getVariantReference() === oVariantInstance.getVariantReference();
+				var aReferencedVariantIds = getAllReferencedVariantIds(aFlexObjects, oVariantInstance);
+				var bControlChangeOfReferencedVariant = aReferencedVariantIds.indexOf(oFlexObject.getVariantReference()) > -1;
 				var bLowerLayerChange = LayerUtils.compareAgainstCurrentLayer(oFlexObject.getLayer(), oVariantInstance.getLayer()) === -1;
 				return bOwnControlChange || bControlChangeOfReferencedVariant && bLowerLayerChange;
 			}),
@@ -152,7 +149,7 @@ sap.ui.define([
 		};
 	}
 
-	function applyVariantChange(oVariantEntry, oVariantChange, sReference, oVariantManagementsMap) {
+	function applyVariantChange(oVariantEntry, oVariantChange) {
 		switch (oVariantChange.getChangeType()) {
 			case "setTitle":
 				oVariantEntry.title = oVariantChange.getText("title");
@@ -165,16 +162,6 @@ sap.ui.define([
 				break;
 			case "setVisible":
 				oVariantEntry.visible = oVariantChange.getContent().visible;
-
-				// Set standard variant as current variant if current variant is set to invisible
-				var sVMReference = oVariantEntry.instance.getVariantManagementReference();
-				if (
-					mCurrentVariantReferences[sReference][sVMReference] === oVariantEntry.key
-					&& !oVariantEntry.visible
-				) {
-					mCurrentVariantReferences[sReference][sVMReference] = sVMReference;
-					oVariantManagementsMap[sVMReference].currentVariant = sVMReference;
-				}
 				break;
 			case "setContexts":
 				oVariantEntry.contexts = oVariantChange.getContent().contexts;
@@ -187,53 +174,81 @@ sap.ui.define([
 	function applyVariantManagementChange(oVariantManagementEntry, oVariantManagementChange) {
 		// Currently only setDefault
 		var sDesiredDefaultVariant = oVariantManagementChange.getContent().defaultVariant;
-		// Only set default if the variant exists
-		if (oVariantManagementEntry.variants.some(function(oVariant) {
-			return oVariant.key === sDesiredDefaultVariant;
-		})) {
-			oVariantManagementEntry.defaultVariant = sDesiredDefaultVariant;
-		}
+		oVariantManagementEntry.variants.forEach((oVariant) => {
+			// Only set default if the variant exists and was not removed
+			if (
+				oVariant.key === sDesiredDefaultVariant
+				&& oVariant.visible
+			) {
+				oVariantManagementEntry.defaultVariant = sDesiredDefaultVariant;
+			}
+		});
 	}
 
-	function createVariantsMap(aFlexObjects, sReference) {
-		var aVariants = aFlexObjects.filter(function(oFlexObject) {
+	function createVariantsMap(aFlexObjects) {
+		const sReference = aFlexObjects[0]?.getFlexObjectMetadata().reference;
+		const aVariants = aFlexObjects.filter((oFlexObject) => {
 			return oFlexObject.getFileType() === "ctrl_variant";
 		});
 
-		var oVariantManagementsMap = {};
-		aVariants.forEach(function(oVariantInstance) {
+		const oVariantManagementsMap = {};
+		aVariants.forEach((oVariantInstance) => {
 			var sVMReference = oVariantInstance.getVariantManagementReference();
-			oVariantManagementsMap[sVMReference] ||= createVariantManagement(aFlexObjects, aVariants, sReference, sVMReference);
+			oVariantManagementsMap[sVMReference] ||= createVariantManagement(aFlexObjects, sReference, sVMReference);
 			oVariantManagementsMap[sVMReference].variants.push(
 				createVariantEntry(aFlexObjects, oVariantInstance)
 			);
 		});
 
 		aFlexObjects
-		.filter(function(oFlexObject) {
+		.filter((oFlexObject) => {
 			return oFlexObject.getFileType() === "ctrl_variant_change";
 		})
-		.forEach(function(oVariantChange) {
-			var oVariantEntry = findVariant(oVariantManagementsMap, oVariantChange);
+		.forEach((oVariantChange) => {
+			const oVariantEntry = findVariant(oVariantManagementsMap, oVariantChange);
 			if (oVariantEntry) {
 				applyVariantChange(oVariantEntry, oVariantChange, sReference, oVariantManagementsMap);
 			}
 		});
 
-		aFlexObjects
-		.filter(function(oFlexObject) {
+		const aCtrlVariantManagementChanges = aFlexObjects
+		.filter((oFlexObject) => {
 			return oFlexObject.getFileType() === "ctrl_variant_management_change";
-		})
-		.forEach(function(oVariantManagementChange) {
-			var oVariantManagementEntry = oVariantManagementsMap[oVariantManagementChange.getSelector().id];
+		});
+
+		aCtrlVariantManagementChanges.forEach((oVariantManagementChange) => {
+			const oVariantManagementEntry = oVariantManagementsMap[oVariantManagementChange.getSelector().id];
 			if (oVariantManagementEntry) {
 				applyVariantManagementChange(oVariantManagementEntry, oVariantManagementChange);
 			}
 		});
 
-		Object.values(oVariantManagementsMap).forEach(function(oVariantManagement) {
+		Object.keys(oVariantManagementsMap).forEach((sVMReference) => {
+			const oVariantManagement = oVariantManagementsMap[sVMReference];
+
+			// If current variant is not already set, set initial current variant
+			// Current variant might be unavailable due to layer filtering
+			// or because a component with a different id but the same flex reference was initalized
+			if (
+				!oVariantManagement.currentVariant || !oVariantManagement.variants.some((oVariant) => {
+					return oVariant.key === oVariantManagement.currentVariant;
+				})
+			) {
+				const sCurrentVariant = getInitialCurrentVariant(
+					sReference,
+					aCtrlVariantManagementChanges,
+					oVariantManagement.variants
+				) || sVMReference;
+				oVariantManagement.currentVariant = sCurrentVariant;
+				ObjectPath.set(
+					[sReference, sVMReference],
+					sCurrentVariant,
+					mCurrentVariantReferences
+				);
+			}
+
 			// Standard variant should always be at the first position, all others are sorted alphabetically
-			oVariantManagement.variants.sort(function(oVariant1, oVariant2) {
+			oVariantManagement.variants.sort((oVariant1, oVariant2) => {
 				if (oVariant1.isStandardVariant) {
 					return -1;
 				}
@@ -244,10 +259,10 @@ sap.ui.define([
 			});
 
 			// Set modified flag
-			var aCurrentVariantChanges = oVariantManagement.variants.find(function(oVariant) {
+			var aCurrentVariantChanges = oVariantManagement.variants.find((oVariant) => {
 				return oVariant.key === oVariantManagement.currentVariant;
 			}).controlChanges;
-			oVariantManagement.modified = aCurrentVariantChanges.some(function(oChange) {
+			oVariantManagement.modified = aCurrentVariantChanges.some((oChange) => {
 				return !oChange.isPersisted() && !oChange.getSavedToVariant();
 			});
 
@@ -283,7 +298,6 @@ sap.ui.define([
 
 	var oVariantManagementMapDataSelector = new DataSelector({
 		id: "variantManagementMap",
-		parameterKey: "reference",
 		parentDataSelector: FlexState.getFlexObjectsDataSelector(),
 		executeFunction: createVariantsMap
 	});
@@ -327,10 +341,15 @@ sap.ui.define([
 	};
 
 	/**
-	 * Test function to reset all current variant references.
+	 * Removes the saved current variant from the internal map for the given reference
+	 *
+	 * @param {string} sReference - Flex Reference of the app
 	 */
-	VariantManagementState.resetCurrentVariantReferences = function() {
-		mCurrentVariantReferences = {};
+	VariantManagementState.resetCurrentVariantReference = function(sReference) {
+		delete mCurrentVariantReferences[sReference];
+		oVariantManagementMapDataSelector.checkUpdate({
+			reference: sReference
+		});
 	};
 
 	/**

package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @since 1.27.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.core

package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js

@@ -14,7 +14,7 @@ sap.ui.define(["sap/ui/core/Core"], function(oCore) {
 	 * @alias sap.ui.fl.apply._internal.preprocessors.EventHistory
 	 * @since 1.47.0
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.preprocessors.RegistrationDelegator

package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @since 1.43.0
 	 * @private
 	 */

package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @since 1.27.0
 	 * @private
 	 */

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply.api.ControlVariantApplyAPI
 	 * @since 1.67
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @public
 	 */
 	var ControlVariantApplyAPI = /** @lends sap.ui.fl.apply.api.ControlVariantApplyAPI */{

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.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.118.0
+	 * @version 1.119.0
 	 * @since 1.54
 	 * @private
 	 */

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @since 1.75
 	 * @private
 	 */

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

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 */
 	var BaseAddViaDelegate = {

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.118.0
+	 * @version 1.119.0
 	 * @since 1.75
 	 * @private
 	 */

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

@@ -5,10 +5,8 @@
  */
 
 sap.ui.define([
-	"sap/base/Log",
 	"sap/ui/fl/changeHandler/condenser/Classification"
 ], function(
-	Log,
 	CondenserClassification
 ) {
 	"use strict";
@@ -19,18 +17,18 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @since 1.46
 	 *
 	 */
-	var BaseRename = {
+	const BaseRename = {
 		/**
 		 * Returns an instance of the rename change handler
-		 * @param  {object} mRenameSettings The settings required for the rename action
-		 *                  mRenameSettings.propertyName The property from the control to be renamed (e.g. "label")
-		 *                  mRenameSettings.changePropertyName Only use if you have to have migration changeHandler: Property name in change (for LRep; e.g. "fieldLabel")
-		 *                  mRenameSettings.translationTextType The translation text type in change (e.g. "XFLD")
-		 * @return {any} the rename change handler object
+		 * @param {object} mRenameSettings - Settings required for the rename action
+		 * @param {string} mRenameSettings.propertyName - Property from the control to be renamed (e.g. "label")
+		 * @param {string} mRenameSettings.changePropertyName -  Only use if you have migration changeHandler: Property name in change (for LRep; e.g. "fieldLabel")
+		 * @param {string} mRenameSettings.translationTextType - Translation text type in change (e.g. "XFLD")
+		 * @return {object} The rename change handler
 		 */
 		createRenameChangeHandler(mRenameSettings) {
 			mRenameSettings.changePropertyName ||= "newText";
@@ -39,44 +37,37 @@ sap.ui.define([
 				/**
 				 * Renames a control.
 				 *
-				 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange change wrapper object with instructions to be applied on the control map
-				 * @param {sap.ui.core.Control} oControl Control that matches the change selector for applying the change
-				 * @param {object} mPropertyBag property bag
-				 * @param {object} mPropertyBag.modifier modifier for the controls
+				 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change wrapper object with instructions to be applied on the control map
+				 * @param {sap.ui.core.Control} oControl - Control that matches the change selector for applying the change
+				 * @param {object} mPropertyBag - Property bag
+				 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Modifier for the controls
 				 * @returns {Promise} Promise resolving when the change is applied
 				 * @public
 				 */
-				applyChange(oChange, oControl, mPropertyBag) {
-					var oModifier = mPropertyBag.modifier;
-					var sPropertyName = mRenameSettings.propertyName;
-					var sValue = oChange.getText(mRenameSettings.changePropertyName);
-
-					return Promise.resolve()
-					.then(function() {
-						if (sValue) {
-							return oModifier.getPropertyBindingOrProperty(oControl, sPropertyName)
-							.then(function(vPropertyValue) {
-								oChange.setRevertData(vPropertyValue);
-								return oModifier.setPropertyBindingOrProperty(oControl, sPropertyName, sValue);
-							});
-						}
-						return undefined;
-					});
+				async applyChange(oChange, oControl, mPropertyBag) {
+					const oModifier = mPropertyBag.modifier;
+					const sPropertyName = mRenameSettings.propertyName;
+					const sValue = oChange.getText(mRenameSettings.changePropertyName);
+					if (sValue) {
+						const vPropertyValue = await oModifier.getPropertyBindingOrProperty(oControl, sPropertyName);
+						oChange.setRevertData(vPropertyValue);
+						await oModifier.setPropertyBindingOrProperty(oControl, sPropertyName, sValue);
+					}
 				},
 
 				/**
 				 * Reverts a Rename Change
 				 *
-				 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange change wrapper object with instructions to be applied on the control map
-				 * @param {sap.ui.core.Control} oControl Control that matches the change selector for applying the change
-				 * @param {object} mPropertyBag property bag
-				 * @param {object} mPropertyBag.modifier modifier for the controls
+				 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Change wrapper object with instructions to be applied on the control map
+				 * @param {sap.ui.core.Control} oControl - Control that matches the change selector for applying the change
+				 * @param {object} mPropertyBag - Property bag
+				 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Modifier for the controls
 				 * @public
 				 */
 				revertChange(oChange, oControl, mPropertyBag) {
-					var oModifier = mPropertyBag.modifier;
-					var sPropertyName = mRenameSettings.propertyName;
-					var vOldValue = oChange.getRevertData();
+					const oModifier = mPropertyBag.modifier;
+					const sPropertyName = mRenameSettings.propertyName;
+					const vOldValue = oChange.getRevertData();
 
 					if (vOldValue || vOldValue === "") {
 						oModifier.setPropertyBindingOrProperty(oControl, sPropertyName, vOldValue);
@@ -84,7 +75,7 @@ sap.ui.define([
 						return;
 					}
 
-					Log.error("Change doesn't contain sufficient information to be reverted. Most Likely the Change didn't go through applyChange.");
+					throw new Error("Change without sufficient information to be reverted. It probably didn't go through applyChange.");
 				},
 
 				/**
@@ -93,31 +84,26 @@ sap.ui.define([
 				 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange change wrapper object to be completed
 				 * @param {object} mSpecificChangeInfo with attribute (e.g. textLabel) to be included in the change
 				 * @param {object} mPropertyBag - Property bag
-				 * @param {object} mPropertyBag.modifier - Modifier for the controls
+				 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Modifier for the controls
 				 * @returns {Promise} A promise resolving when the change content is completed
 				 * @public
 				 */
-				completeChangeContent(oChange, mSpecificChangeInfo, mPropertyBag) {
-					var sChangePropertyName = mRenameSettings.changePropertyName;
-					var sTranslationTextType = mRenameSettings.translationTextType;
-
-					return Promise.resolve()
-					.then(function() {
-						return mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent);
-					})
-					.then(function(oControlToBeRenamed) {
-						oChange.setContent({
-							originalControlType: mPropertyBag.modifier.getControlType(oControlToBeRenamed)
-						});
+				async completeChangeContent(oChange, mSpecificChangeInfo, mPropertyBag) {
+					const sChangePropertyName = mRenameSettings.changePropertyName;
+					const sTranslationTextType = mRenameSettings.translationTextType;
 
-						if (typeof (mSpecificChangeInfo.value) === "string") {
-							oChange.setText(sChangePropertyName, mSpecificChangeInfo.value, sTranslationTextType);
-						} else if (typeof (mSpecificChangeInfo.content.value) === "string") {
-							oChange.setText(sChangePropertyName, mSpecificChangeInfo.content.value, sTranslationTextType);
-						} else {
-							return Promise.reject(new Error("oSpecificChangeInfo.value attribute required"));
-						}
+					const oControlToBeRenamed = await mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent);
+					oChange.setContent({
+						originalControlType: mPropertyBag.modifier.getControlType(oControlToBeRenamed)
 					});
+
+					if (typeof (mSpecificChangeInfo.value) === "string") {
+						oChange.setText(sChangePropertyName, mSpecificChangeInfo.value, sTranslationTextType);
+					} else if (typeof (mSpecificChangeInfo.content.value) === "string") {
+						oChange.setText(sChangePropertyName, mSpecificChangeInfo.content.value, sTranslationTextType);
+					} else {
+						throw new Error("oSpecificChangeInfo.value attribute required");
+					}
 				},
 
 				/**
@@ -139,11 +125,11 @@ sap.ui.define([
 				 * Retrieves the information required for the change visualization.
 				 *
 				 * @param {sap.ui.fl.apply._internal.flexObjects.FlexObject} oChange - Object with change data
-				 * @returns {object} Object with a description payload containing the information required for the change visualization
+				 * @returns {object} - Object with a description payload containing the information required for the change visualization
 				 * @public
 				 */
 				getChangeVisualizationInfo(oChange) {
-					var oNewLabel = (
+					const oNewLabel = (
 						oChange.getTexts()
 						&& oChange.getTexts()[mRenameSettings.changePropertyName]
 					);