@openui5/sap.ui.rta 1.128.0 → 1.130.0

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

@@ -5,11 +5,13 @@
  */
 
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/core/Element",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/fl/write/api/ChangesWriteAPI"
 ], function(
+	Log,
 	Element,
 	JsControlTreeModifier,
 	OverlayRegistry,
@@ -28,17 +30,33 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.SupportTools
 	 * @author SAP SE
 	 * @since 1.106
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted
 	 */
 
-	var sHighlightClass = "sapUiFlexibilitySupportExtension_Selected";
+	const sHighlightClass = "sapUiFlexibilitySupportExtension_Selected";
+	const sGlobalVariableName = "ui5flex$temp";
+	window[sGlobalVariableName] = {}; // Container for all temp. variables
+	const aTempVariables = window[sGlobalVariableName];
+	let nTempVarCount = 0;
+
+	/**
+	 * Logs a message to the console
+	 * @param {string} sMessage - Message to be logged
+	 * @param {object} oVariable - Variable containing Object to be logged
+	 */
+	function logToConsole(sMessage, oVariable) {
+		console.log(`Flextention: ${sMessage}`); // eslint-disable-line no-console
+		if (oVariable) {
+			console.log(oVariable); // eslint-disable-line no-console
+		}
+	}
 
 	function getPluginChangeHandler(oPlugin, oElementOverlay, oRta) {
-		var oAction = oPlugin.getAction(oElementOverlay);
+		const oAction = oPlugin.getAction(oElementOverlay);
 		if (oAction && oAction.changeType) {
-			var oElement = oAction.changeOnRelevantContainer
+			const oElement = oAction.changeOnRelevantContainer
 				? oElementOverlay.getRelevantContainer()
 				: oElementOverlay.getElement();
 			return ChangesWriteAPI.getChangeHandler({
@@ -68,10 +86,10 @@ sap.ui.define([
 	}
 
 	function getPluginByName(oRta, sPluginName) {
-		var bIsSibling = isPluginForSibling(sPluginName);
-		var oAllPlugins = oRta.getPlugins();
+		const bIsSibling = isPluginForSibling(sPluginName);
+		const oAllPlugins = oRta.getPlugins();
 		return Object.values(oAllPlugins).find(function(oPlugin) {
-			var sName = oPlugin._retrievePluginName
+			const sName = oPlugin._retrievePluginName
 				? oPlugin._retrievePluginName(bIsSibling)
 				: oPlugin.getMetadata().getName();
 			return sName === sPluginName;
@@ -82,10 +100,10 @@ sap.ui.define([
 	 * Removes the highlighting of a non-selectable overlay
 	 */
 	function removeSelectionHighlight() {
-		var aHighlightedDom = document.getElementsByClassName(sHighlightClass);
-		 if (aHighlightedDom.length > 0) {
-			 aHighlightedDom[0].classList.remove(sHighlightClass);
-		 }
+		const aHighlightedDom = document.getElementsByClassName(sHighlightClass);
+		if (aHighlightedDom.length > 0) {
+			aHighlightedDom[0].classList.remove(sHighlightClass);
+		}
 	}
 
 	/*
@@ -102,11 +120,11 @@ sap.ui.define([
 	 * @returns {Promise<object|null>} Resolves with the overlay info
 	 */
 	async function getOverlayInfo(oRta, mPayload) {
-		var oOverlay = Element.getElementById(mPayload.overlayId);
+		const oOverlay = Element.getElementById(mPayload.overlayId);
 		if (!oOverlay) {
 			return null;
 		}
-		var oElement = oOverlay.getElement();
+		const oElement = oOverlay.getElement();
 
 		// remove previous selection highlighting on clicking in the app
 		if (oOverlay.getSelectable()) {
@@ -120,8 +138,8 @@ sap.ui.define([
 		});
 
 		const aPlugins = await Promise.all(aEditableByPlugins.map(async function(sPluginName) {
-			var oInstance = getPluginByName(oRta, sPluginName);
-			var bIsSibling = isPluginForSibling(sPluginName);
+			const oInstance = getPluginByName(oRta, sPluginName);
+			const bIsSibling = isPluginForSibling(sPluginName);
 
 			const oChangeHandler = await getPluginChangeHandler(oInstance, oOverlay, oRta);
 			return {
@@ -139,19 +157,36 @@ sap.ui.define([
 		};
 	}
 
-	/*
+	/**
 	 * Prints the change handler to the console
-	 *
 	 * @param {sap.ui.rta.RuntimeAuthoring} oRta - Instance of the RuntimeAuthoring class
 	 * @param {object} mPayload - Property Bag
-	 * @param {string} mPayload.overlayId
-	 * @param {string} mPayload.pluginName
+	 * @param {string} mPayload.overlayId - ID of the Overlay
+	 * @param {string} mPayload.pluginName - Name of the Plugin
 	 */
-	function printChangeHandler(oRta, mPayload) {
-		var oOverlay = Element.getElementById(mPayload.overlayId);
-		var oPlugin = getPluginByName(oRta, mPayload.pluginName);
-		getPluginChangeHandler(oPlugin, oOverlay, oRta)
-		.then(console.log); // eslint-disable-line no-console
+	async function printChangeHandler(oRta, mPayload) {
+		const oOverlay = Element.getElementById(mPayload.overlayId);
+		const oPlugin = getPluginByName(oRta, mPayload.pluginName);
+		const oChangeHandler = await getPluginChangeHandler(oPlugin, oOverlay, oRta);
+		if (oPlugin) {
+			try {
+				const sPluginId = oPlugin.getId();
+				const sTempVariableName = aTempVariables[sPluginId] && aTempVariables[sPluginId].savedAs || `ui5flex$${nTempVarCount++}`;
+				aTempVariables[sPluginId] = {
+					description: `ChangeHandler for Plugin: ${sPluginId} - ${mPayload.pluginName}`,
+					changeHandler: oChangeHandler,
+					savedAs: sTempVariableName
+				};
+				const oVariable = aTempVariables[sPluginId];
+				window[sTempVariableName] = aTempVariables[sPluginId];
+				const sMessage = `ChangeHandler copied to global var ${sTempVariableName}, all vars are collected in global var ${sGlobalVariableName}`;
+				logToConsole(sMessage, oVariable);
+			} catch (oError) {
+				// Ignore errors
+			}
+		} else {
+			logToConsole("ChangeHandler could not be logged", undefined);
+		}
 	}
 
 	/*
@@ -163,7 +198,7 @@ sap.ui.define([
 	 */
 	function closeContextMenu(oRta) {
 		if (document.getElementsByClassName("sapUiDtContextMenu").length > 0) {
-			var oContextMenu = oRta.getPlugins().contextMenu;
+			const oContextMenu = oRta.getPlugins().contextMenu;
 			oContextMenu.oContextMenuControl.close();
 		}
 	}
@@ -179,7 +214,7 @@ sap.ui.define([
 	 */
 	function changeOverlaySelection(oRta, mPayload) {
 		// set new focus and enforce collecting overlay info data
-		var oOverlay = Element.getElementById(mPayload.overlayId);
+		const oOverlay = Element.getElementById(mPayload.overlayId);
 		oOverlay.focus();
 		window.postMessage({
 			type: "getOverlayInfo",
@@ -194,19 +229,18 @@ sap.ui.define([
 		// close the contextmenu in UI-Adaptation
 		closeContextMenu(oRta);
 
+		// remove current selection(s)
+		const aSelection = oRta.getSelection();
+		aSelection.forEach(function(oSelectedOverlay) {
+			oSelectedOverlay.setSelected(false);
+		});
+
 		// set new selection (selectable overlays)
 		if (oOverlay.getSelectable()) {
 			oOverlay.setSelected(true);
-		} else {
-			// remove current selection(s)
-			var aSelection = oRta.getSelection();
-			aSelection.forEach(function(oSelectedOverlay) {
-				oSelectedOverlay.setSelected(false);
-			});
+		} else if (oOverlay.getDomRef()) {
 			// highlight unselectable overlay
-			if (oOverlay.getDomRef()) {
-				oOverlay.getDomRef().classList.add("sapUiFlexibilitySupportExtension_Selected");
-			}
+			oOverlay.getDomRef().classList.add("sapUiFlexibilitySupportExtension_Selected");
 		}
 	}
 
@@ -218,12 +252,12 @@ sap.ui.define([
 	 */
 	function collectOverlayTableData() {
 		// create an array with all relevant overlays (no aggregation overlays)
-		var aAllOverlays = OverlayRegistry.getOverlays();
-		var aRelevantOverlayList = [];
+		const aAllOverlays = OverlayRegistry.getOverlays();
+		const aRelevantOverlayList = [];
 		aAllOverlays.forEach(function(oOverlay) {
 			if (!oOverlay.isA("sap.ui.dt.AggregationOverlay")) {
-				var sParentId = oOverlay.getParentElementOverlay()?.getId();
-				var aChildren = oOverlay.getChildren().map(function(oChild) {
+				const sParentId = oOverlay.getParentElementOverlay()?.getId();
+				const aChildren = oOverlay.getChildren().map(function(oChild) {
 					return oChild.getId();
 				});
 				aRelevantOverlayList.push({
@@ -240,13 +274,38 @@ sap.ui.define([
 		return aRelevantOverlayList;
 	}
 
+	/**
+	 * Prints the design time metadata to the console
+	 * @param {sap.ui.rta.RuntimeAuthoring} oRta - Instance of the RuntimeAuthoring class
+	 * @param {object} mPayload - Property Bag
+	 * @param {string} mPayload.overlayId - ID of the Overlay
+	 */
 	function printDesignTimeMetadata(oRta, mPayload) {
-		var oOverlay = Element.getElementById(mPayload.overlayId);
-		console.log(oOverlay.getDesignTimeMetadata().getData()); // eslint-disable-line no-console
+		const oOverlay = Element.getElementById(mPayload.overlayId);
+		const oMetaData = oOverlay.getDesignTimeMetadata().getData();
+		if (oMetaData) {
+			try {
+				const sMetaDataId = oOverlay.getDesignTimeMetadata().getId();
+				const sTempVariableName = aTempVariables[sMetaDataId] && aTempVariables[sMetaDataId].savedAs || `ui5flex$${nTempVarCount++}`;
+				aTempVariables[sMetaDataId] = {
+					description: `DesignTimeMetaData: ${sMetaDataId} for Overlay: ${mPayload.overlayId}`,
+					metaData: oMetaData,
+					savedAs: sTempVariableName
+				};
+				const oVariable = aTempVariables[sMetaDataId];
+				window[sTempVariableName] = aTempVariables[sMetaDataId];
+				const sMessage = `MetaData copied to global var ${sTempVariableName}, all vars are collected in global var ${sGlobalVariableName}`;
+				logToConsole(sMessage, oVariable);
+			} catch (oError) {
+				// Ignore errors
+			}
+		} else {
+			logToConsole("DesignTimeMetaData could not be logged", undefined);
+		}
 	}
 
 	// List of supported handlers
-	var mHandlers = {
+	const mHandlers = {
 		getOverlayInfo: {
 			handler: getOverlayInfo,
 			returnMessageType: "overlayInfo",
@@ -316,13 +375,13 @@ sap.ui.define([
 			return;
 		}
 
-		var aHandler = Object.entries(mHandlers).find(function(aEntry) {
+		const aHandler = Object.entries(mHandlers).find(function(aEntry) {
 			return (
 				aEntry[0] === oEvent.data.type
 				&& aEntry[1].id === oEvent.data.id
 			);
 		});
-		var mHandler = aHandler && aHandler[1];
+		const mHandler = aHandler && aHandler[1];
 
 		if (mHandler) {
 			Promise.resolve(mHandler.handler(oRta, oEvent.data.content))
@@ -339,7 +398,7 @@ sap.ui.define([
 	}
 
 	return function(oRta) {
-		var fnOnMessageReceivedBound = onMessageReceived.bind(null, oRta);
+		const fnOnMessageReceivedBound = onMessageReceived.bind(null, oRta);
 		window.addEventListener("message", fnOnMessageReceivedBound);
 		oRta.attachEventOnce("stop", onRtaStop);
 		onRtaStart();

package/src/sap/ui/rta/themes/base/ChangeVisualization.less

@@ -1,7 +1,6 @@
 /******************************************************************
 	Style of the RTA Change Visualization - base theme
 *******************************************************************/
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiChartPaletteSequentialHue1Light1; //#4880cb
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiChartPaletteSequentialHue1Dark1; //#1b57a7
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: @sapUiChartPaletteSequentialHue11Dark2; //#0e4186
 @_sap_ui_rta_ChangeVisualization_OverlayBoxShadow: @sapUiUx3ToolPopupShadow; //0px 6px 12px 0px fade(black, 30);
@@ -16,21 +15,8 @@
 	margin-left: 0.25rem;
 	transition: width 0.3s, height 0.3s, box-shadow 0.3s;
 	cursor: pointer;
-
-	&.sapUiRtaChangeIndicatorColorLight {
-		background-color: @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight;
-		opacity: 0.6;
-	}
-
-	&.sapUiRtaChangeIndicatorColorMedium {
-		background-color: @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium;
-		opacity: 0.75;
-	}
-
-	&.sapUiRtaChangeIndicatorColorDark {
-		background-color: @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark;
-		opacity: 0.75;
-	}
+	background-color: @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium;
+	opacity: 0.75;
 
 	&.sapUiRtaChangeIndicatorVerticallyCentered {
 		top: 50%;

package/src/sap/ui/rta/themes/base/WhatsNew.less

@@ -0,0 +1,7 @@
+/******************************************************************
+	Style of the RTA WhatsNew Dialog/Overview - base Theme
+*******************************************************************/
+
+.whatsNewImage {
+  border-radius: 1rem;
+}

package/src/sap/ui/rta/themes/base/library.source.less

@@ -18,4 +18,5 @@
 @import "Toolbar.adaptation.less";
 @import "Toolbar.base.less";
 @import "Toolbar.fiori.less";
-@import "Toolbar.standalone.less";
+@import "Toolbar.standalone.less";
+@import "WhatsNew.less";

package/src/sap/ui/rta/themes/sap_hcb/ChangeVisualization.less

@@ -1,7 +1,6 @@
 /******************************************************************
 	Style of the RTA Change Visualization - HCB theme
 *******************************************************************/
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: lighten(@sapUiPositiveText, 10%); //#bbddbb
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiCriticalText; //#ffab1d
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: lighten(@sapUiChart8, 20%); //#dd8ec9
 @_sap_ui_rta_ChangeVisualization_OverlayOutline: @sapUiContentHelpColor; // #03b803

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

@@ -72,5 +72,13 @@
 				visible="{= (${controls>/restore/visible} && ((${controls>/modeSwitcher} === 'visualization') || (${controls>/modeSwitcher} === 'adaptation')))}"
 				press=".restore"
 				text="{i18n>BTN_RESTORE}" />
+		<MenuItem
+				id="sapUiRta_newFeaturesOverview"
+				icon="sap-icon://newspaper"
+				enabled="{controls>/newFeaturesOverview/enabled}"
+				visible="{controls>/newFeaturesOverview/visible}"
+				text="{i18n>BTN_WHATS_NEW_DIALOG_OVERVIEW}"
+				press=".openWhatsNewOverviewDialog"
+				ariaHasPopup="Dialog"/>
 	</Menu>
 </core:FragmentDefinition>

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

@@ -109,7 +109,14 @@
 				<Button
 						id="sapUiRta_actionsMenu"
 						icon="sap-icon://menu2"
-						visible="{= ${controls>/modeSwitcher} === 'adaptation' &amp;&amp; (${controls>/translation/visible} || ${controls>/appVariantMenu/visible} || ${controls>/restore/visible})}"
+						visible="{=
+								${controls>/modeSwitcher} === 'adaptation'
+								&amp;&amp; (
+									${controls>/translation/visible}
+									|| ${controls>/appVariantMenu/visible}
+									|| ${controls>/restore/visible}
+									|| ${controls>/newFeaturesOverview/visible}
+								)}"
 						enabled="{controls>/actionsMenuButton/enabled}"
 						type="Transparent"
 						tooltip="{i18n>BTN_MENU}"

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

@@ -23,6 +23,7 @@ sap.ui.define([
 	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
 	"sap/ui/rta/toolbar/translation/Translation",
 	"sap/ui/rta/toolbar/versioning/Versioning",
+	"sap/ui/rta/util/whatsNew/WhatsNewOverview",
 	"sap/ui/rta/Utils"
 ], function(
 	AdaptationRenderer,
@@ -43,6 +44,7 @@ sap.ui.define([
 	SaveAsAdaptation,
 	Translation,
 	Versioning,
+	WhatsNewOverview,
 	Utils
 ) {
 	"use strict";
@@ -55,7 +57,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -254,7 +256,8 @@ sap.ui.define([
 					overviewForDeveloper: onOverviewForDeveloperPressed.bind(this),
 					restore: this.eventHandler.bind(this, "Restore"),
 					formatSaveAsEnabled,
-					saveAs: onSaveAsPressed.bind(this)
+					saveAs: onSaveAsPressed.bind(this),
+					openWhatsNewOverviewDialog
 				}
 			}).then(function(oMenu) {
 				oMenu.addStyleClass(Utils.getRtaStyleClassName());
@@ -472,6 +475,10 @@ sap.ui.define([
 		AppVariantFeature.onGetOverview(true, this.getRtaInformation().flexSettings.layer);
 	}
 
+	function openWhatsNewOverviewDialog() {
+		WhatsNewOverview.openWhatsNewOverviewDialog();
+	}
+
 	Adaptation.prototype.getControl = function(sName) {
 		var oControl = Element.getElementById(`${this.getId()}_fragment--sapUiRta_${sName}`);
 		// Control is inside the ActionsMenu

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -8,6 +8,7 @@
 sap.ui.define([
 	"sap/base/i18n/Localization",
 	"sap/base/util/restricted/_isEqual",
+	"sap/base/util/restricted/_union",
 	"sap/base/Log",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Fragment",
@@ -22,6 +23,7 @@ sap.ui.define([
 ], function(
 	Localization,
 	_isEqual,
+	_union,
 	Log,
 	ManagedObject,
 	Fragment,
@@ -263,43 +265,43 @@ sap.ui.define([
 	}
 
 	function onDropSelectedAdaptation(oEvent) {
-		var oDraggedItem = oEvent.getParameter("draggedControl");
-		var oDraggedItemContext = oDraggedItem.getBindingContext("contextBased");
+		const oDraggedItem = oEvent.getParameter("draggedControl");
+		const oDraggedItemContext = oDraggedItem.getBindingContext("contextBased");
 		if (!oDraggedItemContext) {
 			return;
 		}
 
-		var iNewRank = oRanking.Default;
-		var oDroppedItem = oEvent.getParameter("droppedControl");
+		let iNewRank = oRanking.Default;
+		const oDroppedItem = oEvent.getParameter("droppedControl");
 
 		if (oDroppedItem instanceof ColumnListItem) {
 			// get the dropped row data
-			var sDropPosition = oEvent.getParameter("dropPosition");
-			var oDroppedItemContext = oDroppedItem.getBindingContext("contextBased");
-			var iDroppedItemRank = oDroppedItemContext.getProperty("rank");
-			var oDroppedTable = oDroppedItem.getParent();
-			var iDroppedItemIndex = oDroppedTable.indexOfItem(oDroppedItem);
+			const sDropPosition = oEvent.getParameter("dropPosition");
+			const oDroppedItemContext = oDroppedItem.getBindingContext("contextBased");
+			const iDroppedItemRank = oDroppedItemContext.getProperty("rank");
+			const oDroppedTable = oDroppedItem.getParent();
+			const iDroppedItemIndex = oDroppedTable.indexOfItem(oDroppedItem);
 			if (oDroppedItemContext === oDraggedItemContext) {
 				return;
 			}
 			// find the new index of the dragged row depending on the drop position
-			var iNewItemIndex = iDroppedItemIndex + (sDropPosition === "After" ? 1 : -1);
-			var oNewItem = oDroppedTable.getItems()[iNewItemIndex];
+			const iNewItemIndex = iDroppedItemIndex + (sDropPosition === "After" ? 1 : -1);
+			const oNewItem = oDroppedTable.getItems()[iNewItemIndex];
 			if (!oNewItem || iNewItemIndex === -1) {
 				// dropped before the first row or after the last row
 				iNewRank = iNewItemIndex === -1 ? 0.5 : oRanking[sDropPosition](iDroppedItemRank);
 			} else {
 				// dropped between first and the last row
-				var oNewItemContext = oNewItem.getBindingContext("contextBased");
+				const oNewItemContext = oNewItem.getBindingContext("contextBased");
 				iNewRank = oRanking.Between(iDroppedItemRank, oNewItemContext.getProperty("rank"));
 			}
 		}
 		// set the rank property and update the model to refresh the bindings
 		this.oAdaptationsModel.setProperty("rank", iNewRank, oDraggedItemContext);
 		sortByRank(this.oAdaptationsModel);
-		var oAllUpdatedAdaptations = Object.assign(
-			this.oAdaptationsModel.getProperty("/allAdaptations"),
-			this.oAdaptationsModel.getProperty("/adaptations")
+		const oAllUpdatedAdaptations = _union(
+			this.oAdaptationsModel.getProperty("/adaptations"),
+			this.oAdaptationsModel.getProperty("/allAdaptations")
 		);
 		this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
 		enableSaveButton.call(this, didAdaptationsPriorityChange.call(this));
@@ -372,9 +374,9 @@ sap.ui.define([
 				parameters: {priorities: aAdaptationPriorities}
 			});
 		}.bind(this)).then(function() {
-			var oAllUpdatedAdaptations = Object.assign(
-				this.oAdaptationsModel.getProperty("/allAdaptations"),
-				this.oAdaptationsModel.getProperty("/adaptations")
+			const oAllUpdatedAdaptations = _union(
+				this.oAdaptationsModel.getProperty("/adaptations"),
+				this.oAdaptationsModel.getProperty("/allAdaptations")
 			);
 			this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
 			onCloseDialog.call(this);

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

@@ -7,7 +7,7 @@
 		draggable="true"
 		contentWidth="830px"
 		contentHeight="450px"
-		setHorizontalScrolling="false"
+		horizontalScrolling="false"
 		title="{i18n>MANAGE_ADAPTATIONS_DIALOG_HEADER}">
 		<Table id="manageAdaptationsTable"
 			showNoData="false"

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -176,12 +176,12 @@ sap.ui.define([
 	}
 
 	function getInitialTranslationModelData() {
-		return Object.assign({}, {
+		return {
 			sourceLanguage: "",
 			sourceLanguages: [],
 			downloadChangedTexts: false,
 			file: undefined
-		});
+		};
 	}
 
 	Translation.prototype.openDownloadTranslationDialog = function(mPropertyBag) {

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
@@ -211,7 +211,7 @@ sap.ui.define([
 			}
 		}
 
-		return Object.assign({}, this._mDefaultPlugins);
+		return { ...this._mDefaultPlugins };
 	};
 
 	/**

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.128.0
+	 * @version 1.130.0
 	 * @constructor
 	 * @private
 	 * @since 1.48