@openui5/sap.ui.rta 1.101.0 → 1.102.2

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

@@ -5,31 +5,35 @@
  */
 
 sap.ui.define([
+	"sap/m/GroupHeaderListItem",
 	"sap/ui/core/format/DateFormat",
 	"sap/ui/core/Fragment",
 	"sap/ui/core/library",
-	"sap/ui/fl/library",
+	"sap/ui/fl/write/api/Version",
 	"sap/ui/rta/Utils",
 	"sap/ui/rta/toolbar/translation/Translation",
+	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/rta/appVariant/Feature",
 	"sap/ui/rta/toolbar/Base",
+	"sap/ui/model/Sorter",
 	"sap/ui/Device"
-],
-function(
+], function(
+	GroupHeaderListItem,
 	DateFormat,
 	Fragment,
 	coreLibrary,
-	flexLibrary,
+	Version,
 	Utils,
 	Translation,
+	FeaturesAPI,
 	AppVariantFeature,
 	Base,
+	Sorter,
 	Device
 ) {
 	"use strict";
 
 	var MessageType = coreLibrary.MessageType;
-	var Versions = flexLibrary.Versions;
 
 	/**
 	 * Constructor for a new sap.ui.rta.toolbar.Adaptation control
@@ -39,7 +43,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 *
 	 * @constructor
 	 * @private
@@ -62,6 +66,7 @@ function(
 				save: {},
 				restore: {},
 				transport: {},
+				publishVersion: {},
 				modeChange: {},
 				activate: {},
 				discardDraft: {},
@@ -114,8 +119,13 @@ function(
 		oButton.setIcon(sIcon || "");
 	}
 
-	Adaptation.prototype.formatDiscardDraftVisible = function (sDisplayedVersion, bVersioningEnabled) {
-		return sDisplayedVersion === Versions.Draft && bVersioningEnabled;
+	Adaptation.prototype.formatPublishVersionVisibility = function (bPublishVisible, bVersioningEnabled, sDisplayedVersion, sModeSwitcher) {
+		return bPublishVisible && bVersioningEnabled && sDisplayedVersion !== Version.Number.Draft && sModeSwitcher === "adaptation";
+	};
+
+
+	Adaptation.prototype.formatDiscardDraftVisible = function (sDisplayedVersion, bVersioningEnabled, sModeSwitcher) {
+		return sDisplayedVersion === Version.Number.Draft && bVersioningEnabled && sModeSwitcher === "adaptation";
 	};
 
 	Adaptation.prototype.formatVersionButtonText = function (aVersions, sDisplayedVersion) {
@@ -124,7 +134,7 @@ function(
 		var sType = "Active";
 		aVersions = aVersions || [];
 
-		if (sDisplayedVersion === undefined || sDisplayedVersion === Versions.Original) {
+		if (sDisplayedVersion === undefined || sDisplayedVersion === Version.Number.Original) {
 			sText = oTextResources.getText("TIT_ORIGINAL_APP");
 			sType = "inactive";
 			if (aVersions.length === 0 || (aVersions.length === 1 && aVersions[0].type === "draft")) {
@@ -136,7 +146,7 @@ function(
 			});
 			if (oDisplayedVersion) {
 				sType = oDisplayedVersion.type;
-				if (sDisplayedVersion === Versions.Draft) {
+				if (sDisplayedVersion === Version.Number.Draft) {
 					sText = oTextResources.getText("TIT_DRAFT");
 				} else {
 					sText = oDisplayedVersion.title || oTextResources.getText("TIT_VERSION_1");
@@ -213,7 +223,7 @@ function(
 
 	Adaptation.prototype.versionSelected = function (oEvent) {
 		var oVersionsBindingContext = oEvent.getSource().getBindingContext("versions");
-		var sVersion = Versions.Original;
+		var sVersion = Version.Number.Original;
 
 		if (oVersionsBindingContext) {
 			// the original Version does not have a version binding Context
@@ -229,7 +239,7 @@ function(
 		if (!this.oVersionDialogPromise) {
 			this.oVersionDialogPromise = Fragment.load({
 				name: "sap.ui.rta.toolbar.VersionHistory",
-				id: this.getId() + "_versionHistoryDialog",
+				id: this.getId() + "_fragment--sapUiRta_versionHistoryDialog",
 				controller: {
 					formatVersionTitle: this.formatVersionTitle.bind(this),
 					formatVersionTimeStamp: this.formatVersionTimeStamp.bind(this),
@@ -238,26 +248,39 @@ function(
 					formatHighlightText: this.formatHighlightText.bind(this),
 					formatOriginalAppHighlight: this.formatOriginalAppHighlight.bind(this),
 					formatOriginalAppHighlightText: this.formatOriginalAppHighlightText.bind(this),
-					versionSelected: this.versionSelected.bind(this)
+					versionSelected: this.versionSelected.bind(this),
+					getGroupHeaderFactory: this.getGroupHeaderFactory.bind(this)
 				}
-			}).then(function (oVersionsDialog) {
-				oVersionButton.addDependent(oVersionsDialog);
-				return oVersionsDialog;
+			}).then(function(oDialog) {
+				oVersionButton.addDependent(oDialog);
+				return oDialog;
 			});
 		}
 
 		return this.oVersionDialogPromise.then(function (oVersionsDialog) {
 			if (!oVersionsDialog.isOpen()) {
 				oVersionsDialog.openBy(oVersionButton);
+				if (this.getModel("controls").getProperty("/publishVisible")) {
+					var oList = this.getControl("versionHistoryDialog--versionList");
+					var oSorter = new Sorter({
+						path: "isPublished",
+						group: true
+					});
+					oList.getBinding("items").sort(oSorter);
+				}
 			} else {
 				oVersionsDialog.close();
 			}
-		});
+		}.bind(this));
 	};
 
-	Adaptation.prototype.showTranslationPopover = function (oEvent) {
-		var oTranslation = this.addExtension("translation", Translation);
-		return oTranslation.showTranslationPopover(oEvent, this);
+	Adaptation.prototype.getGroupHeaderFactory = function (oGroup) {
+		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+		return new GroupHeaderListItem({
+			title: oGroup.key ? oTextResources.getText("TIT_VERSION_HISTORY_PUBLISHED") : oTextResources.getText("TIT_VERSION_HISTORY_UNPUBLISHED"),
+			upperCase: false,
+			visible: this.getModel("controls").getProperty("/publishVisible")
+		}).addStyleClass("sapUiRtaVersionHistoryGrouping").addStyleClass("sapUiRtaVersionHistory");
 	};
 
 	Adaptation.prototype.showRestore = function (bVersioningEnabled) {
@@ -332,16 +355,20 @@ function(
 				activate: this._openVersionTitleDialog.bind(this),
 				discardDraft: this.eventHandler.bind(this, "DiscardDraft"),
 				formatDiscardDraftVisible: this.formatDiscardDraftVisible.bind(this),
+				formatPublishVersionVisibility: this.formatPublishVersionVisibility.bind(this),
 				modeChange: this.eventHandler.bind(this, "ModeChange"),
-				showTranslationPopover: this.showTranslationPopover.bind(this),
+				openDownloadTranslationDialog: onOpenDownloadTranslationDialog.bind(this),
+				openUploadTranslationDialog: onOpenUploadTranslationDialog.bind(this),
 				undo: this.eventHandler.bind(this, "Undo"),
 				redo: this.eventHandler.bind(this, "Redo"),
 				openChangeCategorySelectionPopover: this.eventHandler.bind(this, "OpenChangeCategorySelectionPopover"),
 				manageApps: onManageAppsPressed.bind(this),
 				appVariantOverview: onOverviewPressed.bind(this),
 				saveAs: onSaveAsPressed.bind(this),
+				formatSaveAsEnabled: formatSaveAsEnabled,
 				restore: this.eventHandler.bind(this, "Restore"),
 				publish: this.eventHandler.bind(this, "Transport"),
+				publishVersion: this.eventHandler.bind(this, "PublishVersion"),
 				exit: this.eventHandler.bind(this, "Exit"),
 				formatVersionButtonText: this.formatVersionButtonText.bind(this),
 				showVersionHistory: this.showVersionHistory.bind(this),
@@ -350,6 +377,22 @@ function(
 		});
 	};
 
+	function onOpenDownloadTranslationDialog() {
+		var mPropertyBag = {
+			layer: this.getRtaInformation().flexSettings.layer,
+			selector: this.getRtaInformation().rootControl
+		};
+		this.addExtension("translation", Translation).openDownloadTranslationDialog(mPropertyBag);
+	}
+
+	function onOpenUploadTranslationDialog() {
+		this.addExtension("translation", Translation).openUploadTranslationDialog();
+	}
+
+	function formatSaveAsEnabled(bGeneralSaveAsEnabled, sDisplayedVersion) {
+		return bGeneralSaveAsEnabled && sDisplayedVersion !== Version.Number.Draft;
+	}
+
 	function onSaveAsPressed() {
 		AppVariantFeature.onSaveAs(true, true, this.getRtaInformation().flexSettings.layer, null);
 	}
@@ -411,7 +454,7 @@ function(
 		return oDialogPromise.then(function () {
 			var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
 			var sTitle = oTextResources.getText("TIT_VERSION_TITLE_DIALOG");
-			if (sDisplayedVersion !== Versions.Draft) {
+			if (sDisplayedVersion !== Version.Number.Draft) {
 				sTitle = oTextResources.getText("TIT_REACTIVATE_VERSION_TITLE_DIALOG");
 			}
 			this._oDialog.setTitle(sTitle);

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 *
 	 * @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.101.0
+	 * @version 1.102.2
 	 *
 	 * @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.101.0
+	 * @version 1.102.2
 	 *
 	 * @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.101.0
+	 * @version 1.102.2
 	 *
 	 * @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.101.0
+	 * @version 1.102.2
 	 *
 	 * @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.101.0
+	 * @version 1.102.2
 	 *
 	 * @constructor
 	 * @private

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

@@ -6,9 +6,10 @@
             showHeader="false"
             placement="Bottom" >
         <List
+                id="versionList"
                 class="sapUiRtaVersionsList"
                 visible="{path: 'versions>/versions/length', formatter: '.formatVersionTableVisibility'}"
-                items="{versions>/versions}" >
+                items="{path: 'versions>/versions', groupHeaderFactory: '.getGroupHeaderFactory'}" >
             <FeedListItem
                 text="{parts: [{path: 'versions>title'}, {path: 'versions>type'}], formatter: '.formatVersionTitle'}"
                 info="{versions>activatedBy}"

package/src/sap/ui/rta/toolbar/translation/DownloadTranslationDialog.fragment.xml

@@ -13,26 +13,28 @@
 			text="{i18n>MSG_DOWNLOAD_CHANGED_TEXTS}"
 			class="sapUiTinyMarginBottom">
 		</Label>
-		<VBox
+		<MessageStrip
+			id="dirtyChangesExistsMessage"
+			text="{i18n>MSG_DOWNLOAD_CHANGED_TEXTS_DIRTY_CHANGES_EXIST}"
+			class="sapUiTinyMarginBottom"
+			visible="{translation>/translationRelevantDirtyChangesExist}">
+		</MessageStrip>
+		<Select
 			width="100%"
-			id="languageSelection">
-			<Select
-				width="100%"
-				id="selectedSourceLanguage"
-				items="{translation>/sourceLanguages}"
-				selectedKey="{translation>/sourceLanguage}">
-				<core:Item key="{translation>}" text="{translation>}"/>
-			</Select>
-			<Input
-				width="100%"
-				id="selectedTargetLanguage"
-				value="{translation>/targetLanguage}"
-				placeholder="{i18n>TXT_TARGET_LANGUAGE}">
-			</Input>
-		</VBox>
+			id="selectedSourceLanguage"
+			items="{translation>/sourceLanguages}"
+			selectedKey="{translation>/sourceLanguage}">
+			<core:Item key="{translation>}" text="{translation>}"/>
+		</Select>
+		<Input
+			width="100%"
+			id="selectedTargetLanguage"
+			value="{translation>/targetLanguage}"
+			placeholder="{i18n>TXT_TARGET_LANGUAGE}">
+		</Input>
 		<beginButton>
 			<Button
-				id="sapUiRta_downloadChangedTextsButton"
+				id="downloadTranslation"
 				text="{i18n>BTN_DOWNLOAD_CHANGED_TEXTS}"
 				type="Emphasized"
 				icon="sap-icon://download"
@@ -41,6 +43,7 @@
 		</beginButton>
 		<endButton>
 			<Button
+				id="cancelDownloadTranslation"
 				text="{i18n>BUT_DOWNLOAD_CHANGED_TEXTS_CANCEL}"
 				press=".onCancelDownloadDialog" />
 		</endButton>

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

@@ -7,6 +7,7 @@
 /* global FormData */
 
 sap.ui.define([
+	"sap/base/Log",
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Fragment",
 	"sap/ui/rta/Utils",
@@ -15,9 +16,11 @@ sap.ui.define([
 	"sap/m/MessageBox",
 	"sap/m/MessageToast",
 	"sap/ui/fl/write/api/TranslationAPI",
+	"sap/ui/fl/write/api/VersionsAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/core/util/File"
 ], function(
+	Log,
 	ManagedObject,
 	Fragment,
 	Utils,
@@ -26,11 +29,23 @@ sap.ui.define([
 	MessageBox,
 	MessageToast,
 	TranslationAPI,
+	VersionsAPI,
 	Layer,
 	FileUtil
 ) {
 	"use strict";
 
+	function showError (vError) {
+		var sErrorMessage = vError.userMessage || vError.stack || vError.message || vError.status || vError;
+		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+		Log.error(sErrorMessage);
+		var sMsg = oTextResources.getText("MSG_LREP_TRANSFER_ERROR") + "\n"
+			+ oTextResources.getText("MSG_ERROR_REASON", sErrorMessage);
+		MessageBox.error(sMsg, {
+			styleClass: Utils.getRtaStyleClassName()
+		});
+	}
+
 	/**
 	 * Controller for the <code>sap.ui.rta.toolbar.translation.Translation</code> controls.
 	 * Contains implementation of translation functionality.
@@ -38,7 +53,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.2
 	 *
 	 * @constructor
 	 * @private
@@ -55,73 +70,86 @@ sap.ui.define([
 		},
 		constructor: function () {
 			ManagedObject.prototype.constructor.apply(this, arguments);
-			this._oTranslationModel = new JSONModel(getTranslationModelData());
+			this._oTranslationModel = new JSONModel(getInitialTranslationModelData());
 		}
 	});
 
-	function saveFiles(oEvent) {
-		this._oTranslationModel.setProperty("/file", oEvent.getParameter("files")[0]);
-	}
+	function downloadFile(oEvent) {
+		var oModel = oEvent.getSource().getModel("translation");
+		var sSourceLanguage = oModel.getProperty("/sourceLanguage");
+		var sTargetLanguage = oModel.getProperty("/targetLanguage");
+		var sFileName = sSourceLanguage + "_" + sTargetLanguage + "_" + "TranslationXLIFF";
+
+		var mPropertyBag = {
+			layer: Layer.CUSTOMER,
+			sourceLanguage: sSourceLanguage,
+			targetLanguage: sTargetLanguage,
+			selector: this.getToolbar().getRtaInformation().rootControl
+		};
+
+		var oSavePromise = new Promise(function (resolve) {
+			if (oModel.getProperty("/translationRelevantDirtyChangesExist")) {
+				oSavePromise = this.getToolbar().fireSave({
+					callback: resolve
+				});
+			} else {
+				resolve();
+			}
+		}.bind(this));
 
-	function resetDownloadTranslationDialog() {
-		this._oTranslationModel.setData(getTranslationModelData());
-		return Promise.resolve(this._oDialogDownload);
+		oSavePromise
+			.then(TranslationAPI.getTexts.bind(undefined, mPropertyBag))
+			.then(function (translationTextsXML) {
+				FileUtil.save(translationTextsXML, sFileName, "xml", "application/xml");
+				this._oDownloadDialog.close();
+			}.bind(this)).catch(function (e) {
+				showError(e);
+			});
 	}
 
-	function createDownloadTranslationDialog() {
+	Translation.prototype._createDownloadTranslationDialog = function() {
 		return Fragment.load({
 			name: "sap.ui.rta.toolbar.translation.DownloadTranslationDialog",
 			id: this.getToolbar().getId() + "_download_translation_fragment",
 			controller: {
-				onDownloadFile: function (oEvent) {
-					var oModel = oEvent.getSource().getModel("translation");
-					var sSourceLanguage = oModel.getProperty("/sourceLanguage");
-					var sTargetLanguage = oModel.getProperty("/targetLanguage");
-					var sFileName = sSourceLanguage + "_" + sTargetLanguage + "_" + "TranslationXLIFF";
-
-					var mPropertyBag = {
-						layer: Layer.CUSTOMER,
-						sourceLanguage: sSourceLanguage,
-						targetLanguage: sTargetLanguage,
-						selector: this.getToolbar().getRtaInformation().rootControl
-					};
-					TranslationAPI.getTexts(mPropertyBag).then(function (translationTextsXML) {
-						FileUtil.save(translationTextsXML, sFileName, "xml", "application/xml");
-					}).catch(function (e) {
-						MessageBox.error("Translation texts export failed: " + e);
-					});
-				}.bind(this),
+				onDownloadFile: downloadFile.bind(this),
 				onCancelDownloadDialog: function () {
-					this._oDialogDownload.close();
+					this._oDownloadDialog.close();
 				}.bind(this)
 			}
-		}).then(function (oTranslationDialog) {
-			this._oDialogDownload = oTranslationDialog;
-			this._oDialogDownload.setModel(this._oTranslationModel, "translation");
-			this.getToolbar().addDependent(this._oDialogDownload);
+		}).then(function (oDownloadDialog) {
+			this._oDownloadDialog = oDownloadDialog;
+			this._oDownloadDialog.setModel(this._oTranslationModel, "translation");
+			this.getToolbar().addDependent(this._oDownloadDialog);
+			return oDownloadDialog;
 		}.bind(this));
-	}
+	};
 
-	function createUploadTranslationDialog() {
+	Translation.prototype._createUploadTranslationDialog = function() {
 		var sUploadId = this.getToolbar().getId() + "_upload_translation_fragment";
 		return Fragment.load({
 			name: "sap.ui.rta.toolbar.translation.UploadTranslationDialog",
 			id: sUploadId,
 			controller: {
 				onCancelUploadDialog: function () {
-					this._oDialogUpload.close();
+					this._oUploadDialog.close();
+				}.bind(this),
+				formatUploadEnabled: function () {
+					var oFileUploader = sap.ui.getCore().byId(sUploadId + "--fileUploader");
+					return oFileUploader.checkFileReadable();
+				},
+				saveFiles: function(oEvent) {
+					this._oTranslationModel.setProperty("/file", oEvent.getParameter("files")[0]);
 				}.bind(this),
-				saveFiles: saveFiles.bind(this),
 				handleUploadPress: handleUploadPress.bind(this, sUploadId)
 			}
-		}).then(function (oTranslationDialog) {
-			this._oDialogUpload = oTranslationDialog;
-			this._oDialogUpload.setModel(this._oTranslationModel, "translation");
-			this.getToolbar().addDependent(this._oDialogUpload);
-			return sUploadId;
+		}).then(function (oUploadDialog) {
+			this._oUploadDialog = oUploadDialog;
+			this._oUploadDialog.setModel(this._oTranslationModel, "translation");
+			this.getToolbar().addDependent(this._oUploadDialog);
+			return this._oUploadDialog;
 		}.bind(this));
-	}
-
+	};
 
 	function handleUploadPress(sUploadId) {
 		var oFileUploader = sap.ui.getCore().byId(sUploadId + "--fileUploader");
@@ -132,16 +160,21 @@ sap.ui.define([
 					payload: new FormData()
 				};
 				mPropertyBag.payload.append("file", this._oTranslationModel.getProperty("/file"), oFileUploader.getValue());
-				TranslationAPI.postTranslationTexts(mPropertyBag).then(function () {
-					MessageToast.show("Translation texts import successful");
-				}).catch(function (sError) {
-					MessageBox.error("Translation texts import failed: " + sError);
+				return TranslationAPI.uploadTranslationTexts(mPropertyBag).then(function () {
+					var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+					var sMsg = oTextResources.getText("MSG_UPLOAD_TRANSLATION_SUCCESS");
+					MessageToast.show(sMsg, {
+						styleClass: Utils.getRtaStyleClassName()
+					});
+					this._oUploadDialog.close();
+				}.bind(this)).catch(function (e) {
+					showError(e);
 				}).finally(oFileUploader.clear.bind(oFileUploader));
 			}
 		}.bind(this));
 	}
 
-	function getTranslationModelData() {
+	function getInitialTranslationModelData() {
 		return Object.assign({}, {
 			sourceLanguage: "",
 			sourceLanguages: [],
@@ -150,67 +183,40 @@ sap.ui.define([
 		});
 	}
 
-	Translation.prototype.showTranslationPopover = function (oEvent) {
-		var oTranslationButton = oEvent.getSource();
-
-		if (!this._oPopoverPromise) {
-			this._oPopoverPromise = Fragment.load({
-				name: "sap.ui.rta.toolbar.translation.TranslationPopover",
-				id: this.getToolbar().getId() + "_translationPopoverDialog",
-				controller: {
-					openDownloadTranslationDialog: this.openDownloadTranslationDialog.bind(this),
-					openUploadTranslationDialog: this.openUploadTranslationDialog.bind(this)
-				}
-			}).then(function (oTranslationPopover) {
-				this._oPopover = oTranslationPopover;
-				oTranslationButton.addDependent(this._oPopover);
-				return this._oPopover;
-			}.bind(this));
-		}
-
-		return this._oPopoverPromise.then(function (oTranslationDialog) {
-			if (!oTranslationDialog.isOpen()) {
-				oTranslationDialog.openBy(oTranslationButton);
-			} else {
-				oTranslationDialog.close();
-			}
-		});
-	};
+	Translation.prototype.openDownloadTranslationDialog = function (mPropertyBag) {
+		var bHasTranslationRelevantDirtyChange = TranslationAPI.hasTranslationRelevantDirtyChanges(mPropertyBag);
+		this._oTranslationModel.setProperty("/translationRelevantDirtyChangesExist", bHasTranslationRelevantDirtyChange);
 
-	Translation.prototype.openDownloadTranslationDialog = function () {
-		if (this._oDialogDownload) {
-			this._oDialogPromise = resetDownloadTranslationDialog.call(this);
-		} else {
-			this._oDialogPromise = createDownloadTranslationDialog.call(this);
-		}
-		return this._oDialogPromise.then(function () {
-			var mPropertyBag = {
-				layer: Layer.CUSTOMER,
-				selector: this.getToolbar().getRtaInformation().rootControl
-			};
-			TranslationAPI.getSourceLanguages(mPropertyBag).then(function (oResponse) {
-				var aSourceLanguages = oResponse.sourceLanguages;
+		return TranslationAPI.getSourceLanguages(mPropertyBag)
+			.then(function (aSourceLanguages) {
 				if (aSourceLanguages) {
 					this._oTranslationModel.setProperty("/sourceLanguages", aSourceLanguages);
 					this._oTranslationModel.setProperty("/sourceLanguage", aSourceLanguages[0] || "");
 				}
-				this.getToolbar().addDependent(this._oDialogDownload);
-				this._oDialogDownload.open();
 			}.bind(this))
-			.catch(function (e) {
-				MessageBox.error("Get translation source languages failed: " + e);
+			.then(function () {
+				if (this._oDownloadDialogPromise) {
+					this._oTranslationModel.setProperty("/targetLanguage", "");
+				} else {
+					this._oDownloadDialogPromise = this._createDownloadTranslationDialog();
+				}
+				return this._oDownloadDialogPromise;
+			}.bind(this))
+			.then(function (oDialog) {
+				return oDialog.open();
+			})
+			.catch(function (vError) {
+				showError(vError);
 			});
-			return this._oDialogDownload;
-		}.bind(this));
 	};
 
 	Translation.prototype.openUploadTranslationDialog = function () {
-		if (!this._oDialogUpload) {
-			this._oDialogPromise = createUploadTranslationDialog.call(this);
+		if (!this._oUploadDialogPromise) {
+			this._oUploadDialogPromise = this._createUploadTranslationDialog();
 		}
-		return this._oDialogPromise.then(function () {
-			this.getToolbar().addDependent(this._oDialogUpload);
-			return this._oDialogUpload.open();
+		return this._oUploadDialogPromise.then(function (oUploadDialog) {
+			this.getToolbar().addDependent(oUploadDialog);
+			return oUploadDialog.open();
 		}.bind(this));
 	};
 

package/src/sap/ui/rta/toolbar/translation/UploadTranslationDialog.fragment.xml

@@ -18,6 +18,7 @@
 			sameFilenameAllowed="true"
 			fileType="xml"
 			width="100%"
+			value="{translation>/filePath}"
 			icon="sap-icon://upload"
 			change=".saveFiles">
 			<u:xhrSettings>
@@ -26,14 +27,15 @@
 		</u:FileUploader>
 		<beginButton>
 			<Button
-				id="sapUiRta_uploadChangedTextsButton"
+				id="uploadTranslation"
 				text="{i18n>BTN_UPLOAD_CHANGED_TEXTS}"
+				enabled="{= !!${translation>/filePath}}"
 				type="Emphasized"
-				enabled="{= ${translation>/uploadChangedTexts}}"
 				press=".handleUploadPress" />
 		</beginButton>
 		<endButton>
 			<Button
+				id="cancelTranslationUpload"
 				text="{i18n>BUT_UPLOAD_CHANGED_TEXTS_CANCEL}"
 				press=".onCancelUploadDialog" />
 		</endButton>