@openui5/sap.ui.rta 1.132.1 → 1.134.0

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

@@ -7,19 +7,19 @@
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Fragment",
-	"sap/ui/fl/apply/api/FlexRuntimeInfoAPI",
 	"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/AnnotationChangeDialogController",
+	"sap/ui/rta/Utils"
 ], function(
 	ManagedObject,
 	Fragment,
-	FlexRuntimeInfoAPI,
 	PersistenceWriteAPI,
 	JSONModel,
 	ResourceModel,
-	AnnotationChangeDialogController
+	AnnotationChangeDialogController,
+	RtaUtils
 ) {
 	"use strict";
 
@@ -27,7 +27,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.132.1
+	 * @version 1.134.0
 	 * @constructor
 	 * @since 1.132
 	 * @private
@@ -37,19 +37,20 @@ sap.ui.define([
 
 	AnnotationChangeDialog.prototype._createDialog = async function() {
 		this._oController = new AnnotationChangeDialogController();
-		const oPopover = await Fragment.load({
+		const oDialog = await Fragment.load({
 			name: "sap.ui.rta.plugin.annotations.AnnotationChangeDialog",
 			controller: this._oController
 		});
+		oDialog.addStyleClass(RtaUtils.getRtaStyleClassName());
 		this.oChangeAnnotationModel = new JSONModel();
-		oPopover.setModel(this.oChangeAnnotationModel);
+		oDialog.setModel(this.oChangeAnnotationModel);
 		const oI18nModel = new ResourceModel({ bundleName: "sap.ui.rta.messagebundle" });
-		oPopover.setModel(oI18nModel, "i18n");
-		return oPopover;
+		oDialog.setModel(oI18nModel, "i18n");
+		return oDialog;
 	};
 
 	AnnotationChangeDialog.prototype._openDialog = function() {
-		this._oPopover.open();
+		this._oDialog.open();
 		return this._oController.initialize();
 	};
 
@@ -66,8 +67,7 @@ sap.ui.define([
 	 * @property {string} possibleValues.key - Key of the option
 	 * @property {string} possibleValues.text - Text of the option
 	 * @property {string} [preSelectedProperty] - Name of the property that should be filtered for initially
-	 * @private
-	 * @ui5-restricted
+	 * @public
 	 */
 
 	/**
@@ -75,8 +75,7 @@ sap.ui.define([
 	 * @property {sap.ui.core.Control} oControl - Control for which the annotation change is made
 	 * @property {string} sAnnotation - Annotation name
 	 * @returns {sap.ui.rta.plugin.annotations.AnnotationChangeInfo} - Annotation change info
-	 * @private
-	 * @ui5-restricted
+	 * @public
 	 */
 
 	/**
@@ -88,8 +87,7 @@ sap.ui.define([
 	 * @property {string} content.annotationPath - Path of the property
 	 * @property {string} content.value - New value
 	 * @property {string} serviceUrl - Url of the OData service
-	 * @private
-	 * @ui5-restricted
+	 * @public
 	 */
 
 	/**
@@ -116,10 +114,16 @@ sap.ui.define([
 		} = mPropertyBag;
 		const {
 			serviceUrl: sServiceUrl,
-			properties: aProperties,
+			properties: aDelegateProperties,
 			possibleValues: aPossibleValues,
 			preSelectedProperty: sPreSelectedPropertyKey
 		} = oDelegate.getAnnotationsChangeInfo(oControl, sAnnotation);
+		const aProperties = aDelegateProperties.map((oProperty) => ({
+			...oProperty,
+			originalValue: oProperty.currentValue
+		}));
+
+		aProperties.sort((oProperty1, oProperty2) => oProperty1.propertyName.localeCompare(oProperty2.propertyName));
 
 		const aExistingChanges = PersistenceWriteAPI._getAnnotationChanges({
 			control: oControl
@@ -129,12 +133,7 @@ sap.ui.define([
 			return oChange.getContent().annotationPath;
 		});
 
-		this._oPopover ||= await this._createDialog();
-
-		const oOriginalProperties = {};
-		aProperties.forEach(({ annotationPath, currentValue }) => {
-			oOriginalProperties[annotationPath] = currentValue;
-		});
+		this._oDialog ||= await this._createDialog();
 
 		const sFilterText = sPreSelectedPropertyKey
 			? aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedPropertyKey).propertyName
@@ -144,35 +143,25 @@ sap.ui.define([
 			description: sAnnotationDescription,
 			properties: aProperties, // all properties
 			changedProperties: aProperties.filter(({ annotationPath }) => aChangedAnnotations.includes(annotationPath)),
-			propertiesToDisplay: aProperties, // switches dynamcially between all properties and changed properties
+			propertiesToDisplay: aProperties, // switches dynamically between all properties and changed properties
 			showChangedPropertiesOnly: false,
 			filterText: sFilterText,
 			possibleValues: aPossibleValues,
-			valueType: sAnnotationValueType
+			valueType: sAnnotationValueType,
+			serviceUrl: sServiceUrl
 		});
 		if (sFilterText) {
 			this._oController.filterProperties(sFilterText);
 		}
-		const oChangedProperties = await this._openDialog();
-		this._oPopover.close();
-		return Object.entries(oChangedProperties).map(([sPath, vNewValue]) => {
-			if (oOriginalProperties[sPath] === vNewValue) {
-				return null;
-			}
-			return {
-				serviceUrl: sServiceUrl,
-				content: {
-					annotationPath: sPath,
-					value: vNewValue
-				}
-			};
-		}).filter(Boolean);
+		const aChangedProperties = await this._openDialog();
+		this._oDialog.close();
+		return aChangedProperties;
 	};
 
 	AnnotationChangeDialog.prototype.destroy = function(...aArgs) {
 		ManagedObject.prototype.destroy.apply(this, aArgs);
-		if (this._oPopover) {
-			this._oPopover.destroy();
+		if (this._oDialog) {
+			this._oDialog.destroy();
 		}
 		if (this._oController) {
 			this._oController.destroy();

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

@@ -5,14 +5,24 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/m/Input",
+	"sap/m/Select",
+	"sap/m/Switch",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/Element",
+	"sap/ui/core/Item",
+	"sap/ui/layout/form/FormElement",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
 	"sap/ui/rta/plugin/annotations/AnnotationTypes"
 ], function(
+	Input,
+	Select,
+	Switch,
 	Controller,
 	Element,
+	Item,
+	FormElement,
 	Filter,
 	FilterOperator,
 	AnnotationTypes
@@ -23,7 +33,7 @@ sap.ui.define([
 	 * @class Controller for the AnnotationChangeDialog.
 	 * @extends sap.ui.core.mvc.Controller
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 * @constructor
 	 * @since 1.132
 	 * @private
@@ -32,7 +42,6 @@ sap.ui.define([
 	const AnnotationChangeDialogController = Controller.extend("sap.ui.rta.plugin.annotations.AnnotationChangeDialogController");
 
 	AnnotationChangeDialogController.prototype.initialize = function() {
-		this._oChangedProperties = {};
 		return new Promise((resolve) => {
 			this._fnResolveAfterClose = resolve;
 		});
@@ -55,9 +64,9 @@ sap.ui.define([
 		this.filterProperties(sQuery);
 	};
 
-	AnnotationChangeDialogController.prototype.switchDisplayMode = function() {
+	AnnotationChangeDialogController.prototype.switchDisplayMode = function(oEvent) {
+		const bShowChangedPropertiesOnly = oEvent.getParameter("state");
 		const oList = Element.getElementById("sapUiRtaChangeAnnotationDialog_propertyList");
-		const bShowChangedPropertiesOnly = !oList.getModel().getProperty("/showChangedPropertiesOnly");
 		oList.getModel().setProperty("/showChangedPropertiesOnly", bShowChangedPropertiesOnly);
 		oList.getModel().setProperty(
 			"/propertiesToDisplay",
@@ -67,42 +76,90 @@ sap.ui.define([
 		);
 	};
 
-	AnnotationChangeDialogController.prototype.onValueListChange = function(oEvent) {
-		const sPath = oEvent.getSource().getBindingContext().getObject().annotationPath;
-		const sSelectedKey = oEvent.getParameters().selectedItem.getKey();
-		this._oChangedProperties[sPath] = sSelectedKey;
+	AnnotationChangeDialogController.prototype.onSavePress = function(oEvent) {
+		const oModelData = oEvent.getSource().getModel().getData();
+		const aChanges = oModelData.properties
+		.map((oProperty) => {
+			if (oProperty.originalValue === oProperty.currentValue) {
+				return null;
+			}
+			const oChangeSpecificData = {
+				serviceUrl: oModelData.serviceUrl,
+				content: {
+					annotationPath: oProperty.annotationPath
+				}
+			};
+			oChangeSpecificData.content[oModelData.valueType === AnnotationTypes.StringType ? "text" : "value"] = oProperty.currentValue;
+			return oChangeSpecificData;
+		})
+		.filter(Boolean);
+		this._fnResolveAfterClose(aChanges);
 	};
 
-	AnnotationChangeDialogController.prototype.onBooleanChange = function(oEvent) {
-		const sPath = oEvent.getSource().getBindingContext().getObject().annotationPath;
-		const bSelected = oEvent.getParameters().selected;
-		this._oChangedProperties[sPath] = bSelected;
+	AnnotationChangeDialogController.prototype.onCancelPress = function() {
+		this._fnResolveAfterClose([]);
 	};
 
-	AnnotationChangeDialogController.prototype.onStringChange = function(oEvent) {
-		const sPath = oEvent.getSource().getBindingContext().getObject().annotationPath;
-		const sValue = oEvent.getParameters().value;
-		this._oChangedProperties[sPath] = sValue;
-	};
+	function createEditorField(sValueType) {
+		const onChange = () => {
+			// Property updates are handled via two-way binding
+			// However, the binding of the save button doesn't detect changes
+			// within nested object properties, so it has to be refreshed explicitly
+			const oSaveButton = Element.getElementById("sapUiRtaChangeAnnotationDialog_saveButton");
+			oSaveButton.getBinding("enabled").refresh(true);
+		};
 
-	AnnotationChangeDialogController.prototype.onSavePress = function() {
-		this._fnResolveAfterClose(this._oChangedProperties);
-	};
+		if (sValueType === AnnotationTypes.ValueListType) {
+			const oSelect = new Select({
+				selectedKey: "{currentValue}",
+				change: onChange
+			});
 
-	AnnotationChangeDialogController.prototype.onCancelPress = function() {
-		this._fnResolveAfterClose({});
-	};
+			const oItemTemplate = new Item({
+				key: "{key}",
+				text: "{text}"
+			});
+
+			oSelect.bindItems({
+				path: "/possibleValues",
+				template: oItemTemplate,
+				templateShareable: false
+			});
+
+			return oSelect;
+		}
 
-	AnnotationChangeDialogController.prototype.formatters = {
-		isValueList(sType) {
-			return sType === AnnotationTypes.ValueListType;
-		},
-		isBoolean(sType) {
-			return sType === AnnotationTypes.BooleanType;
-		},
-		isString(sType) {
-			return sType === AnnotationTypes.StringType;
+		if (sValueType === AnnotationTypes.StringType) {
+			return new Input({
+				value: "{currentValue}",
+				change: onChange
+			});
 		}
+
+		if (sValueType === AnnotationTypes.BooleanType) {
+			return new Switch({
+				state: "{currentValue}",
+				change: onChange
+			});
+		}
+
+		throw new Error(`Unsupported value type: ${sValueType}`);
+	}
+
+	AnnotationChangeDialogController.prototype.editorFactory = function(sId, oContext) {
+		const sValueType = oContext.getProperty("/valueType");
+
+		return new FormElement({
+			id: sId,
+			label: "{propertyName}",
+			fields: [
+				createEditorField.call(this, sValueType)
+			]
+		});
+	};
+
+	AnnotationChangeDialogController.prototype.hasChangesFormatter = function(aProperties) {
+		return aProperties?.some((oProperty) => oProperty.originalValue !== oProperty.currentValue);
 	};
 
 	return AnnotationChangeDialogController;

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

@@ -6,11 +6,13 @@
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/base/DesignTime",
 	"sap/ui/dt/Util",
 	"sap/ui/rta/plugin/annotations/AnnotationChangeDialog",
 	"sap/ui/rta/plugin/Plugin"
 ], function(
 	BaseLog,
+	DesignTime,
 	DtUtil,
 	AnnotationChangeDialog,
 	Plugin
@@ -80,7 +82,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 * @constructor
 	 * @private
 	 * @since 1.132
@@ -108,6 +110,12 @@ sap.ui.define([
 	 * @private
 	 */
 	AnnotationPlugin.prototype._isEditable = function(oElementOverlay) {
+		// Currently annotation changes are not supported for developers,
+		// because the changes are not guaranteed to be loaded in time to be properly applied
+		if (DesignTime.isDesignModeEnabled()) {
+			return false;
+		}
+
 		const oActions = this.getAction(oElementOverlay);
 
 		if (oActions) {
@@ -127,6 +135,10 @@ sap.ui.define([
 	 * @public
 	 */
 	AnnotationPlugin.prototype.isEnabled = function(aElementOverlays) {
+		if (aElementOverlays.length !== 1) {
+			return false;
+		}
+
 		const oElementOverlay = aElementOverlays[0];
 		const oResponsibleElementOverlay = this.getResponsibleElementOverlay(oElementOverlay);
 		const oActions = this.getAction(oResponsibleElementOverlay);
@@ -235,5 +247,11 @@ sap.ui.define([
 		return "annotation";
 	};
 
+	AnnotationPlugin.prototype.destroy = function(...args) {
+		Plugin.prototype.destroy.apply(this, args);
+		this._oDialog.destroy();
+		delete this._oDialog;
+	};
+
 	return AnnotationPlugin;
 });

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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.0
 	 * @private
 	 * @ui5-restricted
 	*/

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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.0
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -104,6 +104,18 @@
 			color: @_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor;
 		}
 
+		.sapUiRtaVersionButton.sapUiRtaVersionColor > span > span > bdi,
+		.sapUiRtaVersionButton.sapUiRtaVersionColor > span > span.sapMBtnIcon {
+			color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+		}
+
+		.sapUiRtaVersionButton.sapUiRtaVersionColor:hover  {
+			> span.sapMBtnHoverable.sapMBtnTransparent > span.sapMBtnIcon,
+			> span > span > bdi {
+				color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+			}
+		}
+
 		.sapUiRtaToolbarActionsSection > div:first-child {
 			width: 100%;
 		}

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

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -5,10 +5,12 @@
  */
 
 sap.ui.define([
-	"./Adaptation"
+	"./Adaptation",
+	"./AdaptationRenderer"
 ],
 function(
-	Adaptation
+	Adaptation,
+	AdaptationRenderer
 ) {
 	"use strict";
 
@@ -20,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @private
@@ -31,7 +33,7 @@ function(
 		metadata: {
 			library: "sap.ui.rta"
 		},
-		renderer: "sap.ui.rta.toolbar.AdaptationRenderer",
+		renderer: AdaptationRenderer,
 		type: "standalone"
 	});
 

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.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.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -10,7 +10,7 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/core/Fragment",
-	"sap/ui/core/library",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/fl/initial/api/Version",
 	"sap/ui/model/Sorter",
 	"sap/ui/rta/Utils"
@@ -20,16 +20,16 @@ sap.ui.define([
 	ManagedObject,
 	DateFormat,
 	Fragment,
-	coreLibrary,
+	MessageType,
 	Version,
 	Sorter,
 	Utils
 ) {
 	"use strict";
 
-	var {MessageType} = coreLibrary;
 	var DRAFT_ACCENT_COLOR = "sapUiRtaDraftVersionAccent";
 	var ACTIVE_ACCENT_COLOR = "sapUiRtaActiveVersionAccent";
+	var VERSION_COLOR = "sapUiRtaVersionColor";
 
 	/**
 	 * Controller for the <code>sap.ui.rta.toolbar.versioning.Versioning</code> controls.
@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.132.1
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @private
@@ -149,12 +149,15 @@ sap.ui.define([
 			case Version.Type.Draft:
 				oVersionButton.addStyleClass(DRAFT_ACCENT_COLOR);
 				oVersionButton.removeStyleClass(ACTIVE_ACCENT_COLOR);
+				oVersionButton.removeStyleClass(VERSION_COLOR);
 				break;
 			case Version.Type.Active:
 				oVersionButton.addStyleClass(ACTIVE_ACCENT_COLOR);
 				oVersionButton.removeStyleClass(DRAFT_ACCENT_COLOR);
+				oVersionButton.removeStyleClass(VERSION_COLOR);
 				break;
 			default:
+				oVersionButton.addStyleClass(VERSION_COLOR);
 				oVersionButton.removeStyleClass(ACTIVE_ACCENT_COLOR);
 				oVersionButton.removeStyleClass(DRAFT_ACCENT_COLOR);
 		}

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

@@ -40,4 +40,4 @@ function() {
 	};
 
 	return module;
-}, true);
+});

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

@@ -346,4 +346,4 @@ function(
 	};
 
 	return BindingsExtractor;
-}, true);
+});