@openui5/sap.ui.rta 1.113.0 → 1.114.1

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.2.1
+Component: SAP Theming Base Content, version: 11.3.0
 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.113.0",
+  "version": "1.114.1",
   "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.113.0",
-    "@openui5/sap.ui.core": "1.113.0",
-    "@openui5/sap.ui.dt": "1.113.0",
-    "@openui5/sap.ui.fl": "1.113.0",
-    "@openui5/sap.ui.layout": "1.113.0"
+    "@openui5/sap.m": "1.114.1",
+    "@openui5/sap.ui.core": "1.114.1",
+    "@openui5/sap.ui.dt": "1.114.1",
+    "@openui5/sap.ui.fl": "1.114.1",
+    "@openui5/sap.ui.layout": "1.114.1"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.113.0</version>
+  <version>1.114.1</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.113.0
+	 * @version 1.114.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/BusyIndicator",
+	"sap/ui/core/Core",
 	"sap/ui/dt/DesignTime",
 	"sap/ui/dt/DOMUtil",
 	"sap/ui/dt/ElementUtil",
@@ -22,6 +23,7 @@ sap.ui.define([
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/Util",
 	"sap/ui/events/KeyCodes",
+	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
@@ -62,6 +64,7 @@ sap.ui.define([
 	jQuery,
 	ManagedObject,
 	BusyIndicator,
+	Core,
 	DesignTime,
 	DOMUtil,
 	ElementUtil,
@@ -69,6 +72,7 @@ sap.ui.define([
 	OverlayRegistry,
 	DtUtil,
 	KeyCodes,
+	ManifestUtils,
 	Version,
 	ContextBasedAdaptationsAPI,
 	ControlPersonalizationWriteAPI,
@@ -116,7 +120,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.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -437,6 +441,7 @@ sap.ui.define([
 	 * @public
 	 */
 	RuntimeAuthoring.prototype.start = function() {
+		var bIsAutomaticRestart = RuntimeAuthoring.needsRestart(this.getLayer());
 		var oDesignTimePromise;
 		var vError;
 		// Create DesignTime
@@ -450,8 +455,8 @@ sap.ui.define([
 			}
 
 			return this._loadUShellServicesPromise
-			.then(initVersioning.bind(this))
-			.then(initContextBasedAdaptations.bind(this))
+			.then(initVersioning.bind(this, bIsAutomaticRestart))
+			.then(initContextBasedAdaptations.bind(this, bIsAutomaticRestart))
 			/*
 			 Check if the application has personalized changes and reload without them;
 			 Also Check if the application has an available draft and if yes, reload with those changes.
@@ -461,7 +466,8 @@ sap.ui.define([
 					layer: this.getLayer(),
 					selector: this.getRootControlInstance(),
 					versioningEnabled: this._oVersionsModel.getProperty("/versioningEnabled"),
-					developerMode: this.getFlexSettings().developerMode
+					developerMode: this.getFlexSettings().developerMode,
+					adaptationId: this._oContextBasedAdaptationsModel.getProperty("/displayedAdaptation/id")
 				});
 			}.bind(this))
 			.then(function(bReloadTriggered) {
@@ -570,7 +576,7 @@ sap.ui.define([
 					validateFlexEnabled(this);
 				}
 				this._sStatus = STARTED;
-				RuntimeAuthoring.disableRestart(Layer.CUSTOMER);
+				RuntimeAuthoring.disableRestart(this.getLayer());
 				this.fireStart({
 					editablePluginsCount: this.getPluginManager().getEditableOverlaysCount()
 				});
@@ -1029,10 +1035,13 @@ sap.ui.define([
 			var bIsSaveAsAvailable = aRtaFeaturesAvailability[1];
 			var bIsContextBasedAdaptationAvailable = aRtaFeaturesAvailability[2];
 			var bIsHomePage = aRtaFeaturesAvailability[3];
+			var oManifest = FlexUtils.getAppDescriptor(oRootControl);
+			//context based adaptation is not supported for overview pages
+			var bIsContextBasedAdaptationSupported = oManifest && !ManifestUtils.getOvpEntry(oManifest);
 			return {
 				publishAvailable: bIsPublishAvailable,
 				saveAsAvailable: !bIsHomePage && bIsPublishAvailable && bIsSaveAsAvailable,
-				contextBasedAdaptationAvailable: !bIsHomePage && bIsContextBasedAdaptationAvailable
+				contextBasedAdaptationAvailable: !bIsHomePage && bIsContextBasedAdaptationSupported && bIsContextBasedAdaptationAvailable
 			};
 		});
 	}
@@ -1055,33 +1064,30 @@ sap.ui.define([
 	 * @returns {Promise} Resolves as soon as the MessageBox is closed
 	 */
 	function onStackModified() {
-		var bBackEndDraftExists = this._oVersionsModel.getProperty("/backendDraft");
-		var bDraftDisplayed = this._oVersionsModel.getProperty("/displayedVersion") === Version.Number.Draft;
 		var oCommandStack = this.getCommandStack();
 		var bCanUndo = oCommandStack.canUndo();
 
+		// FIXME Missing check whether action is saveable e.g. switching a view should not trigger this
+		// bCanUndo and _bUserDiscardedDraft seem to be redundant logic,
+		// because displayedVersion would be draft already
 		if (
 			!this.getShowToolbars() ||
 			!bCanUndo ||
-			this._bUserDiscardedDraft ||
-			bDraftDisplayed ||
-			!bBackEndDraftExists
+			this._bUserDiscardedDraft
 		) {
-			return modifyStack.call(this);
+			modifyStack.call(this);
+			return;
 		}
 
 		// warn the user: the existing draft would be discarded in case the user saves
-		return Utils.showMessageBox("warning", "MSG_DRAFT_DISCARD_AND_CREATE_NEW_DIALOG", {
-			titleKey: "TIT_DRAFT_DISCARD_DIALOG",
-			actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
-			emphasizedAction: MessageBox.Action.OK
-		})
-		.then(function(sAction) {
-			if (sAction === MessageBox.Action.OK) {
-				discardDraftConfirmed.call(this);
-			} else {
-				this.undo();
+		Utils.checkDraftOverwrite(this._oVersionsModel)
+		.then(function(bDialogShown) {
+			if (bDialogShown) {
+				this._bUserDiscardedDraft = true;
 			}
+			modifyStack.call(this);
+		}.bind(this), function() {
+			this.undo();
 		}.bind(this));
 	}
 
@@ -1203,6 +1209,10 @@ sap.ui.define([
 			// Save changes on the current layer and discard dirty changes on other layers
 			mPropertyBag.saveAsDraft = this.getLayer() === Layer.CUSTOMER;
 		}
+		if (this._oContextBasedAdaptationsModel.getProperty("/contextBasedAdaptationsEnabled")) {
+			// If an adaptation is being processed, saving without exiting must retrieve the updated state of the adaptation
+			mPropertyBag.adaptationId = bIsExit ? undefined : this._oContextBasedAdaptationsModel.getProperty("/displayedAdaptation/id");
+		}
 
 		return this._oSerializer.saveCommands(mPropertyBag)
 			.then(function() {
@@ -1286,50 +1296,127 @@ sap.ui.define([
 		return this.stop(true, true);
 	}
 
-	function onSwitchVersion(oEvent) {
-		var sVersion = oEvent.getParameter("version");
-		var sDisplayedVersion = this._oVersionsModel.getProperty("/displayedVersion");
-
-		if (sVersion === sDisplayedVersion) {
-			// already displayed version needs no switch
-			return;
+	function onDeleteAdaptation() {
+		if (this.canSave()) {
+			showDeleteAdaptationMessageBox.call(this, "DAC_DATA_LOSS_DIALOG_DESCRIPTION", "DAC_DIALOG_HEADER", true /*bDirtyChanges*/);
+		} else {
+			showDeleteAdaptationMessageBox.call(this, "DAC_DIALOG_DESCRIPTION", "DAC_DIALOG_HEADER");
 		}
+	}
+
+	function showDeleteAdaptationMessageBox(sMessageKey, sTitleKey, bDirtyChanges) {
+		Utils.showMessageBox("confirm", sMessageKey, {
+			titleKey: sTitleKey
+		}).then(function(sAction) {
+			if (sAction === MessageBox.Action.OK) {
+				BusyIndicator.show();
+				if (bDirtyChanges) {
+					// a reload is triggered later and will destroy RTA & the command stack
+					this.getCommandStack().removeAllCommands(true);
+				}
+				deleteAdaptation.call(this);
+			}
+		}.bind(this));
+	}
 
+	function deleteAdaptation() {
+		ContextBasedAdaptationsAPI.remove({
+			control: this.getRootControlInstance(),
+			layer: this.getLayer(),
+			adaptationId: this._oContextBasedAdaptationsModel.getProperty("/displayedAdaptation/id")
+		}).then(function() {
+			BusyIndicator.hide();
+			var sAdaptationId = this._oContextBasedAdaptationsModel.deleteAdaptation();
+			switchAdaptation.call(this, sAdaptationId);
+		}.bind(this)).catch(function(oError) {
+			BusyIndicator.hide();
+			Log.error(oError.stack);
+			var sMessage = "MSG_LREP_TRANSFER_ERROR";
+			var oOptions = { titleKey: "DAC_DIALOG_HEADER" };
+			oOptions.details = oError.userMessage;
+			Utils.showMessageBox("error", sMessage, oOptions);
+		});
+	}
+
+	function handleDataLoss(sMessageKey, sTitleKey, callbackFn) {
 		if (this.canSave()) {
-			this._sSwitchToVersion = sVersion;
-			Utils.showMessageBox("warning", "MSG_SWITCH_VERSION_DIALOG", {
-				titleKey: "TIT_SWITCH_VERSION_DIALOG",
+			Utils.showMessageBox("warning", sMessageKey, {
+				titleKey: sTitleKey,
 				actions: [MessageBox.Action.YES, MessageBox.Action.NO, MessageBox.Action.CANCEL],
 				emphasizedAction: MessageBox.Action.YES
 			}).then(function(sAction) {
 				if (sAction === MessageBox.Action.YES) {
-					this._serializeToLrep()
-						.then(switchVersion.bind(this, this._sSwitchToVersion));
+					return this._serializeToLrep()
+						.then(callbackFn);
 				} else if (sAction === MessageBox.Action.NO) {
 					// avoids the data loss popup; a reload is triggered later and will destroy RTA & the command stack
 					this.getCommandStack().removeAllCommands(true);
-					switchVersion.call(this, this._sSwitchToVersion);
+					return callbackFn();
 				}
-				return undefined;
+				return Promise.resolve();
 			}.bind(this));
+			return Promise.resolve();
+		}
+		return callbackFn();
+	}
+
+	function onSwitchAdaptation(oEvent) {
+		var fnCallback = oEvent.getParameter("callback") || function() {};
+		if (oEvent.getParameter("trigger") === "SaveAs") {
+			// remove all changes from command stack when triggered from saveAs dialog as they are already saved in a new adaptation
+			this.getCommandStack().removeAllCommands(true);
+		}
+		var sAdaptationId = oEvent.getParameter("adaptationId");
+		this._sSwitchToAdaptationId = sAdaptationId;
+		return handleDataLoss.call(this, "MSG_SWITCH_VERSION_DIALOG", "BTN_SWITCH_ADAPTATIONS",
+			switchAdaptation.bind(this, this._sSwitchToAdaptationId))
+			.then(fnCallback)
+			.catch(function(oError) {
+				Utils.showMessageBox("error", "MSG_SWITCH_ADAPTATION_FAILED", {error: oError});
+				Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+			});
+	}
+
+	function switchAdaptation(sAdaptationId) {
+		var sVersion = this._oVersionsModel.getProperty("/displayedVersion");
+		return switchVersion.call(this, sVersion, sAdaptationId);
+	}
+
+	function onSwitchVersion(oEvent) {
+		var fnCallback = oEvent.getParameter("callback") || function() {};
+		var sVersion = oEvent.getParameter("version");
+		var sDisplayedVersion = this._oVersionsModel.getProperty("/displayedVersion");
+
+		if (sVersion === sDisplayedVersion) {
+			// already displayed version needs no switch
 			return;
 		}
-		switchVersion.call(this, sVersion);
+
+		this._sSwitchToVersion = sVersion;
+		handleDataLoss.call(this, "MSG_SWITCH_VERSION_DIALOG", "TIT_SWITCH_VERSION_DIALOG",
+			switchVersion.bind(this, this._sSwitchToVersion))
+			.then(fnCallback)
+			.catch(function(oError) {
+				Utils.showMessageBox("error", "MSG_SWITCH_VERSION_FAILED", {error: oError});
+				Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+			});
 	}
 
-	function switchVersion(sVersion) {
+	function switchVersion(sVersion, sAdaptationId) {
 		RuntimeAuthoring.enableRestart(this.getLayer(), this.getRootControlInstance());
 
-		VersionsAPI.loadVersionForApplication({
+		return VersionsAPI.loadVersionForApplication({
 			control: this.getRootControlInstance(),
 			layer: this.getLayer(),
-			version: sVersion
+			version: sVersion,
+			adaptationId: sAdaptationId
+		}).then(function() {
+			var oReloadInfo = {
+				versionSwitch: true,
+				version: sVersion
+			};
+			ReloadManager.triggerReload(oReloadInfo);
 		});
-		var oReloadInfo = {
-			versionSwitch: true,
-			version: sVersion
-		};
-		ReloadManager.triggerReload(oReloadInfo);
 	}
 
 	function onPublishVersion() {
@@ -1348,11 +1435,6 @@ sap.ui.define([
 		});
 	}
 
-	function discardDraftConfirmed() {
-		this._bUserDiscardedDraft = true;
-		modifyStack.call(this);
-	}
-
 	function isOldVersionDisplayed() {
 		return VersionsAPI.isOldVersionDisplayed({
 			control: this.getRootControlInstance(),
@@ -1367,7 +1449,15 @@ sap.ui.define([
 		});
 	}
 
-	function initVersioning() {
+	/**
+	 * Inits version models. Clears old state if RTA is starting from end user mode (no switch)
+	 * @param {boolean} bIsAutomaticRestart - If true this is not an RTA start but a reload due to version/adaptation switch
+	 * @returns {Promise<void>} - Promise
+	 */
+	function initVersioning(bIsAutomaticRestart) {
+		if (!bIsAutomaticRestart) {
+			VersionsAPI.clearInstances();
+		}
 		return VersionsAPI.initialize({
 			control: this.getRootControlInstance(),
 			layer: this.getLayer()
@@ -1376,7 +1466,15 @@ sap.ui.define([
 		}.bind(this));
 	}
 
-	function initContextBasedAdaptations() {
+	/**
+	 * Inits CBA models. Clears old state if RTA is starting from end user mode (no switch)
+	 * @param {boolean} bIsAutomaticRestart - If true this is not an RTA start but a reload due to version/adaptation switch
+	 * @returns {Promise<void>} - Promise
+	 */
+	function initContextBasedAdaptations(bIsAutomaticRestart) {
+		if (!bIsAutomaticRestart) {
+			ContextBasedAdaptationsAPI.clearInstances();
+		}
 		return ContextBasedAdaptationsAPI.initialize({
 			control: this.getRootControlInstance(),
 			layer: this.getLayer()
@@ -1407,6 +1505,8 @@ sap.ui.define([
 				oProperties.activate = onActivate.bind(this);
 				oProperties.discardDraft = onDiscardDraft.bind(this);
 				oProperties.switchVersion = onSwitchVersion.bind(this);
+				oProperties.switchAdaptation = onSwitchAdaptation.bind(this);
+				oProperties.deleteAdaptation = onDeleteAdaptation.bind(this);
 				oProperties.openChangeCategorySelectionPopover = this.getChangeVisualization
 					? this.getChangeVisualization().openChangeCategorySelectionPopover.bind(this.getChangeVisualization())
 					: function() {};
@@ -1434,6 +1534,7 @@ sap.ui.define([
 					// the "Visualization" tab should not be visible if the "fiori-tools-rta-mode" URL-parameter is set to any value but "false"
 					var bVisualizationButtonVisible;
 					bVisualizationButtonVisible = !oUriParameters.has("fiori-tools-rta-mode") || oUriParameters.get("fiori-tools-rta-mode") === "false";
+					var bFeedbackButtonVisible = Core.getConfiguration().getFlexibilityServices()[0].connector !== "LocalStorageConnector";
 					this.bPersistedDataTranslatable = false;
 
 					this._oToolbarControlsModel = new JSONModel({
@@ -1481,6 +1582,9 @@ sap.ui.define([
 						visualizationButton: {
 							visible: bVisualizationButtonVisible,
 							enabled: bVisualizationButtonVisible
+						},
+						feedbackButton: {
+							visible: bFeedbackButtonVisible
 						}
 					});
 
@@ -1513,7 +1617,7 @@ sap.ui.define([
 					}.bind(this));
 
 					this.getToolbar().setModel(this._oVersionsModel, "versions");
-					this.getToolbar().setModel(this._oContextBasedAdaptationsModel, "contextBasedAdaptation");
+					this.getToolbar().setModel(this._oContextBasedAdaptationsModel, "contextBasedAdaptations");
 					this.getToolbar().setModel(this._oToolbarControlsModel, "controls");
 
 					return Promise.all([oTranslationPromise, oSaveAsPromise]);

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

@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/write/api/Version",
 	"sap/ui/dt/OverlayUtil",
 	"sap/ui/dt/DOMUtil",
 	"sap/ui/dt/ElementUtil",
@@ -26,6 +27,7 @@ function(
 	FlexUtils,
 	Layer,
 	FlexLayerUtils,
+	Version,
 	OverlayUtil,
 	DOMUtil,
 	ElementUtil,
@@ -45,7 +47,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @private
 	 * @since 1.30
@@ -644,5 +646,37 @@ function(
 			});
 	};
 
+	/**
+	 * Check if an existing draft would be overwritten if a change is done on the currently shown version
+	 * If so it opens a confirmation dialog.
+	 * @param {object} oVersionsModel The versions model
+	 * @return {Promise.<boolean>} It either resolves with an indicator whether a confirmation
+	 * was shown or rejects with "cancel" if cancel was pressed
+	 */
+	Utils.checkDraftOverwrite = function(oVersionsModel) {
+		var bBackEndDraftExists = oVersionsModel.getProperty("/backendDraft");
+		var bDraftDisplayed = oVersionsModel.getProperty("/displayedVersion") === Version.Number.Draft;
+
+		if (
+			bDraftDisplayed ||
+			!bBackEndDraftExists
+		) {
+			return Promise.resolve(false);
+		}
+
+		// warn the user: the existing draft would be discarded in case the user saves
+		return Utils.showMessageBox("warning", "MSG_DRAFT_DISCARD_AND_CREATE_NEW_DIALOG", {
+			titleKey: "TIT_DRAFT_DISCARD_DIALOG",
+			actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
+			emphasizedAction: MessageBox.Action.OK
+		})
+		.then(function(sAction) {
+			if (sAction !== MessageBox.Action.OK) {
+				throw "cancel";
+			}
+			return true;
+		});
+	};
+
 	return Utils;
 }, /* bExport= */true);

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.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.53
@@ -118,16 +118,17 @@ sap.ui.define([
 						});
 
 					aAllInlineChangeOperations.push(oInlineChangePromise);
-
-					// create a inline change using a change type 'appdescr_app_removeAllInboundsExceptOne'
-					oPropertyChange = AppVariantUtils.prepareRemoveAllInboundsExceptOneChange(sCurrentRunningInboundId);
-					aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_removeAllInboundsExceptOne", vSelector));
 				} else {
 					// create a inline change using a change type 'appdescr_app_changeInbound'
 					oPropertyChange = AppVariantUtils.prepareChangeInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData);
 					aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_changeInbound", vSelector));
 				}
 
+				// remove all other inbounds except appVariant inbound
+				// create a inline change using a change type 'appdescr_app_removeAllInboundsExceptOne'
+				oPropertyChange = AppVariantUtils.prepareRemoveAllInboundsExceptOneChange(sCurrentRunningInboundId);
+				aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_removeAllInboundsExceptOne", vSelector));
+
 				return Promise.all(aAllInlineChangeOperations);
 			});
 	};

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.113.0
+	 * @version 1.114.1
 	 * @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.113.0
+	 * @version 1.114.1
 	 * @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.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.54

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.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.76

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.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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.113.0
+	 * @version 1.114.1
 	 *
 	 * @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.113.0
+	 * @version 1.114.1
 	 * @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.113.0
+	 * @version 1.114.1
 	 * @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.113.0
+	 * @version 1.114.1
 	 *
 	 * @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.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.52

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.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.command.BaseCommand
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @constructor
 	 * @private
 	 * @since 1.86
@@ -66,6 +66,8 @@ sap.ui.define([
 		this.oModel = this.getModel();
 		this.setSourceDefaultVariant(this.oModel.getData()[this.sVariantManagementReference].defaultVariant);
 		this.sLayer = mFlexSettings.layer;
+		var mComponentPropertyBag = mFlexSettings;
+		mComponentPropertyBag.variantManagementControl = this.oVariantManagementControl;
 
 		function storeEventParameters(oEvent, oArgs) {
 			var mParameters = oEvent.getParameters();
@@ -84,7 +86,7 @@ sap.ui.define([
 			this.oVariantManagementControl.attachSave({resolve: resolve}, storeEventParameters, this);
 			this.oVariantManagementControl.attachCancel({resolve: resolve}, handleCancel, this);
 			this.oVariantManagementControl.openSaveAsDialogForKeyUser(rtaUtils.getRtaStyleClassName(),
-				ContextSharingAPI.createComponent(mFlexSettings));
+				ContextSharingAPI.createComponent(mComponentPropertyBag));
 		}.bind(this))
 			.then(function(bState) {
 				return bState;