@sapui5/sap.ui.export 1.124.6 → 1.124.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.124.6",
+	"version": "1.124.7",
 	"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-2024 SAP SE. All rights reserved.</copyright>
-	<version>1.124.6</version>
+	<version>1.124.7</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.124.6
+	 * @version 1.124.7
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.ExportBase

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

@@ -18,7 +18,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @class The <code>sap.ui.export.ExportHandler</code> class allows you to export table data from an SAPUI5 application.
 	 *
 	 * @author SAP SE
-	 * @version 1.124.6
+	 * @version 1.124.7
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler

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

@@ -147,7 +147,7 @@ sap.ui.define([
 	 * @class Utilities related to export to enable reuse in integration scenarios (e.g. tables).
 	 *
 	 * @author SAP SE
-	 * @version 1.124.6
+	 * @version 1.124.7
 	 *
 	 * @since 1.59
 	 * @alias sap.ui.export.ExportUtils
@@ -1228,7 +1228,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.124.6")
+		 * @param {string} [oContext.version] Application version (default: "1.124.7")
 		 * @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

@@ -24,7 +24,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.124.6
+	 * @version 1.124.7
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument

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

@@ -85,7 +85,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.124.6")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.124.7")</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>
@@ -169,7 +169,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.124.6',
+		 *         version: '1.124.7',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -281,7 +281,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.124.6
+		 * @version 1.124.7
 		 *
 		 * @since 1.50
 		 * @alias sap.ui.export.Spreadsheet

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.124.6
+	 * @version 1.124.7
 	 *
 	 * @alias sap.ui.export.SpreadsheetExport
 	 * @private

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

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/core/Lib"], function(Library) {
 	 * @namespace
 	 * @alias sap.ui.export
 	 * @author SAP SE
-	 * @version 1.124.6
+	 * @version 1.124.7
 	 * @public
 	 */
 
@@ -33,7 +33,7 @@ sap.ui.define(["sap/ui/core/Lib"], function(Library) {
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.124.6"
+		version: "1.124.7"
 	});
 
 	/**

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

@@ -24,7 +24,7 @@
 	 * @param {object} mSettings Data service related part of the export configuration
 	 *
 	 * @author SAP SE
-	 * @version 1.124.6
+	 * @version 1.124.7
 	 *
 	 * @constructor
 	 * @class DataProviderBase
@@ -250,7 +250,7 @@
 
 		iRemainingRows = this.iTotalRows - this.iAvailableRows;
 
-		mCallbackParams.finished = iFetchedRows === 0 || (!sNextUrl && iRemainingRows <= 0) || (!sNextUrl && iFetchedRows < this.iBatchSize); // Done criteria
+		mCallbackParams.finished = this._isFinished(iFetchedRows, sNextUrl, iRemainingRows);
 		mCallbackParams.progress = this.iTotalRows;
 		mCallbackParams.total = this.iTotalRows < this.iCount ? this.iTotalRows : this.iCount;
 		mCallbackParams.fetched = this.iAvailableRows;
@@ -264,10 +264,30 @@
 				.catch(this.fnOnError.bind(this));
 		}
 
+		if (iFetchedRows < this.iBatchSize && sNextUrl) {
+			this.iBatchSize = iFetchedRows;
+		}
 		mCallbackParams.rows = this.fnConvertData(aData); // Normalize data
 		this.fnProcessCallback(mCallbackParams); // Return result
 	};
 
+	/**
+	 * The function returns array of columns that need special conversion for values.
+	 * E.g. handling data from association/navigationProperty
+	 *
+	 * @param {number} iFetchedRows - Number of rows fetched
+	 * @param {string} sNextUrl - Next url to fetch data
+	 * @param {number} iRemainingRows - Remaining rows to fetch
+	 * @returns {boolean} - True if the finish condition is met
+	 *
+	 * @static
+	 * @private
+	 */
+	DataProviderBase.prototype._isFinished = function(iFetchedRows, sNextUrl, iRemainingRows) {
+		const bFetchedRows = !sNextUrl && ((iFetchedRows < this.iBatchSize) || iFetchedRows > this.iBatchSize);
+		return iFetchedRows === 0 || iRemainingRows <= 0 || bFetchedRows;
+	};
+
 	/**
 	 * Inner function that processes request handler exceptions.
 	 *

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.124.6
+	 * @version 1.124.7
 	 *
 	 * @since 1.110
 	 * @alias sap.ui.export.util.Filter