@openui5/sap.ui.rta 1.96.2 → 1.98.0

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

@@ -1,95 +1,98 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 // 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/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/rta/util/StylesLoader",
+	"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/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"
-],
-function(
+	"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,
 	FeaturesAPI,
-	VersionsAPI,
 	PersistenceWriteAPI,
-	MessageBox,
-	MessageToast,
-	PluginManager,
-	PopupManager,
-	BusyIndicator,
-	DOMUtil,
-	StylesLoader,
+	ReloadInfoAPI,
+	VersionsAPI,
+	Layer,
+	LayerUtils,
+	flexLibrary,
+	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";
 
@@ -107,7 +110,7 @@ function(
 	 * @class The runtime authoring allows to adapt the fields of a running application.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -218,6 +221,7 @@ function(
 		_sAppTitle: null,
 		_dependents: null,
 		_sStatus: STOPPED,
+		_bHasSwitchedToNavigationMode: false,
 		constructor: function() {
 			// call parent constructor
 			ManagedObject.apply(this, arguments);
@@ -226,6 +230,7 @@ function(
 			this._mServices = {};
 			this._mCustomServicesDictinary = {};
 			this._mUShellServices = {};
+			this._pElementModified = Promise.resolve();
 
 			this.addDependent(new PluginManager(), "pluginManager");
 			this.addDependent(new PopupManager(), "popupManager");
@@ -473,6 +478,9 @@ function(
 						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);
 
@@ -500,6 +508,7 @@ function(
 				// 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()) {
@@ -507,6 +516,7 @@ function(
 					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))
@@ -525,6 +535,7 @@ function(
 					// 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") {
@@ -536,8 +547,6 @@ function(
 			.then(function() {
 				this.fnKeyDown = this._onKeyDown.bind(this);
 				jQuery(document).on("keydown", this.fnKeyDown);
-
-				addOrRemoveStyleClass(this.getRootControlInstance(), true);
 			}.bind(this))
 			.then(function () {
 				this._sStatus = STARTED;
@@ -555,8 +564,10 @@ function(
 					this.destroy();
 					return Promise.reject(vError);
 				}
+				return undefined;
 			}.bind(this));
 		}
+		return undefined;
 	};
 
 	function _ffContextMenuHandler() {
@@ -652,6 +663,7 @@ function(
 
 	/**
 	 * adapt the enablement of undo/redo/reset/transport button
+	 * @returns {Promise} Resolves as soon as the MessageBox is closed
 	 * @private
 	 */
 	RuntimeAuthoring.prototype._onStackModified = function() {
@@ -711,6 +723,7 @@ function(
 		if (this.getShowToolbars() && this.getToolbar && this.getToolbar()) {
 			return this.getToolbar()[sName](vValue);
 		}
+		return undefined;
 	};
 
 	/**
@@ -725,17 +738,25 @@ function(
 		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))
@@ -747,6 +768,7 @@ function(
 						oReloadInfo.triggerHardReload = (oReloadInfo.reloadMethod === this._RELOAD.RELOAD_PAGE); // StandAlone or AppDescriptorChanges case
 						return this._handleUrlParameterOnExit(oReloadInfo);
 					}
+					return undefined;
 				}.bind(this));
 			}.bind(this))
 			.catch(fnShowTechnicalError)
@@ -839,10 +861,12 @@ function(
 			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() {
@@ -937,16 +961,16 @@ function(
 	};
 
 	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],
@@ -954,22 +978,20 @@ function(
 			}).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()) {
@@ -986,7 +1008,7 @@ function(
 		VersionsAPI.loadVersionForApplication({
 			selector: this.getRootControlInstance(),
 			layer: this.getLayer(),
-			version: nVersion
+			version: sVersion
 		});
 		var aVersionsParameter = mParsedHash.params[sap.ui.fl.Versions.UrlParameter];
 		if (
@@ -1049,6 +1071,14 @@ function(
 			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,
@@ -1064,7 +1094,8 @@ function(
 					saveAsEnabled: false,
 					manageAppsVisible: bSaveAsAvailable && !bExtendedOverview,
 					manageAppsEnabled: bSaveAsAvailable && !bExtendedOverview,
-					modeSwitcher: this.getMode()
+					modeSwitcher: this.getMode(),
+					visualizationButtonVisible: bVisualizationButtonVisible
 				});
 
 				if (bSaveAsAvailable) {
@@ -1075,12 +1106,13 @@ function(
 					}.bind(this));
 				}
 
-				/* TODO enable as soon as the code is ready
-				FeaturesAPI.isKeyUserTranslationEnabled(this.getLayer()).then(function(oResult) {
-					this._oToolbarControlsModel.setProperty("/translationVisible", oResult);
+				/*
+				FeaturesAPI.isKeyUserTranslationEnabled(this.getLayer()).then(function() {
+					this._oToolbarControlsModel.setProperty("/translationVisible", true);
 				}.bind(this));
 				*/
 
+
 				this.getToolbar().setModel(this._oVersionsModel, "versions");
 				this.getToolbar().setModel(this._oToolbarControlsModel, "controls");
 			}.bind(this));
@@ -1143,8 +1175,9 @@ function(
 		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) {
@@ -1216,13 +1249,14 @@ function(
 
 	/**
 	 * 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 || {});
 	};
 
 	/**
@@ -1230,7 +1264,7 @@ function(
 	 *
 	 * @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) {
@@ -1243,11 +1277,11 @@ function(
 	 *
 	 * @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);
 	};
@@ -1257,7 +1291,7 @@ function(
 	 *
 	 * @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);
@@ -1383,35 +1417,38 @@ function(
 	 * @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;
 	};
 
 	/**
@@ -1511,6 +1548,7 @@ function(
 		if (oReloadInfo.triggerHardReload) {
 			this._reloadPage();
 		}
+		return undefined;
 	};
 
 	/**
@@ -1586,6 +1624,7 @@ function(
 		if (oReloadInfo.allContexts) {
 			return "MSG_RELOAD_WITHOUT_ALL_CONTEXT";
 		}
+		return undefined;
 	};
 
 	/**
@@ -1626,24 +1665,25 @@ function(
 		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));
 	};
 
 	/**
@@ -1748,6 +1788,13 @@ function(
 				oTabHandlingPlugin[(sNewMode === "navigation") ? "restoreTabIndex" : "removeTabIndex"]();
 			}
 
+			if (sNewMode === "navigation" && !this._bHasSwitchedToNavigationMode) {
+				this._showMessageToast("MSG_NAVIGATION_MODE_CHANGES_WARNING", {
+					duration: 5000
+				});
+				this._bHasSwitchedToNavigationMode = true;
+			}
+
 			oTabHandlingPlugin[(sNewMode === "adaptation") ? "restoreOverlayTabIndex" : "removeOverlayTabIndex"]();
 			oSelectionPlugin.setIsActive(!(sNewMode === "visualization"));
 
@@ -1783,6 +1830,7 @@ function(
 		if (ServicesIndex.hasOwnProperty(sName)) {
 			return ServicesIndex[sName].replace(/\./g, "/");
 		}
+		return undefined;
 	}
 
 	/**

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -46,7 +46,7 @@ function(
 	 * @class Utility functionality to work with controls, e.g. iterate through aggregations, find parents, etc.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @private
 	 * @static

package/src/sap/ui/rta/api/startAdaptation.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @alias module:sap/ui/rta/api/startAdaptation
 	 *
 	 * @param {object} mOptions - Object with properties
-	 * @param {sap.ui.core.Element|sap.ui.core.UIComponent} mOptions.rootControl - Control instance from where UI adaptation should be started
+	 * @param {sap.ui.core.Control|sap.ui.core.UIComponent} mOptions.rootControl - Control instance to get the AppComponent. This then is used to start UI adaptation.
 	 * @param {object} [mOptions.flexSettings] - Map with flex-related settings
 	 * @param {string} [mOptions.flexSettings.layer] - The Layer in which RTA should be started. Default: "CUSTOMER"
 	 * @param {boolean} [mOptions.flexSettings.developerMode] - Whether RTA is started in developerMode mode. Default: <code>false</code>
@@ -41,7 +41,6 @@ sap.ui.define([
 	 * @param {function} [onFailed] - Event handler function called on failed event
 	 * @param {function} [onStop] - Event handler function called on stop event
 	 * @returns {Promise} Resolves when UI adaptation was successfully started
-	 * @ui5-restricted
 	 * @public
 	 */
 	function startAdaptation(mOptions, loadPlugins, onStart, onFailed, onStop) {

package/src/sap/ui/rta/api/startKeyUserAdaptation.js

@@ -1,6 +1,6 @@
 /*
  * ! OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -22,9 +22,9 @@ sap.ui.define([
 	 * @alias module:sap/ui/rta/api/startKeyUserAdaptation
 	 *
 	 * @param {object} mPropertyBag - Object with properties
-	 * @param {sap.ui.core.Element|sap.ui.core.UIComponent} mPropertyBag.rootControl - Control instance from where key user adaptation should be started
+	 * @param {sap.ui.core.Control|sap.ui.core.UIComponent} mPropertyBag.rootControl - Control instance to get the AppComponent. This then is used to start UI adaptation.
 	 *
-	 * @returns {Promise} Resolves when adaptation was successfully started
+	 * @returns {Promise} Resolves when UI adaptation was successfully started
 	 * @public
 	 */
 	function startKeyUserAdaptation(mPropertyBag) {