@openui5/sap.ui.rta 1.139.0 → 1.141.0

package/src/sap/ui/rta/command/ControlVariantSaveAs.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/variants/VariantManager",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
@@ -13,11 +13,11 @@ sap.ui.define([
 	"sap/ui/rta/library",
 	"sap/ui/rta/Utils"
 ], function(
-	JsControlTreeModifier,
+	FlexRuntimeInfoAPI,
 	VariantManager,
 	ContextSharingAPI,
 	PersistenceWriteAPI,
-	flUtils,
+	FlUtils,
 	BaseCommand,
 	rtaLibrary,
 	rtaUtils
@@ -30,13 +30,13 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
 	 * @alias sap.ui.rta.command.ControlVariantSaveAs
 	 */
-	var ControlVariantSaveAs = BaseCommand.extend("sap.ui.rta.command.ControlVariantSaveAs", {
+	const ControlVariantSaveAs = BaseCommand.extend("sap.ui.rta.command.ControlVariantSaveAs", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -46,9 +46,6 @@ sap.ui.define([
 				sourceDefaultVariant: {
 					type: "string"
 				},
-				model: {
-					type: "object"
-				},
 				newVariantParameters: {
 					type: "object"
 				}
@@ -61,18 +58,17 @@ sap.ui.define([
 	/**
 	 * @override
 	 */
-	ControlVariantSaveAs.prototype.prepare = function(mFlexSettings) {
+	ControlVariantSaveAs.prototype.prepare = async function(mFlexSettings) {
 		this.oVariantManagementControl = this.getElement();
-		this.oAppComponent = flUtils.getAppComponentForControl(this.oVariantManagementControl);
-		this.sVariantManagementReference = JsControlTreeModifier.getSelector(this.oVariantManagementControl, this.oAppComponent).id;
-		this.oModel = this.getModel();
-		this.setSourceDefaultVariant(this.oModel.getData()[this.sVariantManagementReference].defaultVariant);
+		this.oAppComponent = FlUtils.getAppComponentForControl(this.oVariantManagementControl);
+		this.sVariantManagementReference = this.oVariantManagementControl.getVariantManagementReference();
+		this.setSourceDefaultVariant(this.oVariantManagementControl.getDefaultVariantKey());
 		this.sLayer = mFlexSettings.layer;
-		var mComponentPropertyBag = mFlexSettings;
+		const mComponentPropertyBag = mFlexSettings;
 		mComponentPropertyBag.variantManagementControl = this.oVariantManagementControl;
 
 		function storeEventParameters(oEvent, oArgs) {
-			var mParameters = oEvent.getParameters();
+			const mParameters = oEvent.getParameters();
 			this.setNewVariantParameters(mParameters);
 			this.oVariantManagementControl.detachSave(storeEventParameters, this);
 			this.oVariantManagementControl.detachCancel(handleCancel, this);
@@ -84,15 +80,15 @@ sap.ui.define([
 			oArgs.resolve(false);
 		}
 
-		return new Promise(function(resolve) {
+		const bState = await new Promise((resolve) => {
 			this.oVariantManagementControl.attachSave({resolve}, storeEventParameters, this);
 			this.oVariantManagementControl.attachCancel({resolve}, handleCancel, this);
-			this.oVariantManagementControl.openSaveAsDialogForKeyUser(rtaUtils.getRtaStyleClassName(),
-				ContextSharingAPI.createComponent(mComponentPropertyBag));
-		}.bind(this))
-		.then(function(bState) {
-			return bState;
+			this.oVariantManagementControl.openSaveAsDialogForKeyUser(
+				rtaUtils.getRtaStyleClassName(),
+				ContextSharingAPI.createComponent(mComponentPropertyBag)
+			);
 		});
+		return bState;
 	};
 
 	ControlVariantSaveAs.prototype.getPreparedChange = function() {
@@ -107,28 +103,27 @@ sap.ui.define([
 	 * @public
 	 * @returns {Promise} Promise that resolves after execution
 	 */
-	ControlVariantSaveAs.prototype.execute = function() {
-		var sSourceVariantReference = this.getSourceVariantReference();
-		// once a change is saved to a variant it will automatically be restored by the VariantModel
-		this._aControlChangesWithoutVariant = this.oModel.getVariant(sSourceVariantReference, this.sVariantManagementReference)
-		.controlChanges
-		.filter((oFlexObject) => !oFlexObject.getSavedToVariant());
-		var mParams = this.getNewVariantParameters();
+	ControlVariantSaveAs.prototype.execute = async function() {
+		const sFlexReference = FlexRuntimeInfoAPI.getFlexReference({ element: this.oVariantManagementControl });
+		this._aControlChangesWithoutVariant = VariantManager.getControlChangesForVariant(
+			sFlexReference,
+			this.sVariantManagementReference,
+			this.getSourceVariantReference()
+		).filter((oFlexObject) => !oFlexObject.getSavedToVariant());
+		const mParams = this.getNewVariantParameters();
 		mParams.layer = this.sLayer;
 		mParams.newVariantReference = this.sNewVariantReference;
 		mParams.generator = rtaLibrary.GENERATOR_NAME;
-		return VariantManager.handleSaveEvent(this.oVariantManagementControl, mParams, this.oModel)
-		.then(function(aDirtyChanges) {
-			this._aPreparedChanges = aDirtyChanges;
-			[this._oVariantChange] = aDirtyChanges;
-			this.sNewVariantReference = this._oVariantChange.getId();
-			this._aPreparedChanges.forEach(function(oChange) {
-				if (oChange.getFileType() === "change") {
-					oChange.setSavedToVariant(true);
-				}
-			});
-			this.getModel().invalidateMap();
-		}.bind(this));
+		const aDirtyChanges = await VariantManager.handleSaveEvent(this.oVariantManagementControl, mParams);
+		this._aPreparedChanges = aDirtyChanges;
+		[this._oVariantChange] = aDirtyChanges;
+		this.sNewVariantReference = this._oVariantChange.getId();
+		this._aPreparedChanges.forEach(function(oChange) {
+			if (oChange.getFileType() === "change") {
+				oChange.setSavedToVariant(true);
+			}
+		});
+		VariantManager.updateVariantManagementMap(sFlexReference);
 	};
 
 	/**
@@ -138,8 +133,8 @@ sap.ui.define([
 	 */
 	ControlVariantSaveAs.prototype.undo = async function() {
 		if (this._oVariantChange) {
-			var aChangesToBeDeleted = [];
-			this._aPreparedChanges.forEach(function(oChange) {
+			const aChangesToBeDeleted = [];
+			this._aPreparedChanges.forEach((oChange) => {
 				if (oChange.getFileType() === "ctrl_variant_management_change") {
 					aChangesToBeDeleted.push(oChange);
 				}
@@ -149,7 +144,7 @@ sap.ui.define([
 				selector: this.oAppComponent
 			});
 
-			var mPropertyBag = {
+			const mPropertyBag = {
 				variant: this._oVariantChange,
 				sourceVariantReference: this.getSourceVariantReference(),
 				variantManagementReference: this.sVariantManagementReference,

package/src/sap/ui/rta/command/ControlVariantSetTitle.js

@@ -4,15 +4,11 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/variants/VariantManager",
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/command/BaseCommand",
 	"sap/ui/rta/library"
 ], function(
-	JsControlTreeModifier,
-	ControlVariantApplyAPI,
 	VariantManager,
 	flUtils,
 	BaseCommand,
@@ -26,13 +22,13 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
 	 * @alias sap.ui.rta.command.ControlVariantSetTitle
 	 */
-	var ControlVariantSetTitle = BaseCommand.extend("sap.ui.rta.command.ControlVariantSetTitle", {
+	const ControlVariantSetTitle = BaseCommand.extend("sap.ui.rta.command.ControlVariantSetTitle", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -69,30 +65,26 @@ sap.ui.define([
 	 * @public
 	 * @returns {Promise} Returns resolve after execution
 	 */
-	ControlVariantSetTitle.prototype.execute = function() {
-		var oVariantManagementControl = this.getElement();
+	ControlVariantSetTitle.prototype.execute = async function() {
+		const oVariantManagementControl = this.getElement();
 
 		this.oAppComponent = flUtils.getAppComponentForControl(oVariantManagementControl);
-		this.oModel = this.oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-		this.sVariantManagementReference = JsControlTreeModifier.getSelector(oVariantManagementControl, this.oAppComponent).id;
-		this.sCurrentVariant = this.oModel.getCurrentVariantReference(this.sVariantManagementReference);
+		this.sVariantManagementReference = oVariantManagementControl.getVariantManagementReference();
+		this.sCurrentVariantKey = oVariantManagementControl.getCurrentVariantKey();
 
-		var sCurrentTitle = this.oModel.getVariantTitle(this.sCurrentVariant, this.sVariantManagementReference);
+		const sCurrentTitle = oVariantManagementControl.getVariantByKey(this.sCurrentVariantKey).getTitle();
 		this.setOldText(sCurrentTitle);
 
-		var mPropertyBag = {
+		const mPropertyBag = {
 			appComponent: this.oAppComponent,
-			variantReference: this.sCurrentVariant,
+			variantReference: this.sCurrentVariantKey,
 			changeType: "setTitle",
 			title: this.getNewText(),
 			layer: this.sLayer,
 			generator: rtaLibrary.GENERATOR_NAME
 		};
 
-		return Promise.resolve(VariantManager.addVariantChange(this.sVariantManagementReference, mPropertyBag))
-		.then(function(oChange) {
-			this._oVariantChange = oChange;
-		}.bind(this));
+		this._oVariantChange = await VariantManager.addVariantChange(this.sVariantManagementReference, mPropertyBag);
 	};
 
 	/**
@@ -100,19 +92,16 @@ sap.ui.define([
 	 * @public
 	 * @returns {Promise} Returns resolve after undo
 	 */
-	ControlVariantSetTitle.prototype.undo = function() {
-		var mPropertyBag = {
-			variantReference: this.sCurrentVariant,
+	ControlVariantSetTitle.prototype.undo = async function() {
+		const mPropertyBag = {
+			variantReference: this.sCurrentVariantKey,
 			changeType: "setTitle",
 			title: this.getOldText(),
 			appComponent: this.oAppComponent
 		};
-		var oChange = this._oVariantChange;
 
-		return Promise.resolve(VariantManager.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, oChange))
-		.then(function() {
-			this._oVariantChange = null;
-		}.bind(this));
+		await VariantManager.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, this._oVariantChange);
+		this._oVariantChange = null;
 	};
 
 	return ControlVariantSetTitle;

package/src/sap/ui/rta/command/ControlVariantSwitch.js

@@ -4,13 +4,11 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/variants/VariantManager",
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/command/BaseCommand"
 ], function(
-	JsControlTreeModifier,
 	ControlVariantApplyAPI,
 	VariantManager,
 	flUtils,
@@ -24,13 +22,13 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
 	 * @alias sap.ui.rta.command.ControlVariantSwitch
 	 */
-	var ControlVariantSwitch = BaseCommand.extend("sap.ui.rta.command.ControlVariantSwitch", {
+	const ControlVariantSwitch = BaseCommand.extend("sap.ui.rta.command.ControlVariantSwitch", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -60,40 +58,30 @@ sap.ui.define([
 		}
 	});
 
-	function discardVariantContent(sVReference) {
-		return VariantManager.eraseDirtyChangesOnVariant(this.sVariantManagementReference, sVReference, this._getAppComponent())
-		.then(function(aDirtyChanges) {
-			this.setDiscardedChanges(aDirtyChanges);
-		}.bind(this));
+	async function discardVariantContent(sVReference) {
+		const aDirtyChanges = await VariantManager.eraseDirtyChangesOnVariant(
+			this.sVariantManagementReference,
+			sVReference,
+			this.getElement()
+		);
+		this.setDiscardedChanges(aDirtyChanges);
 	}
 
-	ControlVariantSwitch.prototype._getAppComponent = function() {
-		var oElement = this.getElement();
-		return oElement ? flUtils.getAppComponentForControl(oElement) : this.getSelector().appComponent;
-	};
-
 	/**
 	 * Template Method to implement execute logic, with ensure precondition Element is available.
 	 *
 	 * @public
 	 * @returns {Promise} Returns resolve after execution
 	 */
-	ControlVariantSwitch.prototype.execute = function() {
-		var oElement = this.getElement();
-		var oAppComponent = this._getAppComponent();
-		var sNewVariantReference = this.getTargetVariantReference();
-
-		this.oModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-		this.sVariantManagementReference = JsControlTreeModifier.getSelector(oElement, oAppComponent).id;
+	ControlVariantSwitch.prototype.execute = async function() {
+		const oElement = this.getElement();
+		const sNewVariantReference = this.getTargetVariantReference();
+		this.sVariantManagementReference = oElement.getVariantManagementReference();
 
-		return Promise.resolve()
-		.then(function() {
-			if (this.getDiscardVariantContent()) {
-				return discardVariantContent.call(this, this.getSourceVariantReference());
-			}
-			return undefined;
-		}.bind(this))
-		.then(this._updateModelVariant.bind(this, sNewVariantReference, oAppComponent));
+		if (this.getDiscardVariantContent()) {
+			await discardVariantContent.call(this, this.getSourceVariantReference());
+		}
+		this._updateVariant(sNewVariantReference);
 	};
 
 	/**
@@ -101,33 +89,24 @@ sap.ui.define([
 	 * @public
 	 * @returns {Promise} Returns resolve after undo
 	 */
-	ControlVariantSwitch.prototype.undo = function() {
-		var sSourceVariantReference = this.getSourceVariantReference();
-		var oAppComponent = this._getAppComponent();
+	ControlVariantSwitch.prototype.undo = async function() {
+		const sSourceVariantReference = this.getSourceVariantReference();
 
-		return this._updateModelVariant(sSourceVariantReference, oAppComponent)
-		.then(function() {
-			// When discarding, dirty changes on source variant need to be applied AFTER the switch
-			if (this.getDiscardVariantContent()) {
-				return VariantManager.addAndApplyChangesOnVariant(this.getDiscardedChanges(), this._getAppComponent())
-				.then(function() {
-					this.setDiscardedChanges([]);
-					this.oModel.checkUpdate(true);
-				}.bind(this));
-			}
-			return undefined;
-		}.bind(this));
+		await this._updateVariant(sSourceVariantReference);
+		// When discarding, dirty changes on source variant need to be applied AFTER the switch
+		if (this.getDiscardVariantContent()) {
+			await VariantManager.addAndApplyChangesOnVariant(this.getDiscardedChanges(), this.getElement());
+			this.setDiscardedChanges([]);
+		}
 	};
 
-	ControlVariantSwitch.prototype._updateModelVariant = function(sVariantReference, oAppComponent) {
+	ControlVariantSwitch.prototype._updateVariant = async function(sVariantReference) {
 		if (this.getTargetVariantReference() !== this.getSourceVariantReference()) {
-			return this.oModel.updateCurrentVariant({
-				variantManagementReference: this.sVariantManagementReference,
-				newVariantReference: sVariantReference,
-				appComponent: oAppComponent
+			await ControlVariantApplyAPI.activateVariant({
+				element: this.getElement(),
+				variantReference: sVariantReference
 			});
 		}
-		return Promise.resolve();
 	};
 
 	return ControlVariantSwitch;

package/src/sap/ui/rta/command/CreateContainer.js

@@ -12,13 +12,13 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
 	 * @alias sap.ui.rta.command.CreateContainer
 	 */
-	var CreateContainer = FlexCommand.extend("sap.ui.rta.command.CreateContainer", {
+	const CreateContainer = FlexCommand.extend("sap.ui.rta.command.CreateContainer", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -44,7 +44,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	});
 
 	CreateContainer.prototype._getChangeSpecificData = function() {
-		var mSpecificInfo = FlexCommand.prototype._getChangeSpecificData.apply(this);
+		const mSpecificInfo = FlexCommand.prototype._getChangeSpecificData.apply(this);
 
 		mSpecificInfo.content.newLabel = this.getLabel();
 

package/src/sap/ui/rta/command/CustomAdd.js

@@ -12,13 +12,13 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @constructor
 	 * @private
 	 * @since 1.62
 	 * @alias sap.ui.rta.command.CustomAdd
 	 */
-	var CustomAdd = FlexCommand.extend("sap.ui.rta.command.CustomAdd", {
+	const CustomAdd = FlexCommand.extend("sap.ui.rta.command.CustomAdd", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {

package/src/sap/ui/rta/command/ExtendControllerCommand.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 * @constructor
 	 * @private
 	 * @since 1.135
@@ -56,9 +56,7 @@ sap.ui.define([
 		const sControllerName = oView.getControllerModuleName() ? `module:${oView.getControllerModuleName()}` : oView.getController()?.getMetadata().getName();
 		// Calculate moduleName for code extension
 		const sReference = FlexRuntimeInfoAPI.getFlexReference({element: oAppComponent});
-		let sModuleName = sReference.replace(/\.Component/g, "").replace(/\./g, "/");
-		sModuleName += "/changes/";
-		sModuleName += sCodeRef.replace(/\.js/g, "");
+		const sModuleName = `${sReference.replace(/\.Component/g, "").replace(/\./g, "/")}/changes/${sCodeRef.replace(/\.js/g, "")}`;
 
 		const oChangeSpecificData = {
 			changeType: this.getChangeType(),

package/src/sap/ui/rta/command/FlexCommand.js

@@ -35,14 +35,14 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 *
 	 * @constructor
 	 * @private
 	 * @since 1.34
 	 * @alias sap.ui.rta.command.FlexCommand
 	 */
-	var FlexCommand = BaseCommand.extend("sap.ui.rta.command.FlexCommand", {
+	const FlexCommand = BaseCommand.extend("sap.ui.rta.command.FlexCommand", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -69,31 +69,29 @@ sap.ui.define([
 					type: "boolean",
 					defaultValue: false
 				}
-			},
-			associations: {},
-			events: {}
+			}
 		}
 	});
 
 	/**
-	 * Retrieves id of element or selector
+	 * Retrieves the id of element or selector
 	 *
-	 * @returns {string} id value
+	 * @returns {string} Id value
 	 * @public
 	 */
 	FlexCommand.prototype.getElementId = function() {
-		var oElement = this.getElement();
+		const oElement = this.getElement();
 		return oElement ? oElement.getId() : this.getSelector().id;
 	};
 
 	/**
 	 * Retrieves app component of element or selector
 	 *
-	 * @returns {sap.ui.core.UIComponent} component
+	 * @returns {sap.ui.core.UIComponent} App component Instance
 	 * @private
 	 */
 	FlexCommand.prototype.getAppComponent = function() {
-		var oElement = this.getElement();
+		const oElement = this.getElement();
 		return oElement ? FlUtils.getAppComponentForControl(oElement) : this.getSelector().appComponent;
 	};
 
@@ -131,7 +129,7 @@ sap.ui.define([
 
 	/**
 	 * Returns a prepared change if exists in the command
-	 * @returns {object} Prepared change object
+	 * @returns {object} Prepared change instance
 	 * @public
 	 */
 	FlexCommand.prototype.getPreparedChange = function() {
@@ -140,10 +138,10 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @returns {Promise} empty promise after finishing execution
+	 * @returns {Promise<undefined>} Resolves with undefined after finishing execution
 	 */
 	FlexCommand.prototype.execute = function() {
-		var vChange = this.getPreparedChange();
+		const vChange = this.getPreparedChange();
 		return this._applyChange(vChange);
 	};
 
@@ -153,28 +151,26 @@ sap.ui.define([
 	 * @protected
 	 */
 	FlexCommand.prototype._getChangeSpecificData = function() {
-		var mProperties = this.getMetadata().getProperties();
-		var mChangeSpecificData = {
+		const mProperties = this.getMetadata().getProperties();
+		const mChangeSpecificData = {
 			changeType: this.getChangeType(),
 			content: mProperties.content?.get(this)
 		};
 		objectValues(mProperties)
-		.filter(function(oProperty) {
-			return oProperty.group === "content";
-		})
-		.forEach(function(oProperty) {
+		.filter((oProperty) => oProperty.group === "content")
+		.forEach((oProperty) => {
 			mChangeSpecificData.content ||= {};
 			mChangeSpecificData.content[oProperty.name] = oProperty.get(this);
-		}, this);
+		});
 		return mChangeSpecificData;
 	};
 
 	/**
 	 * Creates a change.
-	 * @param {object} mFlexSettings Map containing the flexibility settings
-	 * @param {string} sVariantManagementReference Reference to the variant management
-	 * @param {string} sCommand Command name
-	 * @returns {object} Returns the change object
+	 * @param {object} mFlexSettings - Map containing the flexibility settings
+	 * @param {string} sVariantManagementReference - Reference to the variant management
+	 * @param {string} sCommand - Command name
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Returns the change instance
 	 * @private
 	 */
 	FlexCommand.prototype._createChange = function(mFlexSettings, sVariantManagementReference, sCommand) {
@@ -188,8 +184,8 @@ sap.ui.define([
 	 * @param {object} mChangeSpecificData - Map containing change specific data
 	 * @param {object} mFlexSettings - Map containing flex settings
 	 * @param {string} sVariantManagementReference - Reference to the variant management
-	 * @param {string} sCommand Command name
-	 * @returns {Promise.<object>} Change object wrapped in a promise.
+	 * @param {string} sCommand - Command name
+	 * @returns {Promise<object>} Resolves with the Change instance
 	 * @private
 	 */
 	FlexCommand.prototype._createChangeFromData = async function(
@@ -246,39 +242,33 @@ sap.ui.define([
 	 * @override
 	 */
 	FlexCommand.prototype.undo = function() {
-		var vControl = this.getElement() || JsControlTreeModifier.bySelector(this.getSelector());
-
-		var oChange = this.getPreparedChange();
+		const vControl = this.getElement() || JsControlTreeModifier.bySelector(this.getSelector());
+		const oChange = this.getPreparedChange();
 
 		return ChangesWriteAPI.revert({change: oChange, element: vControl});
 	};
 
 	/**
 	 * @private
-	 * @param {sap.ui.fl.apply._internal.flexObjects.UIChange|Object} vChange Change object or map containing the change object
-	 * @returns {Promise} Returns an empty promise
+	 * @param {sap.ui.fl.apply._internal.flexObjects.UIChange|Object} oChange Change object
 	 */
-	FlexCommand.prototype._applyChange = function(oChange) {
-		var oAppComponent = this.getAppComponent();
-		var oSelectorElement = JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
+	FlexCommand.prototype._applyChange = async function(oChange) {
+		const oAppComponent = this.getAppComponent();
+		const oSelectorElement = JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
 
-		var mPropertyBag = {
+		const mPropertyBag = {
 			modifier: JsControlTreeModifier,
 			appComponent: oAppComponent,
 			view: FlUtils.getViewForControl(oSelectorElement)
 		};
-		return ChangesWriteAPI.apply({ change: oChange, element: oSelectorElement, ...mPropertyBag })
-
-		.then(function(oResult) {
-			if (!oResult.success) {
-				return Promise.reject(oResult.error);
-			}
-			return undefined;
-		});
+		const oResult = await ChangesWriteAPI.apply({ change: oChange, element: oSelectorElement, ...mPropertyBag });
+		if (!oResult.success) {
+			throw new Error(oResult.error);
+		}
 	};
 
 	FlexCommand.prototype._validateControlForChange = function(mFlexSettings) {
-		if (mFlexSettings && mFlexSettings.originalSelector && mFlexSettings.content && mFlexSettings.content.boundAggregation) {
+		if (mFlexSettings?.originalSelector && mFlexSettings?.content?.boundAggregation) {
 			return {
 				id: mFlexSettings.originalSelector,
 				appComponent: this.getAppComponent(),