@openui5/sap.ui.rta 1.115.0 → 1.116.0

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.106
 	 * @since 1.106
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -44,12 +44,12 @@ sap.ui.define([
 				modifier: JsControlTreeModifier,
 				layer: oRta.getLayer()
 			})
-				.then(function(oChangeHandler) {
-					return oChangeHandler;
-				})
-				.catch(function() {
-					return;
-				});
+			.then(function(oChangeHandler) {
+				return oChangeHandler;
+			})
+			.catch(function() {
+				return;
+			});
 		}
 		return Promise.resolve(undefined);
 	}
@@ -97,29 +97,29 @@ sap.ui.define([
 			var bIsSibling = isPluginForSibling(sPluginName);
 
 			return getPluginChangeHandler(oInstance, oOverlay, oRta)
-				.then(function(oChangeHandler) {
-					return {
-						name: sPluginName,
-						isAvailable: oInstance.isAvailable([oOverlay], bIsSibling),
-						hasChangeHandler: !!oChangeHandler
-					};
-				});
-		}))
-			.then(function(aPlugins) {
+			.then(function(oChangeHandler) {
 				return {
-					elementId: oElement.getId(),
-					elementControlType: oElement.getMetadata().getName(),
-					overlayId: oOverlay.getId(),
-					plugins: aPlugins
+					name: sPluginName,
+					isAvailable: oInstance.isAvailable([oOverlay], bIsSibling),
+					hasChangeHandler: !!oChangeHandler
 				};
 			});
+		}))
+		.then(function(aPlugins) {
+			return {
+				elementId: oElement.getId(),
+				elementControlType: oElement.getMetadata().getName(),
+				overlayId: oOverlay.getId(),
+				plugins: aPlugins
+			};
+		});
 	}
 
 	function printChangeHandler(oRta, mPayload) {
 		var oOverlay = Core.byId(mPayload.overlayId);
 		var oPlugin = getPluginByName(oRta, mPayload.pluginName);
 		getPluginChangeHandler(oPlugin, oOverlay, oRta)
-			.then(console.log); // eslint-disable-line no-console
+		.then(console.log); // eslint-disable-line no-console
 	}
 
 	function printDesignTimeMetadata(oRta, mPayload) {
@@ -174,15 +174,15 @@ sap.ui.define([
 
 		if (mHandler) {
 			Promise.resolve(mHandler.handler(oRta, oEvent.data.content))
-				.then(function(oResult) {
-					if (mHandler.returnMessageType) {
-						oEvent.source.postMessage({
-							id: mHandler.id,
-							type: mHandler.returnMessageType,
-							content: oResult
-						});
-					}
-				});
+			.then(function(oResult) {
+				if (mHandler.returnMessageType) {
+					oEvent.source.postMessage({
+						id: mHandler.id,
+						type: mHandler.returnMessageType,
+						content: oResult
+					});
+				}
+			});
 		}
 	}
 

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

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(function () {
+sap.ui.define(function() {
 	"use strict";
 
 	return Object.freeze({

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

@@ -7,7 +7,6 @@
 sap.ui.define([
 	"./AdaptationRenderer",
 	"sap/base/Log",
-	"sap/m/MessageBox",
 	"sap/ui/core/BusyIndicator",
 	"sap/ui/core/Fragment",
 	"sap/ui/core/Popup",
@@ -15,18 +14,17 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/Version",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/rta/appVariant/Feature",
 	"sap/ui/rta/toolbar/Base",
 	"sap/ui/rta/toolbar/contextBased/ManageAdaptations",
 	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
 	"sap/ui/rta/toolbar/translation/Translation",
 	"sap/ui/rta/toolbar/versioning/Versioning",
-	"sap/ui/rta/Utils"
+	"sap/ui/rta/Utils",
+	"sap/m/MessageBox"
 ], function(
 	AdaptationRenderer,
 	Log,
-	MessageBox,
 	BusyIndicator,
 	Fragment,
 	Popup,
@@ -34,14 +32,14 @@ sap.ui.define([
 	ContextBasedAdaptationsAPI,
 	Version,
 	JSONModel,
-	ResourceModel,
 	AppVariantFeature,
 	Base,
 	ManageAdaptations,
 	SaveAsAdaptation,
 	Translation,
 	Versioning,
-	Utils
+	Utils,
+	MessageBox
 ) {
 	"use strict";
 
@@ -53,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -108,7 +106,7 @@ sap.ui.define([
 
 	Adaptation.prototype._calculateWindowWidth = function(aEntries) {
 		var iSectionWidth = aEntries[0].intersectionRect.width;
-		return (iSectionWidth * 2) + this._iSwitcherToolbarWidth + 80/*toolbar padding*/;
+		return (iSectionWidth * 2) + this._iSwitcherToolbarWidth + 80/* toolbar padding */;
 	};
 
 	Adaptation.prototype.onFragmentLoaded = function() {
@@ -132,7 +130,7 @@ sap.ui.define([
 		}
 	};
 
-	Adaptation.prototype._onResize = function () {
+	Adaptation.prototype._onResize = function() {
 		if (this._iOnResizeAnimationFrame) {
 			window.cancelAnimationFrame(this._iOnResizeAnimationFrame);
 		}
@@ -209,9 +207,9 @@ sap.ui.define([
 
 	Adaptation.prototype.show = function() {
 		return Base.prototype.show.call(this, this.initialAdjustToolbarSectionWidths.bind(this))
-			.then(function() {
-				this._observeIntersections();
-			}.bind(this));
+		.then(function() {
+			this._observeIntersections();
+		}.bind(this));
 	};
 
 	function setButtonProperties(sButtonName, sIcon, sTextKey, sToolTipKey) {
@@ -223,15 +221,15 @@ sap.ui.define([
 		oButton.setIcon(sIcon || "");
 	}
 
-	Adaptation.prototype.formatPublishVersionVisibility = function (bPublishVisible, bVersioningEnabled, sDisplayedVersion, sModeSwitcher) {
+	Adaptation.prototype.formatPublishVersionVisibility = function(bPublishVisible, bVersioningEnabled, sDisplayedVersion, sModeSwitcher) {
 		return this.getExtension("versioning", Versioning).formatPublishVersionVisibility(bPublishVisible, bVersioningEnabled, sDisplayedVersion, sModeSwitcher);
 	};
 
-	Adaptation.prototype.formatDiscardDraftVisible = function (sDisplayedVersion, bVersioningEnabled, sModeSwitcher) {
+	Adaptation.prototype.formatDiscardDraftVisible = function(sDisplayedVersion, bVersioningEnabled, sModeSwitcher) {
 		return this.getExtension("versioning", Versioning).formatDiscardDraftVisible(sDisplayedVersion, bVersioningEnabled, sModeSwitcher);
 	};
 
-	Adaptation.prototype.formatVersionButtonText = function (aVersions, sDisplayedVersion) {
+	Adaptation.prototype.formatVersionButtonText = function(aVersions, sDisplayedVersion) {
 		return this.getExtension("versioning", Versioning).formatVersionButtonText(aVersions, sDisplayedVersion);
 	};
 
@@ -239,7 +237,7 @@ sap.ui.define([
 		return this.getExtension("versioning", Versioning).showVersionHistory(oEvent);
 	};
 
-	Adaptation.prototype._openVersionTitleDialog = function (sDisplayedVersion) {
+	Adaptation.prototype._openVersionTitleDialog = function(sDisplayedVersion) {
 		return this.getExtension("versioning", Versioning).openActivateVersionDialog(sDisplayedVersion);
 	};
 
@@ -287,7 +285,7 @@ sap.ui.define([
 		this.adjustToolbarSectionWidths();
 	};
 
-	Adaptation.prototype._switchToTexts = function () {
+	Adaptation.prototype._switchToTexts = function() {
 		this._showButtonText("adaptationSwitcherButton", "BTN_ADAPTATION");
 		this._showButtonText("navigationSwitcherButton", "BTN_NAVIGATION");
 		this._showButtonText("visualizationSwitcherButton", "BTN_VISUALIZATION");
@@ -301,7 +299,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<sap.ui.core.Control[]>} Returns the controls in a structure described above.
 	 */
-	Adaptation.prototype.buildControls = function () {
+	Adaptation.prototype.buildControls = function() {
 		return Fragment.load({
 			name: "sap.ui.rta.toolbar.Adaptation",
 			id: this.getId() + "_fragment",
@@ -351,10 +349,60 @@ sap.ui.define([
 		AppVariantFeature.onSaveAs(true, true, this.getRtaInformation().flexSettings.layer, null);
 	}
 
+	function confirmMigration(oRtaInformation) {
+		var bDirty = oRtaInformation.commandStack.canSave();
+
+		Utils.showMessageBox("confirm", (bDirty) ? "DAC_DIALOG_MIGRATION_DIRTY_DESCRIPTION" : "DAC_DIALOG_MIGRATION_DESCRIPTION", {
+			titleKey: "DAC_DIALOG_MIGRATION_HEADER",
+			actionKeys: ["DAC_DIALOG_MIGRATION_HEADER"],
+			showCancel: true
+		})
+		.then(function(sAction) {
+			if (sAction !== MessageBox.Action.CANCEL) {
+				BusyIndicator.show();
+
+				if (bDirty) {
+					oRtaInformation.commandStack.removeAllCommands(true);
+				}
+
+				ContextBasedAdaptationsAPI.migrate({
+					control: oRtaInformation.rootControl,
+					layer: oRtaInformation.flexSettings.layer
+				})
+				.finally(function() {
+					BusyIndicator.hide();
+				})
+				.then(Utils.showMessageBox.bind(undefined, "information", "DAC_DIALOG_MIGRATION_SUCCESSFULL_DESCRIPTION", {
+					titleKey: "DAC_DIALOG_MIGRATION_HEADER"
+				}))
+				.then(function() {
+					return new Promise(function(resolve) {
+						this.fireEvent("switchAdaptation", {adaptationId: "DEFAULT", callback: resolve});
+					}.bind(this));
+				}.bind(this))
+				.catch(function(oError) {
+					Log.error(oError.stack || oError);
+					var sMessage = "DAC_DIALOG_MIGRATION_ERROR_DESCRIPTION";
+					var oOptions = {
+						titleKey: "DAC_DIALOG_MIGRATION_HEADER",
+						details: oError.userMessage || oError
+					};
+					Utils.showMessageBox("error", sMessage, oOptions);
+				});
+			}
+		}.bind(this));
+	}
+
 	function onSaveAsAdaptation() {
-		Utils.checkDraftOverwrite(this.getModel("versions"))
-		.then(function() {
-			this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer);
+		var oRtaInformation = this.getRtaInformation();
+		Utils.checkDraftOverwrite(this.getModel("versions")).then(function() {
+			return ContextBasedAdaptationsAPI.canMigrate({ control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer });
+		}).then(function(bCanMigrate) {
+			if (bCanMigrate) {
+				confirmMigration.call(this, oRtaInformation);
+			} else {
+				this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(oRtaInformation.flexSettings.layer);
+			}
 		}.bind(this))
 		.catch(handleError);
 	}
@@ -362,7 +410,7 @@ sap.ui.define([
 	function onEditAdaptation() {
 		Utils.checkDraftOverwrite(this.getModel("versions"))
 		.then(function() {
-			this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer, true /*bIsEditMode*/);
+			this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer, true /* bIsEditMode */);
 		}.bind(this))
 		.catch(handleError);
 	}
@@ -393,7 +441,7 @@ sap.ui.define([
 	function formatAdaptationsMenuText(iCount, sTitle) {
 		if (iCount > 0) {
 			if (sTitle === "") {
-				sTitle = this.getTextResources().getText("TXT_DEFAULT_APP");
+				return this.getTextResources().getText("TXT_DEFAULT_APP");
 			}
 			return this.getTextResources().getText("BTN_ADAPTING_FOR", sTitle);
 		}
@@ -440,7 +488,7 @@ sap.ui.define([
 		var sURLPart2 = "SV_4MANxRymEIl9K06";
 		var sURL = sURLPart1 + sURLPart2;
 		var oUrlParams = new URLSearchParams();
-		oUrlParams.set("version", sap.ui.version);
+		oUrlParams.set("version", Core.getConfiguration().getVersion().toString());
 		oUrlParams.set("feature", (sConnector === "KeyUserConnector" ? "BTP" : "ABAP"));
 
 		var oFeedbackDialogModel = new JSONModel({
@@ -450,7 +498,7 @@ sap.ui.define([
 		return Fragment.load({
 			name: "sap.ui.rta.toolbar.FeedbackDialog",
 			controller: this
-		}).then(function (oFeedbackDialog) {
+		}).then(function(oFeedbackDialog) {
 			this._oFeedbackDialog = oFeedbackDialog;
 			this._oFeedbackDialog.addStyleClass(Utils.getRtaStyleClassName());
 			this._oFeedbackDialog.setModel(oFeedbackDialogModel, "feedbackModel");
@@ -459,7 +507,7 @@ sap.ui.define([
 				this._oFeedbackDialog.destroy();
 			}.bind(this));
 			this._oFeedbackDialog.open();
-		}.bind(this)).catch(function (oError) {
+		}.bind(this)).catch(function(oError) {
 			Log.error("Error loading fragment sap.ui.rta.toolbar.FeedbackDialog: ", oError);
 		});
 	};

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

@@ -15,7 +15,7 @@ sap.ui.define([
 
 	AdaptationRenderer.apiVersion = 1; // @todo-semantic-rendering out of order .class() call before openStart
 
-	AdaptationRenderer.render = function (oRM, oControl) {
+	AdaptationRenderer.render = function(oRM, oControl) {
 		oRM.class("sapUiRtaToolbarAdaptation");
 
 		BaseRenderer.render(oRM, oControl);

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

@@ -6,12 +6,14 @@
 
 sap.ui.define([
 	"sap/m/HBox",
+	"sap/ui/core/StaticArea",
 	"sap/ui/dt/util/ZIndexManager",
 	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/rta/util/Animation",
 	"./BaseRenderer"
 ], function(
 	HBox,
+	StaticArea,
 	ZIndexManager,
 	ResourceModel,
 	Animation,
@@ -27,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -148,7 +150,7 @@ sap.ui.define([
 	 * @param {string} sEventName - Name of the event
 	 * @param {sap.ui.base.Event} oEvent - Event object
 	 */
-	Base.prototype.eventHandler = function (sEventName, oEvent) {
+	Base.prototype.eventHandler = function(sEventName, oEvent) {
 		this["fire" + sEventName](oEvent.getParameters());
 	};
 
@@ -158,7 +160,7 @@ sap.ui.define([
 	 * @returns {Promise<sap.ui.core.Control[]>} A Promise that resolves with an array of controls
 	 * @protected
 	 */
-	Base.prototype.buildControls = function () {
+	Base.prototype.buildControls = function() {
 		return Promise.resolve([]);
 	};
 
@@ -166,9 +168,9 @@ sap.ui.define([
 	 * Function renders the Toolbar into the page
 	 * @protected
 	 */
-	Base.prototype.placeToContainer = function () {
+	Base.prototype.placeToContainer = function() {
 		// Render toolbar
-		this.placeAt(sap.ui.getCore().getStaticAreaRef());
+		this.placeAt(StaticArea.getDomRef());
 	};
 
 	/**
@@ -176,8 +178,8 @@ sap.ui.define([
 	 * @protected
 	 * @returns {Promise} An empty Promise
 	 */
-	Base.prototype.buildContent = function () {
-		return this.buildControls().then(function (aControls) {
+	Base.prototype.buildContent = function() {
+		return this.buildControls().then(function(aControls) {
 			aControls.forEach(this.addItem, this);
 		}.bind(this));
 	};
@@ -190,9 +192,9 @@ sap.ui.define([
 	 */
 	Base.prototype.show = function(fnAdjustToolbarCallback) {
 		// 1) create Promise and wait until DomRef is available
-		return new Promise(function (fnResolve) {
+		return new Promise(function(fnResolve) {
 			var oDelegate = {
-				onAfterRendering: function () {
+				onAfterRendering: function() {
 					this.removeEventDelegate(oDelegate);
 					fnResolve();
 				}
@@ -202,7 +204,7 @@ sap.ui.define([
 			this.setVisible(true); // show DomRef
 		}.bind(this))
 		// 2) animate DomRef
-		.then(function () {
+		.then(function() {
 			if (fnAdjustToolbarCallback && typeof fnAdjustToolbarCallback === "function") {
 				fnAdjustToolbarCallback();
 			}
@@ -211,7 +213,7 @@ sap.ui.define([
 				: Promise.resolve();
 		}.bind(this))
 		// 3) focus on Toolbar
-		.then(function () {
+		.then(function() {
 			this.focus();
 		}.bind(this));
 	};
@@ -234,9 +236,9 @@ sap.ui.define([
 		}
 		return oPromise
 		// 2) hide DomRef
-			.then(function () {
-				this.setVisible(false);
-			}.bind(this));
+		.then(function() {
+			this.setVisible(false);
+		}.bind(this));
 	};
 
 	/**
@@ -254,7 +256,7 @@ sap.ui.define([
 	 * Place the Toolbar above everything on the page
 	 * @public
 	 */
-	Base.prototype.bringToFront = function () {
+	Base.prototype.bringToFront = function() {
 		this.setZIndex(ZIndexManager.getNextZIndex());
 	};
 

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

@@ -18,7 +18,7 @@ function(
 
 	BaseRenderer.apiVersion = 1; // @todo-semantic-rendering out of order .class() and .style() calls before openStart
 
-	BaseRenderer.render = function (oRM, oControl) {
+	BaseRenderer.render = function(oRM, oControl) {
 		oRM.class("sapUiRtaToolbar");
 		oRM.class("color_" + oControl.getColor());
 
@@ -32,6 +32,5 @@ function(
 		HBoxRenderer.render(oRM, oControl);
 	};
 
-
 	return BaseRenderer;
 });

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

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -48,19 +48,19 @@ function(
 		type: "fiori"
 	});
 
-	Fiori.prototype.init = function () {
+	Fiori.prototype.init = function() {
 		this._oRenderer = Utils.getFiori2Renderer();
 		this._oFioriHeader = this._oRenderer.getRootControl().getShellHeader();
 		Adaptation.prototype.init.apply(this, arguments);
 	};
 
-	Fiori.prototype.show = function () {
+	Fiori.prototype.show = function() {
 		this._oFioriHeader.addStyleClass(FIORI_HIDDEN_CLASS);
 		return Adaptation.prototype.show.apply(this, arguments);
 	};
 
-	Fiori.prototype.buildControls = function () {
-		return Adaptation.prototype.buildControls.apply(this, arguments).then(function (aControls) {
+	Fiori.prototype.buildControls = function() {
+		return Adaptation.prototype.buildControls.apply(this, arguments).then(function(aControls) {
 			var sLogoPath = this._oFioriHeader.getLogo();
 
 			if (this._oFioriHeader.getShowLogo() && sLogoPath) {
@@ -95,9 +95,9 @@ function(
 	/**
 	 * @inheritDoc
 	 */
-	Fiori.prototype.hide = function () {
+	Fiori.prototype.hide = function() {
 		return Adaptation.prototype.hide.apply(this, arguments)
-		.then(function () {
+		.then(function() {
 			this._oFioriHeader.removeStyleClass(FIORI_HIDDEN_CLASS);
 		}.bind(this));
 	};
@@ -156,7 +156,7 @@ function(
 		oIconSpacer.setVisible(bVisible);
 	};
 
-	Fiori.prototype.destroy = function () {
+	Fiori.prototype.destroy = function() {
 		// In case of destroy() without normal hide() call
 		this._oFioriHeader.removeStyleClass(FIORI_HIDDEN_CLASS);
 

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

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.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.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -50,7 +50,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	OverflowToolbarButton.prototype._onBeforeEnterOverflow = function () {
+	OverflowToolbarButton.prototype._onBeforeEnterOverflow = function() {
 		SapMOverflowToolbarButton.prototype._onBeforeEnterOverflow.apply(this, arguments);
 		this.setVisibleIcon(this.getIcon());
 		this.setIcon("");
@@ -61,7 +61,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	OverflowToolbarButton.prototype._onAfterExitOverflow = function () {
+	OverflowToolbarButton.prototype._onAfterExitOverflow = function() {
 		SapMOverflowToolbarButton.prototype._onAfterExitOverflow.apply(this, arguments);
 		this.setIcon(this.getVisibleIcon());
 	};
@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @public
 	 * @returns {object} Configuration information for the <code>sap.m.IOverflowToolbarContent</code> interface.
 	 */
-	OverflowToolbarButton.prototype.getOverflowToolbarConfig = function () {
+	OverflowToolbarButton.prototype.getOverflowToolbarConfig = function() {
 		return {
 			canOverflow: true,
 			onBeforeEnterOverflow: this._onBeforeEnterOverflow.bind(this),

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

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -62,7 +62,7 @@ function(
 				text: "{i18n>BTN_DONE}",
 				press: this.eventHandler.bind(this, "Exit")
 			}).data("name", "exit")
-		].forEach(function (oControl) {
+		].forEach(function(oControl) {
 			this.addItem(oControl);
 		}.bind(this));
 

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

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

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

@@ -79,7 +79,7 @@ function(
 					onSaveReorderedAdaptations: onSaveReorderedAdaptations.bind(this),
 					isAdaptationsSelected: isAdaptationsSelected.bind(this),
 					getIndexOfSelectedAdaptation: getIndexOfSelectedAdaptation.bind(this),
-					onClose: onCloseDialog.bind(this)
+					onCancel: onCancelDialog.bind(this)
 				}
 			}).then(function(oDialog) {
 				this._oManageAdaptationDialog = oDialog;
@@ -99,6 +99,7 @@ function(
 			this.oAdaptationsModel = ContextBasedAdaptationsAPI.getAdaptationsModel({control: this._oRtaInformation.rootControl, layer: this._oRtaInformation.flexSettings.layer});
 			this.oAdaptationsModel.updateAdaptations(oAdaptations.adaptations);
 			this.oReferenceAdaptationsData = JSON.parse(JSON.stringify(this.oAdaptationsModel.getProperty("/adaptations")));
+			this._oOriginAdaptationsData = JSON.parse(JSON.stringify(this.oAdaptationsModel.getProperty("/allAdaptations")));
 			this._oControlConfigurationModel = new JSONModel({isTableItemSelected: false});
 			this._oManageAdaptationDialog.setModel(this.oAdaptationsModel, "contextBased");
 			this._oManageAdaptationDialog.setModel(this._oControlConfigurationModel, "controlConfiguration");
@@ -171,7 +172,7 @@ function(
 		if (sQuery && sQuery.length > 0) {
 			syncEnabledPropertyOfMoveButtons.call(this);
 			enableDragAndDropForAdaptationTable.call(this, false);
-			//filter Table context
+			// filter Table context
 			var oFilterByTitle = new Filter("title", FilterOperator.Contains, sQuery);
 			var oFilterByContextId = new Filter({
 				path: "contexts/role",
@@ -184,7 +185,7 @@ function(
 			var oFilterCreatedBy = new Filter("createdBy", FilterOperator.Contains, sQuery);
 			var oFilterChangedBy = new Filter("changedBy", FilterOperator.Contains, sQuery);
 			oFilters = new Filter([oFilterByTitle, oFilterByContextId, oFilterCreatedBy, oFilterChangedBy]);
-			//Filter default Table context
+			// Filter default Table context
 			if (sDefaultTableText.toUpperCase().includes(sQuery.toUpperCase())) {
 				oDefaultApplicationTable.setVisible(true);
 			} else {
@@ -292,8 +293,8 @@ function(
 
 	function didAdaptationsPriorityChange() {
 		return !_isEqual(
-			this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdapation) { return oAdapation.id; }),
-			this.oReferenceAdaptationsData.map(function(oAdapation) { return oAdapation.id; })
+			this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; }),
+			this.oReferenceAdaptationsData.map(function(oAdaptation) { return oAdaptation.id; })
 		);
 	}
 
@@ -347,7 +348,7 @@ function(
 	}
 
 	function onSaveReorderedAdaptations() {
-		Utils.checkDraftOverwrite(this.getModel("versions")).then(function() {
+		Utils.checkDraftOverwrite(this.getToolbar().getModel("versions")).then(function() {
 			var oRtaInformation = this.getToolbar().getRtaInformation();
 			var aAdaptationPriorities = this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; });
 			return ContextBasedAdaptationsAPI.reorder({control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer, parameters: {priorities: aAdaptationPriorities}});
@@ -364,6 +365,12 @@ function(
 		});
 	}
 
+	function onCancelDialog() {
+		// the adaptationsModel has to be set to its origin as no reorder has taken place
+		this.oAdaptationsModel.updateAdaptations(this._oOriginAdaptationsData);
+		onCloseDialog.call(this);
+	}
+
 	function onCloseDialog() {
 		this._oControlConfigurationModel.setProperty("/isTableItemSelected", false);
 		getSearchField.call(this).setValue("");