@openui5/sap.ui.rta 1.136.4 → 1.139.0

package/src/sap/ui/rta/util/PopupManager.js

@@ -5,50 +5,83 @@
  */
 
 sap.ui.define([
-	"sap/ui/base/ManagedObject",
+	"sap/base/util/restricted/_curry",
 	"sap/m/InstanceManager",
-	"sap/ui/dt/Overlay",
-	"sap/ui/dt/OverlayRegistry",
-	"sap/ui/fl/Utils",
+	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Component",
-	"sap/ui/core/ComponentContainer",
-	"sap/ui/core/Element",
 	"sap/ui/dt/util/ZIndexManager",
-	"sap/m/Dialog",
-	"sap/m/Popover",
-	"sap/base/util/restricted/_curry"
+	"sap/ui/dt/Overlay",
+	"sap/ui/dt/OverlayRegistry",
+	"sap/ui/fl/Utils"
 ], function(
-	ManagedObject,
+	_curry,
 	InstanceManager,
-	Overlay,
-	OverlayRegistry,
-	flUtils,
+	ManagedObject,
 	Component,
-	ComponentContainer,
-	Element,
 	ZIndexManager,
-	Dialog,
-	Popover,
-	_curry
+	Overlay,
+	OverlayRegistry,
+	FlUtils
 ) {
 	"use strict";
 
-	var FOCUS_EVENT_NAMES = {
+	const FOCUS_EVENT_NAMES = {
 		add: "_activateFocusHandle",
 		remove: "_deactivateFocusHandle"
 	};
 
+	// TODO harmonize with FlUtils.getAppComponentForControl, todos#9
+	function getAppComponentForControl(oControl) {
+		let oComponent;
+		let oAppComponent;
+
+		if (oControl.isA("sap.ui.core.Component")) {
+			oComponent = oControl;
+		} else {
+			oComponent = getComponentForControl(oControl);
+		}
+
+		if (oComponent) {
+			oAppComponent = FlUtils.getAppComponentForControl(oComponent);
+		}
+		return oAppComponent;
+	}
+
+	function getComponentForControl(oControl) {
+		let oComponent;
+		let oRootComponent;
+		let oParentControl;
+		if (oControl) {
+			oComponent = Component.getOwnerComponentFor(oControl);
+			if (
+				!oComponent
+				&& typeof oControl.getParent === "function"
+				&& oControl.getParent()?.isA("sap.ui.core.Element")
+			) {
+				oParentControl = oControl.getParent();
+			} else if (oComponent) {
+				oParentControl = oComponent;
+			}
+
+			if (oParentControl) {
+				oRootComponent = getComponentForControl(oParentControl);
+			}
+		}
+
+		return oRootComponent || oComponent;
+	}
+
 	/**
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
 	 * @alias sap.ui.rta.util.PopupManager
 	 */
-	var PopupManager = ManagedObject.extend("sap.ui.rta.util.PopupManager", {
+	const PopupManager = ManagedObject.extend("sap.ui.rta.util.PopupManager", {
 		metadata: {
 			properties: {
 				rta: "any"
@@ -120,20 +153,17 @@ sap.ui.define([
 	 * @public
 	 */
 	PopupManager.prototype.getCategorizedOpenPopups = function() {
-		var aOpenDialogs;
-		var aOpenPopovers;
-
 		// check if dialogs are already open when RTA is started
-		aOpenDialogs = InstanceManager.getOpenDialogs();
+		const aOpenDialogs = InstanceManager.getOpenDialogs();
 		// separate adaptable dialogs from all supported dialogs
-		var oCategorizedDialogs = this._getValidatedPopups(aOpenDialogs);
+		const oCategorizedDialogs = this._getValidatedPopups(aOpenDialogs);
 
 		// check if popovers are already open when RTA is started
-		aOpenPopovers = InstanceManager.getOpenPopovers();
+		const aOpenPopovers = InstanceManager.getOpenPopovers();
 		// separate adaptable popovers from all supported popovers
-		var oCategorizedPopovers = this._getValidatedPopups(aOpenPopovers);
+		const oCategorizedPopovers = this._getValidatedPopups(aOpenPopovers);
 
-		var oOpenPopups = {
+		const oOpenPopups = {
 			aDialogs: oCategorizedDialogs.relevant,
 			aPopovers: oCategorizedPopovers.relevant,
 			aAllSupportedPopups: oCategorizedDialogs.allSupported.concat(oCategorizedPopovers.allSupported)
@@ -150,12 +180,12 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._getValidatedPopups = function(aOpenPopups) {
-		var aAllSupportedPopups = [];
+		const aAllSupportedPopups = [];
 		aOpenPopups = aOpenPopups.filter(function(oPopupElement) {
 			if (this._isPopupAdaptable(oPopupElement)) {
 				aAllSupportedPopups.push(oPopupElement);
 				return true;
-			} else if (oPopupElement instanceof Dialog) {
+			} else if (oPopupElement.isA("sap.m.Dialog")) {
 				// all modal type popups are supported for which modal property is later turned true, when in Adaptation mode
 				aAllSupportedPopups.push(oPopupElement);
 			}
@@ -180,8 +210,8 @@ sap.ui.define([
 		return Array.isArray(oPopup.getContent())
 			? oPopup.getContent().some(
 				function(oContent) {
-					if (oContent instanceof ComponentContainer) {
-						return this.oRtaRootAppComponent === this._getAppComponentForControl(Component.getComponentById(oContent.getComponent()));
+					if (oContent.isA("sap.ui.core.ComponentContainer")) {
+						return this.oRtaRootAppComponent === getAppComponentForControl(Component.getComponentById(oContent.getComponent()));
 					}
 					return undefined;
 				}.bind(this))
@@ -196,7 +226,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._isSupportedPopup = function(oPopup) {
-		return (oPopup instanceof Dialog || oPopup instanceof Popover);
+		return (oPopup.isA("sap.m.Dialog") || oPopup.isA("sap.m.Popover"));
 	};
 
 	/**
@@ -208,10 +238,10 @@ sap.ui.define([
 	PopupManager.prototype.setRta = function(oRta) {
 		if (oRta && oRta._oDesignTime) {
 			this.setProperty("rta", oRta);
-			var oRootControl = oRta.getRootControlInstance();
-			this.oRtaRootAppComponent = this._getAppComponentForControl(oRootControl);
+			const oRootControl = oRta.getRootControlInstance();
+			this.oRtaRootAppComponent = getAppComponentForControl(oRootControl);
 			// listener for RTA mode change
-			var fnModeChange = this._onModeChange.bind(this);
+			const fnModeChange = this._onModeChange.bind(this);
 			oRta.attachModeChanged(fnModeChange);
 			this._overrideInstanceFunctions();
 		}
@@ -236,8 +266,8 @@ sap.ui.define([
 	 * @param  {sap.ui.base.Event} oEvent The Event triggered by the mode change
 	 */
 	PopupManager.prototype._onModeChange = function(oEvent) {
-		var sNewMode = oEvent.getParameters().mode;
-		var fnApplyFocusAndSetModal = function(sMode, oPopover) {
+		const sNewMode = oEvent.getParameters().mode;
+		const fnApplyFocusAndSetModal = function(sMode, oPopover) {
 			if (sMode === "navigation") {
 				// add focus handlers
 				oPopover.oPopup[this._getFocusEventName("add")]();
@@ -319,7 +349,7 @@ sap.ui.define([
 	PopupManager.prototype._overrideAddFunctions = function(fnOriginalFunction) {
 		return function(...aArgs) {
 			const [oPopupElement] = aArgs;
-			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
+			const vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
 			if (this._isSupportedPopup(oPopupElement)) {
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
@@ -327,7 +357,7 @@ sap.ui.define([
 					// PopupManager internal method
 					oPopupElement.attachEventOnce("afterOpen", this.fireOpen, this);
 					this._setModal(true, oPopupElement);
-				} else if (!(oPopupElement instanceof Popover)) {
+				} else if (!(oPopupElement.isA("sap.m.Popover"))) {
 					// for all popups which are non-adaptable and non-popovers
 					this._setModal(true, oPopupElement);
 				}
@@ -345,7 +375,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._setModal = function(bSetModal, oPopupElement) {
-		var bOriginalModalState = this._oModalState.get(oPopupElement.oPopup);
+		const bOriginalModalState = this._oModalState.get(oPopupElement.oPopup);
 		if (typeof bOriginalModalState !== "boolean" && bSetModal && this.getRta().getMode() !== "navigation") {
 			this._oModalState.set(oPopupElement.oPopup, oPopupElement.oPopup.getModal());
 			if (this._isPopupAdaptable(oPopupElement)) {
@@ -363,7 +393,7 @@ sap.ui.define([
 
 	PopupManager.prototype._applyPopupAttributes = function(mPropertyBag) {
 		// check if popups are open
-		var oRelevantPopups = this.getCategorizedOpenPopups();
+		const oRelevantPopups = this.getCategorizedOpenPopups();
 
 		["aDialogs", "aPopovers"].forEach(function(sKey) {
 			if (oRelevantPopups[sKey].length > 0) {
@@ -392,9 +422,9 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._applyPopupPatch = function(oPopupElement) {
-		var oOverlayContainer = Overlay.getOverlayContainer();
-		var {oPopup} = oPopupElement;
-		var aAutoCloseAreas = [
+		const oOverlayContainer = Overlay.getOverlayContainer();
+		const {oPopup} = oPopupElement;
+		const aAutoCloseAreas = [
 			oPopup.oContent.getDomRef(),
 			oOverlayContainer
 		].concat(
@@ -402,8 +432,8 @@ sap.ui.define([
 		);
 
 		if (this.getRta().getShowToolbars()) {
-			var oRtaToolbar = this.getRta().getToolbar();
-			var bVisible = !!oRtaToolbar.getVisible();
+			const oRtaToolbar = this.getRta().getToolbar();
+			const bVisible = !!oRtaToolbar.getVisible();
 			// Check if  RTA is not started -> toolbar is not visible
 			if (!bVisible) {
 				this.getRta().attachEventOnce("start", function() {
@@ -419,7 +449,7 @@ sap.ui.define([
 		// cases when onAfterRendering is called after this function - app inside popup
 		this.fnOriginalPopupOnAfterRendering ||= oPopup.onAfterRendering;
 		oPopup.onAfterRendering = function(...aArgs) {
-			var vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, aArgs);
+			const vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, aArgs);
 			oPopup[this._getFocusEventName("remove")]();
 			return vOriginalReturn;
 		}.bind(this);
@@ -455,7 +485,7 @@ sap.ui.define([
 	PopupManager.prototype._overrideRemoveFunctions = function(fnOriginalFunction) {
 		return function(...aArgs) {
 			const [oPopupElement] = aArgs;
-			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
+			const vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
 			if (this._isSupportedPopup(oPopupElement)) {
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
@@ -470,60 +500,6 @@ sap.ui.define([
 		}.bind(this);
 	};
 
-	/**
-	 * Returns the app component of the passed control is exists
-	 *
-	 * @param {sap.ui.core.Control} oControl Control object
-	 * @returns {object|undefined} component object if exists
-	 * @private
-	 */
-	PopupManager.prototype._getAppComponentForControl = function(oControl) {
-		var oComponent;
-		var oAppComponent;
-
-		if (oControl instanceof Component) {
-			oComponent = oControl;
-		} else {
-			oComponent = this._getComponentForControl(oControl);
-		}
-
-		if (oComponent) {
-			oAppComponent = flUtils.getAppComponentForControl(oComponent);
-		}
-		return oAppComponent;
-	};
-
-	/**
-	 * Returns the component of the passed control, navigating through control tree, except if parent is sap.ui.core.UIArea
-	 *
-	 * @param {sap.ui.core.Control} oControl Control object
-	 * @returns {object|undefined} component object if exists
-	 * @private
-	 */
-	PopupManager.prototype._getComponentForControl = function(oControl) {
-		var oComponent;
-		var oRootComponent;
-		var oParentControl;
-		if (oControl) {
-			oComponent = Component.getOwnerComponentFor(oControl);
-			if (
-				!oComponent
-				&& typeof oControl.getParent === "function"
-				&& oControl.getParent() instanceof Element
-			) {
-				oParentControl = oControl.getParent();
-			} else if (oComponent) {
-				oParentControl = oComponent;
-			}
-
-			if (oParentControl) {
-				oRootComponent = this._getComponentForControl(oParentControl);
-			}
-		}
-
-		return oRootComponent || oComponent;
-	};
-
 	/**
 	 * Create popup overlays
 	 *
@@ -534,7 +510,7 @@ sap.ui.define([
 		if (!oEvent) {
 			return;
 		}
-		var oPopupElement = (oEvent instanceof Element) ? oEvent : oEvent.getSource();
+		const oPopupElement = oEvent.isA("sap.ui.base.Event") ? oEvent.getSource() : oEvent;
 
 		// when application is opened in a popup, rootElement should not be added more than once
 		if (
@@ -583,7 +559,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._removePopupPatch = function(oPopupElement) {
-		var {oPopup} = oPopupElement;
+		const {oPopup} = oPopupElement;
 		oPopup[this._getFocusEventName("add")]();
 		if (this.fnOriginalPopupOnAfterRendering) {
 			oPopup.onAfterRendering = this.fnOriginalPopupOnAfterRendering;
@@ -591,7 +567,7 @@ sap.ui.define([
 	};
 
 	function checkPopupAncestorsAdaptation(oPopupElement) {
-		if (!oPopupElement || oPopupElement instanceof Component) {
+		if (!oPopupElement || oPopupElement.isA("sap.ui.core.Component")) {
 			return true;
 		}
 		if (!oPopupElement.isPopupAdaptationAllowed || oPopupElement.isPopupAdaptationAllowed()) {
@@ -601,10 +577,15 @@ sap.ui.define([
 	}
 
 	PopupManager.prototype._isPopupAdaptable = function(oPopupElement) {
-		if (oPopupElement.isPopupAdaptationAllowed && !oPopupElement.isPopupAdaptationAllowed()) {
+		if (oPopupElement.isPopupAdaptationAllowed) {
+			return oPopupElement.isPopupAdaptationAllowed();
+		}
+		// the event is needed for the RTA integration
+		if (!oPopupElement.getMetadata().getEvents().afterOpen) {
 			return false;
 		}
-		var oPopupAppComponent = this._getAppComponentForControl(oPopupElement);
+
+		const oPopupAppComponent = getAppComponentForControl(oPopupElement);
 		if (
 			(oPopupAppComponent && this.oRtaRootAppComponent === oPopupAppComponent)
 			|| this._isComponentInsidePopup(oPopupElement)

package/src/sap/ui/rta/util/ReloadManager.js

@@ -30,22 +30,17 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @ui5-restricted
 	 */
-	var ReloadManager = {};
+	const ReloadManager = {};
 
-	var mUShellServices = {};
-	var mReloadMethods = {
-		NOT_NEEDED: "NO_RELOAD",
-		VIA_HASH: "CROSS_APP_NAVIGATION",
-		RELOAD_PAGE: "HARD_RELOAD"
-	};
+	let mUShellServices = {};
 
 	function getReloadMessageOnStart(oReloadInfo) {
-		var sReason;
-		var bIsCustomerLayer = oReloadInfo.layer === Layer.CUSTOMER;
+		let sReason;
+		const bIsCustomerLayer = oReloadInfo.layer === Layer.CUSTOMER;
 
 		if (oReloadInfo.hasHigherLayerChanges && oReloadInfo.isDraftAvailable) {
 			sReason = bIsCustomerLayer ? "MSG_VIEWS_OR_PERSONALIZATION_AND_DRAFT_EXISTS" : "MSG_HIGHER_LAYER_CHANGES_AND_DRAFT_EXISTS";
@@ -62,7 +57,7 @@ sap.ui.define([
 	}
 
 	function getReloadMessageOnExit(oReloadInfo) {
-		var bIsCustomerLayer = oReloadInfo.layer === Layer.CUSTOMER;
+		const bIsCustomerLayer = oReloadInfo.layer === Layer.CUSTOMER;
 
 		if (oReloadInfo.hasHigherLayerChanges) {
 			if (!bIsCustomerLayer) {
@@ -102,48 +97,44 @@ sap.ui.define([
 		return undefined;
 	}
 
-	function handleReloadMessageBoxOnExit(oReloadReasons) {
-		var sReason = getReloadMessageOnExit(oReloadReasons);
+	async function handleReloadMessageBoxOnExit(oReloadReasons) {
+		const sReason = getReloadMessageOnExit(oReloadReasons);
 
 		if (sReason) {
-			return Utils.showMessageBox("information", sReason, {
+			await Utils.showMessageBox("information", sReason, {
 				titleKey: "HEADER_RELOAD_NEEDED"
 			});
 		}
-		return Promise.resolve();
 	}
 
-	function triggerReloadOnStart(oReloadInfo, bVersioningEnabled, bDeveloperMode) {
-		return Promise.resolve().then(function() {
-			if (mUShellServices.Navigation && bVersioningEnabled) {
-				// clears FlexState and triggers reloading of the flex data without blocking
-				if (oReloadInfo.isDraftAvailable) {
-					return VersionsAPI.loadDraftForApplication({
-						control: oReloadInfo.selector,
-						layer: oReloadInfo.layer,
-						allContexts: oReloadInfo.allContexts,
-						adaptationId: oReloadInfo.adaptationId
-					});
-				}
-				return VersionsAPI.loadVersionForApplication({
+	async function triggerReloadOnStart(oReloadInfo) {
+		if (mUShellServices.Navigation && oReloadInfo.versioningEnabled) {
+			// clears FlexState and triggers reloading of the flex data without blocking
+			if (oReloadInfo.isDraftAvailable) {
+				await VersionsAPI.loadDraftForApplication({
+					control: oReloadInfo.selector,
+					layer: oReloadInfo.layer,
+					allContexts: oReloadInfo.allContexts,
+					adaptationId: oReloadInfo.adaptationId
+				});
+			} else {
+				await VersionsAPI.loadVersionForApplication({
 					control: oReloadInfo.selector,
 					layer: oReloadInfo.layer,
 					allContexts: oReloadInfo.allContexts,
 					adaptationId: oReloadInfo.adaptationId
 				});
 			}
-			return undefined;
-		}).then(function() {
-			var sReason = getReloadMessageOnStart(oReloadInfo);
-			// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
-			return bDeveloperMode ? undefined : Utils.showMessageBox("information", sReason);
-		}).then(function() {
-			ReloadManager.enableAutomaticStart(oReloadInfo.layer, oReloadInfo.selector);
-			oReloadInfo.onStart = true;
-			return ReloadManager.triggerReload(oReloadInfo);
-		}).then(function() {
-			return true;
-		});
+		}
+		const sReason = getReloadMessageOnStart(oReloadInfo);
+		// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
+		if (!oReloadInfo.developerMode) {
+			await Utils.showMessageBox("information", sReason);
+		}
+		ReloadManager.enableAutomaticStart(oReloadInfo.layer, oReloadInfo.selector);
+		oReloadInfo.onStart = true;
+		ReloadManager.triggerReload(oReloadInfo);
+		return true;
 	}
 
 	ReloadManager.setUShellServices = function(mPassedUShellServices) {
@@ -157,8 +148,8 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oRootControl - Root control for which key user adaptation was started
 	 */
 	ReloadManager.enableAutomaticStart = function(sLayer, oRootControl) {
-		var sFlexReference = FlexRuntimeInfoAPI.getFlexReference({element: oRootControl});
-		var vParameter = sFlexReference || true;
+		const sFlexReference = FlexRuntimeInfoAPI.getFlexReference({element: oRootControl});
+		const vParameter = sFlexReference || true;
 		window.sessionStorage.setItem(`sap.ui.rta.restart.${sLayer}`, vParameter);
 	};
 
@@ -181,37 +172,12 @@ sap.ui.define([
 		return !!window.sessionStorage.getItem(`sap.ui.rta.restart.${sLayer}`);
 	};
 
-	/**
-	 * Sets a flag in sessionStorage to indicate that the "What's New" dialog should not be shown after rta reload.
-	 */
-	ReloadManager.setDontShowWhatsNewAfterReload = () => {
-		window.sessionStorage.setItem("sap.ui.rta.whatsNew", true);
-	};
-
-	/**
-	 * Checks if the "What's New" dialog should be shown rta after reload.
-	 *
-	 * @returns {boolean} Returns true if the "What's New" dialog should be shown, false otherwise.
-	 */
-	ReloadManager.getDontShowWhatsNewAfterReload = () => {
-		return window.sessionStorage.getItem("sap.ui.rta.whatsNew");
-	};
-
-	/**
-	 * Removes the flag from sessionStorage that indicates the "What's New" dialog should not be shown after reload.
-	 */
-	ReloadManager.removeDontShowWhatsNewAfterReload = () => {
-		window.sessionStorage.removeItem("sap.ui.rta.whatsNew");
-	};
-
 	/**
 	 * Triggers the reload of the page. Can either be a soft reload inside the FLP or a hard reload.
 	 *
 	 * @param {object} oReloadInfo - Information needed for the reload
-	 * @param {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
 	 * @param {boolean} oReloadInfo.hasHigherLayerChanges - Indicates if higher layer changes exist
 	 * @param {boolean} oReloadInfo.ignoreMaxLayerParameter - Indicates if the max layer parameter should be ignored
-	 * @param {string|object} oReloadInfo.parameters - The URL parameters to be modified
 	 * @param {string} oReloadInfo.versionSwitch - Indicates if we are in a version switch scenario
 	 * @param {string} oReloadInfo.version - Version we want to switch to
 	 * @param {string} oReloadInfo.removeVersionParameter - Indicates if version parameter should be removed
@@ -225,9 +191,7 @@ sap.ui.define([
 		}
 		if (FlUtils.getUshellContainer()) {
 			mUShellServices.AppLifeCycle.reloadCurrentApp();
-		}
-		// standalone app always trigger hard reload
-		if (!FlUtils.getUshellContainer() || oReloadInfo.triggerHardReload) {
+		} else {
 			ReloadManager.reloadPage();
 		}
 	};
@@ -260,25 +224,20 @@ sap.ui.define([
 	 *
 	 * @return {Promise<boolean>} Resolving to <code>false</code> means that reload is not necessary
 	 */
-	ReloadManager.handleReloadOnStart = function(mProperties) {
+	ReloadManager.handleReloadOnStart = async function(mProperties) {
 		merge(mProperties, {
-			hasHigherLayerChanges: false,
-			isDraftAvailable: false,
 			ignoreMaxLayerParameter: false,
-			includeCtrlVariants: true,
-			URLParsingService: mUShellServices.URLParsing
-		});
-		return ReloadInfoAPI.getReloadReasonsForStart(mProperties).then(function(oReloadInfo) {
-			if (
-				oReloadInfo.hasHigherLayerChanges
-				|| oReloadInfo.isDraftAvailable
-				|| oReloadInfo.allContexts
-				|| oReloadInfo.switchAdaptation
-			) {
-				return triggerReloadOnStart(oReloadInfo, mProperties.versioningEnabled, mProperties.developerMode);
-			}
-			return undefined;
+			includeCtrlVariants: true
 		});
+		const oReloadInfo = await ReloadInfoAPI.getReloadReasonsForStart(mProperties);
+		if (
+			oReloadInfo.hasHigherLayerChanges
+			|| oReloadInfo.isDraftAvailable
+			|| oReloadInfo.allContexts
+		) {
+			return triggerReloadOnStart(merge(mProperties, oReloadInfo));
+		}
+		return undefined;
 	};
 
 	/**
@@ -290,21 +249,17 @@ sap.ui.define([
 	 * @param {boolean} mProperties.versioningEnabled - Whether versioning is enabled
 	 * @param {boolean} mProperties.isDraftAvailable - Whether a draft is available
 	 * @param {boolean} mProperties.activeVersion - Number of the active version
-	 * @param {Promise} mProperties.changesNeedReloadPromise - Resolves to whether any change needs a hard reload
+	 * @param {Promise} mProperties.changesNeedReloadPromise - Resolves to whether any change needs a reload
 	 * @param {boolean} bSkipRestart - Stop key user adaptation without reloading the app in any way
 	 *
 	 * @return {Promise<object>} Resolving to an object containing information about whether a reload is needed and how to handle it
 	 */
-	ReloadManager.checkReloadOnExit = function(mProperties) {
-		return mProperties.changesNeedReloadPromise.then(function(bChangesNeedReload) {
-			mProperties.changesNeedReload = bChangesNeedReload;
-			mProperties.URLParsingService = mUShellServices.URLParsing;
-			var oReloadInfo = ReloadInfoAPI.getReloadMethod(mProperties);
-			return handleReloadMessageBoxOnExit(oReloadInfo).then(function() {
-				oReloadInfo.triggerHardReload = oReloadInfo.reloadMethod === mReloadMethods.RELOAD_PAGE;
-				return oReloadInfo;
-			});
-		});
+	ReloadManager.checkReloadOnExit = async function(mProperties) {
+		const bChangesNeedReload = await mProperties.changesNeedReloadPromise;
+		mProperties.changesNeedReload = bChangesNeedReload;
+		const oReloadInfo = ReloadInfoAPI.getReloadInfo(mProperties);
+		await handleReloadMessageBoxOnExit(oReloadInfo);
+		return oReloadInfo;
 	};
 
 	/**
@@ -314,7 +269,7 @@ sap.ui.define([
 	 * @param {boolean} oReloadInfo.hasHigherLayerChanges - Indicates if higher layer changes exist
 	 */
 	ReloadManager.handleReloadOnExit = function(oReloadInfo) {
-		if (oReloadInfo.reloadMethod !== mReloadMethods.NOT_NEEDED) {
+		if (oReloadInfo.reloadNeeded) {
 			oReloadInfo.removeVersionParameter = true;
 			ReloadManager.triggerReload(oReloadInfo);
 		}

package/src/sap/ui/rta/util/ServiceEventBus.js

@@ -6,8 +6,7 @@
 
 sap.ui.define([
 	"sap/ui/core/EventBus"
-],
-function(
+], function(
 	EventBus
 ) {
 	"use strict";
@@ -19,12 +18,12 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus
 	 */
-	var ServiceEventBus = EventBus.extend("sap.ui.rta.util.ServiceEventBus");
+	const ServiceEventBus = EventBus.extend("sap.ui.rta.util.ServiceEventBus");
 
 	ServiceEventBus.prototype._callListener = function(fnCallback, oListener, sChannelId, sEventId, vData) {
 		fnCallback.call(oListener, vData);

package/src/sap/ui/rta/util/ServiceManager.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.4
+	 * @version 1.139.0
 	 * @constructor
 	 * @private
 	 * @since 1.121