@openui5/sap.ui.fl 1.115.1 → 1.116.0

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

@@ -100,16 +100,6 @@ sap.ui.define([
 					group: "Misc",
 					defaultValue: true
 				},
-				/**
-				 * If set to <code>true</code>, the key for a vendor variant will be added manually.<br>
-				 * <p>
-				 * <b>Note:</b> This flag is only used internally.
-				 */
-				manualVariantKey: {
-					type: "boolean",
-					group: "Misc",
-					defaultValue: false
-				},
 
 				/**
 				 * 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.
@@ -218,7 +208,7 @@ sap.ui.define([
 						/**
 						 * Indicates the check box state for 'Public'.
 						 */
-						'public': {
+						"public": {
 							type: "boolean"
 						},
 
@@ -370,7 +360,7 @@ sap.ui.define([
 		};
 	};
 
-	/// <EVENT FORWARDING>
+	// / <EVENT FORWARDING>
 	VariantManagement.prototype.attachCancel = function(mProps, fnCallback, oObj) {
 		this.attachEvent("cancel", mProps, fnCallback, oObj);
 		return this;
@@ -557,7 +547,6 @@ sap.ui.define([
 		}
 	};
 
-
 	VariantManagement.prototype._fireManage = function(oEvent) {
 		this._handleAllListeners(oEvent, this._aManageEventHandlers);
 	};
@@ -594,10 +583,9 @@ sap.ui.define([
 
 		return this;
 	};
-	/// </EVENT FORWARDING>
-
+	// / </EVENT FORWARDING>
 
-	///<OVERWRITES>
+	// /<OVERWRITES>
 
 	VariantManagement.prototype._createSaveAsDialog = function() {
 		this._oVM._createSaveAsDialog();
@@ -673,12 +661,11 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype.setShowExecuteOnSelection = function(bValue) {
-		//this.setProperty("showExecuteOnSelection", bValue);
+		// this.setProperty("showExecuteOnSelection", bValue);
 		this._oVM.setSupportApplyAutomatically(bValue);
 		return this;
 	};
 
-
 	VariantManagement.prototype.setShowSetAsDefault = function(bValue) {
 		this.setProperty("showSetAsDefault", bValue);
 		this._oVM.setSupportDefault(bValue);
@@ -697,12 +684,6 @@ sap.ui.define([
 		return this;
 	};
 
-	VariantManagement.prototype.setManualVariantKey = function(bValue) {
-		this.setProperty("manualVariantKey", bValue);
-		this._oVM._setShowManualVariantKey(bValue);
-		return this;
-	};
-
 	VariantManagement.prototype.setInErrorState = function(bValue) {
 		this.setProperty("inErrorState", bValue);
 		this._oVM.setInErrorState(bValue);
@@ -713,7 +694,6 @@ sap.ui.define([
 		this._oVM.openManagementDialog(bCreateAlways, sClass, oRolesComponentContainer);
 	};
 
-
 	VariantManagement.prototype.openSaveAsDialogForKeyUser = function(sClass, oRolesComponentContainer) {
 		this._oVM.openSaveAsDialog(sClass, oRolesComponentContainer);
 	};
@@ -782,14 +762,14 @@ sap.ui.define([
 	VariantManagement.prototype.getStandardVariantKey = function() {
 		return this._oVM.getStandardVariantKey();
 	};
-	/// </OVERWRITES>
+	// / </OVERWRITES>
 
 	VariantManagement.prototype._getEmbeddedVM = function() {
 		return this._oVM;
 	};
 
 	VariantManagement.prototype._updateWithSettingsInfo = function() {
-		flSettings.getInstance().then(function (oSettings) {
+		flSettings.getInstance().then(function(oSettings) {
 			if (this._oVM) {
 				this._oVM.setShowSaveAs(oSettings.isVariantPersonalizationEnabled());
 				this._oVM.setSupportPublic(oSettings.isPublicFlVariantEnabled());
@@ -816,7 +796,6 @@ sap.ui.define([
 		return this;
 	};
 
-
 	/**
 	 * Reinitializes the inner model registration. This is necessary when using a session dependent <code>VariantManagement</code>
 	 * control that may be used across the lifecycle of more than one application.
@@ -860,7 +839,6 @@ sap.ui.define([
 
 					this._oVM.setSupportDefault(true);
 
-
 					this._createItemsModel(sModelName);
 
 					this._oVM.bindProperty("selectedKey", {
@@ -918,7 +896,6 @@ sap.ui.define([
 			originalContexts: "{" + sModelName + ">originalContexts}"
 		});
 
-
 		this._oVM.bindAggregation("items", {
 			path: this.oContext + "/variants",
 			model: sModelName,
@@ -1011,7 +988,6 @@ sap.ui.define([
 		return bExecuteOnSelection;
 	};
 
-
 	// exit destroy all controls created in init
 	VariantManagement.prototype.exit = function() {
 		this._oVM.detachManage(this._fireManage, this);
@@ -1053,7 +1029,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
 	 */
-	VariantManagement.prototype._getToolbarInteractive = function () {
+	VariantManagement.prototype._getToolbarInteractive = function() {
 		return true;
 	};
 

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

@@ -135,21 +135,21 @@ sap.ui.define([
 		aVariantDirtyChanges = aVariantDirtyChanges.reverse();
 
 		return Promise.resolve()
-			.then(function() {
-				if (mPropertyBag.revert) {
-					return Reverter.revertMultipleChanges(aVariantDirtyChanges, {
-						appComponent: mPropertyBag.model.oAppComponent,
-						modifier: JsControlTreeModifier,
-						flexController: mPropertyBag.model.oFlexController
-					});
-				}
-				return undefined;
-			})
-			.then(function() {
-				aVariantDirtyChanges.forEach(function(oChange) {
-					mPropertyBag.model.oFlexController.deleteChange(oChange);
+		.then(function() {
+			if (mPropertyBag.revert) {
+				return Reverter.revertMultipleChanges(aVariantDirtyChanges, {
+					appComponent: mPropertyBag.model.oAppComponent,
+					modifier: JsControlTreeModifier,
+					flexController: mPropertyBag.model.oFlexController
 				});
+			}
+			return undefined;
+		})
+		.then(function() {
+			aVariantDirtyChanges.forEach(function(oChange) {
+				mPropertyBag.model.oFlexController.deleteChange(oChange);
 			});
+		});
 	}
 
 	/**
@@ -164,8 +164,8 @@ sap.ui.define([
 	function executeAfterSwitch(fnCallback, oModel) {
 		// if there are multiple switches triggered very quickly this makes sure that they are being executed one after another
 		oModel._oVariantSwitchPromise = oModel._oVariantSwitchPromise
-			.catch(function() {})
-			.then(fnCallback);
+		.catch(function() {})
+		.then(fnCallback);
 		oModel.oFlexController.setVariantSwitchPromise(oModel._oVariantSwitchPromise);
 		return oModel._oVariantSwitchPromise;
 	}
@@ -182,19 +182,19 @@ sap.ui.define([
 
 	function switchVariantAndUpdateModel(mPropertyBag, sScenario) {
 		return Switcher.switchVariant(mPropertyBag)
-			.then(function() {
-				// update current variant in model
-				if (this.oData[mPropertyBag.vmReference].updateVariantInURL) {
-					URLHandler.updateVariantInURL({
-						vmReference: mPropertyBag.vmReference,
-						newVReference: mPropertyBag.newVReference,
-						model: this
-					});
-				}
+		.then(function() {
+			// update current variant in model
+			if (this.oData[mPropertyBag.vmReference].updateVariantInURL) {
+				URLHandler.updateVariantInURL({
+					vmReference: mPropertyBag.vmReference,
+					newVReference: mPropertyBag.newVReference,
+					model: this
+				});
+			}
 
-				// tell listeners that variant switch has happened
-				this.callVariantSwitchListeners(mPropertyBag.vmReference, mPropertyBag.newVReference, undefined, sScenario);
-			}.bind(this));
+			// tell listeners that variant switch has happened
+			this.callVariantSwitchListeners(mPropertyBag.vmReference, mPropertyBag.newVReference, undefined, sScenario);
+		}.bind(this));
 	}
 
 	function updatePersonalVariantPropertiesWithFlpSettings(oVariant) {
@@ -230,7 +230,7 @@ sap.ui.define([
 				resolve();
 			} else {
 				oControl.addEventDelegate({
-					onAfterRendering: function () {
+					onAfterRendering: function() {
 						resolve();
 					}
 				});
@@ -248,15 +248,15 @@ sap.ui.define([
 				Utils.getUShellService("ShellNavigation")
 			];
 			return Promise.all(aServicePromises)
-				.then(function(aServices) {
-					setUShellService("UserInfo", aServices[0]);
-					setUShellService("URLParsing", aServices[1]);
-					setUShellService("CrossApplicationNavigation", aServices[2]);
-					setUShellService("ShellNavigation", aServices[3]);
-				})
-				.catch(function(vError) {
-					throw new Error("Error getting service from Unified Shell: " + vError);
-				});
+			.then(function(aServices) {
+				setUShellService("UserInfo", aServices[0]);
+				setUShellService("URLParsing", aServices[1]);
+				setUShellService("CrossApplicationNavigation", aServices[2]);
+				setUShellService("ShellNavigation", aServices[3]);
+			})
+			.catch(function(vError) {
+				throw new Error("Error getting service from Unified Shell: " + vError);
+			});
 		}
 	}
 
@@ -280,7 +280,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.116.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
@@ -334,9 +334,9 @@ sap.ui.define([
 			}
 			oCurrentData[sVariantManagementKey].variants = oVariantMapEntry.variants.map(function(oVariant) {
 				var oCurrentVariantData = (oCurrentData[sVariantManagementKey].variants || [])
-					.find(function(oVariantToCheck) {
-						return oVariantToCheck.key === oVariant.key;
-					});
+				.find(function(oVariantToCheck) {
+					return oVariantToCheck.key === oVariant.key;
+				});
 				setOriginalVariantProperties(oVariant);
 				return Object.assign(
 					{},
@@ -363,10 +363,10 @@ sap.ui.define([
 	 */
 	VariantModel.prototype.initialize = function() {
 		return Promise.all([Settings.getInstance(), initUshellServices()])
-			.then(function() {
-				//initialize hash data - variants map & model should exist at this point (set on constructor)
-				URLHandler.initialize({ model: this });
-			}.bind(this));
+		.then(function() {
+			// initialize hash data - variants map & model should exist at this point (set on constructor)
+			URLHandler.initialize({ model: this });
+		}.bind(this));
 	};
 
 	/**
@@ -550,7 +550,7 @@ sap.ui.define([
 	 * @param {string} sVariantReference - Variant reference to remove dirty changes from
 	 * @returns {Promise} Promise resolving to dirty changes which will be removed
 	 */
-	VariantModel.prototype.eraseDirtyChangesOnVariant = function (sVariantManagementReference, sVariantReference) {
+	VariantModel.prototype.eraseDirtyChangesOnVariant = function(sVariantManagementReference, sVariantReference) {
 		var aSourceVariantChanges = VariantManagementState.getControlChangesForVariant({
 			reference: this.sFlexReference,
 			vmReference: sVariantManagementReference,
@@ -606,7 +606,8 @@ sap.ui.define([
 			adaptationId: mPropertyBag.adaptationId,
 			reference: oSourceVariant.getFlexObjectMetadata().reference,
 			generator: mPropertyBag.generator,
-			variantManagementReference: mPropertyBag.variantManagementReference
+			variantManagementReference: mPropertyBag.variantManagementReference,
+			user: mPropertyBag.layer === Layer.VENDOR ? "SAP" : Settings.getInstanceOrUndef().getUserId()
 		};
 		if (mPropertyBag.currentVariantComparison === 1) {
 			// in case a user variant should be saved as a PUBLIC variant, but refers to a PUBLIC variant,
@@ -635,9 +636,9 @@ sap.ui.define([
 			vReference: sSourceVariantReference,
 			reference: this.sFlexReference
 		})
-			.map(function(oVariantChange) {
-				return oVariantChange.convertToFileContent();
-			});
+		.map(function(oVariantChange) {
+			return oVariantChange.convertToFileContent();
+		});
 
 		mPropertyBag.currentVariantComparison = LayerUtils.compareAgainstCurrentLayer(oSourceVariant.instance.getLayer(), mPropertyBag.layer);
 		if (mPropertyBag.currentVariantComparison === 1) {
@@ -702,10 +703,6 @@ sap.ui.define([
 	VariantModel.prototype.copyVariant = function(mPropertyBag) {
 		var oDuplicateVariantData = this._duplicateVariant(mPropertyBag);
 		oDuplicateVariantData.generator = mPropertyBag.generator;
-		var sAuthor = Settings.getInstanceOrUndef().getUserId() ? Settings.getInstanceOrUndef().getUserId() : undefined;
-		if (mPropertyBag.layer === Layer.VENDOR) {
-			sAuthor = "SAP";
-		}
 
 		this.oData[mPropertyBag.variantManagementReference].variants.push({
 			key: oDuplicateVariantData.instance.getId(),
@@ -714,8 +711,7 @@ sap.ui.define([
 			remove: true,
 			sharing: mPropertyBag.layer === Layer.USER
 				? this.sharing.PRIVATE
-				: this.sharing.PUBLIC,
-			author: sAuthor
+				: this.sharing.PUBLIC
 		});
 
 		var aChanges = [];
@@ -866,29 +862,34 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the variant properties and adds a variant change
+	 * Sets the variant properties and creates a variant change
 	 * @param {string} sVariantManagementReference - Variant management reference
 	 * @param {object} mPropertyBag - Map of properties
+	 * @param {string} [mPropertyBag.adaptationId] - Adaptation ID to set which overrules the currently display adaptation
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created Change object
 	 */
-	VariantModel.prototype.addVariantChange = function(sVariantManagementReference, mPropertyBag) {
+	VariantModel.prototype.createVariantChange = function(sVariantManagementReference, mPropertyBag) {
 		var mAdditionalChangeContent = this.setVariantProperties(sVariantManagementReference, mPropertyBag);
 
 		var mNewChangeData = {};
 
-		//create new change object
+		// create new change object
 		mNewChangeData.changeType = mPropertyBag.changeType;
 		mNewChangeData.layer = mPropertyBag.layer;
 		mNewChangeData.generator = mPropertyBag.generator;
 
-		//add adaptationId
-		var mContextBasedAdaptationBag = {
-			layer: mPropertyBag.layer,
-			control: mPropertyBag.appComponent,
-			reference: this.sFlexReference
-		};
-		if (ContextBasedAdaptationsAPI.hasAdaptationsModel(mContextBasedAdaptationBag)) {
-			mNewChangeData.adaptationId = ContextBasedAdaptationsAPI.getDisplayedAdaptationId(mContextBasedAdaptationBag);
+		// add adaptationId
+		if (mPropertyBag.adaptationId !== undefined) {
+			mNewChangeData.adaptationId = mPropertyBag.adaptationId;
+		} else {
+			var mContextBasedAdaptationBag = {
+				layer: mPropertyBag.layer,
+				control: mPropertyBag.appComponent,
+				reference: this.sFlexReference
+			};
+			if (ContextBasedAdaptationsAPI.hasAdaptationsModel(mContextBasedAdaptationBag)) {
+				mNewChangeData.adaptationId = ContextBasedAdaptationsAPI.getDisplayedAdaptationId(mContextBasedAdaptationBag);
+			}
 		}
 
 		if (mPropertyBag.changeType === "setDefault") {
@@ -900,11 +901,24 @@ sap.ui.define([
 		}
 
 		var oChange = this.oFlexController.createBaseChange(mNewChangeData, mPropertyBag.appComponent);
-		//update change with additional content
+		// update change with additional content
 		oChange.setContent(mAdditionalChangeContent);
 		if (mPropertyBag.changeType === "setTitle") {
 			oChange.setText("title", mPropertyBag.title, "XFLD");
 		}
+
+		return oChange;
+	};
+
+	/**
+	 * Sets the variant properties and adds a variant change
+	 * @param {string} sVariantManagementReference - Variant management reference
+	 * @param {object} mPropertyBag - Map of properties
+	 * @param {string} [mPropertyBag.adaptationId] - Adaptation ID to set which overrules the currently display adaptation
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created Change object
+	 */
+	VariantModel.prototype.addVariantChange = function(sVariantManagementReference, mPropertyBag) {
+		var oChange = this.createVariantChange(sVariantManagementReference, mPropertyBag);
 		this.oChangePersistence.addDirtyChange(oChange);
 
 		return oChange;
@@ -971,7 +985,7 @@ sap.ui.define([
 				break;
 			case "setDefault":
 				mAdditionalChangeContent.defaultVariant = mPropertyBag.defaultVariant;
-				//Update hash data
+				// Update hash data
 				var aHashParameters = URLHandler.getStoredHashParams({model: this});
 				if (aHashParameters) {
 					if (
@@ -1023,7 +1037,7 @@ sap.ui.define([
 				reference: this.sFlexReference
 			});
 
-			VariantManagementState.addFakeStandardVariant(this.sFlexReference, this.oAppComponent.getId(), sVariantManagementReference, oStandardVariantInstance);
+			VariantManagementState.addRuntimeSteadyObject(this.sFlexReference, this.oAppComponent.getId(), oStandardVariantInstance);
 		}
 	};
 
@@ -1125,16 +1139,18 @@ sap.ui.define([
 	function handleDirtyChanges(oFlexController, aCopiedVariantDirtyChanges, sVariantManagementReference, oAppComponent) {
 		if (!this._bDesignTimeMode) {
 			return oFlexController.saveSequenceOfDirtyChanges(aCopiedVariantDirtyChanges, oAppComponent)
-				.then(function(oResponse) {
-					if (oResponse) {
-						var oResponseData = oResponse.response[0];
-						this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
-							if (oVariant.key === oResponseData.fileName) {
-								oVariant.author = oResponseData.support.user;
-							}
-						});
-					}
-				}.bind(this));
+			.then(function(oResponse) {
+				// TODO: as soon as the invalidation is done automatically this can be removed
+				this.invalidateMap();
+				if (oResponse) {
+					var oResponseData = oResponse.response[0];
+					this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
+						if (oVariant.key === oResponseData.fileName) {
+							oVariant.author = oResponseData.support.user;
+						}
+					});
+				}
+			}.bind(this));
 		}
 		return Promise.resolve();
 	}
@@ -1166,7 +1182,15 @@ sap.ui.define([
 
 			if (mParameters.overwrite) {
 				// handle triggered "Save" button
-				return this.oFlexController.saveSequenceOfDirtyChanges(this._getDirtyChangesFromVariantChanges(aSourceVariantChanges), oAppComponent);
+				return this.oFlexController.saveSequenceOfDirtyChanges(
+					this._getDirtyChangesFromVariantChanges(aSourceVariantChanges),
+					oAppComponent
+				)
+				.then(function(oResponse) {
+					// TODO: as soon as the invalidation is done automatically this can be removed
+					this.invalidateMap();
+					return oResponse;
+				}.bind(this));
 			}
 
 			var sVariantLayer = mParameters.layer || (mParameters.public ? Layer.PUBLIC : Layer.USER);
@@ -1186,45 +1210,45 @@ sap.ui.define([
 			};
 
 			return this.copyVariant(mPropertyBag)
-				.then(function(aCopiedVariantDirtyChanges) {
-					if (bSetDefault) {
-						var mPropertyBagSetDefault = {
-							changeType: "setDefault",
-							defaultVariant: sNewVariantReference,
-							originalDefaultVariant: this.oData[sVariantManagementReference].defaultVariant,
-							appComponent: oAppComponent,
-							layer: sVariantChangeLayer,
-							variantManagementReference: sVariantManagementReference
-						};
-						var oSetDefaultChange = this.addVariantChange(sVariantManagementReference, mPropertyBagSetDefault);
-						aCopiedVariantDirtyChanges.push(oSetDefaultChange);
-					}
-					if (bSetExecuteOnSelect) {
-						var mPropertyBagSetExecute = {
-							changeType: "setExecuteOnSelect",
-							executeOnSelect: true,
-							variantReference: sNewVariantReference,
-							appComponent: oAppComponent,
-							layer: sVariantChangeLayer,
-							variantManagementReference: sVariantManagementReference
-						};
-						var oSetExecuteChange = this.addVariantChange(sVariantManagementReference, mPropertyBagSetExecute);
-						aCopiedVariantDirtyChanges.push(oSetExecuteChange);
-					}
-					aNewVariantDirtyChanges = aCopiedVariantDirtyChanges;
-					// unsaved changes on the source variant are removed before copied variant changes are saved
-					return eraseDirtyChanges({
-						changes: aSourceVariantChanges,
-						vmReference: sVariantManagementReference,
-						vReference: sSourceVariantReference,
-						model: this
-					})
-						.then(handleDirtyChanges.bind(this, this.oFlexController, aCopiedVariantDirtyChanges, sVariantManagementReference, oAppComponent));
-				}.bind(this));
+			.then(function(aCopiedVariantDirtyChanges) {
+				if (bSetDefault) {
+					var mPropertyBagSetDefault = {
+						changeType: "setDefault",
+						defaultVariant: sNewVariantReference,
+						originalDefaultVariant: this.oData[sVariantManagementReference].defaultVariant,
+						appComponent: oAppComponent,
+						layer: sVariantChangeLayer,
+						variantManagementReference: sVariantManagementReference
+					};
+					var oSetDefaultChange = this.addVariantChange(sVariantManagementReference, mPropertyBagSetDefault);
+					aCopiedVariantDirtyChanges.push(oSetDefaultChange);
+				}
+				if (bSetExecuteOnSelect) {
+					var mPropertyBagSetExecute = {
+						changeType: "setExecuteOnSelect",
+						executeOnSelect: true,
+						variantReference: sNewVariantReference,
+						appComponent: oAppComponent,
+						layer: sVariantChangeLayer,
+						variantManagementReference: sVariantManagementReference
+					};
+					var oSetExecuteChange = this.addVariantChange(sVariantManagementReference, mPropertyBagSetExecute);
+					aCopiedVariantDirtyChanges.push(oSetExecuteChange);
+				}
+				aNewVariantDirtyChanges = aCopiedVariantDirtyChanges;
+				// unsaved changes on the source variant are removed before copied variant changes are saved
+				return eraseDirtyChanges({
+					changes: aSourceVariantChanges,
+					vmReference: sVariantManagementReference,
+					vReference: sSourceVariantReference,
+					model: this
+				})
+				.then(handleDirtyChanges.bind(this, this.oFlexController, aCopiedVariantDirtyChanges, sVariantManagementReference, oAppComponent));
+			}.bind(this));
 		}.bind(this, sVMReference, oAppComponent, mParameters), this)
-			.then(function() {
-				return aNewVariantDirtyChanges;
-			});
+		.then(function() {
+			return aNewVariantDirtyChanges;
+		});
 	};
 
 	VariantModel.prototype.getLocalId = function(sId, oAppComponent) {
@@ -1259,6 +1283,37 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	function resolveTitleBindingsAndCreateVariantChanges(oVariantManagementControl, sVariantManagementReference) {
+		this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
+			// Find model and key from patterns like {i18n>TextKey} - only resource models are supported
+			var aMatches = oVariant.title && oVariant.title.match(/{(\w+)>(\w+)}/);
+			if (aMatches) {
+				var sModelName = aMatches[1];
+				var sKey = aMatches[2];
+				var oModel = oVariantManagementControl.getModel(sModelName);
+				if (oModel) {
+					var sResolvedTitle = oModel.getResourceBundle().getText(sKey);
+					var mChangeProperties = {
+						variantReference: oVariant.key,
+						changeType: "setTitle",
+						title: sResolvedTitle,
+						layer: oVariant.layer,
+						appComponent: this.oAppComponent
+					};
+					var oVariantChange = this.createVariantChange(sVariantManagementReference, mChangeProperties);
+					// The change cannot be added as a dirty change but must survive a state invalidation
+					VariantManagementState.addRuntimeSteadyObject(this.sFlexReference, this.oAppComponent.getId(), oVariantChange);
+				} else {
+					// Wait for model to be assigned and try again
+					oVariantManagementControl.attachEventOnce(
+						"modelContextChange",
+						resolveTitleBindingsAndCreateVariantChanges.bind(this, oVariantManagementControl, sVariantManagementReference)
+					);
+				}
+			}
+		}.bind(this));
+	}
+
 	VariantModel.prototype.registerToModel = function(oVariantManagementControl) {
 		var sVariantManagementReference = this.getVariantManagementReferenceForControl(oVariantManagementControl);
 
@@ -1271,6 +1326,9 @@ sap.ui.define([
 		// only attachVariantApplied will set this to true
 		this.oData[sVariantManagementReference].showExecuteOnSelection = false;
 
+		// replace bindings in titles with the resolved texts
+		resolveTitleBindingsAndCreateVariantChanges.call(this, oVariantManagementControl, sVariantManagementReference);
+
 		// attach/detach events on control
 		// select event
 		oVariantManagementControl.attachEvent("select", {
@@ -1284,7 +1342,7 @@ sap.ui.define([
 		// set model's properties specific to control's appearance
 		this.setModelPropertiesForControl(sVariantManagementReference, false, oVariantManagementControl);
 
-		//control property updateVariantInURL set initially
+		// control property updateVariantInURL set initially
 		var sUpdateURL = oVariantManagementControl.getUpdateVariantInURL(); // default false
 		this.oData[sVariantManagementReference].updateVariantInURL = sUpdateURL;
 		URLHandler.registerControl({
@@ -1353,9 +1411,9 @@ sap.ui.define([
 	 */
 	VariantModel.prototype.getCurrentControlVariantIds = function() {
 		return Object.keys(this.oData || {})
-			.reduce(function(aCurrentVariants, sVariantManagementReference) {
-				return aCurrentVariants.concat([this.oData[sVariantManagementReference].currentVariant]);
-			}.bind(this), []);
+		.reduce(function(aCurrentVariants, sVariantManagementReference) {
+			return aCurrentVariants.concat([this.oData[sVariantManagementReference].currentVariant]);
+		}.bind(this), []);
 	};
 
 	/**
@@ -1382,7 +1440,7 @@ sap.ui.define([
 	 */
 	VariantModel.prototype.destroy = function() {
 		this.oDataSelector.removeUpdateListener(this.fnUpdateListener);
-		VariantManagementState.clearFakeStandardVariants(this.sFlexReference, this.oAppComponent.getId());
+		VariantManagementState.clearRuntimeSteadyObjects(this.sFlexReference, this.oAppComponent.getId());
 		JSONModel.prototype.destroy.apply(this);
 	};
 

package/src/sap/ui/fl/variants/context/Component.js

@@ -6,7 +6,7 @@
 
 sap.ui.define([
 	"sap/ui/core/UIComponent"
-], function (UIComponent) {
+], function(UIComponent) {
 	"use strict";
 
 	/**
@@ -19,7 +19,6 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.comp, sap.ui.fl
 	 */
 
-
 	/**
 	 * Provides a UI component for context sharing.
 	 *