@openui5/sap.ui.rta 1.113.0 → 1.115.0

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.115.0
 	 *
 	 * @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.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -50,7 +50,7 @@ function(
 
 	Fiori.prototype.init = function () {
 		this._oRenderer = Utils.getFiori2Renderer();
-		this._oFioriHeader = this._oRenderer.getRootControl().getOUnifiedShell().getHeader();
+		this._oFioriHeader = this._oRenderer.getRootControl().getShellHeader();
 		Adaptation.prototype.init.apply(this, arguments);
 	};
 

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.115.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.113.0
+	 * @version 1.115.0
 	 *
 	 * @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.115.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.113.0
+	 * @version 1.115.0
 	 *
 	 * @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,6 +77,8 @@ function(
 					moveDown: moveDown.bind(this),
 					onDropSelectedAdaptation: onDropSelectedAdaptation.bind(this),
 					onSaveReorderedAdaptations: onSaveReorderedAdaptations.bind(this),
+					isAdaptationsSelected: isAdaptationsSelected.bind(this),
+					getIndexOfSelectedAdaptation: getIndexOfSelectedAdaptation.bind(this),
 					onClose: onCloseDialog.bind(this)
 				}
 			}).then(function(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,10 @@ 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._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 +129,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 +169,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 +193,7 @@ function(
 		} else {
 			enableDragAndDropForAdaptationTable.call(this, true);
 			if (this._oControlConfigurationModel.getProperty("/isTableItemSelected")) {
-				setEnabledPropertyOfMoveButton.call(this, true);
+				syncEnabledPropertyOfMoveButtons.call(this);
 			}
 			oDefaultApplicationTable.setVisible(true);
 		}
@@ -211,14 +224,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 +246,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 +285,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.oReferenceAdaptationsData.map(function(oAdapation) { return oAdapation.id; })
 		);
 	}
 
@@ -324,20 +331,37 @@ 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.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);
-			});
-		}
-		onCloseDialog.call(this);
+			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 onCloseDialog() {

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

@@ -67,6 +67,7 @@
 					hAlign="Left">
 					<Text text="{i18n>CLM_HEADER_ADAPTATIONS_CHANGED_ON}" />
 				</Column>
+				<!--
 				<Column width="7rem"
 					minScreenWidth="tablet"
 					demandPopin="true"
@@ -74,6 +75,7 @@
 					hAlign="Left">
 					<Text text="{i18n>CLM_HEADER_ADAPTATIONS_ACTIONS}" />
 				</Column>
+				-->
 			</columns>
 			<dragDropConfig>
 				<dnd:DragDropInfo sourceAggregation="items"
@@ -96,13 +98,7 @@
 						<Text text="{ parts: ['contextBased>contexts/role'], formatter: '.formatContextColumnCell'}"
 							tooltip="{ parts: ['contextBased>contexts/role'], formatter: '.formatContextColumnTooltip'}" />
 						<Text text="{ parts: ['contextBased>createdBy', 'contextBased>createdAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>
-						<Text text="{ parts: ['contextBased>changedBy', 'contextBased>changedAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>		
-						<MenuButton text="{i18n>CLM_HEADER_ADAPTATIONS_ACTIONS}">
-							<menu>
-								<Menu itemSelected="onMenuAction">
-								</Menu>
-							</menu>
-						</MenuButton>
+						<Text text="{ parts: ['contextBased>changedBy', 'contextBased>changedAt'], formatter: '.formatCreatedChangedOnColumnCell'}"/>
 					</cells>
 				</ColumnListItem>
 			</items>
@@ -126,12 +122,6 @@
 					popinDisplay="Inline"
 					hAlign="Left">
 				</Column>
-				<Column width="7rem"
-					minScreenWidth="tablet"
-					demandPopin="true"
-					popinDisplay="Inline"
-					hAlign="Left">
-				</Column>
 			</columns>
 			<items>
 				<ColumnListItem highlight="Information">
@@ -146,8 +136,6 @@
 							</HBox>
 						</CustomListItem>
 						<Text text="" />
-						<MenuButton text="{i18n>CLM_HEADER_ADAPTATIONS_ACTIONS}">
-						</MenuButton>
 					</cells>
 				</ColumnListItem>
 			</items>

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

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

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

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

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

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

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -124,7 +124,7 @@ sap.ui.define([
 
 		return DateFormat.getInstance({
 			format: "yMMMdjm"
-		}).format(new Date(sTimeStamp));
+		}).format(new Date(sTimeStamp + "Z"));
 	}
 
 	function getGroupHeaderFactory(oGroup) {