@openui5/sap.ui.rta 1.140.0 → 1.141.1

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private
@@ -47,50 +47,30 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} empty resolved promise or rejected promise
 	 */
-	CompositeCommand.prototype.execute = function() {
-		const aPromises = [];
-		this._forEachCommand(function(oCommand) {
-			aPromises.push(oCommand.execute.bind(oCommand));
-		});
-		return FlUtils.execPromiseQueueSequentially(aPromises, true)
-
-		.catch(function(e) {
+	CompositeCommand.prototype.execute = async function() {
+		try {
+			await FlUtils.execPromiseQueueSequentially(this.getCommands().map((oCommand) => {
+				return oCommand.execute.bind(oCommand);
+			}), true);
+		} catch (oError) {
+			await this.undo();
 			const aCommands = this.getCommands();
-			aCommands.forEach(function(oCommand) {
+			aCommands.forEach((oCommand) => {
 				if (oCommand instanceof FlexCommand) {
 					this.removeCommand(oCommand);
 				}
-			}.bind(this));
-
-			return this.undo()
-
-			.then(function() {
-				return Promise.reject(e);
 			});
-		}.bind(this));
+			throw oError;
+		}
 	};
 
 	CompositeCommand.prototype.undo = function() {
-		const aPromises = [];
-		this._forEachCommandInReverseOrder(function(oCommand) {
-			aPromises.push(oCommand.undo.bind(oCommand));
-		});
-		return FlUtils.execPromiseQueueSequentially(aPromises);
-	};
-
-	CompositeCommand.prototype._forEachCommand = function(fnDo) {
-		const aCommands = this.getCommands();
-		aCommands.forEach(fnDo, this);
+		return FlUtils.execPromiseQueueSequentially(this.getCommands().toReversed().map((oCommand) => {
+			return oCommand.undo.bind(oCommand);
+		}));
 	};
 
-	CompositeCommand.prototype._forEachCommandInReverseOrder = function(fnDo) {
-		const aCommands = this.getCommands();
-		for (let i = aCommands.length - 1; i >= 0; i--) {
-			fnDo.call(this, aCommands[i]);
-		}
-	};
-
-	CompositeCommand.prototype._addCompositeIdToChange = function(oCommand) {
+	function addCompositeIdToChange(oCommand) {
 		this._sCompositeId ||= FlUtils.createDefaultFileName("composite");
 		const oPreparedChange = oCommand.getPreparedChange && oCommand.getPreparedChange();
 		if (oPreparedChange) {
@@ -100,10 +80,10 @@ sap.ui.define([
 				oPreparedChange.setSupportInformation(oChangeSupportInformation);
 			}
 		} else if (oCommand.setCompositeId) {
-			// relevant for manifest commands
+			// relevant for manifest commands, as the change is not yet created when this function is called
 			oCommand.setCompositeId(this._sCompositeId);
 		}
-	};
+	}
 
 	/**
 	 * @override
@@ -112,7 +92,7 @@ sap.ui.define([
 	 * @returns {object} the composite command
 	 */
 	CompositeCommand.prototype.addCommand = function(oCommand, bSuppressInvalidate) {
-		this._addCompositeIdToChange(oCommand);
+		addCompositeIdToChange.call(this, oCommand);
 		return this.addAggregation("commands", oCommand, bSuppressInvalidate);
 	};
 
@@ -124,7 +104,7 @@ sap.ui.define([
 	 * @returns {object} the composite command
 	 */
 	CompositeCommand.prototype.insertCommand = function(oCommand, iIndex, bSuppressInvalidate) {
-		this._addCompositeIdToChange(oCommand);
+		addCompositeIdToChange.call(this, oCommand);
 		return this.insertAggregation("commands", oCommand, iIndex, bSuppressInvalidate);
 	};
 

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

@@ -4,7 +4,6 @@
  * 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/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/variants/VariantManager",
@@ -13,7 +12,6 @@ sap.ui.define([
 	"sap/ui/rta/command/BaseCommand",
 	"sap/ui/rta/library"
 ], function(
-	JsControlTreeModifier,
 	ControlVariantApplyAPI,
 	FlexRuntimeInfoAPI,
 	VariantManager,
@@ -30,13 +28,13 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @constructor
 	 * @private
 	 * @since 1.52
 	 * @alias sap.ui.rta.command.ControlVariantConfigure
 	 */
-	var ControlVariantConfigure = BaseCommand.extend("sap.ui.rta.command.ControlVariantConfigure", {
+	const ControlVariantConfigure = BaseCommand.extend("sap.ui.rta.command.ControlVariantConfigure", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -76,25 +74,24 @@ sap.ui.define([
 	 * @returns {Promise} Returns resolve after execution
 	 */
 	ControlVariantConfigure.prototype.execute = async function() {
-		var oVariantManagementControl = this.getControl();
+		const oVariantManagementControl = this.getControl();
 		this.oAppComponent = FlUtils.getAppComponentForControl(oVariantManagementControl);
-		this.oModel = this.oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
-		this.sVariantManagementReference = JsControlTreeModifier.getSelector(oVariantManagementControl, this.oAppComponent).id;
+		this.sVariantManagementReference = oVariantManagementControl.getVariantManagementReference();
 
 		this._aPreparedChanges = [];
 		if (this.getChanges().some((oChange) => {
 			if (
 				oChange.visible === false
-				&& oChange.variantReference === this.oModel.getCurrentVariantReference(this.sVariantManagementReference)
+				&& oChange.variantReference === oVariantManagementControl.getCurrentVariantKey()
 			) {
 				this._sOldVReference = oChange.variantReference;
 				return true;
 			}
 			return false;
 		})) {
-			await this.oModel.updateCurrentVariant({
-				variantManagementReference: this.sVariantManagementReference,
-				newVariantReference: this.sVariantManagementReference
+			await ControlVariantApplyAPI.activateVariant({
+				element: oVariantManagementControl,
+				variantReference: this.sVariantManagementReference
 			});
 		}
 
@@ -126,12 +123,12 @@ sap.ui.define([
 		});
 		delete this._aDeletedFlexObjects;
 
-		this.getChanges().forEach(function(mChangeProperties, index) {
+		this.getChanges().forEach((mChangeProperties, index) => {
 			const mPropertyBag = {
 				appComponent: this.oAppComponent
 			};
 			Object.keys(mChangeProperties).forEach(function(sProperty) {
-				var sOriginalProperty = `original${sProperty.charAt(0).toUpperCase()}${sProperty.substr(1)}`;
+				const sOriginalProperty = `original${sProperty.charAt(0).toUpperCase()}${sProperty.substr(1)}`;
 				if (sProperty === "visible") {
 					mPropertyBag[sProperty] = true; /* visibility of the variant always set back to true on undo */
 				} else if (mChangeProperties[sOriginalProperty]) {
@@ -141,18 +138,17 @@ sap.ui.define([
 					mPropertyBag[sProperty] = mChangeProperties[sProperty];
 				}
 			});
-			var oChange = this._aPreparedChanges[index];
+			const oChange = this._aPreparedChanges[index];
 			VariantManager.deleteVariantChange(this.sVariantManagementReference, mPropertyBag, oChange);
-		}.bind(this));
+		});
 
 		this._aPreparedChanges = null;
 		if (this._sOldVReference) {
-			await this.oModel.updateCurrentVariant({
-				variantManagementReference: this.sVariantManagementReference,
-				newVariantReference: this._sOldVReference
-			}).then(() => {
-				delete this._sOldVReference;
+			await ControlVariantApplyAPI.activateVariant({
+				element: this.getControl(),
+				variantReference: this._sOldVReference
 			});
+			delete this._sOldVReference;
 		}
 	};
 

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

@@ -4,13 +4,13 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/rta/command/BaseCommand",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
+	"sap/ui/fl/variants/VariantManager",
+	"sap/ui/rta/command/BaseCommand"
 ], function(
-	BaseCommand,
-	JsControlTreeModifier,
-	flUtils
+	FlexRuntimeInfoAPI,
+	VariantManager,
+	BaseCommand
 ) {
 	"use strict";
 
@@ -20,49 +20,40 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @constructor
 	 * @private
 	 * @since 1.86
 	 * @alias sap.ui.rta.command.ControlVariantSave
 	 */
-	var ControlVariantSave = BaseCommand.extend("sap.ui.rta.command.ControlVariantSave", {
+	const ControlVariantSave = BaseCommand.extend("sap.ui.rta.command.ControlVariantSave", {
 		metadata: {
 			library: "sap.ui.rta",
-			properties: {
-				model: {
-					type: "object"
-				}
-			},
 			associations: {},
 			events: {}
 		}
 	});
 
-	/**
-	 * @override
-	 */
-	ControlVariantSave.prototype.prepare = function() {
-		this.oAppComponent = flUtils.getAppComponentForControl(this.getElement());
-		this.sVariantManagementReference = JsControlTreeModifier.getSelector(this.getElement(), this.oAppComponent).id;
-		return true;
-	};
-
 	/**
 	 * Triggers the Save of a variant.
 	 * @public
 	 * @returns {Promise} Promise that resolves after execution
 	 */
 	ControlVariantSave.prototype.execute = function() {
-		var sCurrentVariantReference = this.getModel().getCurrentVariantReference(this.sVariantManagementReference);
-		this._aControlChanges = this.getModel().getVariant(sCurrentVariantReference, this.sVariantManagementReference).controlChanges;
-		this._aDirtyChanges = this.getModel()._getDirtyChangesFromVariantChanges(this._aControlChanges);
-		this._aDirtyChanges.forEach(function(oChange) {
+		const oVMControl = this.getElement();
+		this.sFlexReference = FlexRuntimeInfoAPI.getFlexReference({ element: oVMControl });
+		this._aControlChanges = VariantManager.getControlChangesForVariant(
+			this.sFlexReference,
+			oVMControl.getVariantManagementReference(),
+			oVMControl.getCurrentVariantKey()
+		);
+		this._aDirtyChanges = VariantManager.getDirtyChangesFromVariantChanges(this._aControlChanges, this.sFlexReference);
+		this._aDirtyChanges.forEach((oChange) => {
 			if (oChange.getFileType() === "change") {
 				oChange.setSavedToVariant(true);
 			}
 		});
-		this.getModel().invalidateMap();
+		VariantManager.updateVariantManagementMap(this.sFlexReference);
 		return Promise.resolve();
 	};
 
@@ -77,7 +68,7 @@ sap.ui.define([
 				oChange.setSavedToVariant(false);
 			}
 		});
-		this.getModel().invalidateMap();
+		VariantManager.updateVariantManagementMap(this.sFlexReference);
 		return Promise.resolve();
 	};
 

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.140.0
+	 * @version 1.141.1
 	 * @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.140.0
+	 * @version 1.141.1
 	 * @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;