@openui5/sap.ui.rta 1.120.6 → 1.121.0

package/src/sap/ui/rta/service/Property.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Property
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Selection.js

@@ -14,7 +14,7 @@ sap.ui.define(function() {
 	 * @name sap.ui.rta.service.Selection
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/SupportTools.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.SupportTools
 	 * @author SAP SE
 	 * @since 1.106
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -99,11 +99,12 @@ sap.ui.define([
 	 * @param {sap.ui.rta.RuntimeAuthoring} oRta - Instance of the RuntimeAuthoring class
 	 * @param {object} mPayload - Property Bag
 	 * @param {string} mPayload.overlayId
+	 * @returns {Promise<object|null>} Resolves with the overlay info
 	 */
-	function getOverlayInfo(oRta, mPayload) {
+	async function getOverlayInfo(oRta, mPayload) {
 		var oOverlay = Element.getElementById(mPayload.overlayId);
 		if (!oOverlay) {
-			return;
+			return null;
 		}
 		var oElement = oOverlay.getElement();
 
@@ -112,27 +113,30 @@ sap.ui.define([
 			removeSelectionHighlight();
 		}
 
-		return Promise.all(oOverlay.getEditableByPlugins().map(function(sPluginName) {
+		const mEditableByPlugins = oOverlay.getEditableByPlugins();
+		const aEditableByPlugins = Object.keys(mEditableByPlugins)
+		.filter(function(sPluginName) {
+			return mEditableByPlugins[sPluginName];
+		});
+
+		const aPlugins = await Promise.all(aEditableByPlugins.map(async function(sPluginName) {
 			var oInstance = getPluginByName(oRta, sPluginName);
 			var bIsSibling = isPluginForSibling(sPluginName);
 
-			return getPluginChangeHandler(oInstance, oOverlay, oRta)
-			.then(function(oChangeHandler) {
-				return {
-					name: sPluginName,
-					isAvailable: oInstance.isAvailable([oOverlay], bIsSibling),
-					hasChangeHandler: !!oChangeHandler
-				};
-			});
-		}))
-		.then(function(aPlugins) {
+			const oChangeHandler = await getPluginChangeHandler(oInstance, oOverlay, oRta);
 			return {
-				elementId: oElement.getId(),
-				elementControlType: oElement.getMetadata().getName(),
-				overlayId: oOverlay.getId(),
-				plugins: aPlugins
+				name: sPluginName,
+				isAvailable: oInstance.isAvailable([oOverlay], bIsSibling),
+				hasChangeHandler: !!oChangeHandler
 			};
-		});
+		}));
+
+		return {
+			elementId: oElement.getId(),
+			elementControlType: oElement.getMetadata().getName(),
+			overlayId: oOverlay.getId(),
+			plugins: aPlugins
+		};
 	}
 
 	/*

package/src/sap/ui/rta/toolbar/Adaptation.js

@@ -23,8 +23,7 @@ sap.ui.define([
 	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
 	"sap/ui/rta/toolbar/translation/Translation",
 	"sap/ui/rta/toolbar/versioning/Versioning",
-	"sap/ui/rta/Utils",
-	"sap/ui/VersionInfo"
+	"sap/ui/rta/Utils"
 ], function(
 	AdaptationRenderer,
 	Log,
@@ -44,8 +43,7 @@ sap.ui.define([
 	SaveAsAdaptation,
 	Translation,
 	Versioning,
-	Utils,
-	VersionInfo
+	Utils
 ) {
 	"use strict";
 
@@ -57,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private
@@ -498,17 +496,19 @@ sap.ui.define([
 	};
 
 	Adaptation.prototype.showFeedbackForm = async function() {
-		// Get Connector Type
-		var sConnector = FlexRuntimeInfoAPI.getConfiguredFlexServices()[0].connector;
-
 		// Set URL
-		var sURLPart1 = "https://sapinsights.eu.qualtrics.com/jfe/form/";
-		var sURLPart2 = "SV_4MANxRymEIl9K06";
-		var sURL = sURLPart1 + sURLPart2;
-		var oUrlParams = new URLSearchParams();
-		const oVersion = await VersionInfo.load();
-		oUrlParams.set("version", oVersion.version);
-		oUrlParams.set("feature", (sConnector === "KeyUserConnector" ? "BTP" : "ABAP"));
+		const sURLPart1 = "https://sapinsights.eu.qualtrics.com/jfe/form/";
+		const sURLPart2 = "SV_4MANxRymEIl9K06";
+		const sURL = sURLPart1 + sURLPart2;
+		const oUrlParams = new URLSearchParams();
+		const mPropertyBag = {
+			rootControl: this.getRtaInformation().rootControl
+		};
+		const oFeedbackUrlParams = await FlexRuntimeInfoAPI.getFeedbackInformation(mPropertyBag);
+		oUrlParams.set("version", oFeedbackUrlParams.version);
+		oUrlParams.set("feature", (oFeedbackUrlParams.connector === "KeyUserConnector" ? "BTP" : "ABAP"));
+		oUrlParams.set("appId", oFeedbackUrlParams.appId);
+		oUrlParams.set("appVersion", oFeedbackUrlParams.appVersion);
 
 		var oFeedbackDialogModel = new JSONModel({
 			url: `${sURL}?${oUrlParams.toString()}`
@@ -522,9 +522,6 @@ sap.ui.define([
 			this._oFeedbackDialog.addStyleClass(Utils.getRtaStyleClassName());
 			this._oFeedbackDialog.setModel(oFeedbackDialogModel, "feedbackModel");
 			this._oFeedbackDialog.setModel(this.getModel("i18n"), "i18n");
-			this._oFeedbackDialog.attachEventOnce("afterClose", function() {
-				this._oFeedbackDialog.destroy();
-			}.bind(this));
 			this._oFeedbackDialog.open();
 		}.bind(this)).catch(function(oError) {
 			Log.error("Error loading fragment sap.ui.rta.toolbar.FeedbackDialog: ", oError);
@@ -534,6 +531,7 @@ sap.ui.define([
 	Adaptation.prototype.closeFeedbackForm = function() {
 		if (this._oFeedbackDialog) {
 			this._oFeedbackDialog.close();
+			this._oFeedbackDialog.destroy();
 		}
 	};
 

package/src/sap/ui/rta/toolbar/Base.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Fiori.js

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/FioriLike.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Personalization.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Standalone.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptation.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/translation/Translation.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/versioning/Versioning.js

@@ -5,6 +5,7 @@
  */
 
 sap.ui.define([
+	"sap/base/security/encodeXML",
 	"sap/m/GroupHeaderListItem",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/format/DateFormat",
@@ -14,6 +15,7 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/ui/rta/Utils"
 ], function(
+	encodeXML,
 	GroupHeaderListItem,
 	ManagedObject,
 	DateFormat,
@@ -36,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private
@@ -111,8 +113,11 @@ sap.ui.define([
 		if (sType === Version.Type.Draft) {
 			return this.oTextResources.getText("TIT_DRAFT");
 		}
-
-		return sTitle || this.oTextResources.getText("TIT_VERSION_1");
+		// Version title is a string and should be displayed exactly the same as what the keyuser entered
+		// The back end do not encoded it but the FeedListItem supports text with html formatted tags
+		// So it need to be encoded before passing to control to make sure it is displayed correctly
+		// In addition, it also helps to avoid XSS security thread
+		return sTitle ? encodeXML(sTitle) : this.oTextResources.getText("TIT_VERSION_1");
 	}
 
 	function formatVersionTimeStamp(sActivatedAtTimeStamp, sImportedAtTimeStamp) {
@@ -239,8 +244,10 @@ sap.ui.define([
 				controller: {
 					onConfirmVersioningDialog: function() {
 						var sVersionTitle = this.getToolbar().getControl("activateVersionDialog--versionTitleInput").getValue();
-						this.getToolbar().fireEvent("activate", {versionTitle: sVersionTitle});
-						this._oActivateVersionDialog.close();
+						if (sVersionTitle.length > 0) {
+							this.getToolbar().fireEvent("activate", {versionTitle: sVersionTitle});
+							this._oActivateVersionDialog.close();
+						}
 					}.bind(this),
 					onCancelVersioningDialog: function() {
 						this._oActivateVersionDialog.close();

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.48

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -43,26 +43,6 @@ sap.ui.define([
 		RELOAD_PAGE: "HARD_RELOAD"
 	};
 
-	/**
-	 * Builds the navigation arguments object required to trigger the navigation
-	 * using the <code>CrossApplicationNavigation</code> ushell service.
-	 *
-	 * @param {object} mParsedHash Parsed URL hash
-	 * @return {object} Argument map ("oArg" parameter of the "toExternal" function)
-	 */
-	function buildNavigationArguments(mParsedHash) {
-		return {
-			target: {
-				semanticObject: mParsedHash.semanticObject,
-				action: mParsedHash.action,
-				context: mParsedHash.contextRaw
-			},
-			params: mParsedHash.params,
-			appSpecificRoute: mParsedHash.appSpecificRoute,
-			writeHistory: false
-		};
-	}
-
 	function getReloadMessageOnStart(oReloadInfo) {
 		var sReason;
 		var bIsCustomerLayer = oReloadInfo.layer === Layer.CUSTOMER;
@@ -135,7 +115,7 @@ sap.ui.define([
 
 	function triggerReloadOnStart(oReloadInfo, bVersioningEnabled, bDeveloperMode) {
 		return Promise.resolve().then(function() {
-			if (mUShellServices.CrossApplicationNavigation && bVersioningEnabled) {
+			if (mUShellServices.Navigation && bVersioningEnabled) {
 				// clears FlexState and triggers reloading of the flex data without blocking
 				if (oReloadInfo.isDraftAvailable) {
 					return VersionsAPI.loadDraftForApplication({
@@ -166,38 +146,6 @@ sap.ui.define([
 		});
 	}
 
-	function triggerReloadForStandalone(oReloadInfo) {
-		oReloadInfo.parameters = document.location.search;
-		if (oReloadInfo.onStart) {
-			ReloadInfoAPI.handleParametersOnStart(oReloadInfo, "standalone");
-		} else {
-			ReloadInfoAPI.handleUrlParameters(oReloadInfo, "standalone");
-		}
-
-		if (document.location.search === oReloadInfo.parameters) {
-			ReloadManager.reloadPage();
-		} else {
-			ReloadManager.setUriParameters(oReloadInfo.parameters);
-		}
-	}
-
-	function triggerReloadForFLP(oReloadInfo) {
-		oReloadInfo.URLParsingService = mUShellServices.URLParsing;
-		oReloadInfo.parsedHash = FlUtils.getParsedURLHash(mUShellServices.URLParsing);
-		oReloadInfo.parameters = oReloadInfo.parsedHash.params;
-		var bChanged = oReloadInfo.onStart ? ReloadInfoAPI.handleParametersOnStart(oReloadInfo, "flp") : ReloadInfoAPI.handleUrlParameters(oReloadInfo, "flp");
-
-		if (bChanged) {
-			// if a hard reload is required the crossAppNav still has to be triggered to update the URL
-			mUShellServices.CrossApplicationNavigation.toExternal(buildNavigationArguments(oReloadInfo.parsedHash));
-		} else {
-			mUShellServices.AppLifeCycle.reloadCurrentApp();
-		}
-		if (oReloadInfo.triggerHardReload) {
-			ReloadManager.reloadPage();
-		}
-	}
-
 	ReloadManager.setUShellServices = function(mPassedUShellServices) {
 		mUShellServices = mPassedUShellServices;
 	};
@@ -247,10 +195,17 @@ sap.ui.define([
 	 * @param {string} oReloadInfo.removeDraft - Indicates if draft parameter should be removed
 	 */
 	ReloadManager.triggerReload = function(oReloadInfo) {
-		if (FlUtils.getUshellContainer()) {
-			triggerReloadForFLP(oReloadInfo);
+		if (oReloadInfo.onStart) {
+			ReloadInfoAPI.handleReloadInfoOnStart(oReloadInfo);
 		} else {
-			triggerReloadForStandalone(oReloadInfo);
+			ReloadInfoAPI.handleReloadInfo(oReloadInfo);
+		}
+		if (FlUtils.getUshellContainer()) {
+			mUShellServices.AppLifeCycle.reloadCurrentApp();
+		}
+		// standalone app always trigger hard reload
+		if (!FlUtils.getUshellContainer() || oReloadInfo.triggerHardReload) {
+			ReloadManager.reloadPage();
 		}
 	};
 
@@ -291,7 +246,12 @@ sap.ui.define([
 			URLParsingService: mUShellServices.URLParsing
 		});
 		return ReloadInfoAPI.getReloadReasonsForStart(mProperties).then(function(oReloadInfo) {
-			if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.isDraftAvailable || oReloadInfo.allContexts || oReloadInfo.switchAdaptation) {
+			if (
+				oReloadInfo.hasHigherLayerChanges
+				|| oReloadInfo.isDraftAvailable
+				|| oReloadInfo.allContexts
+				|| oReloadInfo.switchAdaptation
+			) {
 				return triggerReloadOnStart(oReloadInfo, mProperties.versioningEnabled, mProperties.developerMode);
 			}
 			return undefined;
@@ -331,7 +291,7 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
 	 * @param {boolean} oReloadInfo.hasHigherLayerChanges - Indicates if higher layer changes exist
 	 */
-	ReloadManager.handleUrlParametersOnExit = function(oReloadInfo) {
+	ReloadManager.handleReloadOnExit = function(oReloadInfo) {
 		if (oReloadInfo.layer !== Layer.USER && oReloadInfo.reloadMethod !== mReloadMethods.NOT_NEEDED) {
 			oReloadInfo.removeVersionParameter = true;
 			ReloadManager.triggerReload(oReloadInfo);

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

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

@@ -0,0 +1,193 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+	"sap/base/util/isPlainObject",
+	"sap/ui/base/ManagedObject",
+	"sap/ui/dt/Util",
+	"sap/ui/rta/service/index",
+	"sap/ui/rta/util/ServiceEventBus"
+], function(
+	isPlainObject,
+	ManagedObject,
+	DtUtil,
+	ServicesIndex,
+	ServiceEventBus
+) {
+	"use strict";
+
+	const SERVICE_STARTING = "SERVICE_STARTING";
+	const SERVICE_STARTED = "SERVICE_STARTED";
+	const SERVICE_FAILED = "SERVICE_FAILED";
+
+	/**
+	 * Constructor for a new sap.ui.rta.util.ServiceManager. Starts and manages rta specific services.
+	 *
+	 * @extends sap.ui.base.ManagedObject
+	 * @author SAP SE
+	 * @version 1.121.0
+	 * @constructor
+	 * @private
+	 * @since 1.121
+	 * @alias sap.ui.rta.util.ServiceManager
+	 */
+	const ServiceManager = ManagedObject.extend("sap.ui.rta.util.ServiceManager", {
+		metadata: {
+			properties: {
+				/**
+				 * Services that are started / in use
+				 */
+				services: {
+					type: "any",
+					defaultValue: {}
+				}
+			}
+		},
+		// eslint-disable-next-line object-shorthand
+		constructor: function(...aArgs) {
+			ManagedObject.apply(this, aArgs);
+		}
+	});
+
+	function resolveServiceLocation(sName) {
+		if (ServicesIndex.hasOwnProperty(sName)) {
+			return ServicesIndex[sName].replace(/\./g, "/");
+		}
+		return undefined;
+	}
+
+	async function stopServices() {
+		const aPromises = [];
+		Object.values(this.getServices()).forEach((oService) => {
+			aPromises.push(oService.initPromise.then(() => {
+				if (typeof oService.service.destroy === "function") {
+					oService.service.destroy();
+				}
+			}));
+		});
+		await Promise.all(aPromises);
+		this.setServices({});
+	}
+
+	ServiceManager.prototype.getServices = function() {
+		// without this changing the property would also change the default Value
+		return Object.assign({}, this.getProperty("services"));
+	};
+
+	/**
+	 * Starts and returns the service with the given name
+	 *
+	 * @param {string} sName - Service name
+	 * @param {sap.ui.rta.RuntimeAuthoring} oRuntimeAuthoringInstance - Instance of RuntimeAuthoring
+	 * @returns {Promise<object>} Resolves with the initialized service
+	 */
+	ServiceManager.prototype.startService = function(sName, oRuntimeAuthoringInstance) {
+		const sServiceLocation = resolveServiceLocation(sName);
+		const mServices = this.getServices();
+		let mService;
+
+		if (!sServiceLocation) {
+			return Promise.reject(Error(`sap.ui.rta, ServiceManager#startService: Unknown service. Can't find any registered service by name '${sName}'`));
+		}
+
+		mService = mServices[sName];
+		if (mService) {
+			switch (mService.status) {
+				case SERVICE_STARTED: {
+					return Promise.resolve(mService.exports);
+				}
+				case SERVICE_STARTING: {
+					return mService.initPromise;
+				}
+				case SERVICE_FAILED: {
+					return mService.initPromise;
+				}
+				default: {
+					return Promise.reject(Error(`sap.ui.rta, ServiceManager#startService: Unknown service status. Service name = '${sName}'`));
+				}
+			}
+		} else {
+			mService = {};
+			mService.status = SERVICE_STARTING;
+			mService.location = sServiceLocation;
+			mService.initPromise = new Promise(function(fnResolve, fnReject) {
+				sap.ui.require(
+					[sServiceLocation],
+					async function(fnServiceFactory) {
+						try {
+							mService.factory = fnServiceFactory;
+
+							this._oServiceEventBus ||= new ServiceEventBus();
+
+							const oService = await fnServiceFactory(
+								oRuntimeAuthoringInstance,
+								this._oServiceEventBus.publish.bind(this._oServiceEventBus, sName)
+							);
+
+							if (oRuntimeAuthoringInstance.bIsDestroyed) {
+								throw Error(`sap.ui.rta, ServiceManager#startService: RuntimeAuthoring instance is destroyed while initializing the service '${sName}'`);
+							}
+
+							if (!isPlainObject(oService)) {
+								throw Error(`sap.ui.rta, ServiceManager#startService: Invalid service format. Service should return simple javascript object after initialization. Service name = '${sName}'`);
+							}
+
+							mService.service = oService;
+							mService.exports = {};
+
+							// Expose events API if there is at least one event
+							if (Array.isArray(oService.events) && oService.events.length > 0) {
+								Object.assign(mService.exports, {
+									attachEvent: this._oServiceEventBus.subscribe.bind(this._oServiceEventBus, sName),
+									detachEvent: this._oServiceEventBus.unsubscribe.bind(this._oServiceEventBus, sName),
+									attachEventOnce: this._oServiceEventBus.subscribeOnce.bind(this._oServiceEventBus, sName)
+								});
+							}
+
+							// Expose methods/properties from exports object if any
+							const mExports = oService.exports || {};
+							Object.assign(
+								mService.exports,
+								Object.keys(mExports).reduce(function(mResult, sKey) {
+									const vValue = mExports[sKey];
+									mResult[sKey] = typeof vValue === "function"
+										? DtUtil.waitForSynced(oRuntimeAuthoringInstance._oDesignTime, vValue)
+										: vValue;
+									return mResult;
+								}, {})
+							);
+
+							mService.status = SERVICE_STARTED;
+							fnResolve(Object.freeze(mService.exports));
+						} catch (oError) {
+							fnReject(oError);
+						}
+					}.bind(this),
+					function(vError) {
+						mService.status = SERVICE_FAILED;
+						fnReject(vError);
+					}
+				);
+			}.bind(this))
+			.catch(function(vError) {
+				mService.status = SERVICE_FAILED;
+				return Promise.reject(vError);
+			});
+			mServices[sName] = mService;
+			this.setServices(mServices);
+
+			return mService.initPromise;
+		}
+	};
+
+	ServiceManager.prototype.destroy = function() {
+		stopServices.call(this);
+		if (this._oServiceEventBus) {
+			this._oServiceEventBus.destroy();
+		}
+	};
+
+	return ServiceManager;
+});

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

@@ -148,7 +148,7 @@ sap.ui.define([
 		})
 		.catch(function(vError) {
 			if (
-				vError !== "Reload triggered"
+				vError.message !== "Reload triggered"
 				&& !(FlexUtils.getUshellContainer() && vError.reason === "flexEnabled") // FLP Plugin already handles this error
 			) {
 				var oRtaResourceBundle = Lib.getResourceBundleFor("sap.ui.rta");