@openui5/sap.ui.rta 1.99.1 → 1.102.0

package/THIRDPARTY.txt

@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.34
+Component: SAP Theming Base Content, version: 11.1.39
 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.99.1",
+  "version": "1.102.0",
   "description": "OpenUI5 UI Library sap.ui.rta",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.99.1",
-    "@openui5/sap.ui.core": "1.99.1",
-    "@openui5/sap.ui.dt": "1.99.1",
-    "@openui5/sap.ui.fl": "1.99.1",
-    "@openui5/sap.ui.layout": "1.99.1"
+    "@openui5/sap.m": "1.102.0",
+    "@openui5/sap.ui.core": "1.102.0",
+    "@openui5/sap.ui.dt": "1.102.0",
+    "@openui5/sap.ui.fl": "1.102.0",
+    "@openui5/sap.ui.layout": "1.102.0"
   }
 }

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

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

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

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

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

@@ -21,6 +21,7 @@ sap.ui.define([
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/Util",
 	"sap/ui/events/KeyCodes",
+	"sap/ui/fl/write/api/Version",
 	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"sap/ui/fl/apply/api/SmartVariantManagementApplyAPI",
 	"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
@@ -28,9 +29,9 @@ sap.ui.define([
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/write/api/ReloadInfoAPI",
 	"sap/ui/fl/write/api/VersionsAPI",
+	"sap/ui/fl/write/api/TranslationAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/library",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/Utils",
 	"sap/ui/model/json/JSONModel",
@@ -67,6 +68,7 @@ sap.ui.define([
 	OverlayRegistry,
 	DtUtil,
 	KeyCodes,
+	Version,
 	FlexRuntimeInfoAPI,
 	SmartVariantManagementApplyAPI,
 	ControlPersonalizationWriteAPI,
@@ -74,9 +76,9 @@ sap.ui.define([
 	PersistenceWriteAPI,
 	ReloadInfoAPI,
 	VersionsAPI,
+	TranslationAPI,
 	Layer,
 	LayerUtils,
-	flexLibrary,
 	Settings,
 	FlexUtils,
 	JSONModel,
@@ -114,7 +116,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.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -330,7 +332,7 @@ sap.ui.define([
 
 	/**
 	 * Getter method for plugins.
-	 * @returns {object<sap.ui.rta.plugin.Plugin>} map with plugins
+	 * @returns {Object<string, sap.ui.rta.plugin.Plugin>} map with plugins
 	 */
 	RuntimeAuthoring.prototype.getPlugins = function () {
 		return this.getPluginManager
@@ -413,7 +415,7 @@ sap.ui.define([
 
 	RuntimeAuthoring.prototype._initVersioning = function() {
 		return VersionsAPI.initialize({
-			selector: this.getRootControlInstance(),
+			control: this.getRootControlInstance(),
 			layer: this.getLayer()
 		}).then(this._setVersionsModel.bind(this));
 	};
@@ -609,14 +611,14 @@ sap.ui.define([
 
 	RuntimeAuthoring.prototype._isOldVersionDisplayed = function() {
 		return VersionsAPI.isOldVersionDisplayed({
-			selector: this.getRootControlInstance(),
+			control: this.getRootControlInstance(),
 			layer: this.getLayer()
 		});
 	};
 
 	RuntimeAuthoring.prototype._isDraftAvailable = function() {
 		return VersionsAPI.isDraftAvailable({
-			selector: this.getRootControlInstance(),
+			control: this.getRootControlInstance(),
 			layer: this.getLayer()
 		});
 	};
@@ -682,7 +684,7 @@ sap.ui.define([
 	 */
 	RuntimeAuthoring.prototype._onStackModified = function() {
 		var bBackEndDraftExists = this._oVersionsModel.getProperty("/backendDraft");
-		var bDraftDisplayed = this._oVersionsModel.getProperty("/displayedVersion") === sap.ui.fl.Versions.Draft;
+		var bDraftDisplayed = this._oVersionsModel.getProperty("/displayedVersion") === Version.Number.Draft;
 		var oCommandStack = this.getCommandStack();
 		var bCanUndo = oCommandStack.canUndo();
 
@@ -721,6 +723,8 @@ sap.ui.define([
 			var oCommandStack = this.getCommandStack();
 			var bCanUndo = oCommandStack.canUndo();
 			var bCanRedo = oCommandStack.canRedo();
+			var bTranslationRelevantDirtyChange = this._oToolbarControlsModel.getProperty("/translationVisible") &&
+				TranslationAPI.hasTranslationRelevantDirtyChanges({layer: Layer.CUSTOMER, selector: this.getRootControlInstance()});
 
 			// TODO: move to the setter to the ChangesState
 			this._oVersionsModel.setDirtyChanges(bCanUndo);
@@ -728,6 +732,7 @@ sap.ui.define([
 			this._oToolbarControlsModel.setProperty("/redoEnabled", bCanRedo);
 			this._oToolbarControlsModel.setProperty("/publishEnabled", this.bInitialPublishEnabled || bCanUndo);
 			this._oToolbarControlsModel.setProperty("/restoreEnabled", this.bInitialResetEnabled || bCanUndo);
+			this._oToolbarControlsModel.setProperty("/translationEnabled", this.bPersistedDataTranslatable || bTranslationRelevantDirtyChange);
 		}
 		this.fireUndoRedoStackModified();
 		return Promise.resolve();
@@ -878,9 +883,20 @@ sap.ui.define([
 		return undefined;
 	};
 
+	RuntimeAuthoring.prototype._saveOnly = function(oEvent) {
+		var fnCallback = oEvent.getParameter("callback") || function() {};
+		return waitForPendingActions.call(this)
+			.then(this._serializeToLrep.bind(this))
+			.then(fnCallback);
+	};
+
 	RuntimeAuthoring.prototype._serializeAndSave = function() {
+		if (this.getShowToolbars()) {
+			this.bPersistedDataTranslatable = this._oToolbarControlsModel.getProperty("/translationEnabled");
+		}
 		// Save changes on the current layer and discard dirty changes on other layers
-		return this._oSerializer.saveCommands(this._oVersionsModel.getProperty("/versioningEnabled"), this.getLayer(), true);
+		var bSaveAsDraft = this._oVersionsModel.getProperty("/versioningEnabled") && this.getLayer() === Layer.CUSTOMER;
+		return this._oSerializer.saveCommands(bSaveAsDraft, this.getLayer(), true);
 	};
 
 	RuntimeAuthoring.prototype._serializeToLrep = function() {
@@ -913,7 +929,7 @@ sap.ui.define([
 			})
 			.then(function(sAction) {
 				if (sAction === MessageBox.Action.OK) {
-					this._activate(sVersionTitle);
+					return this._activate(sVersionTitle);
 				}
 			}.bind(this));
 		}
@@ -923,10 +939,13 @@ sap.ui.define([
 	RuntimeAuthoring.prototype._activate = function(sVersionTitle) {
 		var sLayer = this.getLayer();
 		var oSelector = this.getRootControlInstance();
-		return VersionsAPI.activate({
-			layer: sLayer,
-			selector: oSelector,
-			title: sVersionTitle
+		return this._serializeAndSave()
+		.then(function () {
+			return VersionsAPI.activate({
+				layer: sLayer,
+				control: oSelector,
+				title: sVersionTitle
+			});
 		}).then(function () {
 			this._showMessageToast("MSG_DRAFT_ACTIVATION_SUCCESS");
 			this.bInitialResetEnabled = true;
@@ -965,7 +984,7 @@ sap.ui.define([
 			if (sAction === MessageBox.Action.OK) {
 				return VersionsAPI.discardDraft({
 					layer: this.getLayer(),
-					selector: this.getRootControlInstance(),
+					control: this.getRootControlInstance(),
 					updateState: true
 				})
 				.then(this._handleDiscard.bind(this));
@@ -1020,11 +1039,11 @@ sap.ui.define([
 		}
 		var mParsedHash = FlexUtils.getParsedURLHash(this._getUShellService("URLParsing"));
 		VersionsAPI.loadVersionForApplication({
-			selector: this.getRootControlInstance(),
+			control: this.getRootControlInstance(),
 			layer: this.getLayer(),
 			version: sVersion
 		});
-		var aVersionsParameter = mParsedHash.params[sap.ui.fl.Versions.UrlParameter];
+		var aVersionsParameter = mParsedHash.params[Version.UrlParameter];
 		if (
 			aVersionsParameter &&
 			aVersionsParameter[0] === sVersion &&
@@ -1033,7 +1052,7 @@ sap.ui.define([
 			// RTA was started with a version parameter, the displayed version has changed and the key user switches back
 			this._getUShellService("AppLifeCycle").reloadCurrentApp();
 		} else {
-			mParsedHash.params[sap.ui.fl.Versions.UrlParameter] = sVersion;
+			mParsedHash.params[Version.UrlParameter] = sVersion;
 			this._triggerCrossAppNavigation(mParsedHash);
 		}
 		return undefined;
@@ -1054,19 +1073,21 @@ sap.ui.define([
 				},
 				textResources: this._getTextResources(),
 				restore: this._onRestore.bind(this),
-				exit: this.stop.bind(this, false, bUserLayer)
+				exit: this.stop.bind(this, false, bUserLayer),
+				save: this._saveOnly.bind(this)
 			};
 
 			if (!bUserLayer) {
 				oProperties.transport = this._onTransport.bind(this);
+				oProperties.publishVersion = this._onPublishVersion.bind(this);
 				oProperties.undo = this._onUndo.bind(this);
 				oProperties.redo = this._onRedo.bind(this);
 				oProperties.modeChange = this._onModeChange.bind(this);
 				oProperties.activate = this._onActivate.bind(this);
 				oProperties.discardDraft = this._onDiscardDraft.bind(this);
 				oProperties.switchVersion = this._onSwitchVersion.bind(this);
-				oProperties.onCommandCategorySelection = this.getChangeVisualization
-					? this.getChangeVisualization().onCommandCategorySelection.bind(this.getChangeVisualization())
+				oProperties.openChangeCategorySelectionPopover = this.getChangeVisualization
+					? this.getChangeVisualization().openChangeCategorySelectionPopover.bind(this.getChangeVisualization())
 					: function () {};
 			}
 
@@ -1082,47 +1103,66 @@ sap.ui.define([
 			}
 			this.addDependent(oToolbar, "toolbar");
 
-			return oToolbar.onFragmentLoaded().then(function() {
-				var bSaveAsAvailable = aButtonsVisibility.saveAsAvailable;
-				var bExtendedOverview = bSaveAsAvailable && RtaAppVariantFeature.isOverviewExtended();
-				var oUriParameters = UriParameters.fromURL(window.location.href);
-				// the "Visualization" tab should not be visible if the "fiori-tools-rta-mode" URL-parameter is set to any value but "false"
-				var bVisualizationButtonVisible;
-				if (oUriParameters.has("fiori-tools-rta-mode") && oUriParameters.get("fiori-tools-rta-mode") !== "false") {
-					bVisualizationButtonVisible = false;
-				} else {
-					bVisualizationButtonVisible = true;
-				}
+			return Promise.all([oToolbar.onFragmentLoaded(), FeaturesAPI.isKeyUserTranslationEnabled(this.getLayer())])
+				.then(function(aArguments) {
+					var bTranslationAvailable = aArguments[1];
+					var bSaveAsAvailable = aButtonsVisibility.saveAsAvailable;
+					var bExtendedOverview = bSaveAsAvailable && RtaAppVariantFeature.isOverviewExtended();
+					var oUriParameters = UriParameters.fromURL(window.location.href);
+					// 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";
+					this.bPersistedDataTranslatable = false;
+
+					this._oToolbarControlsModel = new JSONModel({
+						undoEnabled: false,
+						redoEnabled: false,
+						translationVisible: bTranslationAvailable,
+						translationEnabled: this.bPersistedDataTranslatable,
+						publishVisible: aButtonsVisibility.publishAvailable,
+						publishEnabled: this.bInitialPublishEnabled,
+						restoreEnabled: this.bInitialResetEnabled,
+						appVariantsOverviewVisible: bSaveAsAvailable && bExtendedOverview,
+						appVariantsOverviewEnabled: bSaveAsAvailable && bExtendedOverview,
+						saveAsVisible: bSaveAsAvailable,
+						saveAsEnabled: false,
+						manageAppsVisible: bSaveAsAvailable && !bExtendedOverview,
+						manageAppsEnabled: bSaveAsAvailable && !bExtendedOverview,
+						modeSwitcher: this.getMode(),
+						visualizationButtonVisible: bVisualizationButtonVisible
+					});
 
-				this._oToolbarControlsModel = new JSONModel({
-					undoEnabled: false,
-					redoEnabled: false,
-					translationVisible: false,
-					translationEnabled: false,
-					publishVisible: aButtonsVisibility.publishAvailable,
-					publishEnabled: this.bInitialPublishEnabled,
-					restoreEnabled: this.bInitialResetEnabled,
-					appVariantsOverviewVisible: bSaveAsAvailable && bExtendedOverview,
-					appVariantsOverviewEnabled: bSaveAsAvailable && bExtendedOverview,
-					saveAsVisible: bSaveAsAvailable,
-					saveAsEnabled: false,
-					manageAppsVisible: bSaveAsAvailable && !bExtendedOverview,
-					manageAppsEnabled: bSaveAsAvailable && !bExtendedOverview,
-					modeSwitcher: this.getMode(),
-					visualizationButtonVisible: bVisualizationButtonVisible
-				});
+					var oTranslationPromise = new Promise(function (resolve) {
+						if (!bTranslationAvailable) {
+							resolve();
+							return;
+						}
 
-				if (bSaveAsAvailable) {
-					RtaAppVariantFeature.isManifestSupported().then(function (bResult) {
-						this._oToolbarControlsModel.setProperty("/saveAsEnabled", bResult);
-						this._oToolbarControlsModel.setProperty("/appVariantsOverviewEnabled", bResult);
-						this._oToolbarControlsModel.setProperty("/manageAppsEnabled", bResult);
+						TranslationAPI.getSourceLanguages({selector: this.getRootControlInstance(), layer: this.getLayer()})
+							.then(function (aSourceLanguages) {
+								this.bPersistedDataTranslatable = aSourceLanguages.length > 0;
+								this._oToolbarControlsModel.setProperty("/translationEnabled", this.bPersistedDataTranslatable);
+							}.bind(this)).finally(resolve);
 					}.bind(this));
-				}
 
-				this.getToolbar().setModel(this._oVersionsModel, "versions");
-				this.getToolbar().setModel(this._oToolbarControlsModel, "controls");
-			}.bind(this));
+					var oSaveAsPromise = new Promise(function (resolve) {
+						if (!bSaveAsAvailable) {
+							resolve();
+							return;
+						}
+
+						RtaAppVariantFeature.isManifestSupported().then(function (bResult) {
+							this._oToolbarControlsModel.setProperty("/saveAsEnabled", bResult);
+							this._oToolbarControlsModel.setProperty("/appVariantsOverviewEnabled", bResult);
+							this._oToolbarControlsModel.setProperty("/manageAppsEnabled", bResult);
+						}.bind(this)).finally(resolve);
+					}.bind(this));
+
+					this.getToolbar().setModel(this._oVersionsModel, "versions");
+					this.getToolbar().setModel(this._oToolbarControlsModel, "controls");
+
+					return Promise.all([oTranslationPromise, oSaveAsPromise]);
+				}.bind(this));
 		}
 		return Promise.resolve();
 	};
@@ -1177,6 +1217,22 @@ sap.ui.define([
 		ManagedObject.prototype.destroy.apply(this, arguments);
 	};
 
+	RuntimeAuthoring.prototype._onPublishVersion = function() {
+		this.getPluginManager().handleStopCutPaste();
+
+		return VersionsAPI.publish({
+			selector: this.getRootControlInstance(),
+			styleClass: Utils.getRtaStyleClassName(),
+			layer: this.getLayer(),
+			version: this._oVersionsModel.getProperty("/displayedVersion")
+		})
+		.then(function(sMessage) {
+			if (sMessage !== "Error" && sMessage !== "Cancel") {
+				MessageToast.show(sMessage);
+			}
+		});
+	};
+
 	/**
 	 * Function to handle ABAP transport of the changes
 	 * @return {Promise} Returns a Promise processing the transport of changes
@@ -1203,21 +1259,21 @@ sap.ui.define([
 						layer: this.getLayer(),
 						appVariantDescriptors: aAppVariantDescriptor
 					})
-						.then(function(sMessage) {
-							if (sMessage !== "Error" && sMessage !== "Cancel") {
-								MessageToast.show(sMessage);
-								if (this.getShowToolbars()) {
-									PersistenceWriteAPI.getResetAndPublishInfo({
-										selector: this.getRootControlInstance(),
-										layer: this.getLayer()
-									})
-									.then(function(oPublishAndResetInfo) {
-										this._oToolbarControlsModel.setProperty("/publishEnabled", oPublishAndResetInfo.isPublishEnabled);
-										this._oToolbarControlsModel.setProperty("/restoreEnabled", oPublishAndResetInfo.isResetEnabled);
-									}.bind(this));
-								}
+					.then(function(sMessage) {
+						if (sMessage !== "Error" && sMessage !== "Cancel") {
+							MessageToast.show(sMessage);
+							if (this.getShowToolbars()) {
+								PersistenceWriteAPI.getResetAndPublishInfo({
+									selector: this.getRootControlInstance(),
+									layer: this.getLayer()
+								})
+								.then(function(oPublishAndResetInfo) {
+									this._oToolbarControlsModel.setProperty("/publishEnabled", oPublishAndResetInfo.isPublishEnabled);
+									this._oToolbarControlsModel.setProperty("/restoreEnabled", oPublishAndResetInfo.isResetEnabled);
+								}.bind(this));
 							}
-						}.bind(this));
+						}
+					}.bind(this));
 				}.bind(this));
 		}.bind(this))["catch"](showTechnicalError);
 	};
@@ -1237,6 +1293,8 @@ sap.ui.define([
 			selector: oSelector,
 			layer: sLayer
 		}).then(function () {
+			// avoids the data loss popup; a reload is triggered later and will destroy RTA & the command stack
+			this.getCommandStack().removeAllCommands(true);
 			ReloadInfoAPI.removeInfoSessionStorage(oSelector);
 			var oReloadInfo = {
 				isDraftAvailable: ReloadInfoAPI.hasVersionParameterWithValue({value: sLayer}, this._getUShellService("URLParsing")),
@@ -1337,10 +1395,7 @@ sap.ui.define([
 		}).then(function(sAction) {
 			if (sAction === MessageBox.Action.OK) {
 				RuntimeAuthoring.enableRestart(sLayer, this.getRootControlInstance());
-				return this._deleteChanges()
-					.then(function () {
-						this.getCommandStack().removeAllCommands();
-					}.bind(this));
+				return this._deleteChanges();
 			}
 			return undefined;
 		}.bind(this));
@@ -1503,9 +1558,9 @@ sap.ui.define([
 			return mParsedHash;
 		}
 
-		var sVersionParameter = FlexUtils.getParameter(flexLibrary.Versions.UrlParameter, this._getUShellService("URLParsing"));
+		var sVersionParameter = FlexUtils.getParameter(Version.UrlParameter, this._getUShellService("URLParsing"));
 		if (sVersionParameter) {
-			delete mParsedHash.params[flexLibrary.Versions.UrlParameter];
+			delete mParsedHash.params[Version.UrlParameter];
 		} else if (
 			(this._isDraftAvailable() || bTriggerReload /* for discarding of dirty changes */) &&
 			!oReloadInfo.hasHigherLayerChanges &&
@@ -1545,19 +1600,13 @@ sap.ui.define([
 			return undefined;
 		}
 
-		// allContexts do not change the url parameter to trigger a reload
-		if (
-			oReloadInfo.allContexts &&
-			!oReloadInfo.hasHigherLayerChanges &&
-			this._getUShellService("AppLifeCycle")
-		) {
+		if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.hasVersionUrlParameter) {
+			mParsedHash = this._removeMaxLayerParameterForFLP(oReloadInfo, mParsedHash);
+			mParsedHash = this._removeVersionParameterForFLP(oReloadInfo, mParsedHash, false);
+			this._triggerCrossAppNavigation(mParsedHash);
+		} else {
 			this._getUShellService("AppLifeCycle").reloadCurrentApp();
 		}
-
-		mParsedHash = this._removeMaxLayerParameterForFLP(oReloadInfo, mParsedHash);
-		mParsedHash = this._removeVersionParameterForFLP(oReloadInfo, mParsedHash, false);
-		this._triggerCrossAppNavigation(mParsedHash);
-
 		// In FLP scenario we need to remove all parameters and also trigger an hard reload on reset
 		if (oReloadInfo.triggerHardReload) {
 			this._reloadPage();
@@ -1660,16 +1709,16 @@ sap.ui.define([
 	};
 
 	RuntimeAuthoring.prototype._triggerReloadOnStart = function(oReloadInfo) {
-		if (this._getUShellService("CrossApplicationNavigation")) {
+		if (this._getUShellService("CrossApplicationNavigation") && this._oVersionsModel.getProperty("/versioningEnabled")) {
 			if (oReloadInfo.isDraftAvailable) {
 				// clears FlexState and triggers reloading of the flex data without blocking
 				VersionsAPI.loadDraftForApplication({
-					selector: oReloadInfo.selector,
+					control: oReloadInfo.selector,
 					layer: oReloadInfo.layer
 				});
 			} else {
 				VersionsAPI.loadVersionForApplication({
-					selector: oReloadInfo.selector,
+					control: oReloadInfo.selector,
 					layer: oReloadInfo.layer,
 					allContexts: oReloadInfo.allContexts
 				});
@@ -1687,6 +1736,7 @@ sap.ui.define([
 				if (
 					oReloadInfo.allContexts &&
 					!oReloadInfo.hasHigherLayerChanges &&
+					!oReloadInfo.isDraftAvailable &&
 					this._getUShellService("AppLifeCycle")
 				) {
 					this._getUShellService("AppLifeCycle").reloadCurrentApp();
@@ -1802,6 +1852,10 @@ sap.ui.define([
 				oTabHandlingPlugin[(sNewMode === "navigation") ? "restoreTabIndex" : "removeTabIndex"]();
 			}
 
+			if (sCurrentMode === "adaptation") {
+				this.getPluginManager().handleStopCutPaste();
+			}
+
 			oTabHandlingPlugin[(sNewMode === "adaptation") ? "restoreOverlayTabIndex" : "removeOverlayTabIndex"]();
 			oSelectionPlugin.setIsActive(!(sNewMode === "visualization"));
 

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

@@ -41,15 +41,13 @@ function(
 	"use strict";
 
 	/**
-	 * Class for Utils.
-	 *
-	 * @class Utility functionality to work with controls, e.g. iterate through aggregations, find parents, etc.
+	 * Utility functionality to work with controls, e.g. iterate through aggregations, find parents, etc.
 	 *
+	 * @namespace
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @private
-	 * @static
 	 * @since 1.30
 	 * @alias sap.ui.rta.Utils
 	 * @experimental Since 1.30. This class is experimental and provides only limited functionality.

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.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @private
 	 * @since 1.53

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

@@ -563,10 +563,10 @@ sap.ui.define([
 		var oUshellContainer = FlexUtils.getUshellContainer();
 		var oComponentInstance;
 		if (oUshellContainer) {
-			return oUshellContainer.getServiceAsync("AppConfiguration")
+			return oUshellContainer.getServiceAsync("AppLifeCycle")
 				.then(function(oAppConfiguration) {
 					var oApplication = oAppConfiguration.getCurrentApplication();
-					oComponentInstance = oApplication.componentHandle.getInstance();
+					oComponentInstance = oApplication.componentInstance;
 					if (oComponentInstance) {
 						return oUshellContainer.getServiceAsync("CrossApplicationNavigation");
 					}

package/src/sap/ui/rta/appVariant/manageApps/webapp/controller/ManageApps.controller.js

@@ -229,8 +229,6 @@ sap.ui.define([
 				return this.copyId(oEvent);
 			} else if (sItemPath === oI18n.getText("MAA_DIALOG_DELETE_APPVAR")) {
 				return this.deleteAppVariant(oEvent);
-			} else if (sItemPath === oI18n.getText("MAA_DIALOG_SAVE_AS_APP")) {
-				return this.saveAsAppVariant(oEvent);
 			}
 
 			return undefined;
@@ -265,21 +263,6 @@ sap.ui.define([
 			return false;
 		},
 
-		saveAsAppVariant: function(oEvent) {
-			AppVariantUtils.closeOverviewDialog();
-
-			var sDescriptorUrl = this.getModelProperty("descriptorUrl", oEvent.getSource().getBindingContext());
-
-			BusyIndicator.show();
-			return AppVariantOverviewUtils.getDescriptor({
-				appVarUrl: sDescriptorUrl,
-				layer: _sLayer
-			}).then(function(oAppVariantDescriptor) {
-				BusyIndicator.hide();
-				return RtaAppVariantFeature.onSaveAs(false, false, _sLayer, oAppVariantDescriptor);
-			});
-		},
-
 		copyId: function(oEvent) {
 			var sCopiedId = this.getModelProperty("appId", oEvent.getSource().getBindingContext());
 			AppVariantUtils.copyId(sCopiedId);

package/src/sap/ui/rta/appVariant/manageApps/webapp/i18n/i18n.properties

@@ -29,10 +29,6 @@ MAA_ORIGINAL_TYPE=Original App
 MAA_APP_VARIANT_TYPE=App Variant
 #XFLD
 MAA_CURRENT_APP_STATUS=Current Status
-#XFLD
-MAA_DIALOG_SAVE_AS_APP=Save As
-#XTOL: Tooltip for Button 'Save As' of the App variant overview list
-TOOLTIP_MAA_DIALOG_SAVE_AS_APP=Create New App Variant
 #XTOL: Tooltip for Button 'Copy ID'
 TOOLTIP_MAA_DIALOG_COPY_ID=Copy the ID of the app variant to the clipboard
 #XFLD

package/src/sap/ui/rta/appVariant/manageApps/webapp/i18n/i18n_ar.properties

@@ -13,8 +13,6 @@ MAA_NEW_APP_VARIANT=\u0645\u0646\u0634\u0623 \u0644\u0644\u062A\u0648
 MAA_ORIGINAL_TYPE=\u0627\u0644\u062A\u0637\u0628\u064A\u0642 \u0627\u0644\u0623\u0635\u0644\u064A
 MAA_APP_VARIANT_TYPE=\u0645\u062A\u063A\u064A\u0631 \u0627\u0644\u062A\u0637\u0628\u064A\u0642
 MAA_CURRENT_APP_STATUS=\u0627\u0644\u062D\u0627\u0644\u0629 \u0627\u0644\u062D\u0627\u0644\u064A\u0629
-MAA_DIALOG_SAVE_AS_APP=\u062D\u0641\u0638 \u0628\u0627\u0633\u0645
-TOOLTIP_MAA_DIALOG_SAVE_AS_APP=\u0625\u0646\u0634\u0627\u0621 \u0645\u062A\u063A\u064A\u0631 \u062A\u0637\u0628\u064A\u0642 \u062C\u062F\u064A\u062F
 TOOLTIP_MAA_DIALOG_COPY_ID=\u0646\u0633\u062E \u0645\u0639\u0631\u0641 \u0645\u062A\u063A\u064A\u0631 \u0627\u0644\u062A\u0637\u0628\u064A\u0642 \u0625\u0644\u0649 \u0627\u0644\u062D\u0627\u0641\u0638\u0629
 MAA_DIALOG_COPY_ID=\u0645\u0639\u0631\u0641 \u0627\u0644\u0646\u0633\u062E
 MAA_DIALOG_APP_TYPE=\u0646\u0648\u0639 \u0627\u0644\u062A\u0637\u0628\u064A\u0642

package/src/sap/ui/rta/appVariant/manageApps/webapp/i18n/i18n_bg.properties

@@ -13,8 +13,6 @@ MAA_NEW_APP_VARIANT=\u0422\u043E\u043A\u0443-\u0449\u043E \u0441\u044A\u0437\u04
 MAA_ORIGINAL_TYPE=\u041E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u043D\u043E \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435
 MAA_APP_VARIANT_TYPE=\u0412\u0430\u0440\u0438\u0430\u043D\u0442 \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435
 MAA_CURRENT_APP_STATUS=\u0422\u0435\u043A\u0443\u0449 \u0441\u0442\u0430\u0442\u0443\u0441
-MAA_DIALOG_SAVE_AS_APP=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435 \u043A\u0430\u0442\u043E
-TOOLTIP_MAA_DIALOG_SAVE_AS_APP=\u0421\u044A\u0437\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u043D\u043E\u0432 \u0432\u0430\u0440\u0438\u0430\u043D\u0442 \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435
 TOOLTIP_MAA_DIALOG_COPY_ID=\u041A\u043E\u043F\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0418\u0414 \u0437\u0430 \u0432\u0430\u0440\u0438\u0430\u043D\u0442 \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E \u043D\u0430 \u043A\u043B\u0438\u043F\u0431\u043E\u0440\u0434
 MAA_DIALOG_COPY_ID=\u041A\u043E\u043F\u0438\u0440\u0430\u043D\u0435 \u0418\u0414
 MAA_DIALOG_APP_TYPE=\u0412\u0438\u0434 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435