@openui5/sap.ui.rta 1.97.1 → 1.100.0

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

@@ -6,87 +6,97 @@
 
 // Provides class sap.ui.rta.RuntimeAuthoring.
 sap.ui.define([
+	"sap/base/strings/capitalize",
+	"sap/base/util/UriParameters",
+	"sap/base/Log",
+	"sap/m/MessageBox",
+	"sap/m/MessageToast",
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/base/ManagedObject",
-	"sap/ui/rta/toolbar/Fiori",
-	"sap/ui/rta/toolbar/Standalone",
-	"sap/ui/rta/toolbar/Personalization",
-	"sap/ui/rta/toolbar/FioriLike",
+	"sap/ui/core/BusyIndicator",
 	"sap/ui/dt/DesignTime",
+	"sap/ui/dt/DOMUtil",
+	"sap/ui/dt/ElementUtil",
 	"sap/ui/dt/Overlay",
-	"sap/ui/rta/command/Stack",
-	"sap/ui/rta/command/LREPSerializer",
-	"sap/ui/rta/Utils",
+	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/Util",
-	"sap/ui/dt/ElementUtil",
-	"sap/ui/fl/library",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/write/api/ReloadInfoAPI",
+	"sap/ui/events/KeyCodes",
+	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
+	"sap/ui/fl/apply/api/SmartVariantManagementApplyAPI",
+	"sap/ui/fl/write/api/ControlPersonalizationWriteAPI",
 	"sap/ui/fl/write/api/FeaturesAPI",
-	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
-	"sap/m/MessageBox",
-	"sap/m/MessageToast",
-	"sap/ui/rta/util/PluginManager",
-	"sap/ui/rta/util/PopupManager",
-	"sap/ui/core/BusyIndicator",
-	"sap/ui/dt/DOMUtil",
+	"sap/ui/fl/write/api/ReloadInfoAPI",
+	"sap/ui/fl/write/api/VersionsAPI",
+	"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",
+	"sap/ui/performance/Measurement",
 	"sap/ui/rta/appVariant/Feature",
-	"sap/ui/Device",
+	"sap/ui/rta/command/BaseCommand",
+	"sap/ui/rta/command/LREPSerializer",
+	"sap/ui/rta/command/Stack",
 	"sap/ui/rta/service/index",
+	"sap/ui/rta/toolbar/Fiori",
+	"sap/ui/rta/toolbar/FioriLike",
+	"sap/ui/rta/toolbar/Personalization",
+	"sap/ui/rta/toolbar/Standalone",
+	"sap/ui/rta/util/changeVisualization/ChangeVisualization",
+	"sap/ui/rta/util/PluginManager",
+	"sap/ui/rta/util/PopupManager",
 	"sap/ui/rta/util/ServiceEventBus",
-	"sap/ui/dt/OverlayRegistry",
-	"sap/base/strings/capitalize",
-	"sap/base/util/UriParameters",
-	"sap/ui/performance/Measurement",
-	"sap/base/Log",
-	"sap/ui/events/KeyCodes",
-	"sap/ui/model/json/JSONModel",
 	"sap/ui/rta/util/validateFlexEnabled",
-	"sap/ui/rta/util/changeVisualization/ChangeVisualization"
+	"sap/ui/rta/Utils",
+	"sap/ui/Device"
 ], function(
+	capitalize,
+	UriParameters,
+	Log,
+	MessageBox,
+	MessageToast,
 	jQuery,
 	ManagedObject,
-	FioriToolbar,
-	StandaloneToolbar,
-	PersonalizationToolbar,
-	FioriLikeToolbar,
+	BusyIndicator,
 	DesignTime,
+	DOMUtil,
+	ElementUtil,
 	Overlay,
-	CommandStack,
-	LREPSerializer,
-	Utils,
+	OverlayRegistry,
 	DtUtil,
-	ElementUtil,
-	flexLibrary,
-	FlexUtils,
-	LayerUtils,
-	Layer,
-	ReloadInfoAPI,
+	KeyCodes,
+	FlexRuntimeInfoAPI,
+	SmartVariantManagementApplyAPI,
+	ControlPersonalizationWriteAPI,
 	FeaturesAPI,
-	VersionsAPI,
 	PersistenceWriteAPI,
-	MessageBox,
-	MessageToast,
-	PluginManager,
-	PopupManager,
-	BusyIndicator,
-	DOMUtil,
+	ReloadInfoAPI,
+	VersionsAPI,
+	Layer,
+	LayerUtils,
+	flexLibrary,
+	Settings,
+	FlexUtils,
+	JSONModel,
+	Measurement,
 	RtaAppVariantFeature,
-	Device,
+	BaseCommand,
+	LREPSerializer,
+	CommandStack,
 	ServicesIndex,
+	FioriToolbar,
+	FioriLikeToolbar,
+	PersonalizationToolbar,
+	StandaloneToolbar,
+	ChangeVisualization,
+	PluginManager,
+	PopupManager,
 	ServiceEventBus,
-	OverlayRegistry,
-	capitalize,
-	UriParameters,
-	Measurement,
-	Log,
-	KeyCodes,
-	JSONModel,
 	validateFlexEnabled,
-	ChangeVisualization
+	Utils,
+	Device
 ) {
 	"use strict";
 
@@ -104,7 +114,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.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -215,6 +225,7 @@ sap.ui.define([
 		_sAppTitle: null,
 		_dependents: null,
 		_sStatus: STOPPED,
+		_bNavigationModeWarningShown: false,
 		constructor: function() {
 			// call parent constructor
 			ManagedObject.apply(this, arguments);
@@ -223,6 +234,7 @@ sap.ui.define([
 			this._mServices = {};
 			this._mCustomServicesDictinary = {};
 			this._mUShellServices = {};
+			this._pElementModified = Promise.resolve();
 
 			this.addDependent(new PluginManager(), "pluginManager");
 			this.addDependent(new PopupManager(), "popupManager");
@@ -239,10 +251,6 @@ sap.ui.define([
 				this.startService("receiver");
 			}
 
-			if (this._shouldValidateFlexEnabled()) {
-				this.attachEvent("start", validateFlexEnabled.bind(null, this));
-			}
-
 			this._loadUShellServicesPromise = FlexUtils.getUShellServices(["URLParsing", "AppLifeCycle", "CrossApplicationNavigation"])
 				.then(function (mUShellServices) {
 					this._mUShellServices = mUShellServices;
@@ -256,15 +264,11 @@ sap.ui.define([
 	});
 
 	RuntimeAuthoring.prototype._shouldValidateFlexEnabled = function () {
-		var sHostname = document.location.hostname;
-		var bShouldValidateFlexEnabled = sHostname.endsWith(".sap" + ".corp") || sHostname === "localhost";
-
-		if (bShouldValidateFlexEnabled) {
-			var sUriParam = UriParameters.fromQuery(window.location.search).get("sap-ui-rta-skip-flex-validation");
-			bShouldValidateFlexEnabled = sUriParam !== "true";
-		}
-
-		return bShouldValidateFlexEnabled;
+		var sUriParam = UriParameters.fromQuery(window.location.search).get("sap-ui-rta-skip-flex-validation");
+		return Settings.getInstance()
+			.then(function (oSettings) {
+				return !oSettings.isCustomerSystem() && sUriParam !== "true";
+			});
 	};
 
 	RuntimeAuthoring.prototype.addDependent = function (oObject, sName, bCreateGetter) {
@@ -326,7 +330,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
@@ -354,12 +358,12 @@ sap.ui.define([
 	 * Setter for flexSettings. Checks the Uri for parameters that override the layer.
 	 * builds the rootNamespace and namespace parameters from the other parameters
 	 *
-	 * @param {Object} [mFlexSettings] property bag
-	 * @param {String} [mFlexSettings.layer] The Layer in which RTA should be started. Default: "CUSTOMER"
-	 * @param {Boolean} [mFlexSettings.developerMode] Whether RTA is started in DeveloperMode Mode. Whether RTA is started in DeveloperMode Mode
-	 * @param {String} [mFlexSettings.baseId] base ID of the app
-	 * @param {String} [mFlexSettings.projectId] project ID
-	 * @param {String} [mFlexSettings.scenario] Key representing the current scenario
+	 * @param {object} [mFlexSettings] property bag
+	 * @param {string} [mFlexSettings.layer] The Layer in which RTA should be started. Default: "CUSTOMER"
+	 * @param {boolean} [mFlexSettings.developerMode] Whether RTA is started in DeveloperMode Mode. Whether RTA is started in DeveloperMode Mode
+	 * @param {string} [mFlexSettings.baseId] base ID of the app
+	 * @param {string} [mFlexSettings.projectId] project ID
+	 * @param {string} [mFlexSettings.scenario] Key representing the current scenario
 	 */
 	RuntimeAuthoring.prototype.setFlexSettings = function(mFlexSettings) {
 		// Check URI-parameters for sap-ui-layer
@@ -385,7 +389,7 @@ sap.ui.define([
 	/**
 	 * Checks the uri parameters for "sap-ui-layer" and returns either the current layer or the layer from the uri parameter, if there is one
 	 *
-	 * @returns {String} the layer after checking the uri parameters
+	 * @returns {string} the layer after checking the uri parameters
 	 * @private
 	 */
 	RuntimeAuthoring.prototype.getLayer = function () {
@@ -414,6 +418,15 @@ sap.ui.define([
 		}).then(this._setVersionsModel.bind(this));
 	};
 
+	RuntimeAuthoring.prototype._onPersonalizationChangeCreation = function() {
+		if (this.getMode() === "navigation" && !this._bNavigationModeWarningShown) {
+			this._showMessageToast("MSG_NAVIGATION_MODE_CHANGES_WARNING", {
+				duration: 5000
+			});
+			this._bNavigationModeWarningShown = true;
+		}
+	};
+
 	function addOrRemoveStyleClass(oRootControl, bAdd) {
 		if (oRootControl.isA("sap.ui.core.UIComponent")) {
 			oRootControl = oRootControl.getRootControl();
@@ -470,6 +483,9 @@ sap.ui.define([
 						scope: this.getMetadataScope(),
 						plugins: aPlugins
 					});
+
+					addOrRemoveStyleClass(this.getRootControlInstance(), true);
+
 					//add root control is triggering overlay creation, so we need to wait for the scope to be set.
 					this._oDesignTime.addRootElement(this._oRootControl);
 
@@ -497,6 +513,7 @@ sap.ui.define([
 				// Register function for checking unsaved before leaving RTA
 				this._oldUnloadHandler = window.onbeforeunload;
 				window.onbeforeunload = this._onUnload.bind(this);
+				return undefined;
 			}.bind(this))
 			.then(function () {
 				if (this.getShowToolbars()) {
@@ -504,6 +521,7 @@ sap.ui.define([
 					return this._getToolbarButtonsVisibility()
 						.then(this._createToolsMenu.bind(this));
 				}
+				return undefined;
 			}.bind(this))
 			// this is needed to initially check if undo is available, e.g. when the stack gets initialized with changes
 			.then(this._onStackModified.bind(this))
@@ -522,6 +540,7 @@ sap.ui.define([
 					// the show() method of the toolbar relies on this RTA instance being set on the PopupManager
 					return this.getToolbar().show();
 				}
+				return undefined;
 			}.bind(this))
 			.then(function () {
 				if (Device.browser.name === "ff") {
@@ -533,10 +552,17 @@ sap.ui.define([
 			.then(function() {
 				this.fnKeyDown = this._onKeyDown.bind(this);
 				jQuery(document).on("keydown", this.fnKeyDown);
-
-				addOrRemoveStyleClass(this.getRootControlInstance(), true);
+				this.fnOnPersonalizationChangeCreation = this._onPersonalizationChangeCreation.bind(this);
+				ControlPersonalizationWriteAPI.attachChangeCreation(
+					this.getRootControlInstance(),
+					this.fnOnPersonalizationChangeCreation
+				);
 			}.bind(this))
-			.then(function () {
+			.then(this._shouldValidateFlexEnabled)
+			.then(function (bShouldValidateFlexEnabled) {
+				if (bShouldValidateFlexEnabled) {
+					validateFlexEnabled(this);
+				}
 				this._sStatus = STARTED;
 				this.fireStart({
 					editablePluginsCount: this.getPluginManager().getEditableOverlaysCount()
@@ -552,8 +578,10 @@ sap.ui.define([
 					this.destroy();
 					return Promise.reject(vError);
 				}
+				return undefined;
 			}.bind(this));
 		}
+		return undefined;
 	};
 
 	function _ffContextMenuHandler() {
@@ -593,7 +621,7 @@ sap.ui.define([
 		});
 	};
 
-	var fnShowTechnicalError = function(vError) {
+	function showTechnicalError(vError) {
 		BusyIndicator.hide();
 		var sErrorMessage = vError.userMessage || vError.stack || vError.message || vError.status || vError;
 		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
@@ -603,7 +631,7 @@ sap.ui.define([
 		MessageBox.error(sMsg, {
 			styleClass: Utils.getRtaStyleClassName()
 		});
-	};
+	}
 
 	/**
 	 * @override
@@ -709,6 +737,7 @@ sap.ui.define([
 		if (this.getShowToolbars() && this.getToolbar && this.getToolbar()) {
 			return this.getToolbar()[sName](vValue);
 		}
+		return undefined;
 	};
 
 	/**
@@ -723,17 +752,25 @@ sap.ui.define([
 		return [];
 	};
 
+	function waitForPendingActions() {
+		return Promise.resolve(this._oDesignTime && this._oDesignTime.waitForBusyPlugins())
+			.then(function() {
+				return this._pElementModified;
+			}.bind(this));
+	}
+
 	/**
-	 * stop Runtime Authoring
+	 * Stops Runtime Authoring
 	 *
 	 * @public
-	 * @param {boolean} bDontSaveChanges - stop RTA with or w/o saving changes
-	 * @param {boolean} bSkipRestart - stop RTA with or w/o checking if a reload is needed to apply e.g. personalization/app descriptor changes
-	 * @returns {Promise} promise with no parameters
+	 * @param {boolean} bDontSaveChanges - Stop RTA with or w/o saving changes
+	 * @param {boolean} bSkipRestart - Stop RTA with or w/o checking if a reload is needed to apply e.g. personalization/app descriptor changes
+	 * @returns {Promise} Resolves with undefined
 	 */
 	RuntimeAuthoring.prototype.stop = function(bDontSaveChanges, bSkipRestart) {
 		this._checkToolbarAndExecuteFunction("setBusy", true);
-		return this._handleReloadOnExit(bSkipRestart)
+		return waitForPendingActions.call(this)
+			.then(this._handleReloadOnExit.bind(this, bSkipRestart))
 			.then(function(oReloadInfo) {
 				return ((bDontSaveChanges) ? Promise.resolve() : this._serializeToLrep(this))
 				.then(this._checkToolbarAndExecuteFunction.bind(this, "hide", bDontSaveChanges))
@@ -745,9 +782,10 @@ sap.ui.define([
 						oReloadInfo.triggerHardReload = (oReloadInfo.reloadMethod === this._RELOAD.RELOAD_PAGE); // StandAlone or AppDescriptorChanges case
 						return this._handleUrlParameterOnExit(oReloadInfo);
 					}
+					return undefined;
 				}.bind(this));
 			}.bind(this))
-			.catch(fnShowTechnicalError)
+			.catch(showTechnicalError)
 			.then(function () {
 				this._checkToolbarAndExecuteFunction("setBusy", false);
 				this._sStatus = STOPPED;
@@ -837,10 +875,12 @@ sap.ui.define([
 			return this._getTextResources().getText("MSG_UNSAVED_CHANGES");
 		}
 		window.onbeforeunload = this._oldUnloadHandler;
+		return undefined;
 	};
 
 	RuntimeAuthoring.prototype._serializeAndSave = function() {
-		return this._oSerializer.saveCommands(this._oVersionsModel.getProperty("/versioningEnabled"));
+		// Save changes on the current layer and discard dirty changes on other layers
+		return this._oSerializer.saveCommands(this._oVersionsModel.getProperty("/versioningEnabled"), this.getLayer(), true);
 	};
 
 	RuntimeAuthoring.prototype._serializeToLrep = function() {
@@ -935,16 +975,16 @@ sap.ui.define([
 	};
 
 	RuntimeAuthoring.prototype._onSwitchVersion = function (oEvent) {
-		var nVersion = oEvent.getParameter("version");
-		var nDisplayedVersion = this._oVersionsModel.getProperty("/displayedVersion");
+		var sVersion = oEvent.getParameter("version");
+		var sDisplayedVersion = this._oVersionsModel.getProperty("/displayedVersion");
 
-		if (nVersion === nDisplayedVersion) {
+		if (sVersion === sDisplayedVersion) {
 			// already displayed version needs no switch
 			return;
 		}
 
 		if (this.canUndo()) {
-			this._nSwitchToVersion = nVersion;
+			this._sSwitchToVersion = sVersion;
 			Utils.showMessageBox("warning", "MSG_SWITCH_VERSION_DIALOG", {
 				titleKey: "TIT_SWITCH_VERSION_DIALOG",
 				actions: [MessageBox.Action.YES, MessageBox.Action.NO, MessageBox.Action.CANCEL],
@@ -952,22 +992,20 @@ sap.ui.define([
 			}).then(function (sAction) {
 				if (sAction === MessageBox.Action.YES) {
 					this._serializeToLrep(this)
-						.then(this._switchVersion.bind(this, this._nSwitchToVersion));
+						.then(this._switchVersion.bind(this, this._sSwitchToVersion));
 				} 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);
-					this._switchVersion(this._nSwitchToVersion);
+					this._switchVersion(this._sSwitchToVersion);
 				}
 				return undefined;
 			}.bind(this));
 			return;
 		}
-		this._switchVersion(nVersion);
+		this._switchVersion(sVersion);
 	};
 
-	RuntimeAuthoring.prototype._switchVersion = function (nVersion) {
-		var sVersion = nVersion.toString();
-
+	RuntimeAuthoring.prototype._switchVersion = function (sVersion) {
 		RuntimeAuthoring.enableRestart(this.getLayer(), this.getRootControlInstance());
 
 		if (!FlexUtils.getUshellContainer()) {
@@ -984,7 +1022,7 @@ sap.ui.define([
 		VersionsAPI.loadVersionForApplication({
 			selector: this.getRootControlInstance(),
 			layer: this.getLayer(),
-			version: nVersion
+			version: sVersion
 		});
 		var aVersionsParameter = mParsedHash.params[sap.ui.fl.Versions.UrlParameter];
 		if (
@@ -1047,6 +1085,14 @@ sap.ui.define([
 			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;
+				}
 
 				this._oToolbarControlsModel = new JSONModel({
 					undoEnabled: false,
@@ -1062,7 +1108,8 @@ sap.ui.define([
 					saveAsEnabled: false,
 					manageAppsVisible: bSaveAsAvailable && !bExtendedOverview,
 					manageAppsEnabled: bSaveAsAvailable && !bExtendedOverview,
-					modeSwitcher: this.getMode()
+					modeSwitcher: this.getMode(),
+					visualizationButtonVisible: bVisualizationButtonVisible
 				});
 
 				if (bSaveAsAvailable) {
@@ -1073,12 +1120,6 @@ sap.ui.define([
 					}.bind(this));
 				}
 
-				/* TODO enable as soon as the code is ready
-				FeaturesAPI.isKeyUserTranslationEnabled(this.getLayer()).then(function(oResult) {
-					this._oToolbarControlsModel.setProperty("/translationVisible", oResult);
-				}.bind(this));
-				*/
-
 				this.getToolbar().setModel(this._oVersionsModel, "versions");
 				this.getToolbar().setModel(this._oToolbarControlsModel, "controls");
 			}.bind(this));
@@ -1108,6 +1149,13 @@ sap.ui.define([
 
 			// detach browser events
 			jQuery(document).off("keydown", this.fnKeyDown);
+
+			if (this.fnOnPersonalizationChangeCreation) {
+				ControlPersonalizationWriteAPI.detachChangeCreation(
+					this.getRootControlInstance(),
+					this.fnOnPersonalizationChangeCreation
+				);
+			}
 		}
 
 		if (this.getRootControlInstance()) {
@@ -1141,8 +1189,9 @@ sap.ui.define([
 		BusyIndicator.show(500);
 		return this._serializeToLrep().then(function () {
 			BusyIndicator.hide();
-			var bAppVariantRunning = FlexUtils.isApplicationVariant(this._oRootControl) && !FlexUtils.isVariantByStartupParameter(this._oRootControl);
-			return ((bAppVariantRunning) ? RtaAppVariantFeature.getAppVariantDescriptor(this._oRootControl) : Promise.resolve())
+			var bVariantByStartupParameter = FlexUtils.isVariantByStartupParameter(this._oRootControl);
+			var bAppVariantRunning = SmartVariantManagementApplyAPI.isApplicationVariant({control: this._oRootControl}) && !bVariantByStartupParameter;
+			return (bAppVariantRunning ? RtaAppVariantFeature.getAppVariantDescriptor(this._oRootControl) : Promise.resolve())
 				.then(function(oAppVariantDescriptor) {
 					var aAppVariantDescriptor = [];
 					if (oAppVariantDescriptor) {
@@ -1170,7 +1219,7 @@ sap.ui.define([
 							}
 						}.bind(this));
 				}.bind(this));
-		}.bind(this))["catch"](fnShowTechnicalError);
+		}.bind(this))["catch"](showTechnicalError);
 	};
 
 	/**
@@ -1188,6 +1237,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")),
@@ -1214,13 +1265,14 @@ sap.ui.define([
 
 	/**
 	 * Shows a message toast.
-	 * @param  {string} sMessageKey The text key for the message
+	 * @param  {string} sMessageKey - The text key for the message
+	 * @param  {object} mOptions - Options for message toast
 	 * @private
 	 */
-	RuntimeAuthoring.prototype._showMessageToast = function(sMessageKey) {
+	RuntimeAuthoring.prototype._showMessageToast = function(sMessageKey, mOptions) {
 		var sMessage = this._getTextResources().getText(sMessageKey);
 
-		MessageToast.show(sMessage);
+		MessageToast.show(sMessage, mOptions || {});
 	};
 
 	/**
@@ -1228,7 +1280,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @static
-	 * @param {string} sLayer The active layer
+	 * @param {sap.ui.fl.Layer} sLayer - Active layer
 	 * @returns {boolean} Returns true if restart is needed
 	 */
 	RuntimeAuthoring.needsRestart = function(sLayer) {
@@ -1241,11 +1293,11 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @static
-	 * @param {string} sLayer - The active layer
-	 * @param {sap.ui.core.Control} oRootControl - root control for which RTA was started
+	 * @param {sap.ui.fl.Layer} sLayer - Active layer
+	 * @param {sap.ui.core.Control} oRootControl - Root control for which RTA was started
 	 */
 	RuntimeAuthoring.enableRestart = function(sLayer, oRootControl) {
-		var sFlexReference = FlexUtils.getComponentClassName(oRootControl);
+		var sFlexReference = FlexRuntimeInfoAPI.getFlexReference({element: oRootControl});
 		var vParameter = sFlexReference || true;
 		window.sessionStorage.setItem("sap.ui.rta.restart." + sLayer, vParameter);
 	};
@@ -1255,7 +1307,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @static
-	 * @param {string} sLayer The active layer
+	 * @param {sap.ui.fl.Layer} sLayer - Active layer
 	 */
 	RuntimeAuthoring.disableRestart = function(sLayer) {
 		window.sessionStorage.removeItem("sap.ui.rta.restart." + sLayer);
@@ -1287,10 +1339,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));
@@ -1381,35 +1430,38 @@ sap.ui.define([
 	 * @private
 	 */
 	RuntimeAuthoring.prototype._handleElementModified = function(oEvent) {
-		this.getPluginManager().handleStopCutPaste();
-
-		var vAction = oEvent.getParameter("action");
+		// events are synchronously reset after the handlers are called
+		var oCommand = oEvent.getParameter("command");
 		var sNewControlID = oEvent.getParameter("newControlId");
+		var vAction = oEvent.getParameter("action");
 
-		var oCommand = oEvent.getParameter("command");
-		if (oCommand instanceof sap.ui.rta.command.BaseCommand) {
-			if (sNewControlID) {
-				this._scheduleOnCreated(sNewControlID, function (oElementOverlay) {
-					var oDesignTimeMetadata = oElementOverlay.getDesignTimeMetadata();
-					var fnSelect = oDesignTimeMetadata.getData().select;
-					if (typeof fnSelect === "function") {
-						fnSelect(oElementOverlay.getElement());
+		this._pElementModified = this._pElementModified.then(function() {
+			this.getPluginManager().handleStopCutPaste();
+
+			if (oCommand instanceof BaseCommand) {
+				if (sNewControlID) {
+					this._scheduleOnCreated(sNewControlID, function (oElementOverlay) {
+						var oDesignTimeMetadata = oElementOverlay.getDesignTimeMetadata();
+						var fnSelect = oDesignTimeMetadata.getData().select;
+						if (typeof fnSelect === "function") {
+							fnSelect(oElementOverlay.getElement());
+						}
+					});
+					if (vAction) {
+						this._scheduleRenameOnCreatedContainer(vAction, sNewControlID);
 					}
-				});
-				if (vAction) {
-					this._scheduleRenameOnCreatedContainer(vAction, sNewControlID);
 				}
+				return this.getCommandStack().pushAndExecute(oCommand)
+					// Error handling when a command fails is done in the Stack
+					.catch(function(oError) {
+						if (oError && oError.message && oError.message.indexOf("The following Change cannot be applied because of a dependency") > -1) {
+							Utils.showMessageBox("error", "MSG_DEPENDENCY_ERROR", {error: oError});
+						}
+						Log.error("sap.ui.rta: " + oError.message);
+					});
 			}
-			return this.getCommandStack().pushAndExecute(oCommand)
-			// Error handling when a command fails is done in the Stack
-			.catch(function(oError) {
-				if (oError && oError.message && oError.message.indexOf("The following Change cannot be applied because of a dependency") > -1) {
-					Utils.showMessageBox("error", "MSG_DEPENDENCY_ERROR", {error: oError});
-				}
-				Log.error("sap.ui.rta: " + oError.message);
-			});
-		}
-		return Promise.resolve();
+		}.bind(this));
+		return this._pElementModified;
 	};
 
 	/**
@@ -1509,6 +1561,7 @@ sap.ui.define([
 		if (oReloadInfo.triggerHardReload) {
 			this._reloadPage();
 		}
+		return undefined;
 	};
 
 	/**
@@ -1584,6 +1637,7 @@ sap.ui.define([
 		if (oReloadInfo.allContexts) {
 			return "MSG_RELOAD_WITHOUT_ALL_CONTEXT";
 		}
+		return undefined;
 	};
 
 	/**
@@ -1605,7 +1659,7 @@ 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({
@@ -1624,24 +1678,25 @@ sap.ui.define([
 		if (!sReason) {
 			return Promise.resolve();
 		}
-		return Utils.showMessageBox("information", sReason)
-		.then(function() {
-			RuntimeAuthoring.enableRestart(oReloadInfo.layer, this.getRootControlInstance());
-			// allContexts do not change the url parameter to trigger a reload
-			if (
-				oReloadInfo.allContexts &&
-				!oReloadInfo.hasHigherLayerChanges &&
-				this._getUShellService("AppLifeCycle")
-			) {
-				this._getUShellService("AppLifeCycle").reloadCurrentApp();
-			}
-			if (FlexUtils.getUshellContainer()) {
-				// clears FlexState and triggers reloading of the flex data without blocking
-				var oParsedHash = ReloadInfoAPI.handleParametersOnStart(oReloadInfo);
-				return this._triggerCrossAppNavigation(oParsedHash);
-			}
-			return this._triggerHardReload(oReloadInfo);
-		}.bind(this));
+		// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
+		return (this.getFlexSettings().developerMode ? Promise.resolve() : Utils.showMessageBox("information", sReason))
+			.then(function() {
+				RuntimeAuthoring.enableRestart(oReloadInfo.layer, this.getRootControlInstance());
+				// allContexts do not change the url parameter to trigger a reload
+				if (
+					oReloadInfo.allContexts &&
+					!oReloadInfo.hasHigherLayerChanges &&
+					this._getUShellService("AppLifeCycle")
+				) {
+					this._getUShellService("AppLifeCycle").reloadCurrentApp();
+				}
+				if (FlexUtils.getUshellContainer()) {
+					// clears FlexState and triggers reloading of the flex data without blocking
+					var oParsedHash = ReloadInfoAPI.handleParametersOnStart(oReloadInfo);
+					return this._triggerCrossAppNavigation(oParsedHash);
+				}
+				return this._triggerHardReload(oReloadInfo);
+			}.bind(this));
 	};
 
 	/**
@@ -1781,6 +1836,7 @@ sap.ui.define([
 		if (ServicesIndex.hasOwnProperty(sName)) {
 			return ServicesIndex[sName].replace(/\./g, "/");
 		}
+		return undefined;
 	}
 
 	/**