@openui5/sap.ui.rta 1.108.2 → 1.110.0

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

@@ -1,16 +1,18 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * 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/ControlVariantApplyAPI",
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/command/BaseCommand"
 ], function(
-	BaseCommand,
 	JsControlTreeModifier,
-	flUtils
+	ControlVariantApplyAPI,
+	flUtils,
+	BaseCommand
 ) {
 	"use strict";
 
@@ -20,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -35,6 +37,9 @@ sap.ui.define([
 				},
 				sourceVariantReference: {
 					type: "string"
+				},
+				discardVariantContent: {
+					type: "boolean"
 				}
 			},
 			associations: {},
@@ -42,7 +47,15 @@ sap.ui.define([
 		}
 	});
 
-	ControlVariantSwitch.prototype._getAppComponent = function () {
+	function discardVariantContent(sVReference) {
+		return this.oModel.eraseDirtyChangesOnVariant(this.sVariantManagementReference, sVReference)
+		.then(function(aDirtyChanges) {
+			this._aSourceVariantDirtyChanges = aDirtyChanges;
+			this.oModel.checkUpdate(true);
+		}.bind(this));
+	}
+
+	ControlVariantSwitch.prototype._getAppComponent = function() {
 		var oElement = this.getElement();
 		return oElement ? flUtils.getAppComponentForControl(oElement) : this.getSelector().appComponent;
 	};
@@ -50,6 +63,7 @@ sap.ui.define([
 
 	/**
 	 * Template Method to implement execute logic, with ensure precondition Element is available.
+	 *
 	 * @public
 	 * @returns {Promise} Returns resolve after execution
 	 */
@@ -58,9 +72,17 @@ sap.ui.define([
 		var oAppComponent = this._getAppComponent();
 		var sNewVariantReference = this.getTargetVariantReference();
 
-		this.oModel = oAppComponent.getModel(flUtils.VARIANT_MODEL_NAME);
+		this.oModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
 		this.sVariantManagementReference = JsControlTreeModifier.getSelector(oElement, oAppComponent).id;
-		return this._updateModelVariant(sNewVariantReference, oAppComponent);
+
+		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));
 	};
 
 	/**
@@ -71,10 +93,20 @@ sap.ui.define([
 	ControlVariantSwitch.prototype.undo = function() {
 		var sOldVariantReference = this.getSourceVariantReference();
 		var oAppComponent = this._getAppComponent();
+
+		if (this.getDiscardVariantContent()) {
+			return this.oModel.addAndApplyChangesOnVariant(this._aSourceVariantDirtyChanges)
+			.then(function() {
+				this._aSourceVariantDirtyChanges = null;
+				this.oModel.checkUpdate(true);
+				return this._updateModelVariant(sOldVariantReference, oAppComponent);
+			}.bind(this));
+		}
+
 		return this._updateModelVariant(sOldVariantReference, oAppComponent);
 	};
 
-	ControlVariantSwitch.prototype._updateModelVariant = function (sVariantReference, oAppComponent) {
+	ControlVariantSwitch.prototype._updateModelVariant = function(sVariantReference, oAppComponent) {
 		if (this.getTargetVariantReference() !== this.getSourceVariantReference()) {
 			return this.oModel.updateCurrentVariant({
 				variantManagementReference: this.sVariantManagementReference,

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.62

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

@@ -1,26 +1,28 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/rta/command/BaseCommand",
-	"sap/ui/rta/library",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/fl/Utils",
-	"sap/base/Log",
 	"sap/base/util/merge",
+	"sap/base/util/values",
+	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
-	"sap/base/util/values"
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/command/BaseCommand",
+	"sap/ui/rta/library"
 ], function(
-	BaseCommand,
-	rtaLibrary,
-	JsControlTreeModifier,
-	FlUtils,
-	Log,
 	merge,
+	objectValues,
+	Log,
+	JsControlTreeModifier,
+	ControlVariantApplyAPI,
 	ChangesWriteAPI,
-	objectValues
+	FlUtils,
+	BaseCommand,
+	rtaLibrary
 ) {
 	"use strict";
 
@@ -31,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @private
@@ -195,7 +197,7 @@ sap.ui.define([
 			mChangeSpecificData = merge({}, mChangeSpecificData, mFlexSettings);
 		}
 		mChangeSpecificData.jsOnly = this.getJsOnly();
-		var oModel = this.getAppComponent().getModel(FlUtils.VARIANT_MODEL_NAME);
+		var oModel = this.getAppComponent().getModel(ControlVariantApplyAPI.getVariantModelName());
 		var sVariantReference;
 		if (oModel && sVariantManagementReference) {
 			sVariantReference = oModel.getCurrentVariantReference(sVariantManagementReference);
@@ -237,7 +239,7 @@ sap.ui.define([
 
 	/**
 	 * @private
-	 * @param {sap.ui.fl.Change|Object} vChange Change object or map containing the change object
+	 * @param {sap.ui.fl.apply._internal.flexObjects.UIChange|Object} vChange Change object or map containing the change object
 	 * @returns {Promise} Returns an empty promise
 	 */
 	FlexCommand.prototype._applyChange = function(vChange) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -8,7 +8,6 @@ sap.ui.define([
 	"sap/ui/rta/command/FlexCommand",
 	"sap/ui/rta/command/AppDescriptorCommand",
 	"sap/ui/fl/Utils",
-	"sap/ui/fl/Change",
 	"sap/ui/dt/ElementUtil",
 	"sap/base/Log",
 	"sap/ui/fl/write/api/PersistenceWriteAPI"
@@ -17,7 +16,6 @@ sap.ui.define([
 	FlexCommand,
 	AppDescriptorCommand,
 	FlUtils,
-	Change,
 	ElementUtil,
 	Log,
 	PersistenceWriteAPI
@@ -29,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.42
@@ -114,9 +112,6 @@ sap.ui.define([
 						var oAppComponent = oCommand.getAppComponent();
 						if (oAppComponent) {
 							var oPreparedChange = oCommand.getPreparedChange();
-							if (oPreparedChange.getState() === Change.states.DELETED) {
-								oPreparedChange.setState(Change.states.NEW);
-							}
 							if (!this._isPersistedChange(oPreparedChange)) {
 								PersistenceWriteAPI.add({change: oCommand.getPreparedChange(), selector: oAppComponent});
 							}
@@ -182,23 +177,33 @@ sap.ui.define([
 		}.bind(this))
 		.then(function() {
 			Log.info("UI adaptation successfully transfered changes to layered repository");
+			this.getCommandStack().setSaved(true);
 			this.getCommandStack().removeAllCommands();
 		}.bind(this));
 
 		return this._lastPromise;
 	};
 
-	LREPSerializer.prototype._triggerUndoChanges = function() {
+	LREPSerializer.prototype._triggerUndoChanges = function(bRemoveChanges) {
 		var oCommandStack = this.getCommandStack();
 		var aPromises = [];
 
 		var aCommands = oCommandStack.getAllExecutedCommands();
-		aCommands.forEach(function(oCommand) {
-			aPromises.push(oCommand.undo.bind(oCommand));
-		});
 
-		// The last command has to be undone first, therefore reversing is required
-		aPromises = aPromises.reverse();
+		if (bRemoveChanges) {
+			// Calling "undo" from the stack, the serializer is also informed of the
+			// command execution and clears the dirty changes from the persistence
+			aCommands.forEach(function() {
+				// Undo on the stack already starts from the last command
+				aPromises.push(oCommandStack.undo.bind(oCommandStack));
+			});
+		} else {
+			aCommands.forEach(function(oCommand) {
+				aPromises.push(oCommand.undo.bind(oCommand));
+			});
+			// The last command has to be undone first, therefore reversing is required
+			aPromises = aPromises.reverse();
+		}
 
 		return FlUtils.execPromiseQueueSequentially(aPromises, false, true);
 	};
@@ -208,18 +213,23 @@ sap.ui.define([
 	 * At this point command stack is not aware if the changes have been already booked for the new app variant.
 	 * Therefore if there shall be some UI changes present in command stack, we undo all the changes till the beginning.
 	 * In the last when user presses 'Save and Exit', there will be no change registered for the current app.
+	 * @param {boolean} bRemoveChanges if LREPSerializer should clear the dirty changes in the persistence
 	 * @returns {Promise} returns a promise with true or false
 	 */
-	LREPSerializer.prototype.clearCommandStack = function() {
+	LREPSerializer.prototype.clearCommandStack = function(bRemoveChanges) {
 		var oCommandStack = this.getCommandStack();
 
 		// Detach the event 'commandExecuted' here to stop the communication of LREPSerializer with Flex
-		oCommandStack.detachCommandExecuted(this.handleCommandExecuted.bind(this));
-		return this._triggerUndoChanges()
+		if (!bRemoveChanges) {
+			oCommandStack.detachCommandExecuted(this.handleCommandExecuted.bind(this));
+		}
+		return this._triggerUndoChanges(bRemoveChanges)
 		.then(function() {
 			oCommandStack.removeAllCommands();
 			// Attach the event 'commandExecuted' here to start the communication of LREPSerializer with Flex
-			oCommandStack.attachCommandExecuted(this.handleCommandExecuted.bind(this));
+			if (!bRemoveChanges) {
+				oCommandStack.attachCommandExecuted(this.handleCommandExecuted.bind(this));
+			}
 			return true;
 		}.bind(this));
 	};

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.90

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -17,7 +17,7 @@ function(
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.42

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
@@ -12,7 +12,7 @@ sap.ui.define(["sap/ui/rta/command/FlexCommand"], function(FlexCommand) {
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -70,7 +70,15 @@ sap.ui.define([
 	var Stack = ManagedObject.extend("sap.ui.rta.command.Stack", {
 		metadata: {
 			library: "sap.ui.rta",
-			properties: {},
+			properties: {
+				/**
+				 * If the stack was saved at least once
+				 */
+				saved: {
+					type: "boolean",
+					defaultValue: false
+				}
+			},
 			aggregations: {
 				commands: {
 					type: "sap.ui.rta.command.BaseCommand",

package/src/sap/ui/rta/command/appDescriptor/AddLibrary.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.AppDescriptorCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/command/compVariant/CompVariantContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.102
@@ -81,7 +81,6 @@ sap.ui.define([
 	};
 
 	CompVariantContent.prototype.execute = function() {
-		this.setIsModifiedBefore(this.getElement().getModified());
 		this.getElement().setModified(true);
 		var oNewVariantContent = setVariantContent.call(this, this.getNewContent());
 		callFlAPIFunction.call(this, "updateVariantContent", this.getVariantId(), {content: oNewVariantContent});

package/src/sap/ui/rta/command/compVariant/CompVariantSaveAs.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/command/compVariant/CompVariantSwitch.js

@@ -1,12 +1,14 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/rta/command/BaseCommand"
+	"sap/ui/rta/command/BaseCommand",
+	"sap/ui/fl/write/api/SmartVariantManagementWriteAPI"
 ], function(
-	BaseCommand
+	BaseCommand,
+	SmartVariantManagementWriteAPI
 ) {
 	"use strict";
 
@@ -16,7 +18,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.87
@@ -31,18 +33,29 @@ sap.ui.define([
 				},
 				targetVariantId: {
 					type: "string"
+				},
+				discardVariantContent: {
+					type: "boolean"
 				}
 			}
 		}
 	});
 
 	/**
-	 * Triggers the configuration of a variant.
+	 * Triggers the switch of a variant. If the switch was done from
+	 * a variant with changes, the user can decide to discard them on switch.
 	 * @public
-	 * @returns {Promise} Returns resolve after execution
+	 * @returns {Promise} Resolves after execution
 	 */
 	CompVariantSwitch.prototype.execute = function() {
 		this.getElement().activateVariant(this.getTargetVariantId());
+		if (this.getDiscardVariantContent()) {
+			this.getElement().setModified(false);
+			SmartVariantManagementWriteAPI.discardVariantContent({
+				control: this.getElement(),
+				id: this.getSourceVariantId()
+			});
+		}
 		return Promise.resolve();
 	};
 
@@ -52,7 +65,16 @@ sap.ui.define([
 	 * @returns {Promise} Resolves after undo
 	 */
 	CompVariantSwitch.prototype.undo = function() {
+		if (this.getDiscardVariantContent()) {
+			SmartVariantManagementWriteAPI.revert({
+				control: this.getElement(),
+				id: this.getSourceVariantId()
+			});
+		}
 		this.getElement().activateVariant(this.getSourceVariantId());
+		if (this.getDiscardVariantContent()) {
+			this.getElement().setModified(true);
+		}
 		return Promise.resolve();
 	};
 

package/src/sap/ui/rta/command/compVariant/CompVariantUpdate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.87

package/src/sap/ui/rta/enablement/TestDelegate.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([