@openui5/sap.ui.rta 1.113.0 → 1.114.1

package/src/sap/ui/rta/toolbar/contextBased/ManageAdaptationsDialog.fragment.xml

@@ -48,7 +48,7 @@
 					hAlign="Left">
 					<Text text="{i18n>CLM_HEADER_ADAPTATIONS_TITLE}" />
 				</Column>
-				<Column width="8rem"
+				<Column width="6rem"
 					minScreenWidth="tablet"
 					demandPopin="true"
 					popinDisplay="Inline"
@@ -67,6 +67,7 @@
 					hAlign="Left">
 					<Text text="{i18n>CLM_HEADER_ADAPTATIONS_CHANGED_ON}" />
 				</Column>
+				<!--
 				<Column width="7rem"
 					minScreenWidth="tablet"
 					demandPopin="true"
@@ -74,6 +75,7 @@
 					hAlign="Left">
 					<Text text="{i18n>CLM_HEADER_ADAPTATIONS_ACTIONS}" />
 				</Column>
+				-->
 			</columns>
 			<dragDropConfig>
 				<dnd:DragDropInfo sourceAggregation="items"
@@ -85,24 +87,12 @@
 				<ColumnListItem>
 					<cells>
 						<Text text="{contextBased>rank}"/>
-						<CustomListItem>
-							<HBox>
-								<VBox class="sapUiSmallMarginTopBottom">
 									<Text wrapping="false" maxLines="1" text="{contextBased>title}"
 									tooltip="{contextBased>title}"/>
-								</VBox>
-							</HBox>
-						</CustomListItem>
 						<Text text="{ parts: ['contextBased>contexts/role'], formatter: '.formatContextColumnCell'}"
 							tooltip="{ parts: ['contextBased>contexts/role'], formatter: '.formatContextColumnTooltip'}" />
 						<Text text="{ parts: ['contextBased>createdBy', 'contextBased>createdAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>
-						<Text text="{ parts: ['contextBased>changedBy', 'contextBased>changedAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>		
-						<MenuButton text="{i18n>CLM_HEADER_ADAPTATIONS_ACTIONS}">
-							<menu>
-								<Menu itemSelected="onMenuAction">
-								</Menu>
-							</menu>
-						</MenuButton>
+						<Text text="{ parts: ['contextBased>changedBy', 'contextBased>changedAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>
 					</cells>
 				</ColumnListItem>
 			</items>
@@ -126,12 +116,6 @@
 					popinDisplay="Inline"
 					hAlign="Left">
 				</Column>
-				<Column width="7rem"
-					minScreenWidth="tablet"
-					demandPopin="true"
-					popinDisplay="Inline"
-					hAlign="Left">
-				</Column>
 			</columns>
 			<items>
 				<ColumnListItem highlight="Information">
@@ -146,8 +130,6 @@
 							</HBox>
 						</CustomListItem>
 						<Text text="" />
-						<MenuButton text="{i18n>CLM_HEADER_ADAPTATIONS_ACTIONS}">
-						</MenuButton>
 					</cells>
 				</ColumnListItem>
 			</items>
@@ -163,7 +145,7 @@
 		<endButton>
 			<Button id="manageAdaptations-closeButton"
 				text="{i18n>APP_CTX_DIALOG_CANCEL}"
-				press=".onClose"/>
+				press=".onCancel"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

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

@@ -8,25 +8,25 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/base/Log",
 	"sap/base/strings/formatMessage",
+	"sap/ui/core/BusyIndicator",
 	"sap/ui/core/Fragment",
 	"sap/ui/core/library",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/rta/Utils",
-	"sap/ui/model/Binding",
 	"sap/ui/model/json/JSONModel"
 ], function(
 	ManagedObject,
 	Log,
 	formatMessage,
+	BusyIndicator,
 	Fragment,
 	coreLibrary,
 	Layer,
 	ContextBasedAdaptationsAPI,
 	ContextSharingAPI,
 	Utils,
-	Binding,
 	JSONModel
 ) {
 	"use strict";
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private
@@ -62,7 +62,8 @@ sap.ui.define([
 		}
 	});
 
-	SaveAsAdaptation.prototype.openAddAdaptationDialog = function(sLayer) {
+	SaveAsAdaptation.prototype.openAddAdaptationDialog = function(sLayer, bIsEditMode) {
+		this._bIsEditMode = bIsEditMode;
 		if (!this._oAddAdaptationDialogPromise) {
 			this._oAddAdaptationDialogPromise = Fragment.load({
 				name: "sap.ui.rta.toolbar.contextBased.SaveAsAdaptationDialog",
@@ -78,15 +79,25 @@ sap.ui.define([
 				this._oAddAdaptationDialog.attachBeforeClose(clearComponent.bind(this));
 				oDialog.addStyleClass(Utils.getRtaStyleClassName());
 				this.getToolbar().addDependent(this._oAddAdaptationDialog);
+				this.oDialogModel = new JSONModel();
+				this._oAddAdaptationDialog.setModel(this.oDialogModel, "dialogModel");
 			}.bind(this));
 		} else {
-			this.getToolbar().getControl("addAdaptationDialog--saveAdaptation-title-input").setValue("");
+			var oInputField = this.getToolbar().getControl("addAdaptationDialog--saveAdaptation-title-input");
+			oInputField.setValue("");
+			oInputField.setValueState(ValueState.None);
 		}
 		return this._oAddAdaptationDialogPromise.then(function() {
 			return createContextSharingComponent.call(this, sLayer);
 		}.bind(this)).then(function() {
 			var oRtaInformation = this.getToolbar().getRtaInformation();
 			this.oAdaptationsModel = ContextBasedAdaptationsAPI.getAdaptationsModel({ control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer });
+			if (bIsEditMode) {
+				enableEditMode.call(this);
+			} else {
+				this.oDialogModel.setProperty("/title", this.oTextResources.getText("SAC_DIALOG_HEADER"));
+				this.oDialogModel.refresh(true);
+			}
 			return openDialog.call(this);
 		}.bind(this));
 	};
@@ -97,24 +108,49 @@ sap.ui.define([
 		return this._oAddAdaptationDialog.open();
 	}
 
+	// ------ enables dialog for editing -----
+	function enableEditMode() {
+		this.oDialogModel.setProperty("/title", this.oTextResources.getText("EAC_DIALOG_HEADER"));
+		this.oDialogModel.refresh(true);
+		var oDisplayedAdaptation = this.oAdaptationsModel.getProperty("/displayedAdaptation");
+		this._mEditProperties = {
+			adaptationId: oDisplayedAdaptation.id,
+			title: oDisplayedAdaptation.title,
+			priority: oDisplayedAdaptation.rank - 1,
+			roles: oDisplayedAdaptation.contexts.role
+		};
+		this.getToolbar().getControl("addAdaptationDialog--saveAdaptation-title-input").setValue(this._mEditProperties.title);
+		this._oContextComponentInstance.setSelectedContexts({role: this._mEditProperties.roles});
+	}
+
 	// ------ formatting ------
 	function formatPriorityText(aAdaptations) {
-		var aItems = [{ key: 0, title: this.oTextResources.getText("TXT_SELECT_FIRST_PRIO") }];
+		var aItems = [{ key: "0", title: this.oTextResources.getText("TXT_SELECT_FIRST_PRIO") }];
 		var sPriorityTextTemplate = this.oTextResources.getText("TXT_SELECT_PRIO");
+		var iCurrentPriority = this._mEditProperties ? this._mEditProperties.priority : undefined;
+		// create the data for the priority selection model
+		// selected is the currently or by default selected priority
+		// priority is the array with all available priorities together with the displayed text defined in text template
 		aAdaptations.forEach(function(oAdaptation, iIndex) {
+			if (iCurrentPriority !== undefined && iCurrentPriority === iIndex) {
+				return;
+			}
+			var iKey = aItems.length;
 			aItems.push({
-				key: (iIndex + 1).toString(),
-				title: formatMessage(sPriorityTextTemplate, [oAdaptation.title, iIndex + 2])
+				key: iKey.toString(),
+				title: formatMessage(sPriorityTextTemplate, [oAdaptation.title, iKey + 1])
 			});
 		});
-		this.oPrioritySelectionModel = new JSONModel({
-			selected: this.oTextResources.getText("TXT_SELECT_FIRST_PRIO"),
-			priority: aItems
-		});
-		this._oAddAdaptationDialog.setModel(this.oPrioritySelectionModel, "prioritySelectionModel");
+		this.oDialogModel.setProperty("/selected", iCurrentPriority ? aItems[iCurrentPriority].key : aItems[0].key);
+		this.oDialogModel.setProperty("/priority", aItems);
 	}
 
 	function onAdaptationTitleChange() {
+		checkAdaptationsNameConstraints.call(this);
+		enableSaveAsButton.call(this);
+	}
+
+	function onContextRoleChange() {
 		enableSaveAsButton.call(this);
 	}
 
@@ -128,25 +164,52 @@ sap.ui.define([
 		oContextBasedAdaptation.contexts = this._oContextComponentInstance.getSelectedContexts();
 		oContextBasedAdaptation.priority = getAdaptationPriority.call(this);
 		var oRtaInformation = this.getToolbar().getRtaInformation();
-		ContextBasedAdaptationsAPI.create({
-			control: oRtaInformation.rootControl,
-			layer: oRtaInformation.flexSettings.layer,
-			contextBasedAdaptation: oContextBasedAdaptation
-		}).catch(function(oError) {
-			Log.error(oError.stack);
-			var sMessage = "MSG_LREP_TRANSFER_ERROR";
-			var oOptions = { titleKey: "SAC_DIALOG_HEADER" };
-			oOptions.details = oError.userMessage;
-			Utils.showMessageBox("error", sMessage, oOptions);
-		});
+		if (this._bIsEditMode) {
+			oContextBasedAdaptation.adaptationId = this._mEditProperties.adaptationId;
+			ContextBasedAdaptationsAPI.update({
+				control: oRtaInformation.rootControl,
+				layer: oRtaInformation.flexSettings.layer,
+				contextBasedAdaptation: oContextBasedAdaptation,
+				adaptationId: this._mEditProperties.adaptationId
+			})
+			.then(function(oContextBasedAdaptation, oResponse) {
+				if (oResponse.status === 200) {
+					this.oAdaptationsModel.updateAdaptationContent(oContextBasedAdaptation);
+				}
+			}.bind(this, oContextBasedAdaptation))
+			.catch(function(oError) {
+				Log.error(oError.stack);
+				var sMessage = "MSG_LREP_TRANSFER_ERROR";
+				var oOptions = { titleKey: "EAC_DIALOG_HEADER" };
+				oOptions.details = oError.userMessage;
+				Utils.showMessageBox("error", sMessage, oOptions);
+			});
+		} else {
+			BusyIndicator.show();
+			ContextBasedAdaptationsAPI.create({
+				control: oRtaInformation.rootControl,
+				layer: oRtaInformation.flexSettings.layer,
+				contextBasedAdaptation: oContextBasedAdaptation
+			}).then(function() {
+				BusyIndicator.hide();
+				this.getToolbar().fireEvent("switchAdaptation", {adaptationId: oContextBasedAdaptation.id, trigger: "SaveAs"});
+			}.bind(this)).catch(function(oError) {
+				BusyIndicator.hide();
+				Log.error(oError.stack);
+				var sMessage = "MSG_LREP_TRANSFER_ERROR";
+				var oOptions = { titleKey: "SAC_DIALOG_HEADER" };
+				oOptions.details = oError.userMessage;
+				Utils.showMessageBox("error", sMessage, oOptions);
+			});
+		}
 		this._oAddAdaptationDialog.close();
 	}
 
 	function onPriorityChange(oEvent) {
+		enableSaveAsButton.call(this);
 		this.sPriority = oEvent.getParameters().selectedItem.getProperty("key");
 	}
 
-
 	function checkAdaptationsNameConstraints() {
 		// check for empty adaptations title
 		if (this._oAddAdaptationDialog && this._oAddAdaptationDialog.isOpen()) {
@@ -165,10 +228,14 @@ sap.ui.define([
 				// check for duplicates
 				var iIndexOfDuplicate = this.oAdaptationsModel.getProperty("/adaptations").findIndex(function(adaptation) {
 					if (adaptation.title.trim().toLowerCase() === oInputField.getValue().trim().toLowerCase()) {
+						// allow matching in case of edit mode with already used title
+						if (this._mEditProperties && this._mEditProperties.title.toLowerCase() === oInputField.getValue().toLowerCase()) {
+							return false;
+						}
 						return true;
 					}
 					return false;
-				});
+				}.bind(this));
 				if (iIndexOfDuplicate > -1) {
 					oInputField.setValueState(ValueState.Error);
 					oInputField.setValueStateText(this.oTextResources.getText("TXT_CTX_ERROR_DUPLICATE_TITLE"));
@@ -187,9 +254,10 @@ sap.ui.define([
 			this._oContextComponentInstance = oContextSharingComponent.getComponentInstance();
 			this._oContextComponentInstance.resetSelectedContexts();
 			this._oAddAdaptationDialog.addContent(this._oContextComponent);
-			var oSelectedContextsModel = this._oContextComponentInstance.getSelectedContextsModel();
-			this.oSelectedContextsBinding = new Binding(oSelectedContextsModel, "/", oSelectedContextsModel.getContext("/"));
-			this.oSelectedContextsBinding.attachChange(enableSaveAsButton.bind(this));
+			var oContextsList = sap.ui.getCore().byId("contextSharing---ContextVisibility--selectedContextsList");
+			oContextsList.attachUpdateFinished(onContextRoleChange.bind(this));
+			oContextsList.getHeaderToolbar().getContent()[0].setRequired(true);
+			this._oContextComponentInstance.setEmptyListTextWithAdvice();
 			this._oContextComponentInstance.showMessageStrip(false);
 		}.bind(this));
 	}
@@ -200,21 +268,39 @@ sap.ui.define([
 	}
 
 	function getAdaptationPriority() {
+		if (this._bIsEditMode && !this.sPriority) {
+			this.sPriority = this.oDialogModel.getProperty("/selected");
+		}
 		return Number(this.sPriority) || 0;
 	}
 
 	function enableSaveAsButton() {
-		checkAdaptationsNameConstraints.call(this);
 		var oInputField = this.getToolbar().getControl("addAdaptationDialog--saveAdaptation-title-input");
-		var bEnable = oInputField.getValueState() === ValueState.None && this._oContextComponentInstance.getSelectedContexts().role.length > 0;
+		var bEnable;
+		var bRolesSelectedAndValidTitle = this._oContextComponentInstance.getSelectedContexts().role.length > 0
+			&& oInputField.getValueState() === ValueState.None
+			&& oInputField.getValue().length > 0;
+		if (this._bIsEditMode && this._mEditProperties && this.oDialogModel) {
+			bEnable = bRolesSelectedAndValidTitle
+				// check that some of the properties title, priority, roles have been changed
+				&& (oInputField.getValue() !== this._mEditProperties.title
+				|| this.oDialogModel.getProperty("/selected") !== (this._mEditProperties.priority).toString()
+				|| this._oContextComponentInstance.getSelectedContexts().role.length !== this._mEditProperties.roles.length
+				|| !this._oContextComponentInstance.getSelectedContexts().role.every(function(sRole) {
+					return this._mEditProperties.roles.indexOf(sRole) > -1;
+				}.bind(this)));
+		} else {
+			bEnable = bRolesSelectedAndValidTitle;
+		}
 		this.getToolbar().getControl("addAdaptationDialog--saveAdaptation-saveButton").setEnabled(bEnable);
 	}
 
 	function clearComponent() {
-		if (this._oContextComponentInstance) {
-			this._oContextComponentInstance.showMessageStrip(true);
-			this._oContextComponentInstance.resetSelectedContexts();
-		}
+		this._mEditProperties = undefined;
+		this._oAddAdaptationDialog.removeContent(this._oContextComponent);
+		this._oContextComponentInstance.destroy();
+		this._oContextComponent.destroy();
 	}
+
 	return SaveAsAdaptation;
 });

package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptationDialog.fragment.xml

@@ -5,14 +5,16 @@
 	<Dialog id="selectContextsDialog"
 		resizable="true"
 		draggable="true"
-		title="{i18n>SAC_DIALOG_HEADER}">
+		title="{dialogModel>/title}">
 		<Panel id="saveAdaptation-information-panel">
-			<Toolbar id="toolbar">
-				<Label id="label"
-					text="Information"
-					design="Bold">
-				</Label>
-			</Toolbar>
+			<headerToolbar>
+				<Toolbar id="toolbar">
+					<Label id="label"
+						text="Information"
+						design="Bold">
+					</Label>
+				</Toolbar>
+			</headerToolbar>
 			<form:Form id="saveAdaptation-form"
 				editable="true">
 				<form:layout>
@@ -58,10 +60,10 @@
 								<Select
 									id="saveAdaptation-rank-select"
 									forceSelection="true"
-									selectedKey="{prioritySelectionModel>/selected}"
-									items="{prioritySelectionModel>/priority}"
+									selectedKey="{dialogModel>/selected}"
+									items="{dialogModel>/priority}"
 									change=".onPriorityChange">
-									<core:Item key="{prioritySelectionModel>key}" text="{prioritySelectionModel>title}" />
+									<core:Item key="{dialogModel>key}" text="{dialogModel>title}" />
 								</Select>
 						</form:FormElement>
 					</form:formElements>

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

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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

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

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

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

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @namespace sap.ui.rta.util.ReloadManager
 	 * @alias sap.ui.rta.util.ReloadManager
 	 * @since 1.104
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -77,7 +77,7 @@ sap.ui.define([
 			sReason = "MSG_DRAFT_EXISTS";
 		} else if (oReloadInfo.allContexts) {
 			sReason = "MSG_RESTRICTED_CONTEXT_EXIST";
-		} // TODO add app descr changes case for start?
+		}// TODO add app descr changes case for start?
 		return sReason;
 	}
 
@@ -94,6 +94,9 @@ sap.ui.define([
 			if (oReloadInfo.allContexts) {
 				return "MSG_RELOAD_WITH_PERSONALIZATION_AND_RESTRICTED_CONTEXT";
 			}
+			if (oReloadInfo.switchEndUserAdaptation) {
+				return "MSG_RELOAD_WITH_PERSONALIZATION_AND_CONTEXT_BASED_ADAPTATION";
+			}
 			return "MSG_RELOAD_WITH_PERSONALIZATION_AND_VIEWS";
 		}
 
@@ -112,6 +115,10 @@ sap.ui.define([
 		if (oReloadInfo.allContexts) {
 			return "MSG_RELOAD_WITHOUT_ALL_CONTEXT";
 		}
+
+		if (oReloadInfo.switchEndUserAdaptation) {
+			return "MSG_RELOAD_OTHER_CONTEXT_BASED_ADAPTATION";
+		}
 		return undefined;
 	}
 
@@ -127,31 +134,34 @@ sap.ui.define([
 	}
 
 	function triggerReloadOnStart(oReloadInfo, bVersioningEnabled, bDeveloperMode) {
-		if (mUShellServices.CrossApplicationNavigation && bVersioningEnabled) {
-			// clears FlexState and triggers reloading of the flex data without blocking
-			if (oReloadInfo.isDraftAvailable) {
-				VersionsAPI.loadDraftForApplication({
+		return Promise.resolve().then(function() {
+			if (mUShellServices.CrossApplicationNavigation && bVersioningEnabled) {
+				// clears FlexState and triggers reloading of the flex data without blocking
+				if (oReloadInfo.isDraftAvailable) {
+					return VersionsAPI.loadDraftForApplication({
+						control: oReloadInfo.selector,
+						layer: oReloadInfo.layer,
+						allContexts: oReloadInfo.allContexts,
+						adaptationId: oReloadInfo.adaptationId
+					});
+				}
+				return VersionsAPI.loadVersionForApplication({
 					control: oReloadInfo.selector,
 					layer: oReloadInfo.layer,
-					allContexts: oReloadInfo.allContexts
-				});
-			} else {
-				VersionsAPI.loadVersionForApplication({
-					control: oReloadInfo.selector,
-					layer: oReloadInfo.layer,
-					allContexts: oReloadInfo.allContexts
+					allContexts: oReloadInfo.allContexts,
+					adaptationId: oReloadInfo.adaptationId
 				});
 			}
-		}
-		var sReason = getReloadMessageOnStart(oReloadInfo);
-		// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
-		var pMessageBox = bDeveloperMode ? Promise.resolve() : Utils.showMessageBox("information", sReason);
-		return pMessageBox.then(function() {
+			return undefined;
+		}).then(function() {
+			var sReason = getReloadMessageOnStart(oReloadInfo);
+			// showing messages in visual editor is leading to blocked screen. In this case we should reload without message
+			return bDeveloperMode ? undefined : Utils.showMessageBox("information", sReason);
+		}).then(function() {
 			ReloadManager.enableAutomaticStart(oReloadInfo.layer, oReloadInfo.selector);
 			oReloadInfo.onStart = true;
 			return ReloadManager.triggerReload(oReloadInfo);
-		})
-		.then(function() {
+		}).then(function() {
 			return true;
 		});
 	}
@@ -268,6 +278,7 @@ sap.ui.define([
 	 * @param {sap.ui.fl.Selector} mProperties.selector - Root control
 	 * @param {boolean} mProperties.versioningEnabled - Whether versioning is enabled
 	 * @param {boolean} mProperties.developerMode - Whether the developer mode is set
+	 * @param {string} mProperties.adaptationId - Context-based adaptation ID of the currently displayed adaptation
 	 *
 	 * @return {Promise<boolean>} Resolving to <code>false</code> means that reload is not necessary
 	 */
@@ -280,7 +291,7 @@ sap.ui.define([
 			URLParsingService: mUShellServices.URLParsing
 		});
 		return ReloadInfoAPI.getReloadReasonsForStart(mProperties).then(function(oReloadInfo) {
-			if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.isDraftAvailable || oReloadInfo.allContexts) {
+			if (oReloadInfo.hasHigherLayerChanges || oReloadInfo.isDraftAvailable || oReloadInfo.allContexts || oReloadInfo.switchAdaptation) {
 				return triggerReloadOnStart(oReloadInfo, mProperties.versioningEnabled, mProperties.developerMode);
 			}
 			return undefined;

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

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

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {
@@ -203,7 +203,6 @@ sap.ui.define([
 			sDescriptionText = oDescription.descriptionText;
 			sDescriptionTooltip = oDescription.descriptionTooltip || "";
 		} else {
-			sElementLabel = sElementLabel && "'" + sElementLabel + "'";
 			var sShortenedElementLabel = ChangeVisualizationUtils.shortenString(sElementLabel);
 			var sChangeTextKey = (
 				"TXT_CHANGEVISUALIZATION_CHANGE_"

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorCategorySelection.fragment.xml

@@ -6,7 +6,7 @@
 		showHeader="false"
 		placement="Bottom"
 		id="popover">
-		<SegmentedButton selectedKey="satellite" width="420px" selectionChange=".onVersioningCategoryChange">
+		<SegmentedButton selectedKey="{visualizationModel>/changeState}" width="420px" selectionChange=".onVersioningCategoryChange">
 			<items>
 				<SegmentedButtonItem
 					text="{i18n>BUT_CHANGEVISUALIZATION_VERSIONING_ALL}"

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {
@@ -211,7 +211,7 @@ sap.ui.define([
 			} else if (aDraftChangesList && aDraftChangesList.includes(oChange.getId())) {
 				aChangeStates = [ChangeStates.DRAFT];
 			} else {
-				aChangeStates = [ChangeStates.ACTIVATED];
+				aChangeStates = [ChangeStates.ALL];
 			}
 
 			this._oRegisteredChanges[oChange.getId()] = {
@@ -242,12 +242,17 @@ sap.ui.define([
 		return getInfoFromChangeHandler(oAppComponent, oChange)
 			.then(function(oInfoFromChangeHandler) {
 				var mVisualizationInfo = oInfoFromChangeHandler || {};
-				var aAffectedElementIds = getSelectorIds(mVisualizationInfo.affectedControls || oChange.getSelector && [oChange.getSelector()] || []);
+				var aChangeSelectors = oChange.getSelector && oChange.getSelector() && [oChange.getSelector()];
+				var aAffectedElementSelectors = mVisualizationInfo.affectedControls || aChangeSelectors || [];
+				// If there is an original selector (e.g. control is inside a template),
+				// the indicator should be displayed on the host control (change selector)
+				var oChangeOriginalSelector = oChange.getOriginalSelector && oChange.getOriginalSelector();
+				var aDisplayElementSelectors = oChangeOriginalSelector ? aChangeSelectors : aAffectedElementSelectors;
 
 				return {
-					affectedElementIds: aAffectedElementIds,
+					affectedElementIds: getSelectorIds(aAffectedElementSelectors),
 					dependentElementIds: getSelectorIds(mVisualizationInfo.dependentControls) || [],
-					displayElementIds: getSelectorIds(mVisualizationInfo.displayControls) || aAffectedElementIds,
+					displayElementIds: getSelectorIds(mVisualizationInfo.displayControls || getSelectorIds(aDisplayElementSelectors)),
 					updateRequired: mVisualizationInfo.updateRequired,
 					descriptionPayload: mVisualizationInfo.descriptionPayload || {}
 				};
@@ -255,7 +260,11 @@ sap.ui.define([
 	}
 
 	function getInfoFromChangeHandler(oAppComponent, oChange) {
-		var oControl = oChange.getSelector && JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
+		var oSelector = oChange.getOriginalSelector && oChange.getOriginalSelector();
+		if (!oSelector) {
+			oSelector = oChange.getSelector && oChange.getSelector();
+		}
+		var oControl = JsControlTreeModifier.bySelector(oSelector, oAppComponent);
 		if (oControl) {
 			return ChangesWriteAPI.getChangeHandler({
 				changeType: oChange.getChangeType(),

package/src/sap/ui/rta/util/changeVisualization/ChangeStates.js

@@ -11,7 +11,7 @@ sap.ui.define([
 
 	var ChangeStates = {};
 
-	ChangeStates.ACTIVATED = "activated";
+	ChangeStates.ALL = "all";
 	ChangeStates.DRAFT = "draft";
 	ChangeStates.DIRTY = "dirty";