@openui5/sap.ui.fl 1.104.0 → 1.105.0

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @experimental Since 1.45
 	 */
 	var LrepConnector = {};
@@ -58,10 +58,11 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @param {string} sContent - Content of the file saved to the layered repository
 	 * @param {string} sTransportId - ID of an ABAP transport or ATO_NOTIFICATION
 	 * @param {string} sPackageName - Name of an ABAP package
+	 * @param [boolean] bSupport - Save file with support mode for activated version
 	 * @returns {Promise} Promise of the SAVE content request to the back end
 	 * @public
 	 */
-	LrepConnector.saveFile = function (sLayer, sNamespace, sFilename, sFileType, sContent, sTransportId, sPackageName) {
+	LrepConnector.saveFile = function (sLayer, sNamespace, sFilename, sFileType, sContent, sTransportId, sPackageName, bSupport) {
 		return new Promise(function (fnResolve, fnReject) {
 			if (!sLayer || sNamespace === undefined || !sFilename || !sFileType) {
 				fnReject();
@@ -73,6 +74,9 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 			var sChangeListSuffix = this._getChangeListSuffix(sTransportId);
 			var sPackageSuffix = this._getPackageSuffix(sPackageName);
 			var sUrl = LrepConnector.sContentPathPrefix + sContentSuffix + sLayerSuffix + sChangeListSuffix + sPackageSuffix;
+			if (bSupport) {
+				sUrl = sUrl + "&support=true";
+			}
 			this._getTokenAndSendPutRequest(sUrl, sContent, fnResolve, fnReject);
 		}.bind(this));
 	};
@@ -85,10 +89,11 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @param {string} sFileName - Name of the file
 	 * @param {string} sFileType - Type of the file
 	 * @param {string} sTransportId - ID of the ABAP transport or ATO_NOTIFICATION
+	 * @param [boolean] bSupport - Delete file with support mode for activated version
 	 * @returns {Promise} Promise of DELETE content request to the back end
 	 * @public
 	 */
-	LrepConnector.deleteFile = function (sLayer, sNamespace, sFileName, sFileType, sTransportId) {
+	LrepConnector.deleteFile = function (sLayer, sNamespace, sFileName, sFileType, sTransportId, bSupport) {
 		return new Promise(function (fnResolve, fnReject) {
 			if (!sLayer || sNamespace === undefined || !sFileName || !sFileType) {
 				fnReject();
@@ -99,6 +104,9 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 			var sLayerSuffix = this._getLayerSuffix(sLayer);
 			var sChangeListSuffix = this._getChangeListSuffix(sTransportId);
 			var sUrl = LrepConnector.sContentPathPrefix + sContentSuffix + sLayerSuffix + sChangeListSuffix;
+			if (bSupport) {
+				sUrl = sUrl + "&support=true";
+			}
 			this._getTokenAndSendDeletionRequest(sUrl, fnResolve, fnReject);
 		}.bind(this));
 	};

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @experimental Since 1.45
 	 */
 	var DataUtils = {

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -16,7 +16,7 @@ function (MessagePopoverItem, MessagePopover) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.104.0
+		 * @version 1.105.0
 		 * @experimental Since 1.45
 		 */
 	var ErrorUtils = {};

package/src/sap/ui/fl/support/apps/contentbrowser/view/ContentDetails.view.xml

@@ -47,6 +47,7 @@
 				<ToolbarSpacer />
 				<Button text="{i18n>edit}" press=".onEditClicked" />
 				<Button text="{i18n>delete}" press=".onDeleteClicked" />
+				<CheckBox id="activeVersionCheckBox" text="{i18n>onActiveVersion}" valueState="Warning" visible="false"/>
 			</Toolbar>
 		</footer>
 	</Page>

package/src/sap/ui/fl/support/apps/contentbrowser/view/ContentDetailsEdit.view.xml

@@ -18,6 +18,7 @@
 				<ToolbarSpacer />
 				<Button text="{i18n>save}" press=".onSave" />
 				<Button text="{i18n>cancel}" press=".onCancel" />
+				<CheckBox id="activeVersionCheckBox" text="{i18n>onActiveVersion}" valueState="Warning" visible="false"/>
 			</Toolbar>
 		</footer>
 	</Page>

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -11,6 +11,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"./getContainerUserInfo",
 	"sap/base/util/extend",
+	"sap/base/util/restricted/_CancelablePromise",
 	"sap/base/security/URLListValidator",
 	"sap/base/Log",
 	"sap/ui/core/library",
@@ -21,6 +22,7 @@ sap.ui.define([
 	JSONModel,
 	getContainerUserInfo,
 	extend,
+	CancelablePromise,
 	URLListValidator,
 	Log
 ) {
@@ -50,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private
@@ -114,7 +116,30 @@ sap.ui.define([
 			var sEncodedUrl = decodeURI(sUrl) === sUrl ? encodeURI(sUrl) : sUrl;
 
 			if (IFrame.isValidUrl(sEncodedUrl)) {
-				this.setProperty("url", sEncodedUrl);
+				// Setting the url of the IFrame directly can lead to issues
+				// if the change doesn't result in a reload of the embedded page
+				// e.g. when a navigation parameter is changed
+				// To avoid problems with the ushell and the embedded apps, it is safer
+				// to unload the iframe content first and thus force a full browser reload
+
+				if (this._oSetUrlPromise) {
+					this._oSetUrlPromise.cancel();
+					delete this._oSetUrlPromise;
+				}
+
+				this.setProperty("url", "");
+
+				this._oSetUrlPromise = new CancelablePromise(function (fnResolve, fnReject, onCancel) {
+					onCancel.shouldReject = false;
+					// Use a timeout here to avoid issues with browser caching in Chrome
+					// that seem to lead to a mismatch between IFrame content and src,
+					// see Chromium issue 324102
+					setTimeout(fnResolve, 0);
+				});
+
+				this._oSetUrlPromise.then(function() {
+					this.setProperty("url", sEncodedUrl);
+				}.bind(this));
 			} else {
 				Log.error("Provided URL is not valid as an IFrame src");
 			}

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @experimental
 	 * @since 1.91

package/src/sap/ui/fl/variants/VariantManagement.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -7,6 +7,8 @@
 // Provides control sap.ui.fl.variants.VariantManagement.
 sap.ui.define([
 	"sap/ui/model/Context",
+	"sap/ui/model/Filter",
+	"sap/ui/model/FilterOperator",
 	"sap/m/VariantItem",
 	"sap/m/VariantManagement",
 	"sap/ui/fl/Utils",
@@ -16,6 +18,8 @@ sap.ui.define([
 	'sap/base/Log'
 ], function(
 	Context,
+	Filter,
+	FilterOperator,
 	VariantItem,
 	MVariantManagement,
 	flUtils,
@@ -53,7 +57,7 @@ sap.ui.define([
 				/**
 				 * Determines the intention of setting the current variant based on passed information.
 				 * <p>
-				 * <b>Note:</b> The <code>VariantManagement</code> control does not react in any way to this property.
+				 * <b>Note:</b> The <code>VariantManagement</code> control does not react in any way to this property. It is used internally by the flexibility layer.
 				 */
 				updateVariantInURL: {
 					type: "boolean",
@@ -61,7 +65,9 @@ sap.ui.define([
 					defaultValue: false
 				},
 				/**
-				 * When set to false, doesn't reset the <code>VariantManagement</code> control to the default variant, when its binding context is changed.
+				 * When set to <code>false</code>, doesn't reset the <code>VariantManagement</code> control to the default variant, when its binding context is changed.
+				 * <p>
+				 * <b>Note:</b> The <code>VariantManagement</code> control does not react in any way to this property. It is used internally by the flexibility layer.
 				 */
 				resetOnContextChange: {
 					type: "boolean",
@@ -94,7 +100,8 @@ sap.ui.define([
 				},
 				/**
 				 * If set to <code>true</code>, the key for a vendor variant will be added manually.<br>
-				 * <b>Note:</b>This flag is only used internally in the app variant scenarios.
+				 * <p>
+				 * <b>Note:</b> This flag is only used internally.
 				 */
 				manualVariantKey: {
 					type: "boolean",
@@ -103,8 +110,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Indicates that the control is in error state. If set to <code>true</code>, an error message will be displayed whenever the variant is
-				 * opened.
+				 * Indicates that the control is in error state. If set to <code>true</code>, an error message will be displayed whenever the variant is opened.
 				 */
 				inErrorState: {
 					type: "boolean",
@@ -124,8 +130,8 @@ sap.ui.define([
 
 				/**
 				 * Defines the Apply Automatically text for the standard variant in the Manage Views dialog if the application controls this behavior.
-				 *
-				 * <br><b>Note:</b> the usage of this property is restricted to <code>sap.fe</code> components only.
+				 * <p>
+				 * <b>Note:</b> the usage of this property is restricted to <code>sap.fe</code> components only.
 				 */
 				displayTextForExecuteOnSelectionForStandardVariant: {
 					type: "string",
@@ -266,7 +272,7 @@ sap.ui.define([
 			associations: {
 
 				/**
-				 * Contains the controls for which the variant management is responsible.
+				 * Contains the ids of the controls for which the variant management is responsible.
 				 */
 				"for": {
 					type: "sap.ui.core.Control",
@@ -567,9 +573,6 @@ sap.ui.define([
 
 	///<OVERWRITES>
 
-	VariantManagement.prototype.onclick = function(oEvent) {
-		this._oVM.onclick(oEvent);
-	};
 	VariantManagement.prototype._createSaveAsDialog = function() {
 		this._oVM._createSaveAsDialog();
 	};
@@ -710,9 +713,15 @@ sap.ui.define([
 		return this._oVM.getDefaultKey();
 	};
 
+	/**
+	 * Determines if the current variant is modified.
+	 * @public
+	 * @returns {boolean} If the current variant is modified <code>true</code>, otherwise <code>false</code>
+	 */
 	VariantManagement.prototype.getModified = function() {
 		return this._oVM.getModified();
 	};
+
 	VariantManagement.prototype.setModified = function(bFlag) {
 		this._oVM.setModified(bFlag);
 	};
@@ -844,7 +853,12 @@ sap.ui.define([
 		this._oVM.bindAggregation("items", {
 			path: this.oContext + "/variants",
 			model: sModelName,
-			template: oItemsTemplate
+			template: oItemsTemplate,
+			filters: new Filter({
+				path: "visible",
+				operator: FilterOperator.EQ,
+				value1: true
+			})
 		});
 	};
 
@@ -949,5 +963,18 @@ sap.ui.define([
 		this._aSelectEventHandlers = undefined;
 	};
 
+	// <overwrite for docu>
+	/**
+	 * Adds a control to the association {@link #for for}.
+	 * @public
+	 * @param {sap.ui.core.ID | sap.ui.core.Control} vFor The control to add; if empty, nothing is inserted
+	 * @returns {Object} Reference to <code>this</code> in order to allow method chaining
+	 */
+	VariantManagement.prototype.addFor = function(vFor) {
+		this.addAssociation("for", vFor);
+		return this;
+	};
+
+
 	return VariantManagement;
 });

package/src/sap/ui/fl/variants/VariantModel.js

@@ -1,5 +1,5 @@
-/*
- * ! OpenUI5
+/*!
+ * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
@@ -17,10 +17,10 @@ sap.ui.define([
 	"sap/ui/core/BusyIndicator",
 	"sap/ui/fl/apply/_internal/changes/Reverter",
 	"sap/ui/fl/apply/_internal/controlVariants/URLHandler",
+	"sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
-	"sap/ui/fl/changeHandler/Base",
 	"sap/ui/fl/Change",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
@@ -40,10 +40,10 @@ sap.ui.define([
 	BusyIndicator,
 	Reverter,
 	URLHandler,
+	FlexObjectFactory,
 	Switcher,
 	VariantManagementState,
 	VariantUtil,
-	BaseChangeHandler,
 	Change,
 	Layer,
 	LayerUtils,
@@ -264,7 +264,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
@@ -440,8 +440,22 @@ sap.ui.define([
 		});
 	};
 
-	VariantModel.prototype.getVariantProperty = function(sVariantReference, sProperty) {
-		return this.getVariant(sVariantReference).content.content[sProperty];
+	/**
+	 * Searches for the variant and returns the current title.
+	 *
+	 * @param {string} sVariantReference - Variant reference
+	 * @param {string} sVMReference - Variant management reference
+	 * @returns {string} Title of the variant
+	 */
+	VariantModel.prototype.getVariantTitle = function(sVariantReference, sVMReference) {
+		var sTitle = "";
+		this.oData[sVMReference].variants.some(function(oVariantData) {
+			if (oVariantData.key === sVariantReference) {
+				sTitle = oVariantData.title;
+				return true;
+			}
+		});
+		return sTitle;
 	};
 
 	function handleInitialLoadScenario(sVMReference, oVariantManagementControl) {
@@ -463,7 +477,7 @@ sap.ui.define([
 				vReference: sVMReference
 			});
 			// set executeOnSelect in model and State without creating a change
-			oVariant.content.content.executeOnSelect = true;
+			oVariant.instance.setExecuteOnSelection(true);
 			this.oData[sVMReference].variants[0].originalExecuteOnSelect = true;
 			this.oData[sVMReference].variants[0].executeOnSelect = true;
 			return true;
@@ -595,58 +609,57 @@ sap.ui.define([
 		}, 0);
 	};
 
+	function createNewVariant(oSourceVariant, mPropertyBag) {
+		var mProperties = {
+			id: mPropertyBag.newVariantReference,
+			variantName: mPropertyBag.title,
+			contexts: mPropertyBag.contexts,
+			layer: mPropertyBag.layer,
+			reference: oSourceVariant.getFlexObjectMetadata().reference,
+			generator: mPropertyBag.generator,
+			variantManagementReference: mPropertyBag.variantManagementReference
+		};
+		if (mPropertyBag.currentVariantComparison === 1) {
+			// in case a user variant should be saved as a PUBLIC variant, but refers to a PUBLIC variant,
+			// the references dependencies must be followed one more time
+			if (mPropertyBag.sourceVariantSource.instance.getLayer() === mPropertyBag.layer) {
+				mProperties.variantReference = mPropertyBag.sourceVariantSource.instance.getVariantReference();
+			} else {
+				mProperties.variantReference = oSourceVariant.getVariantReference();
+			}
+		} else if (mPropertyBag.currentVariantComparison === 0) {
+			mProperties.variantReference = oSourceVariant.getVariantReference();
+		} else if (mPropertyBag.currentVariantComparison === -1) {
+			mProperties.variantReference = mPropertyBag.sourceVariantReference;
+		}
+
+		return FlexObjectFactory.createFlVariant(mProperties);
+	}
+
 	VariantModel.prototype._duplicateVariant = function(mPropertyBag) {
-		var sNewVariantReference = mPropertyBag.newVariantReference;
 		var sSourceVariantReference = mPropertyBag.sourceVariantReference;
 		var sVariantManagementReference = mPropertyBag.variantManagementReference;
 		var oSourceVariant = this.getVariant(sSourceVariantReference);
 
-		var aVariantChanges =
-			VariantManagementState.getControlChangesForVariant({
-				vmReference: sVariantManagementReference,
-				vReference: sSourceVariantReference,
-				reference: this.sFlexReference
-			})
-				.map(function(oVariantChange) {
-					return oVariantChange.getDefinition();
-				});
+		var aVariantChanges = VariantManagementState.getControlChangesForVariant({
+			vmReference: sVariantManagementReference,
+			vReference: sSourceVariantReference,
+			reference: this.sFlexReference
+		})
+			.map(function(oVariantChange) {
+				return oVariantChange.getDefinition();
+			});
 
+		mPropertyBag.currentVariantComparison = LayerUtils.compareAgainstCurrentLayer(oSourceVariant.instance.getLayer(), mPropertyBag.layer);
+		if (mPropertyBag.currentVariantComparison === 1) {
+			mPropertyBag.sourceVariantSource = this.getVariant(oSourceVariant.instance.getVariantReference());
+		}
 		var oDuplicateVariant = {
-			content: {},
+			instance: createNewVariant(oSourceVariant.instance, mPropertyBag),
 			controlChanges: aVariantChanges,
 			variantChanges: {}
 		};
 
-		var iCurrentLayerComp = LayerUtils.compareAgainstCurrentLayer(oSourceVariant.content.layer, mPropertyBag.layer);
-
-		Object.keys(oSourceVariant.content).forEach(function(sKey) {
-			if (sKey === "fileName") {
-				oDuplicateVariant.content[sKey] = sNewVariantReference;
-			} else if (sKey === "variantReference") {
-				if (iCurrentLayerComp === 1) {
-					// in case a user variant should be saved as a PUBLIC variant, but refers to a PUBLIC variant,
-					// the references dependencies must be followed one more time
-					var oSourceVariantsSource = this.getVariant(oSourceVariant.content.variantReference);
-					if (oSourceVariantsSource.content.layer === mPropertyBag.layer) {
-						oDuplicateVariant.content[sKey] = oSourceVariantsSource.content.variantReference;
-					} else {
-						oDuplicateVariant.content[sKey] = oSourceVariant.content.variantReference;
-					}
-				} else if (iCurrentLayerComp === 0) {
-					oDuplicateVariant.content[sKey] = oSourceVariant.content.variantReference;
-				} else if (iCurrentLayerComp === -1) {
-					oDuplicateVariant.content[sKey] = sSourceVariantReference;
-				}
-			} else if (sKey === "content") {
-				oDuplicateVariant.content[sKey] = JSON.parse(JSON.stringify(oSourceVariant.content[sKey]));
-				oDuplicateVariant.content.content.title = mPropertyBag.title;
-			} else {
-				oDuplicateVariant.content[sKey] = oSourceVariant.content[sKey];
-			}
-		}.bind(this));
-		oDuplicateVariant.content.layer = mPropertyBag.layer;
-		oDuplicateVariant.content.contexts = mPropertyBag.contexts;
-
 		aVariantChanges = oDuplicateVariant.controlChanges.slice();
 
 		var oDuplicateChangeData = {};
@@ -657,7 +670,7 @@ sap.ui.define([
 				oDuplicateChangeData = merge({}, oChange);
 				// ensure that the layer is set to the current variants (USER may becomes PUBLIC)
 				oDuplicateChangeData.layer = mPropertyBag.layer;
-				oDuplicateChangeData.variantReference = oDuplicateVariant.content.fileName;
+				oDuplicateChangeData.variantReference = oDuplicateVariant.instance.getId();
 				if (!oDuplicateChangeData.support) {
 					oDuplicateChangeData.support = {};
 				}
@@ -691,11 +704,11 @@ sap.ui.define([
 		var oDuplicateVariantData = this._duplicateVariant(mPropertyBag);
 		oDuplicateVariantData.generator = mPropertyBag.generator;
 		var oVariantModelData = {
-			key: oDuplicateVariantData.content.fileName,
+			key: oDuplicateVariantData.instance.getId(),
 			layer: mPropertyBag.layer,
-			title: oDuplicateVariantData.content.content.title,
-			originalTitle: oDuplicateVariantData.content.content.title,
-			originalExecuteOnSelect: oDuplicateVariantData.content.content.executeOnSelect,
+			title: oDuplicateVariantData.instance.getName(),
+			originalTitle: oDuplicateVariantData.instance.getName(),
+			originalExecuteOnSelect: oDuplicateVariantData.instance.getExecuteOnSelection(),
 			executeOnSelect: false,
 			favorite: true,
 			originalFavorite: true,
@@ -705,35 +718,19 @@ sap.ui.define([
 			visible: true,
 			originalVisible: true,
 			sharing: mPropertyBag.layer === Layer.USER ? this.sharing.PRIVATE : this.sharing.PUBLIC,
-			contexts: oDuplicateVariantData.content.contexts,
-			originalContexts: oDuplicateVariantData.originalContexts
+			originalContexts: oDuplicateVariantData.instance.getContexts(),
+			contexts: oDuplicateVariantData.instance.getContexts()
 		};
 
-		var oVariant = VariantUtil.createVariant({
-			model: this,
-			variantSpecificData: oDuplicateVariantData
-		});
-
 		// sets copied variant and associated changes as dirty
 		var aChanges = [];
-		[oVariant].concat(oVariant.getControlChanges()).forEach(function(oChange) {
+		[oDuplicateVariantData.instance].concat(oDuplicateVariantData.controlChanges).forEach(function(oChange) {
 			aChanges.push(this.oChangePersistence.addDirtyChange(oChange));
 		}.bind(this));
 
 		// adds variant to variants map
 		var iIndex = VariantManagementState.addVariantToVariantManagement({
-			// ensure "visible" and "favorite" properties are available inside oVariant.content.content
-			variantData: merge({}, oVariant.getDefinitionWithChanges(),
-				{
-					content: {
-						content: {
-							visible: oVariantModelData.visible,
-							favorite:
-							oVariantModelData.favorite
-						}
-					}
-				}
-			),
+			variantData: oDuplicateVariantData,
 			reference: this.sFlexReference,
 			vmReference: mPropertyBag.variantManagementReference
 		});
@@ -742,7 +739,7 @@ sap.ui.define([
 		this.oData[mPropertyBag.variantManagementReference].variants.splice(iIndex, 0, oVariantModelData);
 		return this.updateCurrentVariant({
 			variantManagementReference: mPropertyBag.variantManagementReference,
-			newVariantReference: oVariant.getId(),
+			newVariantReference: oDuplicateVariantData.instance.getId(),
 			appComponent: mPropertyBag.appComponent,
 			internallyCalled: true,
 			scenario: "saveAs"
@@ -898,9 +895,6 @@ sap.ui.define([
 			mNewChangeData.fileType = "ctrl_variant_management_change";
 			mNewChangeData.selector = JsControlTreeModifier.getSelector(sVariantManagementReference, mPropertyBag.appComponent);
 		} else {
-			if (mPropertyBag.changeType === "setTitle") {
-				BaseChangeHandler.setTextInChange(mNewChangeData, "title", mPropertyBag.title, "XFLD");
-			}
 			mNewChangeData.fileType = "ctrl_variant_change";
 			mNewChangeData.selector = JsControlTreeModifier.getSelector(mPropertyBag.variantReference, mPropertyBag.appComponent);
 		}
@@ -908,6 +902,9 @@ sap.ui.define([
 		var oChange = this.oFlexController.createBaseChange(mNewChangeData, mPropertyBag.appComponent);
 		//update change with additional content
 		oChange.setContent(mAdditionalChangeContent);
+		if (mPropertyBag.changeType === "setTitle") {
+			oChange.setText("title", mPropertyBag.title, "XFLD");
+		}
 
 		mUpdateVariantsStateParams.changeContent = oChange.getDefinition();
 		//update variants state and write change to ChangePersistence
@@ -962,6 +959,7 @@ sap.ui.define([
 		var iVariantIndex = -1;
 		var oVariant;
 		var oData = this.getData();
+		var oVariantInstance = this.getVariant(mPropertyBag.variantReference, sVariantManagementReference).instance;
 
 		if (mPropertyBag.variantReference) {
 			iVariantIndex = this.getVariantManagementReference(mPropertyBag.variantReference).variantIndex;
@@ -975,20 +973,21 @@ sap.ui.define([
 				//Update Variant Model
 				oVariant.title = mPropertyBag.title;
 				oVariant.originalTitle = oVariant.title;
+				oVariantInstance.setName(mPropertyBag.title, true);
 				break;
 			case "setFavorite":
 				mAdditionalChangeContent.favorite = mPropertyBag.favorite;
 				//Update Variant Model
 				oVariant.favorite = mPropertyBag.favorite;
 				oVariant.originalFavorite = oVariant.favorite;
+				oVariantInstance.setFavorite(mPropertyBag.favorite);
 				break;
 			case "setExecuteOnSelect":
 				mAdditionalChangeContent.executeOnSelect = mPropertyBag.executeOnSelect;
-				if (oVariant) {
-					//Update Variant Model
-					oVariant.executeOnSelect = mPropertyBag.executeOnSelect;
-					oVariant.originalExecuteOnSelect = oVariant.executeOnSelect;
-				}
+				//Update Variant Model
+				oVariant.executeOnSelect = mPropertyBag.executeOnSelect;
+				oVariant.originalExecuteOnSelect = oVariant.executeOnSelect;
+				oVariantInstance.setExecuteOnSelection(mPropertyBag.executeOnSelect);
 				break;
 			case "setVisible":
 				mAdditionalChangeContent.visible = mPropertyBag.visible;
@@ -996,12 +995,14 @@ sap.ui.define([
 				//Update Variant Model
 				oVariant.visible = mPropertyBag.visible;
 				oVariant.originalVisible = oVariant.visible;
+				oVariantInstance.setVisible(mPropertyBag.visible);
 				break;
 			case "setContexts":
 				mAdditionalChangeContent.contexts = mPropertyBag.contexts;
 				//Update Variant Model
 				oVariant.contexts = mPropertyBag.contexts;
 				oVariant.originalContexts = mPropertyBag.contexts;
+				oVariantInstance.setContexts(mPropertyBag.contexts);
 				break;
 			case "setDefault":
 				mAdditionalChangeContent.defaultVariant = mPropertyBag.defaultVariant;
@@ -1113,22 +1114,13 @@ sap.ui.define([
 				variantManagementChanges: {},
 				variants: [
 					{
-						content: {
-							fileName: sVariantManagementReference,
-							fileType: "ctrl_variant",
+						instance: FlexObjectFactory.createFlVariant({
+							id: sVariantManagementReference,
 							variantManagementReference: sVariantManagementReference,
-							variantReference: "",
-							support: {
-								user: VariantUtil.DEFAULT_AUTHOR
-							},
-							content: {
-								title: this._oResourceBundle.getText("STANDARD_VARIANT_TITLE"),
-								favorite: true,
-								visible: true,
-								executeOnSelect: false
-							},
-							contexts: {}
-						},
+							variantName: this._oResourceBundle.getText("STANDARD_VARIANT_TITLE"),
+							user: VariantUtil.DEFAULT_AUTHOR,
+							reference: this.sFlexReference
+						}),
 						controlChanges: [],
 						variantChanges: {}
 					}