@openui5/sap.ui.rta 1.108.1 → 1.109.0

package/src/sap/ui/rta/messagebundle_zh_TW.properties

@@ -23,6 +23,9 @@ CTX_VARIANT_SET_TITLE=\u8A2D\u5B9A\u6A19\u984C
 CTX_VARIANT_MANAGE=\u7BA1\u7406\u6AA2\u8996
 BTN_CREATE_NEW_VIEW=\u5132\u5B58\u70BA\u65B0\u6AA2\u8996
 MSG_CHANGE_READONLY_VARIANT=\u7531\u65BC\u6B64\u6AA2\u8996\u5DF2\u53D7\u4FDD\u8B77\uFF0C\u56E0\u6B64\u60A8\u7121\u6CD5\u7DE8\u8F2F\u3002\u82E5\u8981\u66F4\u6539\u8A72\u6AA2\u8996\uFF0C\u8ACB\u5C07\u5176\u5132\u5B58\u70BA\u65B0\u6AA2\u8996\u3002
+BTN_MODIFIED_VARIANT_SAVE=Save Changes
+BTN_MODIFIED_VARIANT_DISCARD=Discard Changes
+MSG_CHANGE_MODIFIED_VARIANT=You have unsaved changes on this view. Would you like to save or discard them?
 CTX_ADDXML_AT_EXTENSIONPOINT=\u65BC\u5EF6\u4F38\u9EDE\u65B0\u589E\u7247\u6BB5
 BTN_FREP_OK=\u78BA\u5B9A
 BTN_FREP_REMOVE=\u79FB\u9664
@@ -240,7 +243,7 @@ BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_MOVE=\u986F\u793A\u4F86\u6E90
 BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_SPLIT=\u986F\u793A\u5176\u4ED6\u90E8\u4EFD
 BUT_CHANGEVISUALIZATION_LEARNMORE=[\u6DF1\u5165\u77AD\u89E3]
 
-MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING=\u6B64\u61C9\u7528\u7A0B\u5F0F\u7684\u4F7F\u7528\u8005\u4ECB\u9762\u66F4\u6539\u5167\u5BB9\u5DF2\u65BC\u5176\u4ED6\u7CFB\u7D71\u4E2D\u57F7\u884C\u3002\u82E5\u8981\u907F\u514D\u885D\u7A81\uFF0C\u5F37\u70C8\u5EFA\u8B70\u53EA\u5728\u4E00\u500B\u7CFB\u7D71\u4E2D\u9032\u884C\u4F7F\u7528\u8005\u4ECB\u9762\u66F4\u6539\uFF0C\u7136\u5F8C\u518D\u5C07\u9019\u4E9B\u66F4\u6539\u5167\u5BB9\u50B3\u8F38\u81F3\u5176\u4ED6\u7CFB\u7D71\u3002\u8ACB\u67E5\u770B [Adapting the UI] (https\://help.sap.com/docs/search?q\=Adapting%20the%20UI)\u3002
+MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING=\u6B64\u61C9\u7528\u7A0B\u5F0F\u7684\u4F7F\u7528\u8005\u4ECB\u9762\u66F4\u6539\u5167\u5BB9\u5DF2\u5728\u5176\u4ED6\u7CFB\u7D71\u4E2D\u57F7\u884C\u3002\u82E5\u8981\u907F\u514D\u885D\u7A81\uFF0C\u5F37\u70C8\u5EFA\u8B70\u53EA\u5728\u4E00\u500B\u7CFB\u7D71\u4E2D\u9032\u884C\u4F7F\u7528\u8005\u4ECB\u9762\u66F4\u6539\uFF0C\u7136\u5F8C\u518D\u5C07\u9019\u4E9B\u66F4\u6539\u5167\u5BB9\u50B3\u8F38\u81F3\u5176\u4ED6\u7CFB\u7D71\u3002\u8ACB\u67E5\u770B [Adapting the UI] (https\://help.sap.com/docs/search?q\=Adapting%20the%20UI)\u3002
 TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE=\u8B66\u544A - \u56B4\u91CD\u885D\u7A81\u7684\u98A8\u96AA
 MSG_ADAPTATION_STARTER_NO_CHANGES_IN_P_WARNING=\u60A8\u6B63\u5728\u6B63\u5F0F\u904B\u4F5C\u7CFB\u7D71\u4E2D\u555F\u52D5\u4F7F\u7528\u8005\u4ECB\u9762\u8ABF\u6574\u3002\u82E5\u60A8\u5177\u5099\u958B\u767C\u6216\u6E2C\u8A66\u7CFB\u7D71\uFF0C\u5247\u5EFA\u8B70\u60A8\u5728\u9019\u4E9B\u7CFB\u7D71\u4E2D\u9032\u884C\u66F4\u6539\uFF0C\u4E26\u4E14\u4F7F\u7528\u50B3\u8F38\u6A5F\u5236\u767C\u4F48\u9019\u4E9B\u66F4\u6539\u5167\u5BB9\u3002
 TIT_ADAPTATION_STARTER_NO_CHANGES_IN_P_TITLE=\u8B66\u544A - \u60A8\u5373\u5C07\u5728\u6B63\u5F0F\u904B\u4F5C\u7CFB\u7D71\u4E2D\u9032\u884C\u66F4\u6539

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

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

package/src/sap/ui/rta/plugin/BaseCreate.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class The BaseCreate allows trigger BaseCreate operations on the overlay.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

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

package/src/sap/ui/rta/plugin/CompVariant.js

@@ -27,7 +27,6 @@ sap.ui.define([
 ) {
 	"use strict";
 
-
 	var CompVariant = Plugin.extend("sap.ui.rta.plugin.CompVariant", /** @lends sap.ui.rta.plugin.CompVariant.prototype */ {
 		metadata: {
 			library: "sap.ui.rta",
@@ -40,12 +39,34 @@ sap.ui.define([
 		}
 	});
 
-	function createCommandAndFireEvent(oOverlay, sName, mProperties, oElement) {
+	function createCommandAndFireEvent(oOverlay, aCommandNames, mProperties, oElement) {
 		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
 		var oTargetElement = oElement || oOverlay.getElement();
-
-		return this.getCommandFactory().getCommandFor(oTargetElement, sName, mProperties, oDesignTimeMetadata)
-
+		return Promise.resolve()
+		.then(function() {
+			if (aCommandNames.length === 1) {
+				return this.getCommandFactory().getCommandFor(oTargetElement, aCommandNames[0], mProperties, oDesignTimeMetadata);
+			}
+			var oCompositeCommand;
+			return this.getCommandFactory().getCommandFor(oTargetElement, "composite")
+			.then(function(_oCompositeCommand) {
+				oCompositeCommand = _oCompositeCommand;
+				var aCommandPromises = [];
+				aCommandNames.forEach(function(sCommandName) {
+					aCommandPromises.push(this.getCommandFactory().getCommandFor(
+						oTargetElement,
+						sCommandName,
+						mProperties[sCommandName],
+						oDesignTimeMetadata
+					));
+				}.bind(this));
+				return Promise.all(aCommandPromises)
+				.then(function(aCommands) {
+					aCommands.forEach(oCompositeCommand.addCommand.bind(oCompositeCommand));
+					return oCompositeCommand;
+				});
+			}.bind(this));
+		}.bind(this))
 		.then(function(oCommand) {
 			this.fireElementModified({
 				command: oCommand
@@ -53,7 +74,7 @@ sap.ui.define([
 		}.bind(this))
 
 		.catch(function(oMessage) {
-			throw DtUtil.createError(sName, oMessage, "sap.ui.rta.plugin.CompVariant");
+			throw DtUtil.createError(aCommandNames[0], oMessage, "sap.ui.rta.plugin.CompVariant");
 		});
 	}
 
@@ -89,7 +110,7 @@ sap.ui.define([
 		mPropertyBag.newVariantProperties[sVariantId] = {
 			name: sText
 		};
-		createCommandAndFireEvent.call(this, oOverlay, "compVariantUpdate", mPropertyBag);
+		createCommandAndFireEvent.call(this, oOverlay, ["compVariantUpdate"], mPropertyBag);
 	};
 
 	// ------ configure ------
@@ -103,7 +124,7 @@ sap.ui.define([
 		};
 		oVariantManagementControl.openManageViewsDialogForKeyUser(mPropertyBag, function(oData) {
 			if (!isEmptyObject(oData)) {
-				createCommandAndFireEvent.call(this, aOverlays[0], "compVariantUpdate", {
+				createCommandAndFireEvent.call(this, aOverlays[0], ["compVariantUpdate"], {
 					newVariantProperties: _omit(oData, ["default"]),
 					newDefaultVariantId: oData.default,
 					oldDefaultVariantId: oVariantManagementControl.getDefaultVariantId()
@@ -113,23 +134,71 @@ sap.ui.define([
 	}
 
 	// ------ switch ------
+	function onDirtySwitchWarningClose(oVariantManagementOverlay, sTargetVariantId, sAction) {
+		if (sAction === MessageBox.Action.CANCEL) {
+			return;
+		}
+
+		var oLibraryBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+		var oVariantManagementControl = oVariantManagementOverlay.getElement();
+		var mProperties;
+
+		if (sAction === oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE")) {
+			// Create composite command for compVariantUpdate + compVariantSwitch
+			getCompVariantUpdateProperties(oVariantManagementControl)
+			.then(function(oCompVariantUpdateProperties) {
+				mProperties = {
+					compVariantSwitch: {
+						targetVariantId: sTargetVariantId,
+						sourceVariantId: oVariantManagementControl.getPresentVariantId()
+					},
+					compVariantUpdate: oCompVariantUpdateProperties
+				};
+				createCommandAndFireEvent.call(this, oVariantManagementOverlay, ["compVariantUpdate", "compVariantSwitch"], mProperties);
+			}.bind(this));
+		}
+		if (sAction === oLibraryBundle.getText("BTN_MODIFIED_VARIANT_DISCARD")) {
+			createCommandAndFireEvent.call(this, oVariantManagementOverlay, ["compVariantSwitch"], {
+				targetVariantId: sTargetVariantId,
+				sourceVariantId: oVariantManagementControl.getPresentVariantId(),
+				discardVariantContent: true
+			});
+		}
+	}
+
 	function isSwitchEnabled(aOverlays) {
 		return getAllVariants(aOverlays[0]).length > 1;
 	}
 
 	function switchVariant(aOverlays, mPropertyBag) {
-		var oVariantManagementControl = aOverlays[0].getElement();
-
-		createCommandAndFireEvent.call(this, aOverlays[0], "compVariantSwitch", {
-			targetVariantId: mPropertyBag.eventItem.getParameters().item.getProperty("key"),
-			sourceVariantId: oVariantManagementControl.getPresentVariantId()
-		});
+		var oVariantManagementOverlay = aOverlays[0];
+		var oVariantManagementControl = oVariantManagementOverlay.getElement();
+
+		// If the variant was modified, user must choose whether to save changes before switching
+		if (oVariantManagementControl.getModified()) {
+			var oLibraryBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+			var sTargetVariantId = mPropertyBag.eventItem.getParameters().item.getProperty("key");
+			MessageBox.warning(oLibraryBundle.getText("MSG_CHANGE_MODIFIED_VARIANT"), {
+				onClose: onDirtySwitchWarningClose.bind(this, oVariantManagementOverlay, sTargetVariantId),
+				actions: [
+					oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE"),
+					oLibraryBundle.getText("BTN_MODIFIED_VARIANT_DISCARD"),
+					MessageBox.Action.CANCEL
+				],
+				emphasizedAction: oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE"),
+				styleClass: Utils.getRtaStyleClassName()
+			});
+		} else {
+			createCommandAndFireEvent.call(this, oVariantManagementOverlay, ["compVariantSwitch"], {
+				targetVariantId: mPropertyBag.eventItem.getParameters().item.getProperty("key"),
+				sourceVariantId: oVariantManagementControl.getPresentVariantId()
+			});
+		}
 	}
 
 	// ------ save ------
-	function saveVariant(aOverlays) {
-		var oVariantManagementControl = aOverlays[0].getElement();
-		oVariantManagementControl.getPresentVariantContent().then(function(oContent) {
+	function getCompVariantUpdateProperties(oVariantManagementControl) {
+		return oVariantManagementControl.getPresentVariantContent().then(function(oContent) {
 			var oPropertyBag = {
 				onlySave: true,
 				newVariantProperties: {}
@@ -137,7 +206,15 @@ sap.ui.define([
 			oPropertyBag.newVariantProperties[oVariantManagementControl.getPresentVariantId()] = {
 				content: oContent
 			};
-			createCommandAndFireEvent.call(this, aOverlays[0], "compVariantUpdate", oPropertyBag);
+			return oPropertyBag;
+		});
+	}
+
+	function saveVariant(aOverlays) {
+		var oVariantManagementControl = aOverlays[0].getElement();
+		getCompVariantUpdateProperties(oVariantManagementControl)
+		.then(function(oPropertyBag) {
+			createCommandAndFireEvent.call(this, aOverlays[0], ["compVariantUpdate"], oPropertyBag);
 		}.bind(this));
 	}
 
@@ -153,7 +230,7 @@ sap.ui.define([
 		return new Promise(function(resolve) {
 			oVariantManagementControl.openSaveAsDialogForKeyUser(Utils.getRtaStyleClassName(), function(oReturn) {
 				if (oReturn) {
-					createCommandAndFireEvent.call(this, aOverlays[0], "compVariantSaveAs", {
+					createCommandAndFireEvent.call(this, aOverlays[0], ["compVariantSaveAs"], {
 						newVariantProperties: {
 							"default": oReturn.default,
 							executeOnSelection: oReturn.executeOnSelection,
@@ -194,11 +271,13 @@ sap.ui.define([
 		var oElementOverlay = aOverlays[0];
 		var oControl = oElementOverlay.getElementInstance();
 		var oAction = this.getAction(oElementOverlay);
+		var oVariantManagementControl = oControl.getVariantManagement();
+		// the modified flag might be changed before the dialog is closed, so it has to be saved here already
+		var bIsModified = oVariantManagementControl.getModified();
 
 		return oAction.handler(oControl, {styleClass: Utils.getRtaStyleClassName()}).then(function(aChangeContentData) {
 			if (aChangeContentData && aChangeContentData.length) {
 				var sPersistencyKey = aChangeContentData[0].changeSpecificData.content.persistencyKey;
-				var oVariantManagementControl = oControl.getVariantManagement();
 				var aVariants = oVariantManagementControl.getAllVariants();
 				var oCurrentVariant = aVariants.find(function(oVariant) {
 					return oVariant.getVariantId() === oVariantManagementControl.getPresentVariantId();
@@ -207,11 +286,12 @@ sap.ui.define([
 				// a variant that can't be overwritten must never get dirty,
 				// instead the user needs to save the changes to a new variant
 				if (oCurrentVariant.isEditEnabled(this.getCommandFactory().getFlexSettings().layer)) {
-					createCommandAndFireEvent.call(this, oElementOverlay, "compVariantContent", {
+					createCommandAndFireEvent.call(this, oElementOverlay, ["compVariantContent"], {
 						variantId: aChangeContentData[0].changeSpecificData.content.key,
 						newContent: aChangeContentData[0].changeSpecificData.content.content,
-						persistencyKey: sPersistencyKey
-					}, oControl.getVariantManagement());
+						persistencyKey: sPersistencyKey,
+						isModifiedBefore: bIsModified
+					}, oVariantManagementControl);
 				} else {
 					MessageBox.warning(oLibraryBundle.getText("MSG_CHANGE_READONLY_VARIANT"), {
 						onClose: onWarningClose.bind(this, oVariantManagementControl, oCurrentVariant.getVariantId()),

package/src/sap/ui/rta/plugin/ControlVariant.js

@@ -14,10 +14,12 @@ sap.ui.define([
 	"sap/ui/dt/Util",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/variants/VariantManagement",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/base/ManagedObject",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/m/MessageBox"
 ], function(
 	Plugin,
 	RenameHandler,
@@ -28,10 +30,12 @@ sap.ui.define([
 	DtUtil,
 	flUtils,
 	Layer,
+	ControlVariantApplyAPI,
 	VariantManagement,
 	ContextSharingAPI,
 	ManagedObject,
-	Log
+	Log,
+	MessageBox
 ) {
 	"use strict";
 
@@ -43,7 +47,7 @@ sap.ui.define([
 	 * @class The ControlVariant allows propagation of variantManagement key
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -75,6 +79,28 @@ sap.ui.define([
 		}
 	});
 
+	function getCommandForSave(oOverlay) {
+		var oElement = oOverlay.getElement();
+		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
+		var oModel = this._getVariantModel(oElement);
+		var sVariantManagementReference = oOverlay.getVariantManagement();
+
+		return this.getCommandFactory().getCommandFor(oElement, "save", {
+			model: oModel
+		}, oDesignTimeMetadata, sVariantManagementReference);
+	}
+
+	function getCommandForSwitch(oOverlay, sNewVariantReference, sCurrentVariantReference, bDiscardVariantContent) {
+		var oElement = oOverlay.getElement();
+		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
+
+		return this.getCommandFactory().getCommandFor(oElement, "switch", {
+			targetVariantReference: sNewVariantReference,
+			sourceVariantReference: sCurrentVariantReference,
+			discardVariantContent: bDiscardVariantContent
+		}, oDesignTimeMetadata);
+	}
+
 	/**
 	 * Registers an overlay.
 	 *
@@ -123,7 +149,7 @@ sap.ui.define([
 		}
 	};
 
-	ControlVariant.prototype._isPersonalizationMode = function () {
+	ControlVariant.prototype._isPersonalizationMode = function() {
 		return this.getCommandFactory().getFlexSettings().layer === Layer.USER;
 	};
 
@@ -180,7 +206,7 @@ sap.ui.define([
 
 	ControlVariant.prototype._getVariantModel = function(oElement) {
 		var oAppComponent = flUtils.getAppComponentForControl(oElement);
-		return oAppComponent ? oAppComponent.getModel(flUtils.VARIANT_MODEL_NAME) : undefined;
+		return oAppComponent ? oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName()) : undefined;
 	};
 
 	/**
@@ -195,7 +221,7 @@ sap.ui.define([
 		return this._isVariantManagementControl(oOverlay) && this.hasStableId(oOverlay);
 	};
 
-	ControlVariant.prototype._isVariantManagementControl = function (oOverlay) {
+	ControlVariant.prototype._isVariantManagementControl = function(oOverlay) {
 		var oElement = oOverlay.getElement();
 		var vAssociationElement = oElement.getAssociation("for");
 		return !!(vAssociationElement && oElement instanceof VariantManagement);
@@ -207,7 +233,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSwitchAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantSwitchAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -217,7 +243,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if enabled
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSwitchEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantSwitchEnabled = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var aVariants = [];
 		if (this._isVariantManagementControl(oElementOverlay)) {
@@ -244,7 +270,7 @@ sap.ui.define([
 	/**
 	 * @override
 	 */
-	ControlVariant.prototype.setDesignTime = function (oDesignTime) {
+	ControlVariant.prototype.setDesignTime = function(oDesignTime) {
 		RenameHandler._setDesignTime.call(this, oDesignTime);
 	};
 
@@ -255,7 +281,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isRenameAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isRenameAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -265,7 +291,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isRenameEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isRenameEnabled = function(aElementOverlays) {
 		return this._isVariantManagementControl(aElementOverlays[0]);
 	};
 
@@ -275,7 +301,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantSaveAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -285,7 +311,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantSaveEnabled = function(aElementOverlays) {
 		var oOverlay = aElementOverlays[0];
 		var oElement = oOverlay.getElement();
 		var oModel = this._getVariantModel(oElement);
@@ -299,7 +325,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveAsAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantSaveAsAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -309,7 +335,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveAsEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantSaveAsEnabled = function(aElementOverlays) {
 		return this._isVariantManagementControl(aElementOverlays[0]);
 	};
 
@@ -319,7 +345,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantConfigureAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantConfigureAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -329,7 +355,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantConfigureEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantConfigureEnabled = function(aElementOverlays) {
 		return this._isVariantManagementControl(aElementOverlays[0]);
 	};
 
@@ -342,23 +368,72 @@ sap.ui.define([
 	 * @public
 	 */
 	ControlVariant.prototype.switchVariant = function(oTargetOverlay, sNewVariantReference, sCurrentVariantReference) {
-		var oDesignTimeMetadata = oTargetOverlay.getDesignTimeMetadata();
 		var oTargetElement = oTargetOverlay.getElement();
+		var oLibraryBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
 
-		this.getCommandFactory().getCommandFor(oTargetElement, "switch", {
-			targetVariantReference: sNewVariantReference,
-			sourceVariantReference: sCurrentVariantReference
-		}, oDesignTimeMetadata)
+		function onDirtySwitchWarningClose(sAction) {
+			if (sAction === MessageBox.Action.CANCEL) {
+				return;
+			}
 
-		.then(function(oSwitchCommand) {
-			this.fireElementModified({
-				command: oSwitchCommand
-			});
-		}.bind(this))
+			if (sAction === oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE")) {
+				var oCompositeCommand;
+				this.getCommandFactory().getCommandFor(oTargetElement, "composite")
+				.then(function(_oCompositeCommand) {
+					oCompositeCommand = _oCompositeCommand;
+					return getCommandForSave.call(this, oTargetOverlay);
+				}.bind(this))
+				.then(function(oSaveCommand) {
+					oCompositeCommand.addCommand(oSaveCommand);
+					return getCommandForSwitch.call(this, oTargetOverlay, sNewVariantReference, sCurrentVariantReference);
+				}.bind(this))
+				.then(function(oSwitchCommand) {
+					oCompositeCommand.addCommand(oSwitchCommand);
+					this.fireElementModified({
+						command: oCompositeCommand
+					});
+				}.bind(this));
+			}
 
-		.catch(function(oMessage) {
-			throw DtUtil.createError("ControlVariant#switchVariant", oMessage, "sap.ui.rta");
-		});
+			if (sAction === oLibraryBundle.getText("BTN_MODIFIED_VARIANT_DISCARD")) {
+				getCommandForSwitch.call(
+					this,
+					oTargetOverlay,
+					sNewVariantReference,
+					sCurrentVariantReference,
+					true // discard variant content
+				)
+				.then(function(oSwitchCommand) {
+					this.fireElementModified({
+						command: oSwitchCommand
+					});
+				}.bind(this));
+			}
+		}
+
+		if (oTargetElement.getModified()) {
+			MessageBox.warning(oLibraryBundle.getText("MSG_CHANGE_MODIFIED_VARIANT"), {
+				onClose: onDirtySwitchWarningClose.bind(this),
+				actions: [
+					oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE"),
+					oLibraryBundle.getText("BTN_MODIFIED_VARIANT_DISCARD"),
+					MessageBox.Action.CANCEL
+				],
+				emphasizedAction: oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE"),
+				styleClass: Utils.getRtaStyleClassName()
+			});
+		} else {
+			getCommandForSwitch.call(this, oTargetOverlay, sNewVariantReference, sCurrentVariantReference)
+				.then(function(oSwitchCommand) {
+					this.fireElementModified({
+						command: oSwitchCommand
+					});
+				}.bind(this))
+
+				.catch(function(oMessage) {
+					throw DtUtil.createError("ControlVariant#switchVariant", oMessage, "sap.ui.rta");
+				});
+		}
 	};
 
 	/**
@@ -366,7 +441,7 @@ sap.ui.define([
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target overlays
 	 * @public
 	 */
-	ControlVariant.prototype.renameVariant = function (aElementOverlays) {
+	ControlVariant.prototype.renameVariant = function(aElementOverlays) {
 		this.startEdit(aElementOverlays[0]);
 	};
 
@@ -379,20 +454,13 @@ sap.ui.define([
 		});
 	};
 
-	ControlVariant.prototype.stopEdit = function (bRestoreFocus) {
+	ControlVariant.prototype.stopEdit = function(bRestoreFocus) {
 		RenameHandler._stopEdit.call(this, bRestoreFocus, "plugin.ControlVariant.stopEdit");
 	};
 
-	ControlVariant.prototype.createSaveCommand = function (aElementOverlays) {
+	ControlVariant.prototype.createSaveCommand = function(aElementOverlays) {
 		var oOverlay = aElementOverlays[0];
-		var oElement = oOverlay.getElement();
-		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
-		var oModel = this._getVariantModel(oElement);
-		var sVariantManagementReference = oOverlay.getVariantManagement();
-
-		return this.getCommandFactory().getCommandFor(oElement, "save", {
-			model: oModel
-		}, oDesignTimeMetadata, sVariantManagementReference)
+		return getCommandForSave.call(this, oOverlay)
 			.then(function(oSaveCommand) {
 				this.fireElementModified({
 					command: oSaveCommand
@@ -400,7 +468,7 @@ sap.ui.define([
 			}.bind(this));
 	};
 
-	ControlVariant.prototype.createSaveAsCommand = function (aElementOverlays) {
+	ControlVariant.prototype.createSaveAsCommand = function(aElementOverlays) {
 		var oOverlay = aElementOverlays[0];
 		var oElement = oOverlay.getElement();
 		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
@@ -450,7 +518,7 @@ sap.ui.define([
 	 * @returns {object} setTitle command
 	 * @private
 	 */
-	ControlVariant.prototype._createSetTitleCommand = function (mPropertyBag) {
+	ControlVariant.prototype._createSetTitleCommand = function(mPropertyBag) {
 		this._$oEditableControlDomRef.text(mPropertyBag.text);
 
 		return this.getCommandFactory().getCommandFor(mPropertyBag.element, "setTitle", {
@@ -468,15 +536,15 @@ sap.ui.define([
 	 * @param {string} sValueStateText value state text that needs to be set
 	 * @private
 	 */
-	ControlVariant.prototype._prepareOverlayForValueState = function (oOverlay, sValueStateText) {
+	ControlVariant.prototype._prepareOverlayForValueState = function(oOverlay, sValueStateText) {
 		//Prepare VariantManagement control overlay for valueStateMessage
-		oOverlay.getValueState = function () {
+		oOverlay.getValueState = function() {
 			return "Error";
 		};
-		oOverlay.getValueStateText = function () {
+		oOverlay.getValueStateText = function() {
 			return sValueStateText;
 		};
-		oOverlay.getDomRefForValueStateMessage = function () {
+		oOverlay.getDomRefForValueStateMessage = function() {
 			return this.$();
 		};
 	};
@@ -487,7 +555,7 @@ sap.ui.define([
 	 * @returns {Promise} Resolving when the dialog is closed and the command is created
 	 * @public
 	 */
-	ControlVariant.prototype.configureVariants = function (aElementOverlays) {
+	ControlVariant.prototype.configureVariants = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var oVariantManagementControl = oElementOverlay.getElement();
 		var sVariantManagementReference = oElementOverlay.getVariantManagement();
@@ -536,7 +604,7 @@ sap.ui.define([
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target overlays
 	 * @return {object[]} - array containing the items with required data
 	 */
-	ControlVariant.prototype.getMenuItems = function (aElementOverlays) {
+	ControlVariant.prototype.getMenuItems = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var aMenuItems = [];
 

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The CreateContainer allows trigger CreateContainer operations on the overlay
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/CutPaste.js

@@ -31,7 +31,7 @@ function(
 	 * @extends sap.ui.dt.plugin.CutPaste
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/DragDrop.js

@@ -33,7 +33,7 @@ function(
 	 * @extends sap.ui.dt.plugin.ControlDragDrop
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/EasyAdd.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The EasyAdd Plugin adds an Icon to an Overlay, which allows to trigger add operations directly
 	 * @extends sap.ui.rta.plugin.additionalElements.AdditionalElementsPlugin
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.48

package/src/sap/ui/rta/plugin/EasyRemove.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class The EasyRemove Plugin adds an Icon to an Overlay, which allows to trigger remove operations directly
 	 * @extends sap.ui.rta.plugin.Remove
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @constructor
 	 * @private
 	 * @since 1.48