@openui5/sap.ui.rta 1.108.1 → 1.109.0

package/THIRDPARTY.txt

@@ -478,7 +478,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.40
+Component: SAP Theming Base Content, version: 11.1.44
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.rta",
-  "version": "1.108.1",
+  "version": "1.109.0",
   "description": "OpenUI5 UI Library sap.ui.rta",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.108.1",
-    "@openui5/sap.ui.core": "1.108.1",
-    "@openui5/sap.ui.dt": "1.108.1",
-    "@openui5/sap.ui.fl": "1.108.1",
-    "@openui5/sap.ui.layout": "1.108.1"
+    "@openui5/sap.m": "1.109.0",
+    "@openui5/sap.ui.core": "1.109.0",
+    "@openui5/sap.ui.dt": "1.109.0",
+    "@openui5/sap.ui.fl": "1.109.0",
+    "@openui5/sap.ui.layout": "1.109.0"
   }
 }

package/src/sap/ui/rta/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.108.1</version>
+  <version>1.109.0</version>
 
   <documentation>SAPUI5 library with RTA controls.</documentation>
 

package/src/sap/ui/rta/Client.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.Client
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/RuntimeAuthoring.js

@@ -118,7 +118,7 @@ sap.ui.define([
 	 * @class The runtime authoring allows to adapt the fields of a running application.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -299,6 +299,19 @@ sap.ui.define([
 		ReloadManager.disableAutomaticStart(sLayer);
 	};
 
+	/**
+	 * Check if RTA is about to start or starting after a reload
+	 * e.g. when reloading without personalization changes
+	 *
+	 * @public
+	 * @static
+	 * @param {sap.ui.fl.Layer} [sLayer] - Active layer, CUSTOMER by default
+	 * @returns {boolean} Returns true if RTA is about to start or starting
+	 */
+	RuntimeAuthoring.willRTAStartAfterReload = function(sLayer) {
+		return ReloadManager.needsAutomaticStart(sLayer || Layer.CUSTOMER);
+	};
+
 	RuntimeAuthoring.prototype.addDependent = function(oObject, sName, bCreateGetter) {
 		bCreateGetter = typeof bCreateGetter === "undefined" ? true : !!bCreateGetter;
 		if (!(sName in this._dependents)) {
@@ -558,6 +571,7 @@ sap.ui.define([
 					validateFlexEnabled(this);
 				}
 				this._sStatus = STARTED;
+				RuntimeAuthoring.disableRestart(Layer.CUSTOMER);
 				this.fireStart({
 					editablePluginsCount: this.getPluginManager().getEditableOverlaysCount()
 				});
@@ -813,51 +827,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	/**
-	 * Function to handle ABAP transport of the changes
-	 *
-	 * @returns {Promise} Returns a Promise processing the transport of changes
-	 */
-	RuntimeAuthoring.prototype.transport = function() {
-		this.getPluginManager().handleStopCutPaste();
-
-		BusyIndicator.show(500);
-		return this._serializeToLrep().then(function() {
-			BusyIndicator.hide();
-			var bVariantByStartupParameter = FlexUtils.isVariantByStartupParameter(this._oRootControl);
-			var bAppVariantRunning = SmartVariantManagementApplyAPI.isApplicationVariant({control: this._oRootControl}) && !bVariantByStartupParameter;
-			return (bAppVariantRunning ? RtaAppVariantFeature.getAppVariantDescriptor(this._oRootControl) : Promise.resolve())
-				.then(function(oAppVariantDescriptor) {
-					var aAppVariantDescriptor = [];
-					if (oAppVariantDescriptor) {
-						aAppVariantDescriptor.push(oAppVariantDescriptor);
-					}
-					return PersistenceWriteAPI.publish({
-						selector: this.getRootControlInstance(),
-						styleClass: Utils.getRtaStyleClassName(),
-						layer: this.getLayer(),
-						appVariantDescriptors: aAppVariantDescriptor
-					})
-					.then(function(sMessage) {
-						if (sMessage !== "Error" && sMessage !== "Cancel") {
-							MessageToast.show(sMessage);
-							if (this.getShowToolbars()) {
-								PersistenceWriteAPI.getResetAndPublishInfo({
-									selector: this.getRootControlInstance(),
-									layer: this.getLayer()
-								})
-								.then(function(oPublishAndResetInfo) {
-									this._oToolbarControlsModel.setProperty("/publishEnabled", oPublishAndResetInfo.isPublishEnabled);
-									this._oToolbarControlsModel.setProperty("/restoreEnabled", oPublishAndResetInfo.isResetEnabled);
-								}.bind(this));
-							}
-						}
-					}.bind(this));
-				}.bind(this));
-		}.bind(this))
-		.catch(showTechnicalError);
-	};
-
 	RuntimeAuthoring.prototype.undo = function() {
 		this.getPluginManager().handleStopCutPaste();
 		return this.getCommandStack().undo();
@@ -1016,7 +985,7 @@ sap.ui.define([
 	}
 
 	/**
-	 * Adapt the enablement of undo/redo/reset/transport button
+	 * Adapt the enablement of undo/redo/reset button
 	 *
 	 * @returns {Promise} Resolves as soon as the MessageBox is closed
 	 */
@@ -1085,7 +1054,7 @@ sap.ui.define([
 	}
 
 	function onKeyDown(oEvent) {
-		// if for example the addField Dialog/transport/reset Popup is open, we don't want the user to be able to undo/redo
+		// if for example the addField Dialog/reset Popup is open, we don't want the user to be able to undo/redo
 		var bMacintosh = Device.os.macintosh;
 		var bFocusInsideOverlayContainer = Overlay.getOverlayContainer().get(0).contains(document.activeElement);
 		var bFocusInsideRtaToolbar = this.getShowToolbars() && this.getToolbar().getDomRef().contains(document.activeElement);
@@ -1333,7 +1302,6 @@ sap.ui.define([
 			};
 
 			if (!bUserLayer) {
-				oProperties.transport = this.transport.bind(this);
 				oProperties.publishVersion = onPublishVersion.bind(this);
 				oProperties.undo = this.undo.bind(this);
 				oProperties.redo = this.redo.bind(this);

package/src/sap/ui/rta/Utils.js

@@ -45,7 +45,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @since 1.30

package/src/sap/ui/rta/appVariant/AppVariantManager.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.53

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

@@ -14,7 +14,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.54
@@ -73,7 +73,7 @@ sap.ui.define([
 	AddXML.prototype._applyChange = function(vChange) {
 		// preload the module to be applicable in this session
 		var mModulePreloads = {};
-		mModulePreloads[vChange.getModuleName()] = this.getFragment();
+		mModulePreloads[vChange.getFlexObjectMetadata().moduleName] = this.getFragment();
 		sap.ui.require.preload(mModulePreloads);
 
 		return FlexCommand.prototype._applyChange.apply(this, arguments);

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.76
@@ -78,7 +78,7 @@ sap.ui.define([
 	AddXMLAtExtensionPoint.prototype._applyChange = function(vChange) {
 		// preload the module to be applicable in this session
 		var mModulePreloads = {};
-		mModulePreloads[vChange.getModuleName()] = this.getFragment();
+		mModulePreloads[vChange.getFlexObjectMetadata().moduleName] = this.getFragment();
 		sap.ui.require.preload(mModulePreloads);
 
 		var oChange = vChange.change || vChange;

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.command.BaseCommand
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private
@@ -75,7 +75,7 @@ sap.ui.define([
 
 	/**
 	 * Retrieves the prepared change for e.g. undo execution.
-	 * @return {sap.ui.fl.Change} Returns change after being created and stored
+	 * @return {sap.ui.fl.apply._internal.flexObjects.UIChange} Returns change after being created and stored
 	 */
 	AppDescriptorCommand.prototype.getPreparedChange = function () {
 		return this._oPreparedChange;

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

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"], function(ManagedObject) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.38

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.FlexCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -485,7 +485,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private

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.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -7,11 +7,13 @@ sap.ui.define([
 	"sap/ui/rta/command/BaseCommand",
 	"sap/ui/rta/library",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/Utils"
 ], function(
 	BaseCommand,
 	rtaLibrary,
 	JsControlTreeModifier,
+	ControlVariantApplyAPI,
 	flUtils
 ) {
 	"use strict";
@@ -22,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.52
@@ -67,7 +69,7 @@ sap.ui.define([
 	ControlVariantConfigure.prototype.execute = function() {
 		var oVariantManagementControl = this.getControl();
 		this.oAppComponent = flUtils.getAppComponentForControl(oVariantManagementControl);
-		this.oModel = this.oAppComponent.getModel(flUtils.VARIANT_MODEL_NAME);
+		this.oModel = this.oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
 		this.sVariantManagementReference = JsControlTreeModifier.getSelector(oVariantManagementControl, this.oAppComponent).id;
 
 		this._aPreparedChanges = [];

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

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

@@ -4,19 +4,21 @@
  * 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/Core",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/rta/Utils",
 	"sap/ui/fl/Utils",
-	"sap/ui/fl/write/api/ContextSharingAPI"
+	"sap/ui/fl/write/api/ContextSharingAPI",
+	"sap/ui/rta/command/BaseCommand",
+	"sap/ui/rta/library",
+	"sap/ui/rta/Utils"
 ], function(
-	BaseCommand,
-	rtaLibrary,
+	Core,
 	JsControlTreeModifier,
-	rtaUtils,
 	flUtils,
-	ContextSharingAPI
+	ContextSharingAPI,
+	BaseCommand,
+	rtaLibrary,
+	rtaUtils
 ) {
 	"use strict";
 
@@ -26,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
@@ -146,11 +148,9 @@ sap.ui.define([
 
 			return this.oModel.removeVariant(mPropertyBag, true)
 				.then(function() {
-					this._aControlChanges.forEach(function(oChange) {
-						this.oModel.oFlexController.addPreparedChange(oChange, this.oAppComponent);
-						var oControl = sap.ui.getCore().byId(JsControlTreeModifier.getControlIdBySelector(oChange.getSelector(), this.oAppComponent));
-						this.oModel.oFlexController.applyChange(oChange, oControl);
-					}.bind(this));
+					return this.oModel.addAndApplyChangesOnVariant(this._aControlChanges);
+				}.bind(this))
+				.then(function() {
 					this.oModel.getData()[this.sVariantManagementReference].defaultVariant = this.getSourceDefaultVariant();
 					this.oModel.getData()[this.sVariantManagementReference].originalDefaultVariant = this.getSourceDefaultVariant();
 					this._aPreparedChanges = null;

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

@@ -7,8 +7,15 @@ sap.ui.define([
 	"sap/ui/rta/command/BaseCommand",
 	"sap/ui/rta/library",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/Utils"
-], function(BaseCommand, rtaLibrary, JsControlTreeModifier, flUtils) {
+], function(
+	BaseCommand,
+	rtaLibrary,
+	JsControlTreeModifier,
+	ControlVariantApplyAPI,
+	flUtils
+) {
 	"use strict";
 
 	/**
@@ -17,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -65,7 +72,7 @@ sap.ui.define([
 		var oVariantManagementControlBinding = oVariantManagementControl.getTitle().getBinding("text");
 
 		this.oAppComponent = flUtils.getAppComponentForControl(oVariantManagementControl);
-		this.oModel = this.oAppComponent.getModel(flUtils.VARIANT_MODEL_NAME);
+		this.oModel = this.oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
 		this.sVariantManagementReference = JsControlTreeModifier.getSelector(oVariantManagementControl, this.oAppComponent).id;
 		this.sCurrentVariant = this.oModel.getCurrentVariantReference(this.sVariantManagementReference);
 

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

@@ -4,13 +4,15 @@
  * 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.1
+	 * @version 1.109.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

@@ -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.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -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.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.62

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

@@ -4,23 +4,25 @@
  * 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.1
+	 * @version 1.109.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

@@ -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.1
+	 * @version 1.109.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});
 							}