@sapui5/sap.ui.export 1.102.2 → 1.102.5

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.102.2",
+	"version": "1.102.5",
 	"description": "SAPUI5 Library sap.ui.export",
 	"homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
 	"author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/export/.library

@@ -5,7 +5,7 @@
 	<vendor>SAP SE</vendor>
 	<copyright>SAPUI5
  * (c) Copyright 2009-2022 SAP SE. All rights reserved.</copyright>
-	<version>1.102.2</version>
+	<version>1.102.5</version>
 
 	<documentation>UI5 library: sap.ui.export</documentation>
 

package/src/sap/ui/export/ExportBase.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor The <code>sap.ui.export.ExportBase</code> class allows you to export table data from a UI5 application to certain formats. This class is an abstract class that requires specific implementations for each file format.
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.102.5
 	 *
 	 * @since 1.96
 	 * @name sap.ui.export.ExportBase

package/src/sap/ui/export/ExportDialog.js

@@ -180,6 +180,14 @@ sap.ui.define(['sap/ui/core/library', 'sap/m/library', 'sap/m/Dialog', 'sap/m/Bu
 	 * @param {string} sMessage Error message that will be shown in the error dialog
 	 */
 	function showErrorMessage(sMessage) {
+		if (!sMessage) {
+			return;
+		}
+
+		if (sMessage instanceof Error) {
+			sMessage = sMessage.message;
+		}
+
 		oResourceBundlePromise.then(function(oResourceBundle) {
 			var errorMessage = sMessage || oResourceBundle.getText('PROGRESS_ERROR_DEFAULT');
 

package/src/sap/ui/export/ExportHandler.js

@@ -6,6 +6,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', 'sap/m/MessageToa
 	'use strict';
 
 	var Destination = library.Destination;
+	var FileType = library.FileType;
 
 	/**
 	 * Any export related functionality is encapsuled in the <code>ExportHandler</code> which also stores user settings throughout the session.
@@ -14,7 +15,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', 'sap/m/MessageToa
 	 * @constructor The <code>sap.ui.export.ExportHandler</code> class allows you to export table data from a UI5 application.
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.102.5
 	 *
 	 * @since 1.102
 	 * @name sap.ui.export.ExportHandler
@@ -397,7 +398,10 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', 'sap/m/MessageToa
 
 			/* Merge export settings with user settings from the dialog */
 			Object.assign(mExportSettings, mDialogSettings);
-			ExportUtils.validateFileSettings(mExportSettings);
+
+			if (mExportSettings.fileType !== FileType.XLSX || mExportSettings.destination !== Destination.REMOTE) {
+				ExportUtils.validateFileSettings(mExportSettings);
+			}
 
 			mUserSettings.splitCells = mDialogSettings.splitCells;
 			mUserSettings.includeFilterSettings = mDialogSettings.includeFilterSettings;

package/src/sap/ui/export/ExportUtils.js

@@ -47,7 +47,6 @@ sap.ui.define([
 
 	/* Returns the Export Settings used by the User Settings Dialog */
 	function getDefaultSettings(oCustomConfig, oResourceBundle, oExportCapabilities, bRemoteDestination) {
-		var sSelectedKey;
 		var aSupportedFormats = Object.keys(oExportCapabilities);
 
 		var oDefaultConfig = {
@@ -81,7 +80,15 @@ sap.ui.define([
 		};
 
 		aSupportedFormats.forEach(function(sFormat) {
-			oDefaultConfig.fileTypeCollection.push({key: sFormat.toUpperCase()});
+			var sFileType, sResourceBundleKey;
+
+			sFileType = sFormat.toUpperCase();
+			sResourceBundleKey = bRemoteDestination && sFileType === FileType.XLSX ? sFileType + '_CLOUD_FILETYPE' : sFileType + '_FILETYPE';
+
+			oDefaultConfig.fileTypeCollection.push({
+				key: sFileType,
+				text: oResourceBundle.getText(sResourceBundleKey)
+			});
 		});
 
 		if (bRemoteDestination) {
@@ -93,17 +100,10 @@ sap.ui.define([
 
 		var oExportConfig = Object.assign({}, oDefaultConfig, oCustomConfig || {});
 
-		for (var i = 0; i < oExportConfig.fileTypeCollection.length; i++) {
-			sSelectedKey = null;
-
-			if (!oExportConfig.fileTypeCollection[i].text) {
-				oExportConfig.fileTypeCollection[i].text = oResourceBundle.getText(oExportConfig.fileTypeCollection[i].key + '_FILETYPE');
-			}
-			if (oExportConfig.fileTypeCollection[i].key === oExportConfig.fileType) {
-				sSelectedKey = oExportConfig.fileTypeCollection[i].key;
-			}
-		}
-		if (!sSelectedKey) {
+		/* Select first element if selected key is unavailable */
+		if (!oExportConfig.fileTypeCollection.some(function(oEntry) {
+			return oEntry.key === oExportConfig.fileType;
+		})) {
 			oExportConfig.fileType = oExportConfig.fileTypeCollection[0].key;
 		}
 
@@ -124,7 +124,7 @@ sap.ui.define([
 	 * Utilities related to export to enable reuse in integration scenarios (e.g. tables).
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.102.5
 	 *
 	 * @since 1.59
 	 * @name sap.ui.export.ExportUtils
@@ -974,7 +974,7 @@ sap.ui.define([
 		 *
 		 * @param {object} oContext Context object
 		 * @param {string} [oContext.application] Name of the application (default: "SAP UI5")
-		 * @param {string} [oContext.version] Application version (default: "1.102.2")
+		 * @param {string} [oContext.version] Application version (default: "1.102.5")
 		 * @param {string} [oContext.title] Title that will be written to the file (NOT the filename)
 		 * @param {string} [oContext.modifiedBy] Optional user context that will be written to the file
 		 * @param {string} [oContext.sheetName] Name of the data sheet - Maximum length of 31 characters

package/src/sap/ui/export/PortableDocument.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor The <code>sap.ui.export.PortableDocument</code> class allows you to export table data from a UI5 application to a Portable Document Format (*.PDF) file.
 	 *
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.102.5
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument

package/src/sap/ui/export/Spreadsheet.js

@@ -83,7 +83,7 @@ sap.ui.define([
 		 *      <li><code>workbook.context</code> - Context object that will be applied to the generated file. It may contain the following fields:</li>
 		 *      <ul>
 		 *          <li><code>application</code> (string) - The application that creates the XLSX document (default: "SAP UI5")</li>
-		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.102.2")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.102.5")</li>
 		 *          <li><code>title</code> (string) - Title of the XLSX document (NOT the filename)</li>
 		 *          <li><code>modifiedBy</code> (string) - User context for the XLSX document</li>
 		 *          <li><code>sheetName</code> (string) - The label of the data sheet</li>
@@ -166,7 +166,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.102.2',
+		 *         version: '1.102.5',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -278,7 +278,7 @@ sap.ui.define([
 		 * @constructor The <code>sap.ui.export.Spreadsheet</code> class allows you to export table data from a UI5 application to a spreadsheet file.
 		 *
 		 * @author SAP SE
-		 * @version 1.102.2
+		 * @version 1.102.5
 		 *
 		 * @since 1.50
 		 * @name sap.ui.export.Spreadsheet

package/src/sap/ui/export/SpreadsheetExport.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.102.5
 	 *
 	 * @private
 	 * @since 1.50.0

package/src/sap/ui/export/library.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.export
 	 * @author SAP SE
-	 * @version 1.102.2
+	 * @version 1.102.5
 	 * @public
 	 */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.102.2"
+		version: "1.102.5"
 	});
 
 

package/src/sap/ui/export/messagebundle.properties

@@ -61,6 +61,9 @@ ADD_DATE_TIME=Add current date and time to the file name
 #XLST: Spreadsheet file type config for spreadsheet export
 XLSX_FILETYPE=Spreadsheet (*.xlsx)
 
+#XLST: Spreadsheet file type for exporting to the cloud - No extensions allowed
+XLSX_CLOUD_FILETYPE=Spreadsheet
+
 #XMSG: File name warning text
 FILENAME_WARNING=The file name you entered exceeds 100 characters. This may prevent the spreadsheet from opening correctly.