@openui5/sap.ui.rta 1.113.0 → 1.114.1

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

@@ -109,7 +109,7 @@
 				<Button
 						id="sapUiRta_actionsMenu"
 						icon="sap-icon://menu2"
-						visible="{= ${controls>/modeSwitcher} === 'adaptation' &amp;&amp; (${controls>/translation/visible} || ${controls>/appVariantMenu/visible} || ${controls>/restore/visible} || ${controls>/contextBasedAdaptation/visible})}"
+						visible="{= ${controls>/modeSwitcher} === 'adaptation' &amp;&amp; (${controls>/translation/visible} || ${controls>/appVariantMenu/visible} || ${controls>/restore/visible})}"
 						enabled="{controls>/actionsMenuButton/enabled}"
 						type="Transparent"
 						tooltip="{i18n>BTN_MENU}"
@@ -143,26 +143,65 @@
 						<OverflowToolbarLayoutData priority="NeverOverflow" />
 					</layoutData>
 				</Button>
-				<toolbar:OverflowToolbarButton
-						id="sapUiRta_manageAdaptations"
-						press=".manageAdaptations"
-						visible="{= (${controls>/contextBasedAdaptation/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						type="Transparent"
-						text="{i18n>BTN_MANAGE_APP_CTX}" >
-					<toolbar:layoutData>
-						<OverflowToolbarLayoutData priority="Low" />
-					</toolbar:layoutData>
-				</toolbar:OverflowToolbarButton>
-				<toolbar:OverflowToolbarButton
-						id="sapUiRta_saveAsAdaptation"
-						visible="{= (${controls>/contextBasedAdaptation/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						press=".saveAsAdaptation"
+				<MenuButton
+						id="sapUiRta_contextBasedAdaptationMenu"
+						tooltip="{parts: [{path: 'contextBasedAdaptations>/count'}, {path: 'contextBasedAdaptations>/displayedAdaptation/title'}], formatter: '.formatAdaptationsMenuText'}"
+						text="{parts: [{path: 'contextBasedAdaptations>/count'}, {path: 'contextBasedAdaptations>/displayedAdaptation/title'}], formatter: '.formatAdaptationsMenuText'}"
+						visible="{= (${controls>/contextBasedAdaptation/visible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}">
+					<Menu>
+						<MenuItem
+								id="sapUiRta_saveAsAdaptation"
+								text="{i18n>SAC_DIALOG_HEADER}"
+								press=".saveAsAdaptation"
+								icon="sap-icon://copy"/>
+						<MenuItem
+								id="sapUiRta_editAdaptation"
+								visible="{= (${contextBasedAdaptations>/count} > 0 &amp;&amp; ${contextBasedAdaptations>/displayedAdaptation/title} !== '')}"
+								text="{i18n>EAC_DIALOG_HEADER}"
+								press=".editAdaptation"
+								icon="sap-icon://edit"/>
+						<MenuItem
+								id="sapUiRta_deleteAdaptation"
+								text="{i18n>DAC_DIALOG_HEADER}"
+								press=".deleteAdaptation"
+								visible="{= (${contextBasedAdaptations>/count} > 0 &amp;&amp; ${contextBasedAdaptations>/displayedAdaptation/title} !== '')}"
+								icon="sap-icon://delete"/>
+						<MenuItem
+								id="sapUiRta_manageAdaptations"
+								text="{i18n>MANAGE_ADAPTATIONS_DIALOG_HEADER}"
+								press=".manageAdaptations"
+								icon="sap-icon://action-settings"/>
+						<MenuItem
+								id="sapUiRta_switchAdaptations"
+								visible="{= (${contextBasedAdaptations>/count} > 0)}"
+								text="{i18n>BTN_SWITCH_ADAPTATIONS}"
+								icon="sap-icon://switch-views"
+								items="{contextBasedAdaptations>/allAdaptations}">
+							<items>
+								<MenuItem
+									id="sapUiRta_switchAdaptations_items"
+									enabled="{= (${contextBasedAdaptations>id} !== ${contextBasedAdaptations>/displayedAdaptation/id}) }"
+									icon="{= (${contextBasedAdaptations>id} === ${contextBasedAdaptations>/displayedAdaptation/id} ? 'sap-icon://accept' : 'blank')}"
+									text="{= (${contextBasedAdaptations>title} ? ${contextBasedAdaptations>title} : ${i18n>TXT_DEFAULT_APP})}"
+									press=".switchAdaptation(${contextBasedAdaptations>id})"/>
+							</items>
+						</MenuItem>
+					</Menu>
+					<layoutData>
+						<OverflowToolbarLayoutData priority="NeverOverflow" />
+					</layoutData>
+				</MenuButton>
+				<Button
+						id="sapUiRta_feedback"
+						icon="sap-icon://feedback"
+						press=".showFeedbackForm"
+						visible="{controls>/feedbackButton/visible}"
 						type="Transparent"
-						text="{i18n>BTN_SAVE_AS}" >
-					<toolbar:layoutData>
-						<OverflowToolbarLayoutData priority="Low" />
-					</toolbar:layoutData>
-				</toolbar:OverflowToolbarButton>
+						tooltip="{i18n>BTN_FEEDBACK}" >
+					<layoutData>
+						<OverflowToolbarLayoutData priority="NeverOverflow" />
+					</layoutData>
+				</Button>
 				<toolbar:OverflowToolbarButton
 						id="sapUiRta_save"
 						type="Transparent"

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

@@ -5,29 +5,41 @@
  */
 
 sap.ui.define([
+	"./AdaptationRenderer",
+	"sap/base/Log",
+	"sap/ui/core/BusyIndicator",
 	"sap/ui/core/Fragment",
 	"sap/ui/core/Popup",
+	"sap/ui/core/Core",
+	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/fl/write/api/Version",
-	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
+	"sap/ui/model/json/JSONModel",
+	"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/appVariant/Feature",
-	"sap/ui/rta/toolbar/Base",
 	"sap/ui/rta/Utils",
-	"./AdaptationRenderer"
+	"sap/m/MessageBox"
 ], function(
+	AdaptationRenderer,
+	Log,
+	BusyIndicator,
 	Fragment,
 	Popup,
+	Core,
+	ContextBasedAdaptationsAPI,
 	Version,
-	SaveAsAdaptation,
+	JSONModel,
+	AppVariantFeature,
+	Base,
 	ManageAdaptations,
+	SaveAsAdaptation,
 	Translation,
 	Versioning,
-	AppVariantFeature,
-	Base,
 	Utils,
-	AdaptationRenderer
+	MessageBox
 ) {
 	"use strict";
 
@@ -39,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private
@@ -66,6 +78,8 @@ sap.ui.define([
 				activate: {},
 				discardDraft: {},
 				switchVersion: {},
+				switchAdaptation: {},
+				deleteAdaptation: {},
 				openChangeCategorySelectionPopover: {}
 			}
 		}
@@ -299,13 +313,18 @@ sap.ui.define([
 				redo: this.eventHandler.bind(this, "Redo"),
 				openChangeCategorySelectionPopover: this.eventHandler.bind(this, "OpenChangeCategorySelectionPopover"),
 				saveAsAdaptation: onSaveAsAdaptation.bind(this),
+				editAdaptation: onEditAdaptation.bind(this),
+				deleteAdaptation: onDeleteAdaptation.bind(this),
 				manageAdaptations: onManageAdaptations.bind(this),
+				switchAdaptation: onSwitchAdaptations.bind(this),
+				formatAdaptationsMenuText: formatAdaptationsMenuText.bind(this),
 				publishVersion: this.eventHandler.bind(this, "PublishVersion"),
 				save: this.eventHandler.bind(this, "Save"),
 				exit: this.eventHandler.bind(this, "Exit"),
 				formatVersionButtonText: this.formatVersionButtonText.bind(this),
 				showVersionHistory: this.showVersionHistory.bind(this),
-				showActionsMenu: this.showActionsMenu.bind(this)
+				showActionsMenu: this.showActionsMenu.bind(this),
+				showFeedbackForm: this.showFeedbackForm.bind(this)
 			}
 		});
 	};
@@ -330,14 +349,105 @@ 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() {
-		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);
+	}
+
+	function onEditAdaptation() {
+		Utils.checkDraftOverwrite(this.getModel("versions"))
+		.then(function() {
+			this.getExtension("contextBasedSaveAs", SaveAsAdaptation).openAddAdaptationDialog(this.getRtaInformation().flexSettings.layer, true /*bIsEditMode*/);
+		}.bind(this))
+		.catch(handleError);
+	}
+
+	function handleError(oError) {
+		if (oError !== "cancel") {
+			Utils.showMessageBox("error", "MSG_LREP_TRANSFER_ERROR", {error: oError});
+			Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+		}
+	}
+
+	function onDeleteAdaptation() {
+		Utils.checkDraftOverwrite(this.getModel("versions"))
+		.then(function() {
+			this.fireEvent("deleteAdaptation");
+		}.bind(this))
+		.catch(handleError);
 	}
 
 	function onManageAdaptations() {
 		this.getExtension("contextBasedManage", ManageAdaptations).openManageAdaptationDialog();
 	}
 
+	function onSwitchAdaptations(sAdaptationId) {
+		this.fireEvent("switchAdaptation", {adaptationId: sAdaptationId});
+	}
+
+	function formatAdaptationsMenuText(iCount, sTitle) {
+		if (iCount > 0) {
+			if (sTitle === "") {
+				return this.getTextResources().getText("TXT_DEFAULT_APP");
+			}
+			return this.getTextResources().getText("BTN_ADAPTING_FOR", sTitle);
+		}
+		return this.getTextResources().getText("BTN_ADAPTING_FOR_ALL_USERS");
+	}
+
 	function onOverviewForKeyUserPressed() {
 		return AppVariantFeature.onGetOverview(true, this.getRtaInformation().flexSettings.layer);
 	}
@@ -369,5 +479,44 @@ sap.ui.define([
 		return Base.prototype.hide.apply(this, arguments);
 	};
 
+	Adaptation.prototype.showFeedbackForm = function() {
+		// Get Connector Type
+		var sConnector = Core.getConfiguration().getFlexibilityServices()[0].connector;
+
+		// Set URL
+		var sURLPart1 = "https://sapinsights.eu.qualtrics.com/jfe/form/";
+		var sURLPart2 = "SV_4MANxRymEIl9K06";
+		var sURL = sURLPart1 + sURLPart2;
+		var oUrlParams = new URLSearchParams();
+		oUrlParams.set("version", sap.ui.version);
+		oUrlParams.set("feature", (sConnector === "KeyUserConnector" ? "BTP" : "ABAP"));
+
+		var oFeedbackDialogModel = new JSONModel({
+			url: sURL + "?" + oUrlParams.toString()
+		});
+
+		return Fragment.load({
+			name: "sap.ui.rta.toolbar.FeedbackDialog",
+			controller: this
+		}).then(function (oFeedbackDialog) {
+			this._oFeedbackDialog = oFeedbackDialog;
+			this._oFeedbackDialog.addStyleClass(Utils.getRtaStyleClassName());
+			this._oFeedbackDialog.setModel(oFeedbackDialogModel, "feedbackModel");
+			this._oFeedbackDialog.setModel(this.getModel("i18n"), "i18n");
+			this._oFeedbackDialog.attachEventOnce("afterClose", function() {
+				this._oFeedbackDialog.destroy();
+			}.bind(this));
+			this._oFeedbackDialog.open();
+		}.bind(this)).catch(function (oError) {
+			Log.error("Error loading fragment sap.ui.rta.toolbar.FeedbackDialog: ", oError);
+		});
+	};
+
+	Adaptation.prototype.closeFeedbackForm = function() {
+		if (this._oFeedbackDialog) {
+			this._oFeedbackDialog.close();
+		}
+	};
+
 	return Adaptation;
-});
+});

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -0,0 +1,24 @@
+<core:FragmentDefinition
+    xmlns:core="sap.ui.core"
+    xmlns="sap.m"
+    xmlns:util="sap.ui.fl.util">
+	<Dialog
+		id="sapUiRtaFeedbackIFrameDialog"
+		title="{i18n>TIT_FEEDBACK}"
+		contentWidth="50rem"
+		contentHeight="50rem"
+		draggable="true">
+		<content>
+			<util:IFrame
+				id="sapUiRtaFeedbackIFrameDialog_iFrame"
+				url="{= ${feedbackModel>/url}}"
+				height="46rem"/>
+		</content>
+		<buttons>
+			<Button
+				id="sapUiRtaFeedbackIFrameDialog_ButtonClose"
+				text="{i18n>BTN_CLOSE_FEEDBACK_DIALOG}"
+				press=".closeFeedbackForm"/>
+		</buttons>
+	</Dialog>
+</core:FragmentDefinition>

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

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @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.113.0
+	 * @version 1.114.1
 	 *
 	 * @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.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.114.1
 	 *
 	 * @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.113.0
+	 * @version 1.114.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/m/ColumnListItem",
 	"sap/ui/rta/Utils",
+	"sap/ui/rta/toolbar/contextBased/SaveAsAdaptation",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
 	"sap/ui/model/json/JSONModel",
@@ -26,6 +27,7 @@ function(
 	ContextBasedAdaptationsAPI,
 	ColumnListItem,
 	Utils,
+	SaveAsAdaptation,
 	Filter,
 	FilterOperator,
 	JSONModel,
@@ -75,7 +77,9 @@ function(
 					moveDown: moveDown.bind(this),
 					onDropSelectedAdaptation: onDropSelectedAdaptation.bind(this),
 					onSaveReorderedAdaptations: onSaveReorderedAdaptations.bind(this),
-					onClose: onCloseDialog.bind(this)
+					isAdaptationsSelected: isAdaptationsSelected.bind(this),
+					getIndexOfSelectedAdaptation: getIndexOfSelectedAdaptation.bind(this),
+					onCancel: onCancelDialog.bind(this)
 				}
 			}).then(function(oDialog) {
 				this._oManageAdaptationDialog = oDialog;
@@ -83,7 +87,7 @@ function(
 				this.getToolbar().addDependent(this._oManageAdaptationDialog);
 			}.bind(this));
 		} else {
-			setEnabledPropertyOfMoveButton.call(this, false);
+			syncEnabledPropertyOfMoveButtons.call(this);
 			enableDragAndDropForAdaptationTable.call(this, true);
 			enableSaveButton.call(this, false);
 		}
@@ -94,11 +98,11 @@ function(
 		}.bind(this)).then(function(oAdaptations) {
 			this.oAdaptationsModel = ContextBasedAdaptationsAPI.getAdaptationsModel({control: this._oRtaInformation.rootControl, layer: this._oRtaInformation.flexSettings.layer});
 			this.oAdaptationsModel.updateAdaptations(oAdaptations.adaptations);
-			this.oReferenceAdaptationsData = JSON.parse(JSON.stringify(oAdaptations));
+			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");
-			initializeRanks(this.oAdaptationsModel);
 			getAdaptationsTable.call(this).attachSelectionChange(onSelectionChange.bind(this));
 			return this._oManageAdaptationDialog.open();
 		}.bind(this)
@@ -126,26 +130,36 @@ function(
 		var oOptions = {
 			year: "numeric",
 			month: "short",
-			day: "numeric"
+			day: "numeric",
+			hour: "numeric",
+			minute: "numeric"
 		};
 		var sLanguage = sap.ui.getCore().getConfiguration().getLanguage();
-		return sModifiedBy + "\n" + oUi5Date.toLocaleDateString(sLanguage, oOptions);
+		return sModifiedBy + "\n" + oUi5Date.toLocaleTimeString(sLanguage, oOptions);
 	}
 
 	function onSelectionChange(oEvent) {
 		if (oEvent.getParameter("selected") === true) {
 			this._oControlConfigurationModel.setProperty("/isTableItemSelected", true);
-			if (isSearchFieldValueEmpty.call(this)) {
-				setEnabledPropertyOfMoveButton.call(this, true);
-			}
+			syncEnabledPropertyOfMoveButtons.call(this);
 		}
 	}
 
-	function setEnabledPropertyOfMoveButton(bIsEnabled) {
+	function syncEnabledPropertyOfMoveButtons() {
 		var oUpButton = getControlInDialog.call(this, "moveUpButton");
 		var oDownButton = getControlInDialog.call(this, "moveDownButton");
-		oUpButton.setEnabled(bIsEnabled);
-		oDownButton.setEnabled(bIsEnabled);
+		if (isSearchFieldValueEmpty.call(this)) {
+			if (isAdaptationsSelected.call(this)) {
+				oUpButton.setEnabled(getIndexOfSelectedAdaptation.call(this) > 0);
+				oDownButton.setEnabled(getIndexOfSelectedAdaptation.call(this) < this.oAdaptationsModel.getProperty("/count") - 1);
+			} else {
+				oUpButton.setEnabled(false);
+				oDownButton.setEnabled(false);
+			}
+		} else {
+			oUpButton.setEnabled(false);
+			oDownButton.setEnabled(false);
+		}
 	}
 
 	// ------ search field ------
@@ -156,7 +170,7 @@ function(
 		var oDefaultApplicationTable = getDefaultApplicationTable.call(this);
 		var sDefaultTableText = getDefaultApplicationTitle.call(this);
 		if (sQuery && sQuery.length > 0) {
-			setEnabledPropertyOfMoveButton.call(this, false);
+			syncEnabledPropertyOfMoveButtons.call(this);
 			enableDragAndDropForAdaptationTable.call(this, false);
 			//filter Table context
 			var oFilterByTitle = new Filter("title", FilterOperator.Contains, sQuery);
@@ -180,7 +194,7 @@ function(
 		} else {
 			enableDragAndDropForAdaptationTable.call(this, true);
 			if (this._oControlConfigurationModel.getProperty("/isTableItemSelected")) {
-				setEnabledPropertyOfMoveButton.call(this, true);
+				syncEnabledPropertyOfMoveButtons.call(this);
 			}
 			oDefaultApplicationTable.setVisible(true);
 		}
@@ -211,14 +225,6 @@ function(
 		oModel.refresh(true);
 	}
 
-	function initializeRanks(oModel) {
-		var aContexts = oModel.getProperty("/adaptations") || [];
-		aContexts.forEach(function(oContext, iIndex) {
-			oContext.rank = iIndex + 1;
-		});
-		oModel.setProperty("/adaptations", aContexts);
-	}
-
 	function moveSelectedItem(sDirection) {
 		var oTable = getAdaptationsTable.call(this);
 		var oSelectedItem = oTable.getSelectedItem(0);
@@ -241,7 +247,8 @@ function(
 		sortByRank(this.oAdaptationsModel);
 		// after move select the sibling
 		oTable.getItems()[iSiblingItemIndex].setSelected(true).focus();
-		enableSaveButton.call(this, true);
+		enableSaveButton.call(this, didAdaptationsPriorityChange.call(this));
+		syncEnabledPropertyOfMoveButtons.call(this);
 	}
 
 	function onDropSelectedAdaptation(oEvent) {
@@ -279,14 +286,15 @@ function(
 		// set the rank property and update the model to refresh the bindings
 		this.oAdaptationsModel.setProperty("rank", iNewRank, oDraggedItemContext);
 		sortByRank(this.oAdaptationsModel);
-		initializeRanks(this.oAdaptationsModel);
-		enableSaveButton.call(this, true);
+		var oAllUpdatedAdaptations = Object.assign(this.oAdaptationsModel.getProperty("/allAdaptations"), this.oAdaptationsModel.getProperty("/adaptations"));
+		this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
+		enableSaveButton.call(this, didAdaptationsPriorityChange.call(this));
 	}
 
 	function didAdaptationsPriorityChange() {
 		return !_isEqual(
-			this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdapation) { return oAdapation.id; }),
-			this.oReferenceAdaptationsData.adaptations.map(function(oAdapation) { return oAdapation.id; })
+			this.oAdaptationsModel.getProperty("/adaptations").map(function(oAdaptation) { return oAdaptation.id; }),
+			this.oReferenceAdaptationsData.map(function(oAdaptation) { return oAdaptation.id; })
 		);
 	}
 
@@ -324,19 +332,42 @@ function(
 		getAdaptationsTable.call(this).getDragDropConfig()[0].setEnabled(bIsEnabled);
 	}
 
+	function isAdaptationsSelected() {
+		var oAdaptationsTable = getAdaptationsTable.call(this);
+		return oAdaptationsTable.getSelectedContextPaths().length > 0;
+	}
+
+	function getIndexOfSelectedAdaptation() {
+		var oAdaptationsTable = getAdaptationsTable.call(this);
+		if (oAdaptationsTable.getSelectedContextPaths().length > 0) {
+			var aSplitedPath = oAdaptationsTable.getSelectedContextPaths()[0].split("/");
+			var iIndexOfSelectedItem = Number(aSplitedPath[aSplitedPath.length - 1]);
+			return iIndexOfSelectedItem;
+		}
+		return -1;
+	}
+
 	function onSaveReorderedAdaptations() {
-		if (didAdaptationsPriorityChange.call(this)) {
+		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; });
-			ContextBasedAdaptationsAPI.reorder({control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer, parameters: {priorities: aAdaptationPriorities}})
-			.catch(function(oError) {
-				Log.error(oError.stack);
-				var sMessage = "MSG_LREP_TRANSFER_ERROR";
-				var oOptions = { titleKey: "BTN_MANAGE_APP_CTX" };
-				oOptions.details = oError.userMessage;
-				Utils.showMessageBox("error", sMessage, oOptions);
-			});
-		}
+			return ContextBasedAdaptationsAPI.reorder({control: oRtaInformation.rootControl, layer: oRtaInformation.flexSettings.layer, parameters: {priorities: aAdaptationPriorities}});
+		}.bind(this)).then(function() {
+			var oAllUpdatedAdaptations = Object.assign(this.oAdaptationsModel.getProperty("/allAdaptations"), this.oAdaptationsModel.getProperty("/adaptations"));
+			this.oAdaptationsModel.updateAdaptations(oAllUpdatedAdaptations);
+			onCloseDialog.call(this);
+		}.bind(this))
+		.catch(function(oError) {
+			if (oError !== "cancel") {
+				Utils.showMessageBox("error", "MSG_LREP_TRANSFER_ERROR", { titleKey: "BTN_MANAGE_APP_CTX", error: oError});
+				Log.error("sap.ui.rta: " + oError.stack || oError.message || oError);
+			}
+		});
+	}
+
+	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);
 	}