@openui5/sap.ui.rta 1.101.0 → 1.103.0

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

@@ -5,32 +5,24 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/format/DateFormat",
 	"sap/ui/core/Fragment",
-	"sap/ui/core/library",
-	"sap/ui/fl/library",
-	"sap/ui/rta/Utils",
+	"sap/ui/fl/write/api/Version",
 	"sap/ui/rta/toolbar/translation/Translation",
+	"sap/ui/rta/toolbar/versioning/Versioning",
 	"sap/ui/rta/appVariant/Feature",
 	"sap/ui/rta/toolbar/Base",
 	"sap/ui/Device"
-],
-function(
-	DateFormat,
+], function(
 	Fragment,
-	coreLibrary,
-	flexLibrary,
-	Utils,
+	Version,
 	Translation,
+	Versioning,
 	AppVariantFeature,
 	Base,
 	Device
 ) {
 	"use strict";
 
-	var MessageType = coreLibrary.MessageType;
-	var Versions = flexLibrary.Versions;
-
 	/**
 	 * Constructor for a new sap.ui.rta.toolbar.Adaptation control
 	 *
@@ -39,7 +31,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.103.0
 	 *
 	 * @constructor
 	 * @private
@@ -62,6 +54,7 @@ function(
 				save: {},
 				restore: {},
 				transport: {},
+				publishVersion: {},
 				modeChange: {},
 				activate: {},
 				discardDraft: {},
@@ -79,21 +72,13 @@ function(
 
 	var DEVICE_SET = "sapUiRtaToolbar";
 
-	var DRAFT_ACCENT_COLOR = "sapUiRtaDraftVersionAccent";
-	var ACTIVE_ACCENT_COLOR = "sapUiRtaActiveVersionAccent";
-
 	Adaptation.prototype.init = function() {
-		Device.media.attachHandler(this._onSizeChanged, this, DEVICE_SET);
-		this._pFragmentLoaded = Base.prototype.init.apply(this, arguments);
-	};
-
-	Adaptation.prototype.onBeforeRendering = function () {
-		if (!Device.media.hasRangeSet(DEVICE_SET)) {
-			Device.media.initRangeSet(DEVICE_SET, [900, 1200], "px", [Adaptation.modes.MOBILE, Adaptation.modes.TABLET, Adaptation.modes.DESKTOP]);
-		}
-		this._onSizeChanged(Device.media.getCurrentRange(DEVICE_SET));
-
-		Base.prototype.onBeforeRendering.apply(this, arguments);
+		this._pFragmentLoaded = Base.prototype.init.apply(this, arguments).then(function() {
+			if (!Device.media.hasRangeSet(DEVICE_SET)) {
+				Device.media.initRangeSet(DEVICE_SET, [900, 1200], "px", [Adaptation.modes.MOBILE, Adaptation.modes.TABLET, Adaptation.modes.DESKTOP]);
+			}
+			Device.media.attachHandler(this._onSizeChanged, this, DEVICE_SET);
+		}.bind(this));
 	};
 
 	Adaptation.prototype.onFragmentLoaded = function() {
@@ -105,6 +90,11 @@ function(
 		Base.prototype.exit.apply(this, arguments);
 	};
 
+	Adaptation.prototype.show = function() {
+		this._onSizeChanged(Device.media.getCurrentRange(DEVICE_SET), true);
+		return Base.prototype.show.apply(this, arguments);
+	};
+
 	function setButtonProperties(sButtonName, sIcon, sTextKey, sToolTipKey) {
 		var oButton = this.getControl(sButtonName);
 		var sText = sTextKey ? this.getTextResources().getText(sTextKey) : "";
@@ -114,150 +104,24 @@ function(
 		oButton.setIcon(sIcon || "");
 	}
 
-	Adaptation.prototype.formatDiscardDraftVisible = function (sDisplayedVersion, bVersioningEnabled) {
-		return sDisplayedVersion === Versions.Draft && bVersioningEnabled;
-	};
-
-	Adaptation.prototype.formatVersionButtonText = function (aVersions, sDisplayedVersion) {
-		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-		var sText = "";
-		var sType = "Active";
-		aVersions = aVersions || [];
-
-		if (sDisplayedVersion === undefined || sDisplayedVersion === Versions.Original) {
-			sText = oTextResources.getText("TIT_ORIGINAL_APP");
-			sType = "inactive";
-			if (aVersions.length === 0 || (aVersions.length === 1 && aVersions[0].type === "draft")) {
-				sType = "active";
-			}
-		} else {
-			var oDisplayedVersion = aVersions.find(function (oVersion) {
-				return oVersion.version === sDisplayedVersion;
-			});
-			if (oDisplayedVersion) {
-				sType = oDisplayedVersion.type;
-				if (sDisplayedVersion === Versions.Draft) {
-					sText = oTextResources.getText("TIT_DRAFT");
-				} else {
-					sText = oDisplayedVersion.title || oTextResources.getText("TIT_VERSION_1");
-				}
-			}
-		}
-
-		this.setVersionButtonAccentColor(sType);
-		return sText;
-	};
-
-	Adaptation.prototype.formatVersionTableVisibility = function (nVersionsLength) {
-		return nVersionsLength > 0;
-	};
-
-	Adaptation.prototype.formatVersionTitle = function (sTitle, sType) {
-		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-
-		if (sType === "draft") {
-			return oTextResources.getText("TIT_DRAFT");
-		}
-
-		return sTitle || oTextResources.getText("TIT_VERSION_1");
-	};
-
-	Adaptation.prototype.formatVersionTimeStamp = function (sTimeStamp) {
-		if (!sTimeStamp) {
-			// in case of "Original App" and "Draft" no timestamp is set
-			return "";
-		}
-
-		return DateFormat.getInstance({
-			format: "yMMMdjm"
-		}).format(new Date(sTimeStamp));
-	};
-
-	Adaptation.prototype.formatHighlight = function (sType) {
-		switch (sType) {
-			case "draft":
-				return MessageType.Warning;
-			case "active":
-				return MessageType.Success;
-			default:
-				return MessageType.None;
-		}
-	};
-
-	Adaptation.prototype.formatHighlightText = function (sType) {
-		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-		switch (sType) {
-			case "draft":
-				return oTextResources.getText("TIT_DRAFT");
-			case "active":
-				return oTextResources.getText("LBL_ACTIVE");
-			default:
-				return oTextResources.getText("LBL_INACTIVE");
-		}
-	};
-
-	function doesActiveVersionExists (aVersions) {
-		return aVersions.some(function (oVersion) {
-			return oVersion.type === "active";
-		});
-	}
-
-	Adaptation.prototype.formatOriginalAppHighlight = function (aVersions) {
-		return doesActiveVersionExists(aVersions) ? MessageType.None : MessageType.Success;
+	Adaptation.prototype.formatPublishVersionVisibility = function (bPublishVisible, bVersioningEnabled, sDisplayedVersion, sModeSwitcher) {
+		return this.getExtension("versioning", Versioning).formatPublishVersionVisibility(bPublishVisible, bVersioningEnabled, sDisplayedVersion, sModeSwitcher);
 	};
 
-	Adaptation.prototype.formatOriginalAppHighlightText = function (aVersions) {
-		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
-		return doesActiveVersionExists(aVersions) ? oTextResources.getText("LBL_INACTIVE") : oTextResources.getText("LBL_ACTIVE");
+	Adaptation.prototype.formatDiscardDraftVisible = function (sDisplayedVersion, bVersioningEnabled, sModeSwitcher) {
+		return this.getExtension("versioning", Versioning).formatDiscardDraftVisible(sDisplayedVersion, bVersioningEnabled, sModeSwitcher);
 	};
 
-	Adaptation.prototype.versionSelected = function (oEvent) {
-		var oVersionsBindingContext = oEvent.getSource().getBindingContext("versions");
-		var sVersion = Versions.Original;
-
-		if (oVersionsBindingContext) {
-			// the original Version does not have a version binding Context
-			sVersion = oVersionsBindingContext.getProperty("version");
-		}
-
-		this.fireEvent("switchVersion", {version: sVersion});
+	Adaptation.prototype.formatVersionButtonText = function (aVersions, sDisplayedVersion) {
+		return this.getExtension("versioning", Versioning).formatVersionButtonText(aVersions, sDisplayedVersion);
 	};
 
-	Adaptation.prototype.showVersionHistory = function (oEvent) {
-		var oVersionButton = oEvent.getSource();
-
-		if (!this.oVersionDialogPromise) {
-			this.oVersionDialogPromise = Fragment.load({
-				name: "sap.ui.rta.toolbar.VersionHistory",
-				id: this.getId() + "_versionHistoryDialog",
-				controller: {
-					formatVersionTitle: this.formatVersionTitle.bind(this),
-					formatVersionTimeStamp: this.formatVersionTimeStamp.bind(this),
-					formatVersionTableVisibility: this.formatVersionTableVisibility.bind(this),
-					formatHighlight: this.formatHighlight.bind(this),
-					formatHighlightText: this.formatHighlightText.bind(this),
-					formatOriginalAppHighlight: this.formatOriginalAppHighlight.bind(this),
-					formatOriginalAppHighlightText: this.formatOriginalAppHighlightText.bind(this),
-					versionSelected: this.versionSelected.bind(this)
-				}
-			}).then(function (oVersionsDialog) {
-				oVersionButton.addDependent(oVersionsDialog);
-				return oVersionsDialog;
-			});
-		}
-
-		return this.oVersionDialogPromise.then(function (oVersionsDialog) {
-			if (!oVersionsDialog.isOpen()) {
-				oVersionsDialog.openBy(oVersionButton);
-			} else {
-				oVersionsDialog.close();
-			}
-		});
+	Adaptation.prototype.showVersionHistory = function(oEvent) {
+		return this.getExtension("versioning", Versioning).showVersionHistory(oEvent);
 	};
 
-	Adaptation.prototype.showTranslationPopover = function (oEvent) {
-		var oTranslation = this.addExtension("translation", Translation);
-		return oTranslation.showTranslationPopover(oEvent, this);
+	Adaptation.prototype._openVersionTitleDialog = function (sDisplayedVersion) {
+		return this.getExtension("versioning", Versioning).openActivateVersionDialog(sDisplayedVersion);
 	};
 
 	Adaptation.prototype.showRestore = function (bVersioningEnabled) {
@@ -296,12 +160,8 @@ function(
 		this._showButtonText("exit", "BTN_EXIT");
 	};
 
-	Adaptation.prototype._onSizeChanged = function(mParams) {
-		if (!mParams) {
-			return Promise.resolve();
-		}
-
-		return this.onFragmentLoaded().then(function() {
+	Adaptation.prototype._onSizeChanged = function(mParams, bInitial) {
+		if (mParams) {
 			var sMode = mParams.name;
 			this.sMode = sMode;
 
@@ -311,18 +171,21 @@ function(
 					break;
 				case Adaptation.modes.TABLET:
 				case Adaptation.modes.DESKTOP:
-					this._switchToTexts();
+					// this is already defined in the view
+					if (!bInitial) {
+						this._switchToTexts();
+					}
 					break;
 				default:
 				// no default
 			}
-		}.bind(this));
+		}
 	};
 
 	/**
 	 * Loads and creates the Fragment of the Toolbar
 	 *
-	 * @returns {sap.ui.core.Control[]} Returns the controls in a structure described above.
+	 * @returns {Promise<sap.ui.core.Control[]>} Returns the controls in a structure described above.
 	 */
 	Adaptation.prototype.buildControls = function () {
 		return Fragment.load({
@@ -332,16 +195,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 +217,22 @@ function(
 		});
 	};
 
+	function onOpenDownloadTranslationDialog() {
+		var mPropertyBag = {
+			layer: this.getRtaInformation().flexSettings.layer,
+			selector: this.getRtaInformation().rootControl
+		};
+		this.getExtension("translation", Translation).openDownloadTranslationDialog(mPropertyBag);
+	}
+
+	function onOpenUploadTranslationDialog() {
+		this.getExtension("translation", Translation).openUploadTranslationDialog();
+	}
+
+	function formatSaveAsEnabled(bGeneralSaveAsEnabled, sDisplayedVersion) {
+		return bGeneralSaveAsEnabled && sDisplayedVersion !== Version.Number.Draft;
+	}
+
 	function onSaveAsPressed() {
 		AppVariantFeature.onSaveAs(true, true, this.getRtaInformation().flexSettings.layer, null);
 	}
@@ -364,77 +247,9 @@ function(
 		AppVariantFeature.onGetOverview(true, this.getRtaInformation().flexSettings.layer);
 	}
 
-	function resetDialog() {
-		this.getControl("versionTitleInput").setValue("");
-		this.getControl("confirmVersionTitleButton").setEnabled(false);
-		return Promise.resolve(this._oDialog);
-	}
-
-	function createDialog() {
-		return Fragment.load({
-			name: "sap.ui.rta.toolbar.VersionTitleDialog",
-			id: this.getId() + "_fragment",
-			controller: {
-				onConfirmVersioningDialog: function () {
-					var sVersionTitle = this.getControl("versionTitleInput").getValue();
-					this.fireEvent("activate", {versionTitle: sVersionTitle});
-					this._oDialog.close();
-				}.bind(this),
-				onCancelVersioningDialog: function () {
-					this._oDialog.close();
-				}.bind(this),
-				onVersionTitleLiveChange: function (oEvent) {
-					var sValue = oEvent.getParameter("value");
-					this.getControl("confirmVersionTitleButton").setEnabled(!!sValue);
-				}.bind(this)
-			}
-		}).then(function (oDialog) {
-			this._oDialog = oDialog;
-			oDialog.addStyleClass(Utils.getRtaStyleClassName());
-			this.addDependent(this._oDialog);
-		}.bind(this));
-	}
-
 	Adaptation.prototype.getControl = function(sName) {
 		return sap.ui.getCore().byId(this.getId() + "_fragment--sapUiRta_" + sName);
 	};
 
-	Adaptation.prototype._openVersionTitleDialog = function (sDisplayedVersion) {
-		var oDialogPromise;
-
-		if (this._oDialog) {
-			oDialogPromise = resetDialog.call(this);
-		} else {
-			oDialogPromise = createDialog.call(this);
-		}
-
-		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) {
-				sTitle = oTextResources.getText("TIT_REACTIVATE_VERSION_TITLE_DIALOG");
-			}
-			this._oDialog.setTitle(sTitle);
-			return this._oDialog.open();
-		}.bind(this));
-	};
-
-	Adaptation.prototype.setVersionButtonAccentColor = function (sType) {
-		var oVersionButton = this.getControl("versionButton");
-		switch (sType) {
-			case "draft":
-				oVersionButton.addStyleClass(DRAFT_ACCENT_COLOR);
-				oVersionButton.removeStyleClass(ACTIVE_ACCENT_COLOR);
-				break;
-			case "active":
-				oVersionButton.addStyleClass(ACTIVE_ACCENT_COLOR);
-				oVersionButton.removeStyleClass(DRAFT_ACCENT_COLOR);
-				break;
-			default:
-				oVersionButton.removeStyleClass(ACTIVE_ACCENT_COLOR);
-				oVersionButton.removeStyleClass(DRAFT_ACCENT_COLOR);
-		}
-	};
-
 	return Adaptation;
 });

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.103.0
 	 *
 	 * @constructor
 	 * @private
@@ -111,30 +111,20 @@ sap.ui.define([
 	};
 
 	/**
-	 * Adds an extension to the toolbar, if it is not already registered.
+	 * Adds and returns an extension to the toolbar, if it is not already registered.
 	 * The new extension gets created with the toolbar itself as property 'toolbar'.
 	 *
 	 * @param {string} sName - Name of the extension
 	 * @param {sap.ui.base.ManagedObject} Extension - Extension Class to be instantiated
-	 * @returns {sap.ui.base.ManagedObject} Returns the newly created module.
+	 * @returns {sap.ui.base.ManagedObject|undefined} Returns the extension or undefined if it does not exist
 	 */
-	Base.prototype.addExtension = function(sName, Extension) {
+	Base.prototype.getExtension = function(sName, Extension) {
 		if (!Object.keys(this._oExtensions).includes(sName)) {
 			this._oExtensions[sName] = new Extension({toolbar: this});
 		}
 		return this._oExtensions[sName];
 	};
 
-	/**
-	 * Returns the extension with the passed name
-	 *
-	 * @param {string} sName - Name of the extension
-	 * @returns {sap.ui.base.ManagedObject|undefined} Returns the extension or undefined if it does not exist
-	 */
-	Base.prototype.getExtension = function(sName) {
-		return this._oExtensions[sName];
-	};
-
 	/**
 	 * @override
 	 */
@@ -161,7 +151,7 @@ sap.ui.define([
 	/**
 	 * Function provides controls which should be rendered into the Toolbar. Controls are going to be rendered
 	 * in the same order as provided in returned array.
-	 * @returns {Array.<sap.ui.core.Control>} An array of controls
+	 * @returns {Promise<sap.ui.core.Control[]>} A Promise that resolves with an array of controls
 	 * @protected
 	 */
 	Base.prototype.buildControls = function () {

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.103.0
 	 *
 	 * @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.103.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.101.0
+	 * @version 1.103.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.101.0
+	 * @version 1.103.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.101.0
+	 * @version 1.103.0
 	 *
 	 * @constructor
 	 * @private

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>