@openui5/sap.ui.rta 1.134.0 → 1.135.0

package/src/sap/ui/rta/plugin/annotations/AnnotationChangeDialog.js

@@ -7,18 +7,22 @@
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Fragment",
+	"sap/ui/dt/ElementUtil",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/rta/plugin/annotations/AnnotationChangeDialogController",
+	"sap/ui/rta/plugin/annotations/AnnotationTypes",
 	"sap/ui/rta/Utils"
 ], function(
 	ManagedObject,
 	Fragment,
+	ElementUtil,
 	PersistenceWriteAPI,
 	JSONModel,
 	ResourceModel,
 	AnnotationChangeDialogController,
+	AnnotationTypes,
 	RtaUtils
 ) {
 	"use strict";
@@ -27,7 +31,7 @@ sap.ui.define([
 	 * @class Constructor for a new sap.ui.rta.plugin.annotations.AnnotationChangeDialog.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @since 1.132
 	 * @private
@@ -35,6 +39,15 @@ sap.ui.define([
 	 */
 	const AnnotationChangeDialog = ManagedObject.extend("sap.ui.rta.plugin.annotations.AnnotationChangeDialog");
 
+	function replaceCurrentValueWithTextFromControl(aProperties, sPreSelectedProperty, oControl) {
+		const oProperty = aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedProperty);
+		const aNewLabel = ElementUtil.getLabelForElement(oControl);
+		if (oProperty && aNewLabel) {
+			oProperty.currentValue = aNewLabel;
+			oProperty.originalValue = aNewLabel;
+		}
+	}
+
 	AnnotationChangeDialog.prototype._createDialog = async function() {
 		this._oController = new AnnotationChangeDialogController();
 		const oDialog = await Fragment.load({
@@ -63,6 +76,8 @@ sap.ui.define([
 	 * @property {string} properties.annotationPath - Path of the property
 	 * @property {string} properties.propertyName - Name of the property
 	 * @property {string} properties.currentValue - Current value of the property
+	 * @property {string} [properties.label] - Label of the property. If not given, the property name is used
+	 * @property {string} [properties.tooltip] - Tooltip of the property
 	 * @property {object[]} possibleValues - Array of possible values for value list type properties
 	 * @property {string} possibleValues.key - Key of the option
 	 * @property {string} possibleValues.text - Text of the option
@@ -83,10 +98,15 @@ sap.ui.define([
 	 *
 	 * @typedef {object} sap.ui.rta.plugin.annotations.AnnotationChangeDefinition
 	 * @property {string} annotationChangeType - Change type
+	 * @property {string} serviceUrl - Url of the OData service
 	 * @property {object} content - Change content
 	 * @property {string} content.annotationPath - Path of the property
 	 * @property {string} content.value - New value
-	 * @property {string} serviceUrl - Url of the OData service
+	 * @property {string} content.text - New value as translatable text. If given, the value is ignored
+	 * @property {object} [content.objectTemplateInfo] - Object template to construct a return object.
+	 * If given the applyChange function will return an object as value, which is parsed from the template string.
+	 * @property {string} [content.objectTemplateInfo.templateAsString] - Stringified template to be used for constructing the return object
+	 * @property {string} [content.objectTemplateInfo.placeholder] - Placeholder in the template string. Will be replaced by the new value
 	 * @public
 	 */
 
@@ -110,20 +130,31 @@ sap.ui.define([
 			delegate: oDelegate,
 			control: oControl,
 			annotation: sAnnotation,
-			description: sAnnotationDescription = ""
+			description: sAnnotationDescription,
+			singleRename: bSingleRename
 		} = mPropertyBag;
 		const {
 			serviceUrl: sServiceUrl,
 			properties: aDelegateProperties,
-			possibleValues: aPossibleValues,
+			possibleValues: aDelegatePossibleValues,
 			preSelectedProperty: sPreSelectedPropertyKey
-		} = oDelegate.getAnnotationsChangeInfo(oControl, sAnnotation);
+		} = await oDelegate.getAnnotationsChangeInfo(oControl, sAnnotation);
+
+		const bObjectAsKey = !!aDelegatePossibleValues?.some((oPossibleValue) => typeof oPossibleValue.key === "object");
+		// the key could be an object which does not work as property for the Select control
+		// therefore the key must be stringified and later parsed
 		const aProperties = aDelegateProperties.map((oProperty) => ({
 			...oProperty,
-			originalValue: oProperty.currentValue
+			currentValue: bObjectAsKey ? JSON.stringify(oProperty.currentValue) : oProperty.currentValue,
+			originalValue: bObjectAsKey ? JSON.stringify(oProperty.currentValue) : oProperty.currentValue,
+			label: oProperty.label || oProperty.propertyName
+		}));
+		const aPossibleValues = (aDelegatePossibleValues || []).map((oPossibleValue) => ({
+			...oPossibleValue,
+			key: bObjectAsKey ? JSON.stringify(oPossibleValue.key) : oPossibleValue.key
 		}));
 
-		aProperties.sort((oProperty1, oProperty2) => oProperty1.propertyName.localeCompare(oProperty2.propertyName));
+		aProperties.sort((oProperty1, oProperty2) => oProperty1.label.localeCompare(oProperty2.label));
 
 		const aExistingChanges = PersistenceWriteAPI._getAnnotationChanges({
 			control: oControl
@@ -136,16 +167,30 @@ sap.ui.define([
 		this._oDialog ||= await this._createDialog();
 
 		const sFilterText = sPreSelectedPropertyKey
-			? aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedPropertyKey).propertyName
+			? aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedPropertyKey).label
 			: "";
+		// default size limit is 100, but we need to display all properties.
+		// As the list size is not dynamic, we can set the size limit to the number of properties
+		// the size influences all binding sizes, so we only set it if the number of properties is greater than 100
+		if (aProperties.length > 100) {
+			this.oChangeAnnotationModel.setSizeLimit(aProperties.length);
+		}
+
+		if (bSingleRename) {
+			replaceCurrentValueWithTextFromControl(aProperties, sPreSelectedPropertyKey, oControl);
+		}
+
 		this.oChangeAnnotationModel.setData({
+			objectAsKey: bObjectAsKey,
+			control: oControl,
 			title: sAnnotationTitle,
-			description: sAnnotationDescription,
+			description: sAnnotationDescription || "",
 			properties: aProperties, // all properties
 			changedProperties: aProperties.filter(({ annotationPath }) => aChangedAnnotations.includes(annotationPath)),
 			propertiesToDisplay: aProperties, // switches dynamically between all properties and changed properties
 			showChangedPropertiesOnly: false,
 			filterText: sFilterText,
+			singleRename: bSingleRename || false,
 			possibleValues: aPossibleValues,
 			valueType: sAnnotationValueType,
 			serviceUrl: sServiceUrl
@@ -153,7 +198,11 @@ sap.ui.define([
 		if (sFilterText) {
 			this._oController.filterProperties(sFilterText);
 		}
+		// Ensure that the model is fully refreshed before opening the dialog
+		this.oChangeAnnotationModel.refresh(true);
 		const aChangedProperties = await this._openDialog();
+		// reset filter to not have a filtered list when opening the dialog again
+		this._oController.filterProperties("");
 		this._oDialog.close();
 		return aChangedProperties;
 	};

package/src/sap/ui/rta/plugin/annotations/AnnotationChangeDialogController.js

@@ -6,6 +6,7 @@
  */
 sap.ui.define([
 	"sap/m/Input",
+	"sap/m/Label",
 	"sap/m/Select",
 	"sap/m/Switch",
 	"sap/ui/core/mvc/Controller",
@@ -17,6 +18,7 @@ sap.ui.define([
 	"sap/ui/rta/plugin/annotations/AnnotationTypes"
 ], function(
 	Input,
+	Label,
 	Select,
 	Switch,
 	Controller,
@@ -33,7 +35,7 @@ sap.ui.define([
 	 * @class Controller for the AnnotationChangeDialog.
 	 * @extends sap.ui.core.mvc.Controller
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @since 1.132
 	 * @private
@@ -50,7 +52,7 @@ sap.ui.define([
 	AnnotationChangeDialogController.prototype.filterProperties = function(sQuery) {
 		const aFilters = [];
 		if (sQuery && sQuery.length > 0) {
-			const filter = new Filter("propertyName", FilterOperator.Contains, sQuery);
+			const filter = new Filter("label", FilterOperator.Contains, sQuery);
 			aFilters.push(filter);
 		}
 
@@ -89,10 +91,12 @@ sap.ui.define([
 					annotationPath: oProperty.annotationPath
 				}
 			};
-			oChangeSpecificData.content[oModelData.valueType === AnnotationTypes.StringType ? "text" : "value"] = oProperty.currentValue;
+			oChangeSpecificData.content[oModelData.valueType === AnnotationTypes.StringType ? "text" : "value"] =
+			oModelData.objectAsKey ? JSON.parse(oProperty.currentValue) : oProperty.currentValue;
 			return oChangeSpecificData;
 		})
 		.filter(Boolean);
+
 		this._fnResolveAfterClose(aChanges);
 	};
 
@@ -151,7 +155,10 @@ sap.ui.define([
 
 		return new FormElement({
 			id: sId,
-			label: "{propertyName}",
+			label: new Label({
+				text: "{= ${label} || ${propertyName}}",
+				tooltip: "{tooltip}"
+			}),
 			fields: [
 				createEditorField.call(this, sValueType)
 			]

package/src/sap/ui/rta/plugin/annotations/AnnotationPlugin.js

@@ -7,28 +7,39 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/DesignTime",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/dt/Util",
+	"sap/ui/fl/write/api/PersistenceWriteAPI",
+	"sap/ui/fl/Utils",
 	"sap/ui/rta/plugin/annotations/AnnotationChangeDialog",
+	"sap/ui/rta/plugin/annotations/AnnotationTypes",
 	"sap/ui/rta/plugin/Plugin"
 ], function(
 	BaseLog,
 	DesignTime,
+	JsControlTreeModifier,
 	DtUtil,
+	PersistenceWriteAPI,
+	Utils,
 	AnnotationChangeDialog,
+	AnnotationTypes,
 	Plugin
 ) {
 	"use strict";
 
-	async function handleCompositeCommand(oElement, oAction, aChanges) {
+	async function handleCompositeCommand(oElement, oAction, aAnnotationChanges, aLegacyRenameChanges) {
 		const oCompositeCommand = await this.getCommandFactory().getCommandFor(oElement, "composite");
-		for (const oChange of aChanges) {
+		for (const oChange of aAnnotationChanges) {
+			// aLegacyRenameChanges is only passed for singleRename scenarios, where there is only one annotation change to be saved
+			// so we can simply add it in the loop
 			const oAnnotationCommand = await this.getCommandFactory().getCommandFor(
 				oElement,
 				"annotation",
 				{
 					changeType: oAction.changeType,
 					serviceUrl: oChange.serviceUrl,
-					content: oChange.content
+					content: {...oChange.content, objectTemplateInfo: oAction.objectTemplateInfo},
+					changesToDelete: aLegacyRenameChanges
 				}
 			);
 			oCompositeCommand.addCommand(oAnnotationCommand);
@@ -36,8 +47,7 @@ sap.ui.define([
 
 		if (oCompositeCommand.getCommands().length > 0) {
 			this.fireElementModified({
-				command: oCompositeCommand,
-				hasAnnotationCommand: true
+				command: oCompositeCommand
 			});
 		}
 	}
@@ -59,7 +69,7 @@ sap.ui.define([
 	}
 
 	function getActionIcon(oAnnotationAction) {
-		const sDefaultIcon = "sap-icon://request";
+		const sDefaultIcon = oAnnotationAction.type === AnnotationTypes.StringType ? "sap-icon://edit" : "sap-icon://request";
 		const sActionIcon = oAnnotationAction.icon;
 		if (!sActionIcon) {
 			return sDefaultIcon;
@@ -71,6 +81,14 @@ sap.ui.define([
 		return sActionIcon;
 	}
 
+	function checkDesigntimeActionProperties(oAction) {
+		if (oAction.singleRename && !oAction.controlBasedRenameChangeType) {
+			BaseLog.error("When using singleRename, controlBasedRenameChangeType must also be defined");
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Constructor for a new Annotation Plugin.
 	 * Multiple annotation actions can be defined for the same overlay. Each action is represented by a menu item.
@@ -82,7 +100,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.132
@@ -97,7 +115,8 @@ sap.ui.define([
 			}
 		});
 
-	const sPluginId = "CTX_ANNOTATION";
+	const sPluginIdDefault = "CTX_ANNOTATION";
+	const sPluginIdSingleLabelChange = "CTX_ANNOTATION_CHANGE_SINGLE_LABEL";
 
 	AnnotationPlugin.prototype.init = function(...aArgs) {
 		Plugin.prototype.init.apply(this, aArgs);
@@ -169,17 +188,32 @@ sap.ui.define([
 		const oElement = oElementOverlay.getElement();
 
 		try {
-			const aChanges = await this._oDialog.openDialogAndHandleChanges({
+			const aAnnotationChanges = await this._oDialog.openDialogAndHandleChanges({
 				title: getActionText(oElementOverlay, oAction),
 				type: oAction.type,
 				control: oElement,
 				delegate: oAction.delegate,
 				annotation: oAction.annotation,
-				description: oAction.description
+				description: oAction.description,
+				singleRename: oAction.singleRename,
+				controlBasedRenameChangeType: oAction.controlBasedRenameChangeType
 			});
 
-			if (aChanges.length > 0) {
-				return handleCompositeCommand.call(this, oElement, oAction, aChanges);
+			if (aAnnotationChanges.length) {
+				const aLegacyRenameChanges = [];
+				// for single rename scenarios we are able to remove any existing control based rename change in the context of
+				// the given control and change type
+				if (oAction.singleRename) {
+					const aUIChanges = await PersistenceWriteAPI._getUIChanges({
+						selector: oElement
+					});
+					const oAppComponent = Utils.getAppComponentForControl(oElement);
+					aLegacyRenameChanges.push(...aUIChanges.filter((oChange) =>
+						oChange.getChangeType() === oAction.controlBasedRenameChangeType
+						&& JsControlTreeModifier.getControlIdBySelector(oChange.getSelector(), oAppComponent) === oElement.getId()
+					));
+				}
+				return handleCompositeCommand.call(this, oElement, oAction, aAnnotationChanges, aLegacyRenameChanges);
 			}
 			return undefined;
 		} catch (vError) {
@@ -187,7 +221,7 @@ sap.ui.define([
 				vError,
 				"AnnotationPlugin#handler",
 				"Error occurred during handler execution",
-				"sap.ui.rta.plugin.annotations.annotationplugin"
+				"sap.ui.rta.plugin.annotations.AnnotationPlugin"
 			);
 		}
 	};
@@ -205,16 +239,19 @@ sap.ui.define([
 
 		const aMenuItems = [];
 		if (oAnnotationActionMap) {
-			const iRank = this.getRank(sPluginId);
-
 			if (this._isEditableByPlugin(oResponsibleElementOverlay) === undefined) {
 				// The responsibleElement editableByPlugin state was not evaluated yet e.g. because it
 				// has no visible geometry, thus evaluateEditable now
 				await this.evaluateEditable([oResponsibleElementOverlay], { onRegistration: false });
 			}
-			Object.values(oAnnotationActionMap).forEach(function(oAction, iIndex) {
+			Object.entries(oAnnotationActionMap).forEach(function([sKey, oAction], iIndex) {
+				const sPluginId = oAction.type === AnnotationTypes.StringType && oAction.singleRename
+					? sPluginIdSingleLabelChange
+					: sPluginIdDefault;
+				const iRank = this.getRank(sPluginId);
 				if (
 					this.isAvailable([oResponsibleElementOverlay])
+					&& checkDesigntimeActionProperties(oAction)
 				) {
 					const sActionText = getActionText(oResponsibleElementOverlay, oAction);
 					if (!sActionText) {
@@ -222,7 +259,7 @@ sap.ui.define([
 					}
 
 					aMenuItems.push({
-						id: sPluginId + iIndex,
+						id: `${sPluginId}_${sKey}`,
 						rank: iRank + iIndex,
 						text: sActionText,
 						icon: getActionIcon(oAction),

package/src/sap/ui/rta/plugin/iframe/AddIFrame.js

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @class The AddIFrame allows trigger AddIFrame operations on the overlay.
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -159,7 +159,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Action
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @private
 	 * @ui5-restricted
 	 *

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.ControllerExtension
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @private
 	 * @ui5-restricted
 	*/
@@ -62,11 +62,17 @@ sap.ui.define([
 				add(sCodeRef, sViewId) {
 					var oFlexSettings = oRta.getFlexSettings();
 					if (!oFlexSettings.developerMode) {
-						throw DtUtil.createError("service.ControllerExtension#add", "code extensions can only be created in developer mode", "sap.ui.rta");
+						throw DtUtil.createError(
+							"service.ControllerExtension#add", "code extensions can only be created in developer mode",
+							"sap.ui.rta"
+						);
 					}
 
 					if (!sCodeRef) {
-						throw DtUtil.createError("service.ControllerExtension#add", "can't create controller extension without codeRef", "sap.ui.rta");
+						throw DtUtil.createError(
+							"service.ControllerExtension#add", "can't create controller extension without codeRef",
+							"sap.ui.rta"
+						);
 					}
 
 					if (!sCodeRef.endsWith(".js")) {
@@ -75,7 +81,7 @@ sap.ui.define([
 
 					var oView = Element.getElementById(sViewId);
 					var oAppComponent = FlexUtils.getAppComponentForControl(oView);
-					var sControllerName = oView.getControllerName && oView.getControllerName() || oView.getController() && oView.getController().getMetadata().getName();
+					var sControllerName = oView.getControllerModuleName() ? `module:${oView.getControllerModuleName()}` : oView.getController()?.getMetadata().getName();
 					// Calculate moduleName for code extension
 					var sReference = FlexRuntimeInfoAPI.getFlexReference({element: oAppComponent});
 					var sModuleName = sReference.replace(/\.Component/g, "").replace(/\./g, "/");

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Outline
 	 * @author SAP SE
 	 * @since 1.56
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @private
 	 * @ui5-restricted
 	 */

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.134.0
+	 * @version 1.135.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.134.0
+	 * @version 1.135.0
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.SupportTools
 	 * @author SAP SE
 	 * @since 1.106
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/themes/base/Toolbar.adaptation.less

@@ -25,6 +25,11 @@
 			}
 		}
 
+		.sapUiRtaHardReloadInfoButton .sapMBtnAttention {
+			background-color: transparent;
+			border-color: transparent;
+		}
+
 		.sapMFlexBox {
 			margin-left: 0;
 			height: 2.5rem; //40px

package/src/sap/ui/rta/toolbar/Adaptation.fragment.xml

@@ -20,14 +20,32 @@
 						class="sapUiRtaVersionButton"
 						icon="sap-icon://megamenu"
 						iconFirst="false"
-						visible="{= (${versions>/versioningEnabled} && ${controls>/modeSwitcher} === 'adaptation')}"
+						visible="{= (${versions>/versioningEnabled} && ${controls>/modeSwitcher} === 'adaptation' && ${controls>/changesNeedHardReload} === false)}"
 						text="{parts: [{path: 'versions>/versions'}, {path: 'versions>/displayedVersion'}], formatter: '.formatVersionButtonText'}"
-						tooltip="{parts: [{path: 'versions>/versions'}, {path: 'versions>/displayedVersion'}], formatter: '.formatVersionButtonText'}"
+						tooltip="{i18n>TOL_SHOW_VERSION_HISTORY}"
 						press=".showVersionHistory">
 					<layoutData>
 						<OverflowToolbarLayoutData priority="NeverOverflow"/>
 					</layoutData>
 				</Button>
+				<Button
+					id="sapUiRta_hardReloadButton"
+					type="Attention"
+					visible="{= ${controls>/changesNeedHardReload} === true}"
+					text="{i18n>SAVE_AND_RELOAD}"
+					iconFirst="true"
+					icon="sap-icon://refresh"
+					press=".saveAndReloadApp"
+				/>
+				<Button
+					id="sapUiRta_hardReloadInfoButton"
+					type="Attention"
+					visible="{= ${controls>/changesNeedHardReload} === true}"
+					press=".showHardReloadInfoPopover"
+					icon="sap-icon://question-mark"
+					class="sapUiNoMarginBeginEnd sapUiRtaHardReloadInfoButton"
+					tooltip="{i18n>TOL_SHOW_HARD_RELOAD_INFO}"
+				/>
 				<toolbar:OverflowToolbarButton
 						id="sapUiRta_activate"
 						icon="sap-icon://activate"
@@ -65,7 +83,7 @@
 						id="sapUiRta_modeSwitcher"
 						selectionChange=".modeChange"
 						selectedKey="{controls>/modeSwitcher}"
-						width="auto" >
+						width="100%" >
 					<items>
 						<SegmentedButtonItem
 								id="sapUiRta_adaptationSwitcherButton"

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

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	"./AdaptationRenderer",
 	"sap/base/Log",
 	"sap/m/MessageBox",
+	"sap/m/MessageStrip",
+	"sap/m/Popover",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/core/BusyIndicator",
 	"sap/ui/core/Element",
 	"sap/ui/core/Fragment",
@@ -18,17 +20,20 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/performance/Measurement",
 	"sap/ui/rta/appVariant/Feature",
-	"sap/ui/rta/toolbar/Base",
 	"sap/ui/rta/toolbar/contextBased/ManageAdaptations",
 	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
 	"sap/ui/rta/toolbar/translation/Translation",
 	"sap/ui/rta/toolbar/versioning/Versioning",
+	"sap/ui/rta/toolbar/AdaptationRenderer",
+	"sap/ui/rta/toolbar/Base",
 	"sap/ui/rta/util/whatsNew/WhatsNewOverview",
 	"sap/ui/rta/Utils"
 ], function(
-	AdaptationRenderer,
 	Log,
 	MessageBox,
+	MessageStrip,
+	Popover,
+	MessageType,
 	BusyIndicator,
 	Element,
 	Fragment,
@@ -39,11 +44,12 @@ sap.ui.define([
 	JSONModel,
 	Measurement,
 	AppVariantFeature,
-	Base,
 	ManageAdaptations,
 	SaveAsAdaptation,
 	Translation,
 	Versioning,
+	AdaptationRenderer,
+	Base,
 	WhatsNewOverview,
 	Utils
 ) {
@@ -57,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.135.0
 	 *
 	 * @constructor
 	 * @private
@@ -85,7 +91,8 @@ sap.ui.define([
 				switchVersion: {},
 				switchAdaptation: {},
 				deleteAdaptation: {},
-				openChangeCategorySelectionPopover: {}
+				openChangeCategorySelectionPopover: {},
+				saveAndReload: {}
 			}
 		}
 	});
@@ -242,6 +249,23 @@ sap.ui.define([
 		return this.getExtension("versioning", Versioning).openActivateVersionDialog(sDisplayedVersion);
 	};
 
+	Adaptation.prototype.showHardReloadInfoPopover = function(oEvent) {
+		this._oHardReloadInfoPopover ||= new Popover({
+			placement: "Bottom",
+			content: [
+				new MessageStrip({
+					text: this.getTextResources().getText("MSG_HARD_RELOAD_INFO"),
+					type: MessageType.Warning,
+					showIcon: true
+				})
+			],
+			showHeader: false,
+			contentWidth: "18rem"
+		});
+		this.addDependent(this._oHardReloadInfoPopover);
+		this._oHardReloadInfoPopover.openBy(oEvent.getSource());
+	};
+
 	Adaptation.prototype.showActionsMenu = function(oEvent) {
 		var oButton = oEvent.getSource();
 		if (!this._oActionsMenuFragment) {
@@ -326,7 +350,9 @@ sap.ui.define([
 				formatVersionButtonText: this.formatVersionButtonText.bind(this),
 				showVersionHistory: this.showVersionHistory.bind(this),
 				showActionsMenu: this.showActionsMenu.bind(this),
-				showFeedbackForm: this.showFeedbackForm.bind(this)
+				showFeedbackForm: this.showFeedbackForm.bind(this),
+				showHardReloadInfoPopover: this.showHardReloadInfoPopover.bind(this),
+				saveAndReloadApp: this.eventHandler.bind(this, "SaveAndReload")
 			}
 		});
 	};

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

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