@sapui5/sap.ui.export 1.114.0 → 1.114.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.114.0",
+	"version": "1.114.2",
 	"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-2023 SAP SE. All rights reserved.</copyright>
-	<version>1.114.0</version>
+	<version>1.114.2</version>
 
 	<documentation>UI5 library: sap.ui.export</documentation>
 

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class 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.114.0
+	 * @version 1.114.2
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.ExportBase

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

@@ -9,14 +9,15 @@
  */
 sap.ui.define([
 	'sap/ui/core/library',
+	'sap/ui/core/format/NumberFormat',
+	'sap/ui/export/ExportUtils',
 	'sap/m/library',
 	'sap/m/Dialog',
 	'sap/m/Button',
 	'sap/m/ProgressIndicator',
 	'sap/m/Text',
-	'sap/m/MessageBox',
-	'sap/ui/core/format/NumberFormat'
-], function(coreLibrary, MLibrary, Dialog, Button, ProgressIndicator, Text, MessageBox, NumberFormat) {
+	'sap/m/MessageBox'
+], function(coreLibrary, NumberFormat, ExportUtils, MLibrary, Dialog, Button, ProgressIndicator, Text, MessageBox) {
 	'use strict';
 
 	var ValueState = coreLibrary.ValueState;
@@ -24,9 +25,6 @@ sap.ui.define([
 	var DialogType = MLibrary.DialogType;
 	var ButtonType = MLibrary.ButtonType;
 
-	/* Async call to resource bundle */
-	var oResourceBundlePromise = sap.ui.getCore().getLibraryResourceBundle("sap.ui.export", true);
-
 	/**
 	 * The method returns a new Promise that results in a new
 	 * progress dialog.
@@ -37,7 +35,7 @@ sap.ui.define([
 		return new Promise(function(fnResolve, fnReject) {
 			var dialog;
 
-			oResourceBundlePromise.then(function(oResourceBundle) {
+			ExportUtils.getResourceBundle().then(function(oResourceBundle) {
 				var cancelButton = new Button({
 					text : oResourceBundle.getText("CANCEL_BUTTON"),
 					press : function() {
@@ -117,49 +115,60 @@ sap.ui.define([
 	 * Shows a warning dialog that can show several warning messages, either alone or combined.
 	 *
 	 * @param {Object} mParams Configuration of the warning dialog
-	 * @param {number} mParams.rows Amount of rows that will be exported
-	 * @param {number} mParams.columns Amount of columns that will be exported
-	 * @param {boolean} mParams.sizeLimit Indicates whether the size limit warning needs to be shown
-	 * @param {boolean} mParams.cutOff Indicates whether the cut off message needs to be shown
+	 * @param {number} mParams.rows Number of rows that will be exported
+	 * @param {number} mParams.columns Number of columns that will be exported
+	 * @param {boolean} mParams.cellLimit Number of cells that are suported
+	 * @param {boolean} mParams.rowLimit Number of rows that are supported
 	 * @param {String} mParams.fileType File type of the exported document
 	 * @returns {Promise} Promise that gets resolved when the user wants to export, regardless of the warning
 	 */
 	function showWarningDialog(mParams) {
 		return new Promise(function(fnResolve, fnReject) {
 
-			oResourceBundlePromise.then(function(oResourceBundle) {
-				var bContinue, oWarningDialog, oWarningText, sWarningText, oNumberFormat, sRowsFormatted, sCellsFormatted, sCutOffFormatted, sFileTypeText;
+			ExportUtils.getResourceBundle().then(function(oResourceBundle) {
+				var aText, bContinue, oWarningDialog, oWarningText, oNumberFormat, sRowCount, sCellCount, sCellLimit, sLimit, sFileType;
 
-				oNumberFormat = NumberFormat.getIntegerInstance({groupingEnabled: true});
+				aText = [];
 				bContinue = false;
-				sWarningText = '';
+				oNumberFormat = NumberFormat.getIntegerInstance({groupingEnabled: true});
+				sFileType = oResourceBundle.getText(mParams.fileType + "_FILETYPE");
+				sLimit = oNumberFormat.format(mParams.rowLimit);
 
-				if (!mParams.rows) {
-					sWarningText = oResourceBundle.getText("NO_COUNT_WARNING_MSG");
-				} else {
-					sRowsFormatted = oNumberFormat.format(mParams.rows);
+				if (mParams.rows) {
+					sRowCount = oNumberFormat.format(mParams.rows);
 
-					if (mParams.sizeLimit) {
-						sCellsFormatted = oNumberFormat.format(mParams.rows * mParams.columns);
-						sWarningText = oResourceBundle.getText("SIZE_WARNING_MSG", [sRowsFormatted, mParams.columns, sCellsFormatted]);
+					if (mParams.columns) {
+						sCellCount = oNumberFormat.format(mParams.rows * mParams.columns);
+						aText.push(oResourceBundle.getText("MSG_WARNING_CELL_COUNT", [sRowCount, mParams.columns, sCellCount]));
+					} else {
+						aText.push(oResourceBundle.getText("MSG_WARNING_ROW_COUNT", [sRowCount]));
 					}
 
-					if (mParams.rows > mParams.cutOff) {
-						sCutOffFormatted = oNumberFormat.format(mParams.cutOff);
-						sWarningText += sWarningText === '' ? '' : '\n\n'; // Add line breaks if there is already a message
-						sFileTypeText = oResourceBundle.getText(mParams.fileType + "_FILETYPE");
-						sWarningText += oResourceBundle.getText("MSG_WARNING_CUT_OFF", [sRowsFormatted, sCutOffFormatted, sFileTypeText]);
+					if (mParams.rows > mParams.rowLimit) {
+						aText.push(oResourceBundle.getText("MSG_WARNING_ROW_LIMIT", [sLimit, sFileType]));
 					}
+
+					if (mParams.rows * mParams.columns > mParams.cellLimit) {
+						sCellLimit = oNumberFormat.format(mParams.cellLimit);
+						aText.push(oResourceBundle.getText("MSG_WARNING_CELL_LIMIT", [sCellLimit]));
+					}
+				} else {
+					aText.push(oResourceBundle.getText("MSG_WARNING_COUNT_UNKNOWN"));
+					aText.push(oResourceBundle.getText("MSG_WARNING_ROW_LIMIT", [sLimit, sFileType]));
+					aText.push(oResourceBundle.getText("MSG_WARNING_ADVICE"));
 				}
 
+				aText.push(oResourceBundle.getText("MSG_WARNING_EXPORT_ANYWAY"));
+
 				oWarningText = new Text({
-					text: sWarningText
+					text: aText.join('\n\n')
 				});
 				oWarningDialog = new Dialog({
 					title: oResourceBundle.getText('WARNING_TITLE'),
 					type: DialogType.Message,
 					state: ValueState.Warning,
 					content: oWarningText,
+					contentWidth: '550px', // UX recommendation
 					ariaLabelledBy: oWarningText,
 					endButton: new Button({
 						type: ButtonType.Transparent,
@@ -201,7 +210,7 @@ sap.ui.define([
 			sMessage = sMessage.message;
 		}
 
-		oResourceBundlePromise.then(function(oResourceBundle) {
+		ExportUtils.getResourceBundle().then(function(oResourceBundle) {
 			var sErrorMessage = sMessage || oResourceBundle.getText('PROGRESS_ERROR_DEFAULT');
 
 			// Replace technical error message in case of "out of memory"

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

@@ -15,7 +15,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', 'sap/m/MessageToa
 	 * @class The <code>sap.ui.export.ExportHandler</code> class allows you to export table data from a UI5 application.
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler

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

@@ -33,7 +33,6 @@ sap.ui.define([
 
 	/* Async call to resource bundle */
 	var oResourceBundle;
-	var oResourceBundlePromise = Core.getLibraryResourceBundle('sap.ui.export', true);
 
 	var CLASS_NAME = 'sap.ui.export.ExportUtils';
 
@@ -135,7 +134,7 @@ sap.ui.define([
 	 * @class Utilities related to export to enable reuse in integration scenarios (e.g. tables).
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @since 1.59
 	 * @alias sap.ui.export.ExportUtils
@@ -250,7 +249,7 @@ sap.ui.define([
 					oOpener = null;
 				}
 
-				oResourceBundlePromise.then(function (oResourceBundle) {
+				Utils.getResourceBundle().then(function (oResourceBundle) {
 					var oExportConfigModel = new JSONModel();
 
 					oExportConfigModel.setData(getDefaultSettings(mCustomConfig, oResourceBundle, oExportCapabilities, bRemoteDestination));
@@ -618,7 +617,7 @@ sap.ui.define([
 		parseFilterConfiguration: function() {
 			Log.error('Function is deprecated and must not be used anymore');
 
-			return oResourceBundlePromise.then(function(oResourceBundle) {
+			return Utils.getResourceBundle().then(function(oResourceBundle) {
 				return {
 					name: oResourceBundle.getText('FILTER_HEADER'),
 					items: []
@@ -1168,7 +1167,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.114.0")
+		 * @param {string} [oContext.version] Application version (default: "1.114.2")
 		 * @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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @class 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.114.0
+	 * @version 1.114.2
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument
@@ -239,10 +239,14 @@ sap.ui.define([
 			}
 		}
 
-		/* Eliminate duplicates before adding columns */
+		/* Eliminate duplicate or unknown columns before adding them to the DocumentDescription */
 		oWorkbook.columns.filter(function(oColumn, iIndex, aArray) {
 			var sProperty = Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property;
 
+			if (!sProperty) {
+				return false;
+			}
+
 			return aArray.findIndex(function(oOtherColumn) {
 				var sOtherProperty = Array.isArray(oOtherColumn.property) ? oOtherColumn.property[0] : oOtherColumn.property;
 
@@ -312,13 +316,13 @@ sap.ui.define([
 
 		mParams = {
 			rows: mSettings.dataSource.count,
-			cutOff: this._mCapabilities.ResultSizeMax,
+			rowLimit: this._mCapabilities.ResultSizeMaximum,
 			fileType: FileType.PDF
 		};
 
 		oWarningPromise = Promise.resolve();
 
-		if (mParams.rows > mParams.cutOff) {
+		if (isNaN(mParams.rows) || (mParams.rows > mParams.rowLimit)) {
 			oWarningPromise = ExportDialog.showWarningDialog(mParams);
 		}
 

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

@@ -84,7 +84,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.114.0")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.114.2")</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>
@@ -167,7 +167,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.114.0',
+		 *         version: '1.114.2',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -279,7 +279,7 @@ sap.ui.define([
 		 * @class 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.114.0
+		 * @version 1.114.2
 		 *
 		 * @since 1.50
 		 * @alias sap.ui.export.Spreadsheet
@@ -752,8 +752,8 @@ sap.ui.define([
 					var oDialogSettings = {
 						rows: nRows,
 						columns: nColumns,
-						sizeLimit: nRows * nColumns > nSizeLimit,
-						cutOff: MAX_ROWS,
+						cellLimit: nSizeLimit,
+						rowLimit: MAX_ROWS,
 						fileType: Library.FileType.XLSX
 					};
 

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

@@ -21,7 +21,7 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 	 * Utility class to perform spreadsheet export.
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @alias sap.ui.export.SpreadsheetExport
 	 * @private

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

@@ -15,7 +15,7 @@ sap.ui.define([], function() {
 	 * @namespace
 	 * @alias sap.ui.export
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @public
 	 */
 
@@ -31,7 +31,7 @@ sap.ui.define([], function() {
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.114.0"
+		version: "1.114.2"
 	});
 
 

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

@@ -23,10 +23,25 @@ PROGRESS_FETCHING_MSG=Fetching data from server...
 PROGRESS_ERROR_TITLE=Error
 
 #XMSG: Message text informing that the exported file is too big
-SIZE_WARNING_MSG=The document contains {0} rows and {1} column(s) ({2} cells).\n Documents with more than 2,000,000 cells might be too large to process.\n Export anyway?
+MSG_WARNING_CELL_COUNT=The document contains {0} rows and {1} column(s) ({2} cells).
 
-#XMSG: Message text informing that the amount of items is too large to be exported in a single spreadsheet/PDF and the export is being cut off to maximum allowed amount depending on the file type.
-MSG_WARNING_CUT_OFF=The document contains {0} rows.\n Only {1} rows can be exported in a single {2} file.\n Export anyway?
+#XMSG: Part of a message text that informs about the file specific cell limit for exporting
+MSG_WARNING_CELL_LIMIT=Documents with more than {0} cells might be too large to process.
+
+#XMSG: Part of a message text that informs about the number of rows which will be exported
+MSG_WARNING_ROW_COUNT=The document contains {0} rows.
+
+#XMSG: Part of a message text that contains information about the file specific export limit - Placeholder 1 references the limit and placeholder 2 references the file type
+MSG_WARNING_ROW_LIMIT=Only {0} rows can be exported in a single {1} file.
+
+#XMSG: Part of a message text that will be used when the number of rows is unknown
+MSG_WARNING_COUNT_UNKNOWN=The document contains an unknown number of rows.
+
+#XMSG: Part of a message text that gives advice on how to proceed
+MSG_WARNING_ADVICE=Please do not proceed unless you are sure that the current filter settings do not result in a large amount of data, as the file might be too large to process.
+
+#XMSG: Last sentence of a warning message to ask the user if he/she still wants to export
+MSG_WARNING_EXPORT_ANYWAY=Export anyway?
 
 #XMSG: Textual representation of the technical error message which indicates that the export ran out of memory.
 MSG_ERROR_OUT_OF_MEMORY=The export process ran out of memory and was terminated.\n Please adjust your column or filter settings to select a smaller number of cells.
@@ -130,9 +145,6 @@ FILENAME_ERROR=You cannot use any of the following characters in a file name: \\
 #XMSG: Message text informing that exported file is being created
 PROGRESS_BUNDLE_MSG=Generating file...
 
-#XMSG: Message text informing that the exported file size cannot be predicted
-NO_COUNT_WARNING_MSG=There is no count provided in the export configuration. \nThe total number of exported rows cannot be predicted and might exceed the memory capacity of the application. \nPlease do not proceed unless you are sure that the current filter settings do not result in a large amount of data.
-
 #XTIT: Title of the XLSX document if no title is defined in SpreadSheet settings
 XLSX_DEFAULT_TITLE=SAPUI5 Export
 

package/src/sap/ui/export/provider/DataProviderBase.js

@@ -34,7 +34,7 @@
 	 * @param {object} mSettings Data service related part of the export configuration
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @constructor
 	 * @class DataProviderBase

package/src/sap/ui/export/util/Filter.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/Object'], function(BaseObject) {
 	 * convenience functions like <code>sap.ui.export.util.Filter#setType</code> to improve the result.
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @since 1.110
 	 * @alias sap.ui.export.util.Filter