@openui5/sap.ui.rta 1.96.5 → 1.99.0

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

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

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

@@ -6,28 +6,37 @@
 		type="Message"
 		contentWidth="33%">
 		<Label
+			labelFor="languageSelection"
 			wrappingType="Hyphenated"
 			wrapping="true"
 			width="auto"
-			text="{i18n>MSG_DOWNLOAD_CHANGED_TEXTS}">
+			text="{i18n>MSG_DOWNLOAD_CHANGED_TEXTS}"
+			class="sapUiTinyMarginBottom">
 		</Label>
-		<VBox width="100%">
-			<ComboBox
+		<VBox
+			width="100%"
+			id="languageSelection">
+			<Select
 				width="100%"
-				value="{translation>/sourceLanguage}"
-				id="sapUiRta_selectSourceLanguage"
-				placeholder="{i18n>TXT_SOURCE_LANGUAGE}" />
-			<ComboBox
+				id="selectedSourceLanguage"
+				items="{translation>/sourceLanguages}"
+				selectedKey="{translation>/sourceLanguage}">
+				<core:Item key="{translation>}" text="{translation>}"/>
+			</Select>
+			<Input
 				width="100%"
-				id="sapUiRta_selectTargetLanguage"
-				placeholder="{i18n>TXT_TARGET_LANGUAGE}" />
+				id="selectedTargetLanguage"
+				value="{translation>/targetLanguage}"
+				placeholder="{i18n>TXT_TARGET_LANGUAGE}">
+			</Input>
 		</VBox>
 		<beginButton>
 			<Button
 				id="sapUiRta_downloadChangedTextsButton"
 				text="{i18n>BTN_DOWNLOAD_CHANGED_TEXTS}"
 				type="Emphasized"
-				enabled="{= ${translation>/downloadChangedTexts}}"
+				icon="sap-icon://download"
+				enabled="{= !!${translation>/sourceLanguages}.length}"
 				press=".onDownloadFile" />
 		</beginButton>
 		<endButton>

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

@@ -4,48 +4,33 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
+/* global FormData */
+
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Fragment",
 	"sap/ui/rta/Utils",
-	"sap/ui/model/json/JSONModel"
+	"sap/ui/fl/Utils",
+	"sap/ui/model/json/JSONModel",
+	"sap/m/MessageBox",
+	"sap/m/MessageToast",
+	"sap/ui/fl/write/api/TranslationAPI",
+	"sap/ui/fl/Layer",
+	"sap/ui/core/util/File"
 ], function(
 	ManagedObject,
 	Fragment,
 	Utils,
-	JSONModel
+	FlUtils,
+	JSONModel,
+	MessageBox,
+	MessageToast,
+	TranslationAPI,
+	Layer,
+	FileUtil
 ) {
 	"use strict";
 
-	var oDialog;
-	var oPopover;
-
-	function resetTranslationDialog() {
-		this._oTranslationModel.setProperty("/sourceLanguage", "");
-		this._oTranslationModel.setProperty("/downloadChangedTexts", false);
-		return Promise.resolve(oDialog);
-	}
-
-	function createDownloadTranslationDialog() {
-		return Fragment.load({
-			name: "sap.ui.rta.toolbar.translation.DownloadTranslationDialog",
-			id: this.getContext().getId() + "_download_translation_fragment",
-			controller: {
-				onDownloadFile: function () {
-					oDialog.close();
-				},
-				onCancelDownloadDialog: function () {
-					oDialog.close();
-				}
-			}
-		}).then(function (oTranslationDialog) {
-			oDialog = oTranslationDialog;
-			oDialog.setModel(this._oTranslationModel, "translation");
-			oDialog.addStyleClass(Utils.getRtaStyleClassName());
-			this.getContext().addDependent(oDialog);
-		}.bind(this));
-	}
-
 	/**
 	 * Controller for the <code>sap.ui.rta.toolbar.translation.Translation</code> controls.
 	 * Contains implementation of translation functionality.
@@ -53,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -63,28 +48,107 @@ sap.ui.define([
 	var Translation = ManagedObject.extend("sap.ui.rta.toolbar.translation.Translation", {
 		metadata: {
 			properties: {
-				context: {
+				toolbar: {
 					type: "sap.ui.rta.toolbar.Base"
 				}
 			}
 		},
-		constructor: function() {
+		constructor: function () {
 			ManagedObject.prototype.constructor.apply(this, arguments);
-			this._oTranslationModel = new JSONModel({
-				sourceLanguage: "",
-				downloadChangedTexts: false
-			});
+			this._oTranslationModel = new JSONModel(getTranslationModelData());
 		}
 	});
 
-	Translation.prototype.exit = function() {
-		if (this._oDialogPromise) {
-			this._oDialogPromise.then(oDialog.destroy.bind(oDialog));
-		}
-		if (this._oPopoverPromise) {
-			this._oPopoverPromise.then(oPopover.destroy.bind(oPopover));
-		}
-	};
+	function saveFiles(oEvent) {
+		this._oTranslationModel.setProperty("/file", oEvent.getParameter("files")[0]);
+	}
+
+	function resetDownloadTranslationDialog() {
+		this._oTranslationModel.setData(getTranslationModelData());
+		return Promise.resolve(this._oDialogDownload);
+	}
+
+	function createDownloadTranslationDialog() {
+		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),
+				onCancelDownloadDialog: function () {
+					this._oDialogDownload.close();
+				}.bind(this)
+			}
+		}).then(function (oTranslationDialog) {
+			this._oDialogDownload = oTranslationDialog;
+			this._oDialogDownload.setModel(this._oTranslationModel, "translation");
+			this.getToolbar().addDependent(this._oDialogDownload);
+		}.bind(this));
+	}
+
+	function createUploadTranslationDialog() {
+		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();
+				}.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;
+		}.bind(this));
+	}
+
+
+	function handleUploadPress(sUploadId) {
+		var oFileUploader = sap.ui.getCore().byId(sUploadId + "--fileUploader");
+		oFileUploader.checkFileReadable().then(function() {
+			if (this._oTranslationModel.getProperty("/file")) {
+				var mPropertyBag = {
+					layer: Layer.CUSTOMER,
+					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);
+				}).finally(oFileUploader.clear.bind(oFileUploader));
+			}
+		}.bind(this));
+	}
+
+	function getTranslationModelData() {
+		return Object.assign({}, {
+			sourceLanguage: "",
+			sourceLanguages: [],
+			downloadChangedTexts: false,
+			file: undefined
+		});
+	}
 
 	Translation.prototype.showTranslationPopover = function (oEvent) {
 		var oTranslationButton = oEvent.getSource();
@@ -92,15 +156,16 @@ sap.ui.define([
 		if (!this._oPopoverPromise) {
 			this._oPopoverPromise = Fragment.load({
 				name: "sap.ui.rta.toolbar.translation.TranslationPopover",
-				id: this.getContext().getId() + "_translationPopoverDialog",
+				id: this.getToolbar().getId() + "_translationPopoverDialog",
 				controller: {
-					openDownloadTranslationDialog: this.openDownloadTranslationDialog.bind(this)
+					openDownloadTranslationDialog: this.openDownloadTranslationDialog.bind(this),
+					openUploadTranslationDialog: this.openUploadTranslationDialog.bind(this)
 				}
 			}).then(function (oTranslationPopover) {
-				oPopover = oTranslationPopover;
-				oTranslationButton.addDependent(oTranslationPopover);
-				return oTranslationPopover;
-			});
+				this._oPopover = oTranslationPopover;
+				oTranslationButton.addDependent(this._oPopover);
+				return this._oPopover;
+			}.bind(this));
 		}
 
 		return this._oPopoverPromise.then(function (oTranslationDialog) {
@@ -113,14 +178,39 @@ sap.ui.define([
 	};
 
 	Translation.prototype.openDownloadTranslationDialog = function () {
-		if (oDialog) {
-			this._oDialogPromise = resetTranslationDialog.call(this);
+		if (this._oDialogDownload) {
+			this._oDialogPromise = resetDownloadTranslationDialog.call(this);
 		} else {
 			this._oDialogPromise = createDownloadTranslationDialog.call(this);
 		}
 		return this._oDialogPromise.then(function () {
-			this.getContext().addDependent(oDialog);
-			return oDialog.open();
+			var mPropertyBag = {
+				layer: Layer.CUSTOMER,
+				selector: this.getToolbar().getRtaInformation().rootControl
+			};
+			TranslationAPI.getSourceLanguages(mPropertyBag).then(function (oResponse) {
+				var aSourceLanguages = oResponse.sourceLanguages;
+				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);
+			});
+			return this._oDialogDownload;
+		}.bind(this));
+	};
+
+	Translation.prototype.openUploadTranslationDialog = function () {
+		if (!this._oDialogUpload) {
+			this._oDialogPromise = createUploadTranslationDialog.call(this);
+		}
+		return this._oDialogPromise.then(function () {
+			this.getToolbar().addDependent(this._oDialogUpload);
+			return this._oDialogUpload.open();
 		}.bind(this));
 	};
 

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

@@ -2,18 +2,13 @@
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core" >
 	<Popover
-		showHeader="false"
-		placement="Bottom" >
-		<List
-			visible="true">
-			<ActionListItem
-				text="{i18n>TXT_DOWNLOAD_CHANGED_TEXTS}"
-				type="Active"
-				press=".openDownloadTranslationDialog"/>
-			<ActionListItem
-				text="{i18n>TXT_UPLOAD_TRANSLATIONS}"
-				type="Active"
-				press=".openDownloadTranslationDialog"/>
+			placement="Bottom"
+			showHeader="false">
+		<List>
+			<ActionListItem text="{i18n>BTN_OPEN_DOWNLOAD_TRANSLATION}"
+					press=".openDownloadTranslationDialog"/>
+			<ActionListItem text="{i18n>BTN_OPEN_UPLOAD_TRANSLATION}"
+					press=".openUploadTranslationDialog"/>
 		</List>
 	</Popover>
-</core:FragmentDefinition>
+</core:FragmentDefinition>

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

@@ -0,0 +1,41 @@
+<core:FragmentDefinition
+		xmlns="sap.m"
+		xmlns:core="sap.ui.core"
+		xmlns:u="sap.ui.unified">
+	<Dialog
+		title="{i18n>TIT_UPLOAD_CHANGED_TEXTS}"
+		type="Message">
+		<Label
+			labelFor="fileUploader"
+			wrappingType="Hyphenated"
+			wrapping="true"
+			width="auto"
+			text="{i18n>MSG_UPLOAD_CHANGED_TEXTS}"
+			class="sapUiTinyMarginBottom">
+		</Label>
+		<u:FileUploader
+			id="fileUploader"
+			sameFilenameAllowed="true"
+			fileType="xml"
+			width="100%"
+			icon="sap-icon://upload"
+			change=".saveFiles">
+			<u:xhrSettings>
+				<u:FileUploaderXHRSettings withCredentials = "true"/>
+			</u:xhrSettings>
+		</u:FileUploader>
+		<beginButton>
+			<Button
+				id="sapUiRta_uploadChangedTextsButton"
+				text="{i18n>BTN_UPLOAD_CHANGED_TEXTS}"
+				type="Emphasized"
+				enabled="{= ${translation>/uploadChangedTexts}}"
+				press=".handleUploadPress" />
+		</beginButton>
+		<endButton>
+			<Button
+				text="{i18n>BUT_UPLOAD_CHANGED_TEXTS_CANCEL}"
+				press=".onCancelUploadDialog" />
+		</endButton>
+	</Dialog>
+</core:FragmentDefinition>

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @since 1.86

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

@@ -4,7 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/* global Map */
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/m/InstanceManager",
@@ -41,7 +40,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
@@ -243,7 +242,7 @@ sap.ui.define([
 
 	/**
 	 * Apply focus events to all open popups and set focus on the first.
-	 * @param {function} fnFocusEvent Function to apply to open popups
+	 * @param {function} fnEvent - Function to apply to open popups
 	 * @private
 	 */
 	PopupManager.prototype._applyPatchesToOpenPopups = function(fnEvent) {
@@ -256,7 +255,7 @@ sap.ui.define([
 
 	/**
 	 * Remove focus events from all open popups.
-	 * @param {function} fnFocusEvent Function to apply to open popups
+	 * @param {function} fnEvent - Function to apply to open popups
 	 * @private
 	 */
 	PopupManager.prototype._removePatchesToOpenPopups = function(fnEvent) {
@@ -337,13 +336,6 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * Applies the passed function to the relevant open popups.
-	 *
-	 * @param {function} fnPopupMethod specifies function to be applied
-	 * @param {boolean} bFocus Set to true if the popup is in focus
-	 * @private
-	 */
 	PopupManager.prototype._applyPopupAttributes = function(mPropertyBag) {
 		//check if popups are open
 		var oRelevantPopups = this.getCategorizedOpenPopups();

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

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

@@ -10,7 +10,9 @@ sap.ui.define([
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/write/api/FeaturesAPI",
 	"sap/ui/core/UIComponent",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/ui/fl/write/api/PersistenceWriteAPI",
+	"sap/ui/rta/util/showMessageBox"
 ], function(
 	RuntimeAuthoring,
 	Control,
@@ -18,7 +20,9 @@ sap.ui.define([
 	Layer,
 	FeaturesAPI,
 	UIComponent,
-	Log
+	Log,
+	PersistenceWriteAPI,
+	showMessageBox
 ) {
 	"use strict";
 
@@ -38,7 +42,7 @@ sap.ui.define([
 	 * Starter util for UI adaptation.
 	 * With this API you are also able to modify the UI adaptation plugins list and or add some event handler functions to be called on start, failed and stop events.
 	 * @param {object} mOptions - Object with properties
-	 * @param {sap.ui.core.Element|sap.ui.core.UIComponent} mOptions.rootControl - Control instance from where UI adaptation should be started
+	 * @param {sap.ui.core.Control|sap.ui.core.UIComponent} mOptions.rootControl - Control instance to get the AppComponent. This then is used to start UI adaptation.
 	 * @param {function} [loadPlugins] - Callback function that enables the modification of the default plugin list of UI adaptation. UI adaptation is passed to this function and it should return a promise
 	 * @param {function} [onStart] - Event handler function called on start event
 	 * @param {function} [onFailed] - Event handler function called on failed event
@@ -77,6 +81,40 @@ sap.ui.define([
 				return oRta.start();
 			})
 			.then(function() {
+				if (mOptions.flexSettings.layer === "CUSTOMER") {
+					var mPropertyBag = {
+						oComponent: mOptions.rootControl,
+						selector: mOptions.rootControl,
+						invalidateCache: false,
+						includeVariants: true,
+						includeCtrlVariants: true,
+						currentLayer: Layer.CUSTOMER
+					};
+
+					PersistenceWriteAPI.getChangesWarning(mPropertyBag)
+						.then(function(oWarningMessage) {
+							if (oWarningMessage.showWarning) {
+								var oRtaResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
+								var oMessageProps = oWarningMessage.warningType === "mixedChangesWarning"
+									? {
+										text: "MSG_ADAPTATION_STARTER_MIXED_CHANGES_WARNING",
+										title: "TIT_ADAPTATION_STARTER_MIXED_CHANGES_TITLE"
+									}
+									: {
+										text: "MSG_ADAPTATION_STARTER_NO_CHANGES_IN_P_WARNING",
+										title: "TIT_ADAPTATION_STARTER_NO_CHANGES_IN_P_TITLE"
+									};
+
+								showMessageBox(
+									oRtaResourceBundle.getText(oMessageProps.text),
+									{
+										title: oRtaResourceBundle.getText(oMessageProps.title)
+									},
+									"warning"
+								);
+							}
+						});
+				}
 				return oRta;
 			})
 			.catch(function(vError) {