@sapui5/sap.ui.export 1.130.0 → 1.130.2

package/package.json

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

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

@@ -7,11 +7,12 @@ sap.ui.define([
 	"./ExportUtils",
 	"./ExportDialog",
 	"./util/PDFCapabilities",
+	"sap/base/Log",
 	"sap/m/MessageToast",
 	"sap/ui/base/EventProvider",
 	"sap/ui/model/odata/v4/ODataModel",
 	"sap/ui/util/openWindow"
-], function(library, ExportUtils, ExportDialog, PDFCapabilities, MessageToast, EventProvider, ODataModel, openWindow) {
+], function(library, ExportUtils, ExportDialog, PDFCapabilities, Log, MessageToast, EventProvider, ODataModel, openWindow) {
 	"use strict";
 
 	const Destination = library.Destination;
@@ -27,7 +28,7 @@ sap.ui.define([
 	 * @class The <code>sap.ui.export.ExportHandler</code> class allows you to export table data from an SAPUI5 application.
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.130.2
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler
@@ -185,7 +186,12 @@ sap.ui.define([
 			this._oFileShareBinding = oModel.bindList("/FileShares");
 		}
 
-		return this._oFileShareBinding.requestContexts(0);
+		try {
+			return await this._oFileShareBinding.requestContexts(0);
+		} catch (oError) {
+			Log.error(oError?.message ?? oError);
+			return [];
+		}
 	};
 
 	/**

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

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

@@ -26,7 +26,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.130.0
+	 * @version 1.130.2
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument

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

@@ -90,7 +90,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.130.0")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.130.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>
@@ -174,7 +174,7 @@ sap.ui.define([
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.130.0',
+		 *         version: '1.130.2',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -286,7 +286,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.130.0
+		 * @version 1.130.2
 		 *
 		 * @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.130.0
+	 * @version 1.130.2
 	 *
 	 * @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.130.0
+	 * @version 1.130.2
 	 * @public
 	 */
 
@@ -33,7 +33,7 @@ sap.ui.define(["sap/ui/core/Lib"], function(Library) {
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.130.0"
+		version: "1.130.2"
 	});
 
 	/**

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.130.0
+	 * @version 1.130.2
 	 *
 	 * @constructor
 	 * @class DataProviderBase
@@ -39,6 +39,7 @@
 		this.iAvailableRows = 0;
 		this.mRequest = null;
 		this.iCount = Math.min(mSettings.dataSource.count || DataProviderBase.MAX_ROWS, DataProviderBase.MAX_ROWS);
+		this.fnConvertData = DataProviderBase.getDataConverter(this.mSettings);
 
 		if (this.mSettings.dataSource.downloadLimit) {
 			this.iTotalRows = this.mSettings.dataSource.downloadLimit;
@@ -195,7 +196,6 @@
 	DataProviderBase.prototype.requestData = function(fnProcessCallback) {
 		var mDataSource = this.mSettings.dataSource;
 
-		this.fnConvertData = DataProviderBase.getDataConverter(this.mSettings);
 		this.fnProcessCallback = fnProcessCallback;
 
 		// Execution
@@ -231,7 +231,7 @@
 	 * @private
 	 */
 	DataProviderBase.prototype.fnOnDataReceived = function(oResult) {
-		var aData, sNextUrl, iFetchedRows, iRemainingRows;
+		var aData, sNextUrl, iFetchedRows, iRemainingRows, bWasServerSidePaging;
 		var mCallbackParams = {};
 		this.oPendingXHR = null;
 		if (this.bCanceled) {
@@ -241,6 +241,7 @@
 		/* Check for OData V4 result, if not present check for OData V2 result or apply default */
 		aData = (oResult && oResult.value || (oResult.d && (oResult.d.results || oResult.d))) || oResult;
 		aData = (Array.isArray(aData)) ? aData : [];
+		bWasServerSidePaging = this.mRequest?.dataUrl.includes("$skiptoken");
 		iFetchedRows = aData.length;
 
 		this.iAvailableRows += iFetchedRows;
@@ -250,7 +251,7 @@
 
 		iRemainingRows = this.iTotalRows - this.iAvailableRows;
 
-		mCallbackParams.finished = this._isFinished(iFetchedRows, sNextUrl, iRemainingRows);
+		mCallbackParams.finished = this._isFinished(iFetchedRows, sNextUrl, iRemainingRows, bWasServerSidePaging);
 		mCallbackParams.progress = this.iTotalRows;
 		mCallbackParams.total = this.iTotalRows < this.iCount ? this.iTotalRows : this.iCount;
 		mCallbackParams.fetched = this.iAvailableRows;
@@ -275,17 +276,36 @@
 	 * 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
+	 * @param {number} iFetchedRows Number of rows fetched
+	 * @param {string} sNextUrl Next url to fetch data
+	 * @param {number} iRemainingRows Remaining rows to fetch
+	 * @param {boolean} bWasServerSidePaging Flag if server side paging was used
 	 *
-	 * @static
+	 * @returns {boolean} True if the finish condition is met
 	 * @private
 	 */
-	DataProviderBase.prototype._isFinished = function(iFetchedRows, sNextUrl, iRemainingRows) {
-		const bFetchedRows = !sNextUrl && ((iFetchedRows < this.iBatchSize) || iFetchedRows > this.iBatchSize);
-		return iFetchedRows === 0 || iRemainingRows <= 0 || bFetchedRows;
+	DataProviderBase.prototype._isFinished = function(iFetchedRows, sNextUrl, iRemainingRows, bWasServerSidePaging) {
+		if (iFetchedRows === 0 || iRemainingRows <= 0) {
+			return true;
+		}
+
+		if (sNextUrl) {
+			return false;
+		}
+
+		if (iFetchedRows > this.iBatchSize) {
+			return true;
+		}
+
+		if (iFetchedRows < this.iBatchSize && bWasServerSidePaging) {
+			return false;
+		}
+
+		if (iFetchedRows === this.iBatchSize) {
+			return false;
+		}
+
+		return true;
 	};
 
 	/**

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