@openui5/sap.ui.rta 1.134.0 → 1.135.0

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.m:
 
-Component: purify.js, version: 3.1.7
+Component: purify.js, version: 3.2.4
 Copyright: Mario Heiderich
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -462,7 +462,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.24.0
+Component: SAP Theming Base Content, version: 11.28.2
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.rta",
-  "version": "1.134.0",
+  "version": "1.135.0",
   "description": "OpenUI5 UI Library sap.ui.rta",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.134.0",
-    "@openui5/sap.ui.core": "1.134.0",
-    "@openui5/sap.ui.dt": "1.134.0",
-    "@openui5/sap.ui.fl": "1.134.0",
-    "@openui5/sap.ui.layout": "1.134.0"
+    "@openui5/sap.m": "1.135.0",
+    "@openui5/sap.ui.core": "1.135.0",
+    "@openui5/sap.ui.dt": "1.135.0",
+    "@openui5/sap.ui.fl": "1.135.0",
+    "@openui5/sap.ui.layout": "1.135.0"
   }
 }

package/src/sap/ui/rta/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.134.0</version>
+  <version>1.135.0</version>
 
   <documentation>SAPUI5 library with RTA controls.</documentation>
 

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

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.Client
 	 * @author SAP SE
 	 * @since 1.56.0
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -109,7 +109,7 @@ sap.ui.define([
 	 * @class The runtime authoring allows to adapt the fields of a running application.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.30
@@ -557,7 +557,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @param {boolean} bSkipSave - 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
+	 * @param {boolean} bSkipRestart - Stop RTA with or w/o checking if a reload is needed to apply e.g. personalization/manifest changes
 	 * @param {boolean} bSkipUnsavedChangesPrompt - Stop RTA without showing the "save changes" prompt to the user (e.g. closing of annotation dialog)
 	 * @returns {Promise} Resolves with undefined
 	 */
@@ -1055,6 +1055,8 @@ sap.ui.define([
 					"/translation/enabled",
 					this.bPersistedDataTranslatable || bTranslationRelevantDirtyChange
 				);
+				const bChangesNeedHardReload = this._bSavedChangesNeedReload || await this._oSerializer.needsReload();
+				this._oToolbarControlsModel.setProperty("/changesNeedHardReload", bChangesNeedHardReload);
 			}
 			this.fireUndoRedoStackModified();
 		} catch (e) {
@@ -1117,6 +1119,28 @@ sap.ui.define([
 		}
 	}
 
+	async function saveAndReload() {
+		if (this.canSave()) {
+			const sAction = await Utils.showMessageBox("warning", "MSG_SAVE_AND_RELOAD_DIALOG", {
+				actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
+				emphasizedAction: MessageBox.Action.OK
+			});
+			if (sAction === MessageBox.Action.CANCEL) {
+				return;
+			}
+		}
+		await this.save();
+		if (this._oVersionsModel.getProperty("/versioningEnabled")) {
+			await VersionsAPI.loadDraftForApplication({
+				control: this.getRootControlInstance(),
+				layer: this.getLayer()
+			});
+		}
+		RuntimeAuthoring.enableRestart(this.getLayer(), this.getRootControlInstance());
+		await this.stop(true, true, true);
+		ReloadManager.reloadPage();
+	}
+
 	function saveOnly(oEvent) {
 		const fnCallback = oEvent.getParameter("callback") || function() {};
 		const bVersionsEnabled = this._oVersionsModel.getProperty("/versioningEnabled");
@@ -1197,6 +1221,10 @@ sap.ui.define([
 				title: sVersionTitle,
 				displayedVersion: sDisplayedVersion
 			});
+			await PersistenceWriteAPI.updateResetAndPublishInfo({
+				selector: oSelector,
+				layer: sLayer
+			});
 			showMessageToast.call(this, "MSG_DRAFT_ACTIVATION_SUCCESS");
 			this.getPluginManager().getPlugin("toolHooks").setVersionWasActivated(true);
 			this.bInitialResetEnabled = true;
@@ -1460,6 +1488,7 @@ sap.ui.define([
 			? this.getChangeVisualization().openChangeCategorySelectionPopover.bind(this.getChangeVisualization())
 			: function() {};
 		oProperties.save = saveOnly.bind(this);
+		oProperties.saveAndReload = saveAndReload.bind(this);
 
 		let oToolbar;
 		if (Utils.isOriginalFioriToolbarAccessible()) {
@@ -1485,7 +1514,9 @@ sap.ui.define([
 		});
 		this.bPersistedDataTranslatable = false;
 
+		const bChangesNeedHardReload = this._bSavedChangesNeedReload || await this._oSerializer.needsReload();
 		this._oToolbarControlsModel = new JSONModel({
+			changesNeedHardReload: bChangesNeedHardReload,
 			modeSwitcher: this.getMode(),
 			undo: {
 				enabled: false
@@ -1565,7 +1596,7 @@ sap.ui.define([
 
 	/**
 	 * Delete all changes for current layer and root control's component.
-	 * In case of Base Applications (no App Variants) the App Descriptor Changes and UI Changes are saved
+	 * In case of Base Applications (no App Variants) the manifest Changes and UI Changes are saved
 	 * in different Flex Persistence instances, the changes for both places will be deleted. For App Variants
 	 * all the changes are saved in one place.
 	 *
@@ -1700,14 +1731,6 @@ sap.ui.define([
 		this._pElementModified = this._pElementModified.then(function() {
 			this.getPluginManager().handleStopCutPaste();
 
-			// Executed annotation commands will stop RTA and trigger a save + reload in RTA mode
-			if (oEvent.getParameter("hasAnnotationCommand")) {
-				this._pElementModified = Promise.resolve();
-				RuntimeAuthoring.enableRestart(this.getLayer(), this.getRootControlInstance());
-				return this.getCommandStack().pushAndExecute(oCommand)
-				.then(this.stop.bind(this, false, false, /* bSkipUnsavedChangesPrompt = */true));
-			}
-
 			if (oCommand instanceof BaseCommand) {
 				if (sNewControlID) {
 					scheduleOnCreated.call(this, sNewControlID, function(oElementOverlay) {

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 *
 	 * @private
 	 * @since 1.30

package/src/sap/ui/rta/appVariant/AppVariantManager.js

@@ -24,13 +24,13 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.53
 	 * @alias sap.ui.rta.appVariant.AppVariantManager
 	 */
-	var AppVariantManager = ManagedObject.extend("sap.ui.rta.appVariant.AppVariantManager", {
+	const AppVariantManager = ManagedObject.extend("sap.ui.rta.appVariant.AppVariantManager", {
 		metadata: {
 			library: "sap.ui.rta",
 			properties: {
@@ -45,7 +45,7 @@ sap.ui.define([
 	});
 
 	AppVariantManager.prototype._openDialog = function(fnCreate, fnCancel) {
-		var oDialog = new AppVariantDialog("appVariantDialog");
+		const oDialog = new AppVariantDialog("appVariantDialog");
 
 		oDialog.attachCreate(fnCreate);
 		oDialog.attachCancel(fnCancel);
@@ -63,14 +63,14 @@ sap.ui.define([
 	 * Returns the info required to create the app variant
 	 * @private
 	 */
-	AppVariantManager.prototype._prepareAppVariantData = function(oDescriptor, mParameters) {
+	AppVariantManager.prototype._prepareAppVariantData = function(oManifest, mParameters) {
 		return {
-			referenceAppId: oDescriptor["sap.app"].id,
+			referenceAppId: oManifest["sap.app"].id,
 			title: mParameters.title,
 			subTitle: mParameters.subTitle,
 			description: mParameters.description,
 			icon: mParameters.icon,
-			inbounds: oDescriptor["sap.app"].crossNavigation && oDescriptor["sap.app"].crossNavigation.inbounds ? oDescriptor["sap.app"].crossNavigation.inbounds : null
+			inbounds: oManifest["sap.app"].crossNavigation && oManifest["sap.app"].crossNavigation.inbounds ? oManifest["sap.app"].crossNavigation.inbounds : null
 		};
 	};
 
@@ -78,13 +78,13 @@ sap.ui.define([
 	 *
 	 * @param {Object} oAppVariantSpecificData - Contains the specific info needed to create the inline changes for the app variant
 	 * @param {sap.ui.fl.Selector} vSelector - Managed object or selector object
-	 * @returns {Promise[]} returns all the descriptor inline changes
-	 * @description Creates all the descriptor inline changes for different change types.
+	 * @returns {Promise[]} returns all the manifest inline changes
+	 * @description Creates all the manifest inline changes for different change types.
 	 */
 	AppVariantManager.prototype.createAllInlineChanges = function(oAppVariantSpecificData, vSelector) {
-		var sAppVariantId = AppVariantUtils.getId(oAppVariantSpecificData.referenceAppId);
-		var aAllInlineChangeOperations = [];
-		var oPropertyChange = {};
+		const sAppVariantId = AppVariantUtils.getId(oAppVariantSpecificData.referenceAppId);
+		const aAllInlineChangeOperations = [];
+		let oPropertyChange = {};
 
 		// create a inline change using a change type 'appdescr_app_setTitle'
 		oPropertyChange.content = AppVariantUtils.prepareTextsChange("title", oAppVariantSpecificData.title);
@@ -105,12 +105,12 @@ sap.ui.define([
 		/** *********************************************************Inbounds handling******************************************************************/
 		return AppVariantUtils.getInboundInfo(oAppVariantSpecificData.inbounds)
 		.then(function(oInboundInfo) {
-			var sCurrentRunningInboundId = oInboundInfo.currentRunningInbound;
+			const sCurrentRunningInboundId = oInboundInfo.currentRunningInbound;
 
 			// If there is no inbound, create a new inbound
 			if (oInboundInfo.addNewInboundRequired) {
 				// create a inline change using a change type 'appdescr_app_addNewInbound'
-				var oInlineChangePromise = AppVariantUtils.prepareAddNewInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData)
+				const oInlineChangePromise = AppVariantUtils.prepareAddNewInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData)
 				.then(function(oPropertyChange) {
 					return AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_addNewInbound", vSelector);
 				});
@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @description Creates the app variant with all inline changes in backend.
 	 */
 	AppVariantManager.prototype.createAppVariant = function(sAppVariantId, vSelector) {
-		var mPropertyBag = {
+		const mPropertyBag = {
 			id: sAppVariantId,
 			layer: this.getLayer()
 		};
@@ -158,21 +158,21 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @param {Object} oDescriptor - Contains the app variant descriptor information
+	 * @param {Object} oManifest - Contains the app variant manifest information
 	 * @param {boolean} bSaveAsTriggeredFromRtaToolbar - Boolean value which tells if 'Save As' is triggered from the UI adaptation header bar
 	 * @returns {Object} Contains the information to create the app variant
 	 * @description Processes the Save As Dialog and consolidates the input parameters from the 'Save As' dialog as an object.
 	 */
-	AppVariantManager.prototype.processSaveAsDialog = function(oDescriptor, bSaveAsTriggeredFromRtaToolbar) {
+	AppVariantManager.prototype.processSaveAsDialog = function(oManifest, bSaveAsTriggeredFromRtaToolbar) {
 		return new Promise(function(resolve, reject) {
-			var fnCreate = function(oResult) {
-				var mParameters = oResult.getParameters();
-				var oAppVariantData = this._prepareAppVariantData(oDescriptor, mParameters);
+			const fnCreate = function(oResult) {
+				const mParameters = oResult.getParameters();
+				const oAppVariantData = this._prepareAppVariantData(oManifest, mParameters);
 
 				resolve(oAppVariantData);
 			}.bind(this);
 
-			var fnCancel = function() {
+			const fnCancel = function() {
 				if (!bSaveAsTriggeredFromRtaToolbar) {
 					return RtaAppVariantFeature.onGetOverview(true, this.getLayer());
 				}
@@ -199,7 +199,7 @@ sap.ui.define([
 	 * @description Clears the RTA command stack
 	 */
 	AppVariantManager.prototype.clearRTACommandStack = function(bCopyUnsavedChanges) {
-		var oCommandStack = this.getCommandSerializer().getCommandStack();
+		const oCommandStack = this.getCommandSerializer().getCommandStack();
 		if (bCopyUnsavedChanges && oCommandStack.getAllExecutedCommands().length) {
 			return this._clearRTACommandStack();
 		}
@@ -217,10 +217,10 @@ sap.ui.define([
 	 * In 'Deletion' scenario: The app variant is unassigned from all catalogs.
 	 */
 	AppVariantManager.prototype.triggerCatalogPublishing = function(sAppVariantId, sReferenceAppId, bSaveAs) {
-		var fnTriggerCatalogOperation = bSaveAs ? AppVariantUtils.triggerCatalogAssignment : AppVariantUtils.triggerCatalogUnAssignment;
+		const fnTriggerCatalogOperation = bSaveAs ? AppVariantUtils.triggerCatalogAssignment : AppVariantUtils.triggerCatalogUnAssignment;
 		return fnTriggerCatalogOperation(sAppVariantId, this.getLayer(), sReferenceAppId)
 		.catch(function(oError) {
-			var sMessageKey = bSaveAs ? "MSG_CATALOG_ASSIGNMENT_FAILED" : "MSG_DELETE_APP_VARIANT_FAILED";
+			const sMessageKey = bSaveAs ? "MSG_CATALOG_ASSIGNMENT_FAILED" : "MSG_DELETE_APP_VARIANT_FAILED";
 			return AppVariantUtils.catchErrorDialog(oError, sMessageKey, sAppVariantId);
 		});
 	};
@@ -236,9 +236,9 @@ sap.ui.define([
 	 * In case of deletion: It checks whether the catalogs bound to the app variant have been unpublished and the deletion can be started.
 	 */
 	AppVariantManager.prototype.notifyKeyUserWhenPublishingIsReady = function(sIamId, sAppVarId, bCreation) {
-		var oS4HanaCloudBackend = new S4HanaCloudBackend();
+		const oS4HanaCloudBackend = new S4HanaCloudBackend();
 		return oS4HanaCloudBackend.notifyFlpCustomizingIsReady(sIamId, bCreation).catch(function(oError) {
-			var sMessageKey = bCreation ? "MSG_TILE_CREATION_FAILED" : "MSG_DELETE_APP_VARIANT_FAILED";
+			let sMessageKey = bCreation ? "MSG_TILE_CREATION_FAILED" : "MSG_DELETE_APP_VARIANT_FAILED";
 			if (!bCreation && oError.error === "locked") {
 				sMessageKey = "MSG_CATALOGS_LOCKED";
 			}

package/src/sap/ui/rta/appVariant/Feature.js

@@ -27,36 +27,36 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var oAppVariantOverviewDialog;
-	var oAppVariantManager;
-	var oRootControlRunningApp;
-	var oCommandSerializer;
-	var _oldUnloadHandler;
+	let oAppVariantOverviewDialog;
+	let oAppVariantManager;
+	let oRootControlRunningApp;
+	let oCommandSerializer;
+	let _oldUnloadHandler;
 
-	var fnGetDescriptor = function() {
+	const fnGetManifest = function() {
 		return FlexUtils.getAppDescriptor(oRootControlRunningApp);
 	};
 
-	var fnS4HanaRemoveBrowserCloseWarning = function() {
+	const fnS4HanaRemoveBrowserCloseWarning = function() {
 		window.onbeforeunload = _oldUnloadHandler;
 	};
 
-	var fnS4HanaAddBrowserCloseWarning = function(bCurrentlyAdapting) {
-		var sMessageKey = bCurrentlyAdapting ? "MSG_DO_NOT_CLOSE_BROWSER_CURRENTLY_ADAPTING" : "MSG_DO_NOT_CLOSE_BROWSER";
+	const fnS4HanaAddBrowserCloseWarning = function(bCurrentlyAdapting) {
+		const sMessageKey = bCurrentlyAdapting ? "MSG_DO_NOT_CLOSE_BROWSER_CURRENTLY_ADAPTING" : "MSG_DO_NOT_CLOSE_BROWSER";
 		_oldUnloadHandler = window.onbeforeunload;
 		window.onbeforeunload = AppVariantUtils.handleBeforeUnloadEvent;
 		return AppVariantUtils.showMessage(sMessageKey);
 	};
 
-	var fnTriggerCatalogAssignment = function(sAppVariantId, sReferenceAppId) {
+	const fnTriggerCatalogAssignment = function(sAppVariantId, sReferenceAppId) {
 		return oAppVariantManager.triggerCatalogPublishing(sAppVariantId, sReferenceAppId, true);
 	};
 
-	var fnTriggerCatalogUnAssignment = function(sAppVariantId) {
+	const fnTriggerCatalogUnAssignment = function(sAppVariantId) {
 		return oAppVariantManager.triggerCatalogPublishing(sAppVariantId, null, false);
 	};
 
-	var fnReloadOverviewDialog = function(bIsReloadNeeded, sCurrentLayer) {
+	const fnReloadOverviewDialog = function(bIsReloadNeeded, sCurrentLayer) {
 		if (oAppVariantOverviewDialog) {
 			// in case of S/4HANA Cloud when customer did not close overview
 			AppVariantUtils.closeOverviewDialog();
@@ -68,11 +68,11 @@ sap.ui.define([
 		return Promise.resolve();
 	};
 
-	var fnTriggerActionFlow = function(bSaveAsTriggeredFromRtaToolbar, bIsS4HanaCloud, sCurrentLayer) {
+	const fnTriggerActionFlow = function(bSaveAsTriggeredFromRtaToolbar, bIsS4HanaCloud, sCurrentLayer) {
 		return bSaveAsTriggeredFromRtaToolbar ? AppVariantUtils.navigateToFLPHomepage() : fnReloadOverviewDialog.call(this, !bIsS4HanaCloud, sCurrentLayer);
 	};
 
-	var fnTriggerPollingTileCreation = function(oResult, sAppVariantId) {
+	const fnTriggerPollingTileCreation = function(oResult, sAppVariantId) {
 		// In case of S/4HANA Cloud, oResult is filled from catalog assignment call
 		if (oResult && oResult.response && oResult.response.IAMId) {
 			if (!Array.isArray(oResult.response.CatalogIds) || oResult.response.CatalogIds.length === 0) {
@@ -86,7 +86,7 @@ sap.ui.define([
 		return Promise.resolve();
 	};
 
-	var fnTriggerPollingTileDeletion = function(oResult, sAppVariantId) {
+	const fnTriggerPollingTileDeletion = function(oResult, sAppVariantId) {
 		// In case of S/4HANA Cloud, oResult is filled from catalog unassignment call, do polling only if inProgress === true
 		if (oResult && oResult.response && oResult.response.IAMId && oResult.response.inProgress) {
 			return oAppVariantManager.notifyKeyUserWhenPublishingIsReady(oResult.response.IAMId, sAppVariantId, false);
@@ -104,16 +104,16 @@ sap.ui.define([
 	return {
 		// To see the overview of app variants, a key user has created from an app
 		onGetOverview(bAsKeyUser, sLayer) {
-			var oDescriptor = fnGetDescriptor();
+			const oManifest = fnGetManifest();
 
 			return new Promise(function(resolve) {
-				var fnCancel = function() {
+				const fnCancel = function() {
 					AppVariantUtils.closeOverviewDialog();
 				};
 
-				var sOverviewPath = "sap/ui/rta/appVariant/AppVariantOverviewDialog";
-				var oProperties = {
-					idRunningApp: oDescriptor["sap.app"].id,
+				const sOverviewPath = "sap/ui/rta/appVariant/AppVariantOverviewDialog";
+				const oProperties = {
+					idRunningApp: oManifest["sap.app"].id,
 					isOverviewForKeyUser: bAsKeyUser,
 					layer: sLayer
 				};
@@ -140,8 +140,8 @@ sap.ui.define([
 		 * When this method returns <code>false</code>, an app variant overview is shown only for a key user.
 		 */
 		isOverviewExtended() {
-			var oUriParams = new URLSearchParams(window.location.search);
-			var sMode = oUriParams.get("sap-ui-xx-app-variant-overview-extended");
+			const oUriParams = new URLSearchParams(window.location.search);
+			const sMode = oUriParams.get("sap-ui-xx-app-variant-overview-extended");
 			if (!sMode) {
 				return false;
 			}
@@ -149,8 +149,8 @@ sap.ui.define([
 			return sMode.toLowerCase() === "true";
 		},
 		isManifestSupported() {
-			var oDescriptor = fnGetDescriptor();
-			return AppVariantUtils.getManifirstSupport(oDescriptor["sap.app"].id);
+			const oManifest = fnGetManifest();
+			return AppVariantUtils.getManifirstSupport(oManifest["sap.app"].id);
 		},
 		/**
 		 * @param {object} oRootControl - Root control of an app (variant)
@@ -162,13 +162,13 @@ sap.ui.define([
 			oRootControlRunningApp = oRootControl;
 			oCommandSerializer = oLrepSerializer;
 
-			var oDescriptor = fnGetDescriptor();
+			const oManifest = fnGetManifest();
 
-			if (oDescriptor["sap.app"] && oDescriptor["sap.app"].id) {
+			if (oManifest["sap.app"] && oManifest["sap.app"].id) {
 				return FeaturesAPI.isSaveAsAvailable(sCurrentLayer).then(function(bIsSaveAsAvailable) {
 					if (bIsSaveAsAvailable) {
-						if (oDescriptor["sap.app"].crossNavigation && oDescriptor["sap.app"].crossNavigation.inbounds) {
-							return AppVariantUtils.getInboundInfo(oDescriptor["sap.app"].crossNavigation.inbounds);
+						if (oManifest["sap.app"].crossNavigation && oManifest["sap.app"].crossNavigation.inbounds) {
+							return AppVariantUtils.getInboundInfo(oManifest["sap.app"].crossNavigation.inbounds);
 						}
 						return AppVariantUtils.getInboundInfo();
 					}
@@ -181,23 +181,23 @@ sap.ui.define([
 		},
 		/**
 		 * @param {object} oRootControl - Root control of an app (variant)
-		 * @returns {Promise} Resolved promise with an app variant descriptor
-		 * @description Getting here an app variant descriptor from the layered repository.
+		 * @returns {Promise} Resolved promise with an app variant manifest
+		 * @description Getting here an app variant manifest from the layered repository.
 		 */
-		getAppVariantDescriptor(oRootControl) {
+		getAppVariantManifest(oRootControl) {
 			oRootControlRunningApp = oRootControl;
-			var oDescriptor = fnGetDescriptor();
-			if (oDescriptor["sap.app"] && oDescriptor["sap.app"].id) {
+			const oManifest = fnGetManifest();
+			if (oManifest["sap.app"] && oManifest["sap.app"].id) {
 				return AppVariantFactory.load({
-					id: oDescriptor["sap.app"].id
+					id: oManifest["sap.app"].id
 				});
 			}
 			return Promise.resolve(false);
 		},
-		_determineSelector(bIsRunningApp, oDescriptor) {
+		_determineSelector(bIsRunningApp, oManifest) {
 			return bIsRunningApp ? oRootControlRunningApp : {
-				appId: oDescriptor["sap.app"].id,
-				appVersion: oDescriptor["sap.app"].applicationVersion.version
+				appId: oManifest["sap.app"].id,
+				appVersion: oManifest["sap.app"].applicationVersion.version
 			};
 		},
 		/**
@@ -211,58 +211,58 @@ sap.ui.define([
 		 * The flag <code>bCopyUnsavedChanges</code> is <code>true</code> if a key user presses 'Save As' from the running app entry in the app variant overview dialog.
 		 */
 		onSaveAs(bSaveAsFromRta, bCopyUnsavedChanges, sCurrentLayer, oSelectedAppVariant) {
-			var bIsS4HanaCloud;
-			var oAppVariantSaveClosure;
-			var oDescriptor = fnGetDescriptor();
-			var bIsRunningApp = true;
+			let bIsS4HanaCloud;
+			let oAppVariantSaveClosure;
+			let oManifest = fnGetManifest();
+			let bIsRunningApp = true;
 
 			if (
 				oSelectedAppVariant
-				&& oSelectedAppVariant["sap.app"].id === oDescriptor["sap.app"].id
+				&& oSelectedAppVariant["sap.app"].id === oManifest["sap.app"].id
 			) {
 				// When an app variant is created on top of base app/app variant from the app variant overview dialog and root control is from the latter
 				bCopyUnsavedChanges = true;
-				oDescriptor = merge({}, oSelectedAppVariant);
+				oManifest = merge({}, oSelectedAppVariant);
 				oSelectedAppVariant = null;
 			} else if (oSelectedAppVariant) {
 				// When an app variant is created on top of app variant from the app variant overview dialog and root control is from base application
 				bIsRunningApp = false;
-				oDescriptor = merge({}, oSelectedAppVariant);
+				oManifest = merge({}, oSelectedAppVariant);
 				oSelectedAppVariant = null;
 			}
 
 			// Determine the selector
-			var vSelector = this._determineSelector(bIsRunningApp, oDescriptor);
+			const vSelector = this._determineSelector(bIsRunningApp, oManifest);
 
 			return new Promise(function(resolve) {
-				var fnProcessSaveAsDialog = function() {
-					return oAppVariantManager.processSaveAsDialog(oDescriptor, bSaveAsFromRta);
+				const fnProcessSaveAsDialog = function() {
+					return oAppVariantManager.processSaveAsDialog(oManifest, bSaveAsFromRta);
 				};
 
-				var fnCreateInlineChanges = function(oAppVariantSpecificData) {
+				const fnCreateInlineChanges = function(oAppVariantSpecificData) {
 					BusyIndicator.show();
 					return oAppVariantManager.createAllInlineChanges(oAppVariantSpecificData, vSelector);
 				};
 
-				var fnAddChangesToPersistence = function(aChanges) {
-					var aAllInlineChanges = aChanges.slice();
+				const fnAddChangesToPersistence = function(aChanges) {
+					const aAllInlineChanges = aChanges.slice();
 					return AppVariantUtils.addChangesToPersistence(aAllInlineChanges, vSelector);
 				};
 
-				var fnCreateAppVariant = function() {
-					var sAppVariantId = AppVariantUtils.getNewAppVariantId();
+				const fnCreateAppVariant = function() {
+					const sAppVariantId = AppVariantUtils.getNewAppVariantId();
 
-					// Based on the key user provided info, app variant descriptor is created
+					// Based on the key user provided info, app variant manifest is created
 					return oAppVariantManager.createAppVariant(sAppVariantId, vSelector)
 					.catch(function(oError) {
-						var sMessageKey = oError.messageKey;
+						let sMessageKey = oError.messageKey;
 						sMessageKey ||= "MSG_SAVE_APP_VARIANT_FAILED";
 
 						return AppVariantUtils.catchErrorDialog(oError, sMessageKey, sAppVariantId);
 					});
 				};
 
-				var fnClearRTACommandStack = function(oResult) {
+				const fnClearRTACommandStack = function(oResult) {
 					oAppVariantSaveClosure = null;
 					oAppVariantSaveClosure = merge({}, oResult.response);
 
@@ -270,8 +270,8 @@ sap.ui.define([
 					return oAppVariantManager.clearRTACommandStack(bCopyUnsavedChanges);
 				};
 
-				var fnResetDirtyFlag = function() {
-					var oUshellContainer = FlexUtils.getUshellContainer();
+				const fnResetDirtyFlag = function() {
+					const oUshellContainer = FlexUtils.getUshellContainer();
 					if (oUshellContainer && bCopyUnsavedChanges) {
 						// Tell FLP that no UI change is booked for the currently adapting app
 						oUshellContainer.setDirtyFlag(false);
@@ -283,19 +283,19 @@ sap.ui.define([
 					bIsS4HanaCloud = FlexRuntimeInfoAPI.isAtoEnabled();
 					// Shows the success message and closes the current app (if 'Save As' triggered from UI adaptation toolbar)
 					// or opens the app variant overview list (if 'Save As' triggered from App variant overview List)
-					var oSuccessInfo = AppVariantUtils.buildSuccessInfo(oAppVariantSaveClosure.id, bSaveAsFromRta, bIsS4HanaCloud);
+					const oSuccessInfo = AppVariantUtils.buildSuccessInfo(oAppVariantSaveClosure.id, bSaveAsFromRta, bIsS4HanaCloud);
 					return oAppVariantManager.showSuccessMessage(oSuccessInfo);
 				};
 
-				var fnShowCatalogAssignmentSuccessMessage = function() {
-					var oSuccessInfo = AppVariantUtils.buildFinalSuccessInfoS4HANACloud();
+				const fnShowCatalogAssignmentSuccessMessage = function() {
+					const oSuccessInfo = AppVariantUtils.buildFinalSuccessInfoS4HANACloud();
 					return oAppVariantManager.showSuccessMessage(oSuccessInfo);
 				};
 
-				var fnTriggerPlatformDependentFlow = function() {
+				const fnTriggerPlatformDependentFlow = function() {
 					BusyIndicator.show();
 					if (bIsS4HanaCloud) {
-						var oIAMResponse;
+						let oIAMResponse;
 						return fnS4HanaAddBrowserCloseWarning()
 						.then(function() {
 							return fnTriggerCatalogAssignment(oAppVariantSaveClosure.id, oAppVariantSaveClosure.reference);
@@ -328,7 +328,7 @@ sap.ui.define([
 
 					return fnProcessSaveAsDialog()
 					.then(fnCreateInlineChanges) // Create the inline changes for application variant
-					.then(fnAddChangesToPersistence) // Adds the descriptor inline changes to the persistence
+					.then(fnAddChangesToPersistence) // Adds the manifest inline changes to the persistence
 					.then(fnCreateAppVariant) // Creates the application variant and saves it to the layered repository
 					.then(fnClearRTACommandStack)
 					.then(fnTriggerSuccessMessage)
@@ -353,7 +353,7 @@ sap.ui.define([
 		 * @description Triggers a delete operation of the app variant.
 		 */
 		onDeleteFromOverviewDialog(sAppVariantId, bCurrentlyAdapting, sCurrentLayer) {
-			var bIsS4HanaCloud;
+			let bIsS4HanaCloud;
 			return new Promise(function(resolve) {
 				sap.ui.require(["sap/ui/rta/appVariant/AppVariantManager"], function(AppVariantManager) {
 					oAppVariantManager ||= new AppVariantManager({
@@ -362,28 +362,28 @@ sap.ui.define([
 						layer: sCurrentLayer
 					});
 
-					var fnDeleteAppVariant = function() {
+					const fnDeleteAppVariant = function() {
 						return oAppVariantManager.deleteAppVariant(sAppVariantId)
 						.catch(function(oError) {
 							if (oError === "cancel") {
 								return Promise.reject("cancel");
 							}
-							var sMessageKey = oError.messageKey;
+							let sMessageKey = oError.messageKey;
 							sMessageKey ||= "MSG_DELETE_APP_VARIANT_FAILED";
 							return AppVariantUtils.catchErrorDialog(oError, sMessageKey, sAppVariantId);
 						});
 					};
 
-					var fnDeleteSuccessMessage = function() {
+					const fnDeleteSuccessMessage = function() {
 						AppVariantUtils.closeOverviewDialog();
-						var oSuccessInfo = AppVariantUtils.buildDeleteSuccessMessage(sAppVariantId, bIsS4HanaCloud);
+						const oSuccessInfo = AppVariantUtils.buildDeleteSuccessMessage(sAppVariantId, bIsS4HanaCloud);
 						return oAppVariantManager.showSuccessMessage(oSuccessInfo);
 					};
 
-					var fnTriggerS4HanaPolling = function() {
+					const fnTriggerS4HanaPolling = function() {
 						bIsS4HanaCloud = FlexRuntimeInfoAPI.isAtoEnabled();
 						if (bIsS4HanaCloud) {
-							var oIAMResponse;
+							let oIAMResponse;
 							return fnS4HanaAddBrowserCloseWarning(bCurrentlyAdapting)
 							.then(function() {
 								return fnTriggerCatalogUnAssignment(sAppVariantId);
@@ -400,7 +400,7 @@ sap.ui.define([
 						return Promise.resolve();
 					};
 
-					var fnTriggerS4HanaRefresh = function() {
+					const fnTriggerS4HanaRefresh = function() {
 						if (bIsS4HanaCloud) {
 							fnS4HanaRemoveBrowserCloseWarning();
 						}