@openui5/sap.ui.rta 1.117.1 → 1.119.0

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

@@ -17,7 +17,8 @@ sap.ui.define([
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/date/UI5Date"
+	"sap/ui/core/date/UI5Date",
+	"sap/ui/performance/Measurement"
 ],
 function(
 	Log,
@@ -31,20 +32,21 @@ function(
 	Filter,
 	FilterOperator,
 	JSONModel,
-	UI5Date
+	UI5Date,
+	Measurement
 ) {
 	"use strict";
 
 	var oRanking = {
 		Initial: 0,
 		Default: 1024,
-		Before: function(iRank) {
+		Before(iRank) {
 			return iRank + 1024;
 		},
-		Between: function(iRank1, iRank2) {
+		Between(iRank1, iRank2) {
 			return (iRank1 + iRank2) / 2;
 		},
-		After: function(iRank) {
+		After(iRank) {
 			return iRank + 0.5;
 		}
 	};
@@ -57,17 +59,19 @@ function(
 				}
 			}
 		},
-		constructor: function() {
-			ManagedObject.prototype.constructor.apply(this, arguments);
+		// eslint-disable-next-line object-shorthand
+		constructor: function(...aArgs) {
+			ManagedObject.prototype.constructor.apply(this, aArgs);
 			this.oTextResources = this.getToolbar().getTextResources();
 		}
 	});
 
 	ManageAdaptations.prototype.openManageAdaptationDialog = function() {
+		Measurement.start("onCBAOpenManageAdaptationDialog", "Measurement of opening the manage context-based adaptation dialog");
 		if (!this._oManageAdaptationDialogPromise) {
 			this._oManageAdaptationDialogPromise = Fragment.load({
 				name: "sap.ui.rta.toolbar.contextBased.ManageAdaptationsDialog",
-				id: this.getToolbar().getId() + "_fragment--sapUiRta_manageAdaptationDialog",
+				id: `${this.getToolbar().getId()}_fragment--sapUiRta_manageAdaptationDialog`,
 				controller: {
 					formatContextColumnCell: formatContextColumnCell.bind(this),
 					formatContextColumnTooltip: formatContextColumnTooltip.bind(this),
@@ -94,9 +98,15 @@ function(
 		return this._oManageAdaptationDialogPromise
 		.then(function() {
 			this._oRtaInformation = this.getToolbar().getRtaInformation();
-			return ContextBasedAdaptationsAPI.load({control: this._oRtaInformation.rootControl, layer: this._oRtaInformation.flexSettings.layer});
+			return ContextBasedAdaptationsAPI.load({
+				control: this._oRtaInformation.rootControl,
+				layer: this._oRtaInformation.flexSettings.layer
+			});
 		}.bind(this)).then(function(oAdaptations) {
-			this.oAdaptationsModel = ContextBasedAdaptationsAPI.getAdaptationsModel({control: this._oRtaInformation.rootControl, layer: this._oRtaInformation.flexSettings.layer});
+			this.oAdaptationsModel = ContextBasedAdaptationsAPI.getAdaptationsModel({
+				control: this._oRtaInformation.rootControl,
+				layer: this._oRtaInformation.flexSettings.layer
+			});
 			this.oAdaptationsModel.updateAdaptations(oAdaptations.adaptations);
 			this.oReferenceAdaptationsData = JSON.parse(JSON.stringify(this.oAdaptationsModel.getProperty("/adaptations")));
 			this._oOriginAdaptationsData = JSON.parse(JSON.stringify(this.oAdaptationsModel.getProperty("/allAdaptations")));
@@ -104,6 +114,8 @@ function(
 			this._oManageAdaptationDialog.setModel(this.oAdaptationsModel, "contextBased");
 			this._oManageAdaptationDialog.setModel(this._oControlConfigurationModel, "controlConfiguration");
 			getAdaptationsTable.call(this).attachSelectionChange(onSelectionChange.bind(this));
+			Measurement.end("onCBAOpenManageAdaptationDialog");
+			Measurement.getActive() && Log.info(`onCBAOpenManageAdaptationDialog: ${Measurement.getMeasurement("onCBAOpenManageAdaptationDialog").time} ms`);
 			return this._oManageAdaptationDialog.open();
 		}.bind(this)
 		).catch(function(oError) {
@@ -117,8 +129,8 @@ function(
 
 	// ------ formatting ------
 	function formatContextColumnCell(aRoles) {
-		return aRoles.length + " " + (aRoles.length > 1 ?
-			this.oTextResources.getText("TXT_TABLE_CONTEXT_CELL_ROLES") : this.oTextResources.getText("TXT_TABLE_CONTEXT_CELL_ROLE"));
+		return `${aRoles.length} ${aRoles.length > 1 ?
+			this.oTextResources.getText("TXT_TABLE_CONTEXT_CELL_ROLES") : this.oTextResources.getText("TXT_TABLE_CONTEXT_CELL_ROLE")}`;
 	}
 
 	function formatContextColumnTooltip(aRoles) {
@@ -135,7 +147,7 @@ function(
 			minute: "numeric"
 		};
 		var sLanguage = sap.ui.getCore().getConfiguration().getLanguage();
-		return sModifiedBy + "\n" + oUi5Date.toLocaleTimeString(sLanguage, oOptions);
+		return `${sModifiedBy}\n${oUi5Date.toLocaleTimeString(sLanguage, oOptions)}`;
 	}
 
 	function onSelectionChange(oEvent) {
@@ -176,7 +188,7 @@ function(
 			var oFilterByTitle = new Filter("title", FilterOperator.Contains, sQuery);
 			var oFilterByContextId = new Filter({
 				path: "contexts/role",
-				test: function(aRoles) {
+				test(aRoles) {
 					return aRoles.some(function(sRole) {
 						return sRole.includes(sQuery.toUpperCase());
 					});
@@ -286,7 +298,10 @@ function(
 		// set the rank property and update the model to refresh the bindings
 		this.oAdaptationsModel.setProperty("rank", iNewRank, oDraggedItemContext);
 		sortByRank(this.oAdaptationsModel);
-		var oAllUpdatedAdaptations = Object.assign(this.oAdaptationsModel.getProperty("/allAdaptations"), this.oAdaptationsModel.getProperty("/adaptations"));
+		var oAllUpdatedAdaptations = Object.assign(
+			this.oAdaptationsModel.getProperty("/allAdaptations"),
+			this.oAdaptationsModel.getProperty("/adaptations")
+		);
 		this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
 		enableSaveButton.call(this, didAdaptationsPriorityChange.call(this));
 	}
@@ -309,7 +324,7 @@ function(
 	}
 
 	function getControlInDialog(sId) {
-		return this.getToolbar().getControl("manageAdaptationDialog--" + sId);
+		return this.getToolbar().getControl(`manageAdaptationDialog--${sId}`);
 	}
 
 	function getDefaultApplicationTable() {
@@ -350,17 +365,25 @@ function(
 	function onSaveReorderedAdaptations() {
 		Utils.checkDraftOverwrite(this.getToolbar().getModel("versions")).then(function() {
 			var oRtaInformation = this.getToolbar().getRtaInformation();
-			var aAdaptationPriorities = this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; });
-			return ContextBasedAdaptationsAPI.reorder({control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer, parameters: {priorities: aAdaptationPriorities}});
+			var aAdaptationPriorities = this.oAdaptationsModel.getProperty("/adaptations")
+			.map(function(oAdaptation) { return oAdaptation.id; });
+			return ContextBasedAdaptationsAPI.reorder({
+				control: oRtaInformation.rootControl,
+				layer: oRtaInformation.flexSettings.layer,
+				parameters: {priorities: aAdaptationPriorities}
+			});
 		}.bind(this)).then(function() {
-			var oAllUpdatedAdaptations = Object.assign(this.oAdaptationsModel.getProperty("/allAdaptations"), this.oAdaptationsModel.getProperty("/adaptations"));
+			var oAllUpdatedAdaptations = Object.assign(
+				this.oAdaptationsModel.getProperty("/allAdaptations"),
+				this.oAdaptationsModel.getProperty("/adaptations")
+			);
 			this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
 			onCloseDialog.call(this);
 		}.bind(this))
 		.catch(function(oError) {
 			if (oError !== "cancel") {
 				Utils.showMessageBox("error", "MSG_LREP_TRANSFER_ERROR", { titleKey: "BTN_MANAGE_APP_CTX", error: oError});
-				Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+				Log.error(`sap.ui.rta: ${oError.stack || oError.message || oError}`);
 			}
 		});
 	}

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

@@ -15,7 +15,8 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/rta/Utils",
-	"sap/ui/model/json/JSONModel"
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/performance/Measurement"
 ], function(
 	ManagedObject,
 	Log,
@@ -27,12 +28,13 @@ sap.ui.define([
 	ContextBasedAdaptationsAPI,
 	ContextSharingAPI,
 	Utils,
-	JSONModel
+	JSONModel,
+	Measurement
 ) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
-	var ValueState = coreLibrary.ValueState;
+	var {ValueState} = coreLibrary;
 
 	/**
 	 * Controller for the <code>sap.ui.rta.toolbar.contextBased.SaveAsAdaptation</code> controls.
@@ -41,7 +43,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @private
@@ -56,8 +58,9 @@ sap.ui.define([
 				}
 			}
 		},
-		constructor: function() {
-			ManagedObject.prototype.constructor.apply(this, arguments);
+		// eslint-disable-next-line object-shorthand
+		constructor: function(...aArgs) {
+			ManagedObject.prototype.constructor.apply(this, aArgs);
 			this.oTextResources = this.getToolbar().getTextResources();
 		}
 	});
@@ -67,7 +70,7 @@ sap.ui.define([
 		if (!this._oAddAdaptationDialogPromise) {
 			this._oAddAdaptationDialogPromise = Fragment.load({
 				name: "sap.ui.rta.toolbar.contextBased.SaveAsAdaptationDialog",
-				id: this.getToolbar().getId() + "_fragment--sapUiRta_addAdaptationDialog",
+				id: `${this.getToolbar().getId()}_fragment--sapUiRta_addAdaptationDialog`,
 				controller: {
 					onAdaptationTitleChange: onAdaptationTitleChange.bind(this),
 					onSaveAsAdaptation: onSaveAsAdaptation.bind(this),
@@ -165,6 +168,7 @@ sap.ui.define([
 		oContextBasedAdaptation.priority = getAdaptationPriority.call(this);
 		var oRtaInformation = this.getToolbar().getRtaInformation();
 		if (this._bIsEditMode) {
+			Measurement.start("onCBAUpdateAdaptation", "Measurement of updating a context-based adaptation");
 			oContextBasedAdaptation.adaptationId = this._mEditProperties.adaptationId;
 			ContextBasedAdaptationsAPI.update({
 				control: oRtaInformation.rootControl,
@@ -175,6 +179,8 @@ sap.ui.define([
 			.then(function(oContextBasedAdaptation, oResponse) {
 				if (oResponse.status === 200) {
 					this.oAdaptationsModel.updateAdaptationContent(oContextBasedAdaptation);
+					Measurement.end("onCBAUpdateAdaptation");
+					Measurement.getActive() && Log.info(`onCBAUpdateAdaptation: ${Measurement.getMeasurement("onCBAUpdateAdaptation").time} ms`);
 				}
 			}.bind(this, oContextBasedAdaptation))
 			.catch(function(oError) {
@@ -185,6 +191,7 @@ sap.ui.define([
 				Utils.showMessageBox("error", sMessage, oOptions);
 			});
 		} else {
+			Measurement.start("onCBASaveAsAdaptation", "Measurement of saving a context-based adaptation");
 			BusyIndicator.show();
 			ContextBasedAdaptationsAPI.create({
 				control: oRtaInformation.rootControl,
@@ -193,6 +200,8 @@ sap.ui.define([
 			}).then(function() {
 				BusyIndicator.hide();
 				this.getToolbar().fireEvent("switchAdaptation", {adaptationId: oContextBasedAdaptation.id, trigger: "SaveAs"});
+				Measurement.end("onCBASaveAsAdaptation");
+				Measurement.getActive() && Log.info(`onCBASaveAsAdaptation: ${Measurement.getMeasurement("onCBASaveAsAdaptation").time} ms`);
 			}.bind(this)).catch(function(oError) {
 				BusyIndicator.hide();
 				Log.error(oError.stack);

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

@@ -35,8 +35,8 @@ sap.ui.define([
 		var sErrorMessage = vError.userMessage || vError.stack || vError.message || vError.status || vError;
 		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
 		Log.error(sErrorMessage);
-		var sMsg = oTextResources.getText("MSG_LREP_TRANSFER_ERROR") + "\n"
-			+ oTextResources.getText("MSG_ERROR_REASON", sErrorMessage);
+		var sMsg = `${oTextResources.getText("MSG_LREP_TRANSFER_ERROR")}\n${
+			 oTextResources.getText("MSG_ERROR_REASON", [sErrorMessage])}`;
 		MessageBox.error(sMsg, {
 			styleClass: Utils.getRtaStyleClassName()
 		});
@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @private
@@ -64,8 +64,9 @@ sap.ui.define([
 				}
 			}
 		},
-		constructor: function() {
-			ManagedObject.prototype.constructor.apply(this, arguments);
+		// eslint-disable-next-line object-shorthand
+		constructor: function(...aArgs) {
+			ManagedObject.prototype.constructor.apply(this, aArgs);
 			this._oTranslationModel = new JSONModel(getInitialTranslationModelData());
 		}
 	});
@@ -74,7 +75,7 @@ sap.ui.define([
 		var oModel = oEvent.getSource().getModel("translation");
 		var sSourceLanguage = oModel.getProperty("/sourceLanguage");
 		var sTargetLanguage = oModel.getProperty("/targetLanguage");
-		var sFileName = sSourceLanguage + "_" + sTargetLanguage + "_" + "TranslationXLIFF";
+		var sFileName = `${sSourceLanguage}_${sTargetLanguage}_` + `TranslationXLIFF`;
 
 		var mPropertyBag = {
 			layer: Layer.CUSTOMER,
@@ -106,7 +107,7 @@ sap.ui.define([
 	Translation.prototype._createDownloadTranslationDialog = function() {
 		return Fragment.load({
 			name: "sap.ui.rta.toolbar.translation.DownloadTranslationDialog",
-			id: this.getToolbar().getId() + "_download_translation_fragment",
+			id: `${this.getToolbar().getId()}_download_translation_fragment`,
 			controller: {
 				onDownloadFile: downloadFile.bind(this),
 				onCancelDownloadDialog: function() {
@@ -122,7 +123,7 @@ sap.ui.define([
 	};
 
 	Translation.prototype._createUploadTranslationDialog = function() {
-		var sUploadId = this.getToolbar().getId() + "_upload_translation_fragment";
+		var sUploadId = `${this.getToolbar().getId()}_upload_translation_fragment`;
 		return Fragment.load({
 			name: "sap.ui.rta.toolbar.translation.UploadTranslationDialog",
 			id: sUploadId,
@@ -130,8 +131,8 @@ sap.ui.define([
 				onCancelUploadDialog: function() {
 					this._oUploadDialog.close();
 				}.bind(this),
-				formatUploadEnabled: function() {
-					var oFileUploader = sap.ui.getCore().byId(sUploadId + "--fileUploader");
+				formatUploadEnabled() {
+					var oFileUploader = sap.ui.getCore().byId(`${sUploadId}--fileUploader`);
 					return oFileUploader.checkFileReadable();
 				},
 				saveFiles: function(oEvent) {
@@ -148,7 +149,7 @@ sap.ui.define([
 	};
 
 	function handleUploadPress(sUploadId) {
-		var oFileUploader = sap.ui.getCore().byId(sUploadId + "--fileUploader");
+		var oFileUploader = sap.ui.getCore().byId(`${sUploadId}--fileUploader`);
 		oFileUploader.checkFileReadable().then(function() {
 			if (this._oTranslationModel.getProperty("/file")) {
 				var mPropertyBag = {
@@ -207,9 +208,7 @@ sap.ui.define([
 	};
 
 	Translation.prototype.openUploadTranslationDialog = function() {
-		if (!this._oUploadDialogPromise) {
-			this._oUploadDialogPromise = this._createUploadTranslationDialog();
-		}
+		this._oUploadDialogPromise ||= this._createUploadTranslationDialog();
 		return this._oUploadDialogPromise.then(function(oUploadDialog) {
 			this.getToolbar().addDependent(oUploadDialog);
 			return oUploadDialog.open();

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

@@ -25,7 +25,7 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var MessageType = coreLibrary.MessageType;
+	var {MessageType} = coreLibrary;
 	var DRAFT_ACCENT_COLOR = "sapUiRtaDraftVersionAccent";
 	var ACTIVE_ACCENT_COLOR = "sapUiRtaActiveVersionAccent";
 
@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @private
@@ -51,8 +51,9 @@ sap.ui.define([
 				}
 			}
 		},
-		constructor: function() {
-			ManagedObject.prototype.constructor.apply(this, arguments);
+		// eslint-disable-next-line object-shorthand
+		constructor: function(...aArgs) {
+			ManagedObject.prototype.constructor.apply(this, aArgs);
 			this.oTextResources = this.getToolbar().getTextResources();
 		}
 	});
@@ -121,15 +122,19 @@ sap.ui.define([
 			// in case of "Original App" and "Draft" no timestamp is set
 			return "";
 		}
-
+		if (sTimeStamp.indexOf("Z") === -1) {
+			sTimeStamp = `${sTimeStamp}Z`;
+		}
 		return DateFormat.getInstance({
 			format: "yMMMdjm"
-		}).format(new Date(sTimeStamp + "Z"));
+		}).format(new Date(sTimeStamp));
 	}
 
 	function getGroupHeaderFactory(oGroup) {
 		return new GroupHeaderListItem({
-			title: oGroup.key ? this.oTextResources.getText("TIT_VERSION_HISTORY_PUBLISHED") : this.oTextResources.getText("TIT_VERSION_HISTORY_UNPUBLISHED"),
+			title: oGroup.key
+				? this.oTextResources.getText("TIT_VERSION_HISTORY_PUBLISHED")
+				: this.oTextResources.getText("TIT_VERSION_HISTORY_UNPUBLISHED"),
 			upperCase: false,
 			visible: this.getToolbar().getModel("versions").getProperty("/publishVersionVisible")
 		}).addStyleClass("sapUiRtaVersionHistoryGrouping").addStyleClass("sapUiRtaVersionHistory");
@@ -154,7 +159,7 @@ sap.ui.define([
 	Versioning.prototype.formatVersionButtonText = function(aVersions, sDisplayedVersion) {
 		var sText = "";
 		var sType = "Active";
-		aVersions = aVersions || [];
+		aVersions ||= [];
 
 		if (sDisplayedVersion === undefined || sDisplayedVersion === Version.Number.Original) {
 			sText = this.oTextResources.getText("TIT_ORIGINAL_APP");
@@ -191,25 +196,23 @@ sap.ui.define([
 	Versioning.prototype.showVersionHistory = function(oEvent) {
 		var oVersionButton = oEvent.getSource();
 
-		if (!this._oVersionHistoryDialogPromise) {
-			this._oVersionHistoryDialogPromise = Fragment.load({
-				name: "sap.ui.rta.toolbar.versioning.VersionHistory",
-				id: this.getToolbar().getId() + "_fragment--sapUiRta_versionHistoryDialog",
-				controller: {
-					formatVersionTitle: formatVersionTitle.bind(this),
-					formatVersionTimeStamp: formatVersionTimeStamp,
-					formatHighlight: formatHighlight,
-					formatHighlightText: formatHighlightText.bind(this),
-					formatOriginalAppHighlight: formatOriginalAppHighlight,
-					formatOriginalAppHighlightText: formatOriginalAppHighlightText.bind(this),
-					versionSelected: versionSelected.bind(this),
-					getGroupHeaderFactory: getGroupHeaderFactory.bind(this)
-				}
-			}).then(function(oDialog) {
-				this.getToolbar().addDependent(oDialog);
-				return oDialog;
-			}.bind(this));
-		}
+		this._oVersionHistoryDialogPromise ||= Fragment.load({
+			name: "sap.ui.rta.toolbar.versioning.VersionHistory",
+			id: `${this.getToolbar().getId()}_fragment--sapUiRta_versionHistoryDialog`,
+			controller: {
+				formatVersionTitle: formatVersionTitle.bind(this),
+				formatVersionTimeStamp,
+				formatHighlight,
+				formatHighlightText: formatHighlightText.bind(this),
+				formatOriginalAppHighlight,
+				formatOriginalAppHighlightText: formatOriginalAppHighlightText.bind(this),
+				versionSelected: versionSelected.bind(this),
+				getGroupHeaderFactory: getGroupHeaderFactory.bind(this)
+			}
+		}).then(function(oDialog) {
+			this.getToolbar().addDependent(oDialog);
+			return oDialog;
+		}.bind(this));
 
 		return this._oVersionHistoryDialogPromise.then(function(oVersionsDialog) {
 			if (!oVersionsDialog.isOpen()) {
@@ -232,7 +235,7 @@ sap.ui.define([
 		if (!this._oActivateVersionDialogPromise) {
 			this._oActivateVersionDialogPromise = Fragment.load({
 				name: "sap.ui.rta.toolbar.versioning.VersionTitleDialog",
-				id: this.getToolbar().getId() + "_fragment--sapUiRta_activateVersionDialog",
+				id: `${this.getToolbar().getId()}_fragment--sapUiRta_activateVersionDialog`,
 				controller: {
 					onConfirmVersioningDialog: function() {
 						var sVersionTitle = this.getToolbar().getControl("activateVersionDialog--versionTitleInput").getValue();

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

@@ -28,9 +28,7 @@ function() {
 			// perform animation in the next animation frame, normally 16-17ms later.
 			var iTimestampInitial;
 			var fnAnimCallback = function(iTimestamp) {
-				if (!iTimestampInitial) {
-					iTimestampInitial = iTimestamp;
-				}
+				iTimestampInitial ||= iTimestamp;
 				if (iTimestamp !== iTimestampInitial) {
 					fnCallback();
 				} else {

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

@@ -68,13 +68,11 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
 	 * @alias sap.ui.rta.util.PluginManager
-	 * @experimental Since 1.86. This class is experimental and provides only limited functionality. Also the API might
-	 *               be changed in future.
 	 */
 	var PluginManager = ManagedObject.extend("sap.ui.rta.util.PluginManager", {
 		metadata: {

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

@@ -42,13 +42,11 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
 	 * @alias sap.ui.rta.util.PopupManager
-	 * @experimental Since 1.48. This class is experimental and provides only limited functionality. Also the API might
-	 *               be changed in future.
 	 */
 	var PopupManager = ManagedObject.extend("sap.ui.rta.util.PopupManager", {
 		metadata: {
@@ -144,7 +142,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Filters the passed array and returns an object containing list of adaptable popups and all supported popup controls (also includes non-adaptable popups).
+	 * Filters the passed array and returns an object containing list of adaptable popups and all supported
+	 * popup controls (also includes non-adaptable popups).
 	 *
 	 * @param {sap.ui.core.Popup[]} aOpenPopups Specifies open popups
 	 * @returns {object} Returns an object containing all adaptation relevant popups and all supported popup controls
@@ -160,6 +159,7 @@ sap.ui.define([
 				// all modal type popups are supported for which modal property is later turned true, when in Adaptation mode
 				aAllSupportedPopups.push(oPopupElement);
 			}
+			return undefined;
 		}.bind(this));
 
 		return {
@@ -183,6 +183,7 @@ sap.ui.define([
 					if (oContent instanceof ComponentContainer) {
 						return this.oRtaRootAppComponent === this._getAppComponentForControl(Component.get(oContent.getComponent()));
 					}
+					return undefined;
 				}.bind(this))
 			: false;
 	};
@@ -250,9 +251,11 @@ sap.ui.define([
 			}
 		};
 
-		sNewMode === "navigation"
-			? this._applyPatchesToOpenPopups(_curry(fnApplyFocusAndSetModal)(sNewMode))
-			: this._removePatchesToOpenPopups(_curry(fnApplyFocusAndSetModal)(sNewMode));
+		if (sNewMode === "navigation") {
+			this._applyPatchesToOpenPopups(_curry(fnApplyFocusAndSetModal)(sNewMode));
+		} else {
+			this._removePatchesToOpenPopups(_curry(fnApplyFocusAndSetModal)(sNewMode));
+		}
 	};
 
 	/**
@@ -314,8 +317,9 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._overrideAddFunctions = function(fnOriginalFunction) {
-		return function(oPopupElement) {
-			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, arguments);
+		return function(...aArgs) {
+			const [oPopupElement] = aArgs;
+			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
 			if (this._isSupportedPopup(oPopupElement)) {
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
@@ -389,7 +393,7 @@ sap.ui.define([
 	 */
 	PopupManager.prototype._applyPopupPatch = function(oPopupElement) {
 		var oOverlayContainer = Overlay.getOverlayContainer();
-		var oPopup = oPopupElement.oPopup;
+		var {oPopup} = oPopupElement;
 		var aAutoCloseAreas = [
 			oPopup.oContent.getDomRef(),
 			oOverlayContainer.get(0)
@@ -413,11 +417,9 @@ sap.ui.define([
 		oPopup.setExtraContent(aAutoCloseAreas);
 
 		// cases when onAfterRendering is called after this function - app inside popup
-		if (!this.fnOriginalPopupOnAfterRendering) {
-			this.fnOriginalPopupOnAfterRendering = oPopup.onAfterRendering;
-		}
-		oPopup.onAfterRendering = function() {
-			var vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, arguments);
+		this.fnOriginalPopupOnAfterRendering ||= oPopup.onAfterRendering;
+		oPopup.onAfterRendering = function(...aArgs) {
+			var vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, aArgs);
 			oPopup[this._getFocusEventName("remove")]();
 			return vOriginalReturn;
 		}.bind(this);
@@ -451,8 +453,9 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._overrideRemoveFunctions = function(fnOriginalFunction) {
-		return function(oPopupElement) {
-			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, arguments);
+		return function(...aArgs) {
+			const [oPopupElement] = aArgs;
+			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
 			if (this._isSupportedPopup(oPopupElement)) {
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
@@ -548,7 +551,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Restores the Instance Manager AddDialogInstance/AddPopoverInstance, RemoveDialogInstance/RemovePopoverInstance methods and default blur event for popups
+	 * Restores the Instance Manager AddDialogInstance/AddPopoverInstance, RemoveDialogInstance/RemovePopoverInstance
+	 * methods and default blur event for popups
 	 *
 	 * @private
 	 */
@@ -579,7 +583,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._removePopupPatch = function(oPopupElement) {
-		var oPopup = oPopupElement.oPopup;
+		var {oPopup} = oPopupElement;
 		oPopup[this._getFocusEventName("add")]();
 		if (this.fnOriginalPopupOnAfterRendering) {
 			oPopup.onAfterRendering = this.fnOriginalPopupOnAfterRendering;

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.117.1
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -211,7 +211,7 @@ sap.ui.define([
 	ReloadManager.enableAutomaticStart = function(sLayer, oRootControl) {
 		var sFlexReference = FlexRuntimeInfoAPI.getFlexReference({element: oRootControl});
 		var vParameter = sFlexReference || true;
-		window.sessionStorage.setItem("sap.ui.rta.restart." + sLayer, vParameter);
+		window.sessionStorage.setItem(`sap.ui.rta.restart.${sLayer}`, vParameter);
 	};
 
 	/**
@@ -220,7 +220,7 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Layer} sLayer - Active layer
 	 */
 	ReloadManager.disableAutomaticStart = function(sLayer) {
-		window.sessionStorage.removeItem("sap.ui.rta.restart." + sLayer);
+		window.sessionStorage.removeItem(`sap.ui.rta.restart.${sLayer}`);
 	};
 
 	/**
@@ -230,7 +230,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if restart is needed
 	 */
 	ReloadManager.needsAutomaticStart = function(sLayer) {
-		return !!window.sessionStorage.getItem("sap.ui.rta.restart." + sLayer);
+		return !!window.sessionStorage.getItem(`sap.ui.rta.restart.${sLayer}`);
 	};
 
 	/**

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

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