@openui5/sap.ui.rta 1.98.0 → 1.101.0

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

@@ -5,6 +5,7 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/Fragment",
 	"sap/base/util/restricted/_difference",
 	"sap/base/util/deepEqual",
 	"sap/base/Log",
@@ -12,7 +13,6 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/ElementUtil",
-	"sap/ui/events/KeyCodes",
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
@@ -23,6 +23,7 @@ sap.ui.define([
 	"sap/ui/rta/util/changeVisualization/ChangeIndicator",
 	"sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry"
 ], function(
+	Fragment,
 	difference,
 	deepEqual,
 	Log,
@@ -30,7 +31,6 @@ sap.ui.define([
 	Control,
 	OverlayRegistry,
 	ElementUtil,
-	KeyCodes,
 	ChangesUtils,
 	ChangesWriteAPI,
 	PersistenceWriteAPI,
@@ -79,8 +79,9 @@ sap.ui.define([
 	 * When clicking anywhere on the application, the menu must close
 	 */
 	function _onClick() {
-		if (this.oMenuButton) {
-			this.oMenuButton.getMenu().close();
+		var oPopover = this.getPopover();
+		if (oPopover && oPopover.isOpen()) {
+			oPopover.close();
 		}
 	}
 
@@ -92,7 +93,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 * @private
 	 */
 	var ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {
@@ -112,9 +113,15 @@ sap.ui.define([
 					type: "boolean",
 					defaultValue: false
 				}
+			},
+			aggregations: {
+				popover: {
+					type: "sap.m.Popover",
+					multiple: false
+				}
 			}
 		},
-		constructor: function () {
+		constructor: function() {
 			Control.prototype.constructor.apply(this, arguments);
 
 			this._oChangeIndicatorRegistry = new ChangeIndicatorRegistry({
@@ -137,18 +144,18 @@ sap.ui.define([
 		}
 	});
 
-	ChangeVisualization.prototype.setRootControlId = function (sRootControlId) {
+	ChangeVisualization.prototype.setRootControlId = function(sRootControlId) {
 		if (this.getRootControlId() && this.getRootControlId() !== sRootControlId) {
 			this._reset();
 		}
 		this.setProperty("rootControlId", sRootControlId);
 	};
 
-	ChangeVisualization.prototype._getComponent = function () {
+	ChangeVisualization.prototype._getComponent = function() {
 		return FlUtils.getAppComponentForControl(ElementUtil.getElementInstance(this.getRootControlId()));
 	};
 
-	ChangeVisualization.prototype.setIsActive = function (bActiveState) {
+	ChangeVisualization.prototype.setIsActive = function(bActiveState) {
 		if (bActiveState === this.getIsActive()) {
 			return;
 		}
@@ -161,24 +168,37 @@ sap.ui.define([
 		}
 	};
 
-	ChangeVisualization.prototype.exit = function () {
+	ChangeVisualization.prototype.exit = function() {
 		this._oChangeIndicatorRegistry.destroy();
 		if (this.oRootOverlay) {
-			this.oRootOverlay.getDomRef().removeEventListener("click", this._fnOnClickHandler, {capture: true});
+			this.oRootOverlay.getDomRef().removeEventListener("click", this._fnOnClickHandler, { capture: true });
 		}
 	};
 
-	ChangeVisualization.prototype._reset = function () {
+	ChangeVisualization.prototype._reset = function() {
 		this._oChangeIndicatorRegistry.reset();
 	};
 
-	ChangeVisualization.prototype._updateVisualizationModelMenuData = function () {
-		var aCommandData = Object.keys(VALID_COMMANDS).map(function (sCommandCategoryName) {
-			var sTitle = this._getCommandCategoryLabel(sCommandCategoryName,
-				this._getChangesForCommandCategory(sCommandCategoryName).length);
+	ChangeVisualization.prototype._updateVisualizationModelMenuData = function() {
+		var aVisualizedChanges = this._oChangeVisualizationModel.getData().visualizedChanges;
+		var aHiddenChanges = [];
+		var aRegisteredChanges = this._oChangeIndicatorRegistry.getChanges();
+		aRegisteredChanges.forEach(function(oChange) {
+			var oVisualizedChange = aVisualizedChanges.find(function(oVisualizedChange) {
+				return oChange.change.getId() === oVisualizedChange.id;
+			});
+			if (!oVisualizedChange && !oChange.dependent) {
+				aHiddenChanges.push(oChange);
+			}
+		});
+		var aCommandData = Object.keys(VALID_COMMANDS).map(function(sCommandCategoryName) {
+			var sTitle = this._getCommandCategoryLabel(
+				sCommandCategoryName,
+				this._getChangesForCommandCategory(sCommandCategoryName, aVisualizedChanges).length
+			);
 			return {
 				key: sCommandCategoryName,
-				count: this._getChangesForCommandCategory(sCommandCategoryName).length,
+				count: this._getChangesForCommandCategory(sCommandCategoryName, aVisualizedChanges).length,
 				title: sTitle,
 				icon: CATEGORY_ICONS[sCommandCategoryName]
 			};
@@ -186,50 +206,85 @@ sap.ui.define([
 
 		aCommandData.unshift({
 			key: CATEGORY_ALL,
-			count: this._getChangesForCommandCategory(CATEGORY_ALL).length,
-			title: this._getCommandCategoryLabel(CATEGORY_ALL, this._getChangesForCommandCategory(CATEGORY_ALL).length),
+			count: this._getChangesForCommandCategory(CATEGORY_ALL, aVisualizedChanges).length,
+			title: this._getCommandCategoryLabel(CATEGORY_ALL, this._getChangesForCommandCategory(CATEGORY_ALL, aVisualizedChanges).length),
 			icon: CATEGORY_ICONS[CATEGORY_ALL]
 		});
 
 		this._updateVisualizationModel({
-			commandCategories: aCommandData
+			commandCategories: aCommandData,
+			hiddenChanges: aHiddenChanges,
+			popupInfoMessage: this._oTextBundle.getText(
+				"MSG_CHANGEVISUALIZATION_HIDDEN_CHANGES_INFO",
+				[aHiddenChanges.length]
+			)
 		});
 	};
 
-	ChangeVisualization.prototype._getChangesForCommandCategory = function (sCommandCategory) {
-		var aRegisteredChanges = this._oChangeIndicatorRegistry.getChanges();
-		return aRegisteredChanges.filter(function (oChange) {
+	ChangeVisualization.prototype._getChangesForCommandCategory = function(sCommandCategory, aChanges) {
+		return aChanges.filter(function(oChange) {
 			return sCommandCategory === CATEGORY_ALL
 				? oChange.commandCategory !== undefined
 				: sCommandCategory === oChange.commandCategory;
 		});
 	};
 
-	ChangeVisualization.prototype._getCommandCategoryLabel = function (sCommandCategoryName, iChangesCount) {
+	ChangeVisualization.prototype._getCommandCategoryLabel = function(sCommandCategoryName, iChangesCount) {
 		var sLabelKey = "TXT_CHANGEVISUALIZATION_OVERVIEW_" + sCommandCategoryName.toUpperCase();
 		return this._oTextBundle.getText(sLabelKey, [iChangesCount]);
 	};
 
-	ChangeVisualization.prototype._getCommandCategoryButton = function (sCommandCategoryName) {
+	ChangeVisualization.prototype._getCommandCategoryButton = function(sCommandCategoryName) {
 		var sButtonKey = "BTN_CHANGEVISUALIZATION_OVERVIEW_" + sCommandCategoryName.toUpperCase();
 		return this._oTextBundle.getText(sButtonKey);
 	};
 
+	ChangeVisualization.prototype.openChangeCategorySelectionPopover = function(oEvent) {
+		if (!this._oToolbarButton) {
+			// Event bubbled through the toolbar, get original source
+			this._oToolbarButton = sap.ui.getCore().byId(oEvent.getParameter("id"));
+		}
+		var oPopover = this.getPopover();
+
+		if (!oPopover) {
+			Fragment.load({
+				name: "sap.ui.rta.util.changeVisualization.ChangeIndicatorCategorySelection",
+				id: this._getComponent().createId("changeVisualization_changesListPopover"),
+				controller: this
+			})
+				.then(function(oPopover) {
+					this._oToolbarButton.addDependent(oPopover);
+					oPopover.setModel(this._oChangeVisualizationModel, "visualizationModel");
+					oPopover.openBy(this._oToolbarButton);
+					this.setPopover(oPopover);
+				}.bind(this));
+			return;
+		}
+
+		if (oPopover.isOpen()) {
+			oPopover.close();
+		} else {
+			oPopover.openBy(this._oToolbarButton);
+		}
+	};
+
 	/**
 	 * Sets the selected command category and visualizes all changes for the given category
 	 *
 	 * @param {event} oEvent - Event
-	 * @returns {promise} - Promise of category change
+	 * @returns {Promise} - Promise of category change
 	 */
-	ChangeVisualization.prototype.onCommandCategorySelection = function (oEvent) {
-		var sSelectedCommandCategory = oEvent.getParameter("item").getKey();
+	ChangeVisualization.prototype.onCommandCategorySelection = function(oEvent) {
+		var sSelectedCommandCategory = oEvent.getSource().getBindingContext("visualizationModel").getObject().key;
 		return this._selectCommandCategory(sSelectedCommandCategory);
 	};
 
-	ChangeVisualization.prototype._selectCommandCategory = function (sSelectedCommandCategory) {
+	ChangeVisualization.prototype._selectCommandCategory = function(sSelectedCommandCategory) {
 		this._sSelectedCommandCategory = sSelectedCommandCategory;
 
-		var aRelevantChanges = this._getChangesForCommandCategory(sSelectedCommandCategory);
+		var aRegisteredChanges = this._oChangeIndicatorRegistry.getChanges();
+		var aRelevantChanges = this._getChangesForCommandCategory(sSelectedCommandCategory, aRegisteredChanges);
+
 		var sCommandCategoryText = this._getCommandCategoryButton(sSelectedCommandCategory);
 
 		this._updateVisualizationModel({
@@ -237,22 +292,22 @@ sap.ui.define([
 			commandCategoryText: sCommandCategoryText
 		});
 
-		return Promise.all(aRelevantChanges.map(function (oChange) {
+		return Promise.all(aRelevantChanges.map(function(oChange) {
 			return this._getVisualizationInfo(oChange)
-				.then(function (mVisualizationInfo) {
+				.then(function(mVisualizationInfo) {
 					this._oChangeIndicatorRegistry.addVisualizationInfo(
 						oChange.change.getId(),
 						mVisualizationInfo
 					);
 				}.bind(this));
 		}.bind(this)))
-			.then(function () {
+			.then(function() {
 				this._updateChangeIndicators();
 				this._setFocusedIndicator();
 			}.bind(this));
 	};
 
-	ChangeVisualization.prototype._getVisualizationInfo = function (mChangeInformation) {
+	ChangeVisualization.prototype._getVisualizationInfo = function(mChangeInformation) {
 		var oComponent = this._getComponent();
 
 		function getSelectorIds(aSelectorList) {
@@ -260,7 +315,7 @@ sap.ui.define([
 				return undefined;
 			}
 			return aSelectorList
-				.map(function (vSelector) {
+				.map(function(vSelector) {
 					var oElement = typeof vSelector.getId === "function"
 						? vSelector
 						: JsControlTreeModifier.bySelector(vSelector, oComponent);
@@ -270,7 +325,7 @@ sap.ui.define([
 		}
 
 		return this._getInfoFromChangeHandler(oComponent, mChangeInformation.change)
-			.then(function (oInfoFromChangeHandler) {
+			.then(function(oInfoFromChangeHandler) {
 				var mVisualizationInfo = oInfoFromChangeHandler || {};
 				var aAffectedElementIds = (
 					getSelectorIds(mVisualizationInfo.affectedControls || [mChangeInformation.change.getSelector()])
@@ -329,7 +384,7 @@ sap.ui.define([
 			&& searchForCommand(OverlayRegistry.getOverlay(oLastDependentSelectorControl));
 	};
 
-	ChangeVisualization.prototype._getInfoFromChangeHandler = function (oAppComponent, oChange) {
+	ChangeVisualization.prototype._getInfoFromChangeHandler = function(oAppComponent, oChange) {
 		var oControl = JsControlTreeModifier.bySelector(oChange.getSelector(), oAppComponent);
 		if (oControl) {
 			var mPropertyBag = {
@@ -344,50 +399,54 @@ sap.ui.define([
 				modifier: JsControlTreeModifier,
 				layer: oChange.getLayer()
 			})
-			.then(function (oChangeHandler) {
-				if (oChangeHandler && typeof oChangeHandler.getChangeVisualizationInfo === "function") {
-					return oChangeHandler.getChangeVisualizationInfo(oChange, oAppComponent);
-				}
-				return undefined;
-			})
-			.catch(function(vErr) {
-				Log.error(vErr);
-				return undefined;
-			});
+				.then(function(oChangeHandler) {
+					if (oChangeHandler && typeof oChangeHandler.getChangeVisualizationInfo === "function") {
+						return oChangeHandler.getChangeVisualizationInfo(oChange, oAppComponent);
+					}
+					return undefined;
+				})
+				.catch(function(vErr) {
+					Log.error(vErr);
+					return undefined;
+				});
 		}
 
 		return Promise.resolve();
 	};
 
-	ChangeVisualization.prototype._collectChanges = function () {
+	ChangeVisualization.prototype._collectChanges = function() {
 		var oComponent = this._getComponent();
 		var mPropertyBag = {
-			oComponent: oComponent,
 			selector: oComponent,
 			invalidateCache: false,
-			includeVariants: true,
 			// includeCtrlVariants: true,
-			currentLayer: Layer.CUSTOMER
+			currentLayer: Layer.CUSTOMER,
+			includeDirtyChanges: true,
+			onlyCurrentVariants: true
 		};
 		return PersistenceWriteAPI._getUIChanges(mPropertyBag);
 	};
 
-	ChangeVisualization.prototype._updateChangeRegistry = function () {
-		return this._collectChanges().then(function (aChanges) {
+	ChangeVisualization.prototype._updateChangeRegistry = function() {
+		return this._collectChanges().then(function(aChanges) {
 			var aRegisteredChangeIds = this._oChangeIndicatorRegistry.getChangeIds();
-			var oCurrentChanges = aChanges.reduce(function (oChanges, oChange) {
-				oChanges[oChange.getId()] = oChange;
-				return oChanges;
-			}, {});
+			var oCurrentChanges = aChanges
+				.filter(function(oChange) {
+					return oChange.getFileType() === 'change';
+				})
+				.reduce(function(oChanges, oChange) {
+					oChanges[oChange.getId()] = oChange;
+					return oChanges;
+				}, {});
 			var aCurrentChangeIds = Object.keys(oCurrentChanges);
 
 			// Remove registered changes which no longer exist
-			difference(aRegisteredChangeIds, aCurrentChangeIds).forEach(function (sChangeIdToRemove) {
+			difference(aRegisteredChangeIds, aCurrentChangeIds).forEach(function(sChangeIdToRemove) {
 				this._oChangeIndicatorRegistry.removeChange(sChangeIdToRemove);
 			}.bind(this));
 
 			// Register missing changes
-			difference(aCurrentChangeIds, aRegisteredChangeIds).forEach(function (sChangeIdToAdd) {
+			difference(aCurrentChangeIds, aRegisteredChangeIds).forEach(function(sChangeIdToAdd) {
 				var oChangeToAdd = oCurrentChanges[sChangeIdToAdd];
 				var sCommandName = this._getCommandForChange(oChangeToAdd);
 				this._oChangeIndicatorRegistry.registerChange(oChangeToAdd, sCommandName);
@@ -395,24 +454,24 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	ChangeVisualization.prototype.selectChange = function (oEvent) {
+	ChangeVisualization.prototype.selectChange = function(oEvent) {
 		var sChangeId = oEvent.getParameter("changeId");
 		this._selectChange(sChangeId);
 	};
 
-	ChangeVisualization.prototype._selectChange = function (sChangeId) {
+	ChangeVisualization.prototype._selectChange = function(sChangeId) {
 		var aDependentElements = this._oChangeIndicatorRegistry.getChange(sChangeId).visualizationInfo.dependentElementIds;
 		aDependentElements.forEach(function(sElementId) {
 			var oOverlayDomRef = OverlayRegistry.getOverlay(sElementId).getDomRef();
 			oOverlayDomRef.scrollIntoViewIfNeeded();
 			oOverlayDomRef.classList.add("sapUiRtaChangeIndicatorDependent");
-			oOverlayDomRef.addEventListener("animationend", function () {
+			oOverlayDomRef.addEventListener("animationend", function() {
 				oOverlayDomRef.classList.remove("sapUiRtaChangeIndicatorDependent");
-			}, {once: true});
+			}, { once: true });
 		});
 	};
 
-	ChangeVisualization.prototype._updateVisualizationModel = function (oData) {
+	ChangeVisualization.prototype._updateVisualizationModel = function(oData) {
 		this._oChangeVisualizationModel.setData(Object.assign(
 			{},
 			this._oChangeVisualizationModel.getData(),
@@ -420,23 +479,27 @@ sap.ui.define([
 		));
 	};
 
-	ChangeVisualization.prototype._updateChangeIndicators = function () {
+	ChangeVisualization.prototype._updateChangeIndicators = function() {
 		var oSelectors = this._oChangeIndicatorRegistry.getChangeIndicatorData();
 		var oIndicators = {};
+		var aVisualizedChanges = [];
 		Object.keys(oSelectors)
-			.forEach(function (sSelectorId) {
+			.forEach(function(sSelectorId) {
 				var aChanges = oSelectors[sSelectorId];
 				var oOverlay = OverlayRegistry.getOverlay(sSelectorId);
-				if (!oOverlay || !oOverlay.getDomRef()) {
+				if (!oOverlay || !oOverlay.getDomRef() || !oOverlay.isVisible()) {
 					// Change is not visible
 					return undefined;
 				}
-
-				var oOverlayPosition = oOverlay.getDomRef().getClientRects()[0] || {left: 0, top: 0};
+				var oOverlayPosition = oOverlay.getDomRef().getClientRects()[0] || { left: 0, top: 0 };
+				var aRelevantChanges = this._filterRelevantChanges(aChanges);
+				aRelevantChanges.forEach(function (oChange) {
+					aVisualizedChanges.push(oChange);
+				});
 				oIndicators[sSelectorId] = {
 					posX: parseInt(oOverlayPosition.left),
 					posY: parseInt(oOverlayPosition.top),
-					changes: this._filterRelevantChanges(aChanges)
+					changes: aRelevantChanges
 				};
 
 				if (!this._oChangeIndicatorRegistry.hasChangeIndicator(sSelectorId)) {
@@ -449,21 +512,25 @@ sap.ui.define([
 			!deepEqual(
 				oIndicators,
 				this._oChangeVisualizationModel.getData().content
+			) || !deepEqual(
+				aVisualizedChanges,
+				this._oChangeVisualizationModel.getData().visualizedChanges
 			)
 		) {
 			this._updateVisualizationModel({
-				content: oIndicators
+				content: oIndicators,
+				visualizedChanges: aVisualizedChanges
 			});
 		}
 	};
 
-	ChangeVisualization.prototype._filterRelevantChanges = function (aChanges) {
+	ChangeVisualization.prototype._filterRelevantChanges = function(aChanges) {
 		if (!Array.isArray(aChanges)) {
 			return aChanges;
 		}
 		var oRootData = this._oChangeVisualizationModel.getData();
 
-		return aChanges.filter(function (oChange) {
+		return aChanges.filter(function(oChange) {
 			return (
 				!oChange.dependent
 				&& (
@@ -474,7 +541,7 @@ sap.ui.define([
 		});
 	};
 
-	ChangeVisualization.prototype._createChangeIndicator = function (oOverlay, sSelectorId) {
+	ChangeVisualization.prototype._createChangeIndicator = function(oOverlay, sSelectorId) {
 		var oChangeIndicator = new ChangeIndicator({
 			changes: "{changes}",
 			posX: "{posX}",
@@ -494,17 +561,17 @@ sap.ui.define([
 		this._oChangeIndicatorRegistry.registerChangeIndicator(sSelectorId, oChangeIndicator);
 	};
 
-	ChangeVisualization.prototype._setFocusedIndicator = function () {
+	ChangeVisualization.prototype._setFocusedIndicator = function() {
 		// Sort the Indicators according XY-Position
 		// Set the tabindex according the sorting
 		// Focus the first visible indicator
 		sap.ui.getCore().applyChanges();
 
 		var aVisibleIndicators = this._oChangeIndicatorRegistry.getChangeIndicators()
-			.filter(function (oIndicator) {
+			.filter(function(oIndicator) {
 				return oIndicator.getVisible();
 			})
-			.sort(function (oIndicator1, oIndicator2) {
+			.sort(function(oIndicator1, oIndicator2) {
 				var iDeltaY = oIndicator1.getPosY() - oIndicator2.getPosY();
 				var iDeltaX = oIndicator1.getPosX() - oIndicator2.getPosX();
 				// Only consider x value if y is the same
@@ -533,12 +600,12 @@ sap.ui.define([
 		if (this.getIsActive()) {
 			this.setIsActive(false);
 			if (this.oRootOverlay) {
-				this.oRootOverlay.getDomRef().removeEventListener("click", this._fnOnClickHandler, {capture: true});
+				this.oRootOverlay.getDomRef().removeEventListener("click", this._fnOnClickHandler, { capture: true });
 			}
 			return;
 		}
 		if (this.oRootOverlay) {
-			this.oRootOverlay.getDomRef().addEventListener("click", this._fnOnClickHandler, {capture: true});
+			this.oRootOverlay.getDomRef().addEventListener("click", this._fnOnClickHandler, { capture: true });
 		}
 		if (!this.getRootControlId()) {
 			this.setRootControlId(oRootControl);

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

@@ -0,0 +1,37 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function(
+) {
+	"use strict";
+
+	var ChangeVisualizationUtils = {};
+
+	/**
+	 *
+	 * Shortens a string if it is longer than 60 characters in the middle
+	 * and only shows the first and last part of it.
+	 *
+	 * @param {string} sString - Any string
+	 * @returns {string} Shortened string
+	 * @private
+	 */
+	ChangeVisualizationUtils.shortenString = function(sString) {
+		if (!sString) {
+			return null;
+		}
+		var iStringLength = sString.length;
+		if (iStringLength > 60) {
+			var sFirstPart = sString.substring(0, 27);
+			var sLastPart = sString.substring(iStringLength - 27);
+			sString = sFirstPart + "(...)" + sLastPart;
+		}
+		return sString;
+	};
+
+	return ChangeVisualizationUtils;
+});

package/src/sap/ui/rta/util/changeVisualization/categories/MoveVisualization.js

@@ -5,7 +5,11 @@
  */
 
 sap.ui.define([
+	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils",
+	"sap/ui/core/util/reflection/JsControlTreeModifier"
 ], function(
+	ChangeVisualizationUtils,
+	JsControlTreeModifier
 ) {
 	"use strict";
 
@@ -17,13 +21,30 @@ sap.ui.define([
 	 *
 	 * @param {object} mPayload - Change visualization payload from the change handler
 	 * @param {string} sLabel - Change handler label
+	 * @param {object} mPropertyBag - Additional properties
 	 * @returns {object} Localized description text and button text
 	 */
-	MoveVisualization.getDescription = function (mPayload, sLabel) {
+	MoveVisualization.getDescription = function(mPayload, sLabel, mPropertyBag) {
 		var oRtaResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-		var sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", sLabel);
-		var sButtonText = oRtaResourceBundle.getText("BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_MOVE");
-		return { descriptionText: sDescriptionText, buttonText: sButtonText};
+		var sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE_WITHIN", ChangeVisualizationUtils.shortenString(sLabel));
+		var sDescriptionTooltip = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE_WITHIN", sLabel);
+		var sButtonText;
+		var oAppComponent = mPropertyBag.appComponent;
+		var sSourceParentId = (
+			mPayload.sourceParentContainer
+			&& JsControlTreeModifier.getControlIdBySelector(mPayload.sourceParentContainer, oAppComponent)
+		);
+		var sTargetParentId = (
+			mPayload.targetParentContainer
+			&& JsControlTreeModifier.getControlIdBySelector(mPayload.targetParentContainer, oAppComponent)
+		);
+
+		if (sSourceParentId !== sTargetParentId) {
+			sButtonText = oRtaResourceBundle.getText("BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_MOVE");
+			sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", ChangeVisualizationUtils.shortenString(sLabel));
+			sDescriptionTooltip = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_MOVE", sLabel);
+		}
+		return { descriptionText: sDescriptionText, descriptionTooltip: sDescriptionTooltip, buttonText: sButtonText };
 	};
 
 	return MoveVisualization;

package/src/sap/ui/rta/util/changeVisualization/categories/RenameVisualization.js

@@ -5,7 +5,9 @@
  */
 
 sap.ui.define([
+	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils"
 ], function(
+	ChangeVisualizationUtils
 ) {
 	"use strict";
 
@@ -21,19 +23,29 @@ sap.ui.define([
 	 * @param {string} sFallbackLabel - New label as a fallback if change handler provides no info
 	 * @returns {object} Localized description
 	 */
-	RenameVisualization.getDescription = function (mPayload, sFallbackLabel) {
+	RenameVisualization.getDescription = function(mPayload, sFallbackLabel) {
 		var oRtaResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
 		var sKey = mPayload.originalLabel
 			? "TXT_CHANGEVISUALIZATION_CHANGE_RENAME_FROM_TO"
 			: "TXT_CHANGEVISUALIZATION_CHANGE_RENAME_TO";
 		var sDescriptionText = oRtaResourceBundle.getText(
+			sKey,
+			[
+				ChangeVisualizationUtils.shortenString(mPayload.newLabel) || sFallbackLabel,
+				ChangeVisualizationUtils.shortenString(mPayload.originalLabel)
+			]
+		);
+		var sDescriptionTooltip = oRtaResourceBundle.getText(
 			sKey,
 			[
 				mPayload.newLabel || sFallbackLabel,
 				mPayload.originalLabel
 			]
 		);
-		return {descriptionText: sDescriptionText};
+		return {
+			descriptionText: sDescriptionText,
+			descriptionTooltip: sDescriptionTooltip
+		};
 	};
 
 	return RenameVisualization;

package/src/sap/ui/rta/util/changeVisualization/categories/SplitVisualization.js

@@ -5,7 +5,9 @@
  */
 
 sap.ui.define([
+	"sap/ui/rta/util/changeVisualization/ChangeVisualizationUtils"
 ], function(
+	ChangeVisualizationUtils
 ) {
 	"use strict";
 
@@ -21,9 +23,10 @@ sap.ui.define([
 	 */
 	SplitVisualization.getDescription = function (mPayload, sLabel) {
 		var oRtaResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-		var sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_SPLIT", sLabel);
+		var sDescriptionText = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_SPLIT", ChangeVisualizationUtils.shortenString(sLabel));
+		var sDescriptionTooltip = oRtaResourceBundle.getText("TXT_CHANGEVISUALIZATION_CHANGE_SPLIT", sLabel);
 		var sButtonText = oRtaResourceBundle.getText("BTN_CHANGEVISUALIZATION_SHOW_DEPENDENT_CONTAINER_SPLIT");
-		return { descriptionText: sDescriptionText, buttonText: sButtonText};
+		return { descriptionText: sDescriptionText, descriptionTooltip: sDescriptionTooltip, buttonText: sButtonText};
 	};
 
 	return SplitVisualization;