@sapui5/sap.ui.export 1.130.0 → 1.131.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.130.0",
+	"version": "1.131.0",
 	"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.131.0</version>
 
 	<documentation>UI5 library: sap.ui.export</documentation>
 

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

@@ -4,12 +4,12 @@
  */
 
 sap.ui.define([
-	'sap/ui/core/Core',
-	'sap/ui/base/EventProvider',
-	'sap/base/Log',
-	'sap/ui/export/ExportUtils'
+	"sap/ui/core/Core",
+	"sap/ui/base/EventProvider",
+	"sap/base/Log",
+	"sap/ui/export/ExportUtils"
 ], function(Core, EventProvider, Log, ExportUtils) {
-	'use strict';
+	"use strict";
 
 	/**
 	 * Base class for specific SAPUI5 export implementations. This class contains abstract functions that need to be implemented.
@@ -27,14 +27,14 @@ 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.131.0
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.ExportBase
 	 * @extends sap.ui.base.EventProvider
 	 * @public
 	 */
-	var ExportBase = EventProvider.extend('sap.ui.export.ExportBase', {
+	const ExportBase = EventProvider.extend("sap.ui.export.ExportBase", {
 
 		constructor: function(mSettings, mCapabilities) {
 			EventProvider.call(this, mSettings);
@@ -43,14 +43,14 @@ sap.ui.define([
 
 			/* Default settings */
 			this._mSettings = {
-				fileName: 'Export'
+				fileName: "Export"
 			};
 
 			/* Only apply supported properties */
 			// IMPORTANT: keep count before dataSource to ensure that the expected count can be used for dataSource string
-			['count', 'dataSource', 'fileName', 'fileType', 'workbook'].forEach(function(sProperty) {
-				if (typeof mSettings[sProperty] !== 'undefined') {
-					this._mSettings[sProperty] = sProperty !== 'dataSource' ? mSettings[sProperty] : this.processDataSource(mSettings[sProperty]);
+			["count", "dataSource", "fileName", "fileType", "workbook"].forEach(function(sProperty) {
+				if (typeof mSettings[sProperty] !== "undefined") {
+					this._mSettings[sProperty] = sProperty !== "dataSource" ? mSettings[sProperty] : this.processDataSource(mSettings[sProperty]);
 				}
 			}.bind(this));
 
@@ -94,7 +94,7 @@ sap.ui.define([
 	 * @public
 	 */
 	 ExportBase.prototype.attachBeforeExport = function(oData, fnHandler, oListener) {
-		return this.attachEvent('beforeExport', oData, fnHandler, oListener);
+		return this.attachEvent("beforeExport", oData, fnHandler, oListener);
 	};
 
 	/**
@@ -111,7 +111,7 @@ sap.ui.define([
 	 * @public
 	 */
 	 ExportBase.prototype.detachBeforeExport = function(fnHandler, oListener) {
-		return this.detachEvent('beforeExport', fnHandler, oListener);
+		return this.detachEvent("beforeExport", fnHandler, oListener);
 	};
 
 	/**
@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ExportBase.prototype.cancel = function() {
-		throw new Error('Abstract function not implemented');
+		throw new Error("Abstract function not implemented");
 	};
 
 	/**
@@ -153,7 +153,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ExportBase.prototype.processDataSource = function(oDataSource) {
-		throw new Error('Abstract function not implemented');
+		throw new Error("Abstract function not implemented");
 	};
 
 	/**
@@ -165,7 +165,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ExportBase.prototype.setDefaultExportSettings = function(mSettings) {
-		throw new Error('Abstract function not implemented');
+		throw new Error("Abstract function not implemented");
 	};
 
 	/**
@@ -177,7 +177,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ExportBase.prototype.createBuildPromise = function(mSettings) {
-		throw new Error('Abstract function not implemented');
+		throw new Error("Abstract function not implemented");
 	};
 
 	/**
@@ -188,7 +188,7 @@ sap.ui.define([
 	 * @public
 	 */
 	ExportBase.prototype.getMimeType = function() {
-		throw new Error('Abstract function not implemented');
+		throw new Error("Abstract function not implemented");
 	};
 
 	/**
@@ -200,17 +200,17 @@ sap.ui.define([
 	 * @async
 	 */
 	 ExportBase.prototype.build = async function() {
-		var mParameters = this._mSettings;
+		const mParameters = this._mSettings;
 
 		if (this.bIsDestroyed) {
-			var sMessage = this.getMetadata().getName() + ': Cannot trigger build - the object has been destroyed';
+			const sMessage = this.getMetadata().getName() + ": Cannot trigger build - the object has been destroyed";
 
 			Log.error(sMessage);
 			return Promise.reject(sMessage);
 		}
 
 		await this.setDefaultExportSettings(mParameters);
-		const bExecuteDefaultAction = this.fireEvent('beforeExport', {exportSettings: mParameters}, true, false);
+		const bExecuteDefaultAction = this.fireEvent("beforeExport", {exportSettings: mParameters}, true, false);
 
 		if (!bExecuteDefaultAction) {
 			return Promise.resolve();

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

@@ -27,7 +27,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.131.0
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler

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.131.0
 	 *
 	 * @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.131.0")
 		 * @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.131.0
 	 *
 	 * @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.131.0")</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>
@@ -134,7 +134,7 @@ sap.ui.define([
 		 *
 		 * Example:
 		 * <pre>
-		 *   var oSpreadsheet = new sap.ui.export.Spreadsheet(mSettings);
+		 *   const oSpreadsheet = new sap.ui.export.Spreadsheet(mSettings);
 		 *   oSpreadsheet.build();
 		 * </pre>
 		 *
@@ -145,7 +145,7 @@ sap.ui.define([
 		 *
 		 * Example:
 		 * <pre>
-		 *   var oSpreadsheet = new sap.ui.export.Spreadsheet(mSettings);
+		 *   const oSpreadsheet = new sap.ui.export.Spreadsheet(mSettings);
 		 *   oSpreadsheet.onprogress = function(iValue) {
 		 *   	{@link sap.base.Log#debug Log.debug}("Export: %" + iValue + " completed");
 		 *   };
@@ -157,7 +157,7 @@ sap.ui.define([
 		 *
 		 * Example of column configuration:
 		 * <pre>
-		 *   var aColumns = [];
+		 *   const aColumns = [];
 		 *   aColumns.push({
 		 *   	label: "Name",
 		 *   	property: "name"
@@ -169,12 +169,12 @@ sap.ui.define([
 		 *     scale: 2
 		 *   });
 		 *
-		 *   var mSettings = {
+		 *   const mSettings = {
 		 *     workbook: {
 		 *       columns: aColumns,
 		 *       context: {
 		 *         application: 'Debug Test Application',
-		 *         version: '1.130.0',
+		 *         version: '1.131.0',
 		 *         title: 'Some random title',
 		 *         modifiedBy: 'John Doe',
 		 *         metaSheetName: 'Custom metadata',
@@ -202,7 +202,7 @@ sap.ui.define([
 		 *     dataSource: mDataSource,
 		 *     fileName: "salary.xlsx"
 		 *   };
-		 *   var oSpreadsheet = new sap.ui.export.Spreadsheet(mSettings);
+		 *   const oSpreadsheet = new sap.ui.export.Spreadsheet(mSettings);
 		 *   oSpreadsheet.build();
 		 * </pre>
 
@@ -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.131.0
 		 *
 		 * @since 1.50
 		 * @alias sap.ui.export.Spreadsheet
@@ -294,7 +294,7 @@ sap.ui.define([
 		 * @see {@link topic:2691788a08fc43f7bf269ea7c6336caf Spreadsheet}
 		 * @public
 		 */
-		var Spreadsheet = ExportBase.extend(CLASS_NAME, {
+		const Spreadsheet = ExportBase.extend(CLASS_NAME, {
 
 			constructor: function(mSettings) {
 				ExportBase.call(this, mSettings);
@@ -344,8 +344,6 @@ sap.ui.define([
 		 * @private
 		 */
 		Spreadsheet.prototype.setDefaultExportSettings = async function(mParameters) {
-			var mCurrencySettings, mUnitSettings, oWorkbookContext, sCurrencyCode;
-
 			const oResourceBundle = await ExportUtils.getResourceBundle();
 
 			/* Attach timezone customizing */
@@ -355,7 +353,7 @@ sap.ui.define([
 			 * Check if a document title and a sheet name have been defined in the 'context' settings.
 			 * Otherwise use default resource bundle properties
 			 */
-			oWorkbookContext = mParameters.workbook.context;
+			let oWorkbookContext = mParameters.workbook.context;
 
 			if (!(oWorkbookContext instanceof Object)) {
 				oWorkbookContext = mParameters.workbook.context = {};
@@ -368,14 +366,13 @@ sap.ui.define([
 			}
 
 			/* Initialize currency customizing for currencies and units of measure */
-			mCurrencySettings = mParameters.customizing.currency = {};
-			mUnitSettings = mParameters.customizing.unit = {};
+			const mCurrencySettings = mParameters.customizing.currency = {};
+			const mUnitSettings = mParameters.customizing.unit = {};
+			const oCustomCurrencies = Formatting.getCustomCurrencies();
 
 			/* Attach custom currency configuration */
-			var oCustomCurrencies = Formatting.getCustomCurrencies();
-
 			if (oCustomCurrencies) {
-				for (sCurrencyCode in oCustomCurrencies) {
+				for (const sCurrencyCode in oCustomCurrencies) {
 					addUnit(sCurrencyCode, oCustomCurrencies[sCurrencyCode], mCurrencySettings);
 				}
 			}
@@ -509,13 +506,11 @@ sap.ui.define([
 		 * @private
 		 */
 		Spreadsheet.prototype.onprogress = function(iFetched, iTotal) {
-			var iProgress;
-
 			if (isNaN(iFetched) || isNaN(iTotal)) {
 				return;
 			}
 
-			iProgress = Math.round(iFetched / iTotal * 100);
+			const iProgress = Math.round(iFetched / iTotal * 100);
 			Log.debug('Spreadsheet export: ' + iProgress + '% loaded.');
 		};
 
@@ -532,13 +527,13 @@ sap.ui.define([
 			 * Use empty array as default in case of <code>ListBinding</code> is not of type
 			 * ClientListBinding and does not provide a getDownloadUrl function
 			 */
-			var oDataSource = [];
+			let oDataSource = [];
 
 			/**
 			 * If <code>ClientListBinding</code>, we use the binding path to receive the data from the underlying model
 			 */
 			if (oBinding.isA('sap.ui.model.ClientListBinding')) {
-				var aData = [];
+				const aData = [];
 
 				oBinding.getAllCurrentContexts().forEach(function(oContext) {
 					aData.push(oContext.getObject());
@@ -558,10 +553,10 @@ sap.ui.define([
 			 * All other <code>Bindings</code> need to provide a downloadUrl
 			 */
 			if (typeof oBinding.getDownloadUrl === 'function') {
-				var oModel = oBinding.getModel(),
-					sDataUrl = oBinding.getDownloadUrl('json'),
-					sServiceUrl = oModel.sServiceUrl,
-					bV4ODataModel = oModel.isA('sap.ui.model.odata.v4.ODataModel');
+				const oModel = oBinding.getModel();
+				const bV4ODataModel = oModel.isA('sap.ui.model.odata.v4.ODataModel');
+				let sDataUrl = oBinding.getDownloadUrl('json');
+				let sServiceUrl = oModel.sServiceUrl;
 
 				sDataUrl = ExportUtils.interceptUrl(sDataUrl);
 				sServiceUrl = ExportUtils.interceptUrl(sServiceUrl);
@@ -603,8 +598,8 @@ sap.ui.define([
 		 * @public
 		 */
 		Spreadsheet.prototype.processDataSource = function(oDataSource) {
-			var mDataSource = null;
-			var sDataSourceType = typeof oDataSource;
+			const sDataSourceType = typeof oDataSource;
+			let mDataSource = null;
 
 			if (!oDataSource) {
 				return null;
@@ -649,17 +644,17 @@ sap.ui.define([
 		 * @private
 		 */
 		Spreadsheet.prototype.createBuildPromise = function(mParameters) {
-			var that = this;
+			const that = this;
 
 			return new Promise(function(fnResolve, fnReject) {
 
-				var progressDialog;
-				var MAX_ROWS = 1048576; // Maximum allowed Rows per sheet
+				let progressDialog;
+				const MAX_ROWS = 1_048_576; // Maximum allowed Rows per sheet
 				const iCount = mParameters.dataSource.count;
 				const iDownloadLimit = mParameters.dataSource.downloadLimit;
-				var nSizeLimit = Device.system.desktop ? 2000000 : 100000; // 2.000.000 cells on desktop and 100.000 otherwise
-				var nRows = mParameters.dataSource.type == 'array' ? mParameters.dataSource.data.length : iDownloadLimit || iCount;
-				var nColumns = mParameters.workbook.columns.length;
+				const nSizeLimit = Device.system.desktop ? 2_000_000 : 100_000; // 2.000.000 cells on desktop and 100.000 otherwise
+				const nRows = mParameters.dataSource.type == 'array' ? mParameters.dataSource.data.length : iDownloadLimit || iCount;
+				const nColumns = mParameters.workbook.columns.length;
 
 				function onmessage(oMessage) {
 
@@ -706,7 +701,7 @@ sap.ui.define([
 					}
 
 					if (typeof oMessage.error != 'undefined') {
-						var sError = oMessage.error.message || oMessage.error;
+						const sError = oMessage.error.message || oMessage.error;
 						that.process = null;
 
 						if (progressDialog) {
@@ -762,7 +757,7 @@ sap.ui.define([
 					// Consider showing a dialog to the end users instead of just this error!
 					fnReject('No columns to export.');
 				} else if (nRows * nColumns > nSizeLimit || !nRows || nRows >= MAX_ROWS || isDownloadLimitLessThanCount(nRows, iCount)) { // Amount of rows need to be less than maximum amount because of column header
-					var oDialogSettings = {
+					const oDialogSettings = {
 						rows: nRows,
 						columns: nColumns,
 						cellLimit: nSizeLimit,

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.131.0
 	 *
 	 * @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.131.0
 	 * @public
 	 */
 
@@ -33,7 +33,7 @@ sap.ui.define(["sap/ui/core/Lib"], function(Library) {
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.130.0"
+		version: "1.131.0"
 	});
 
 	/**

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

@@ -4,18 +4,18 @@
  */
 
 (function(fClass) {
-	'use strict';
+	"use strict";
 
-	if (typeof globalThis.sap?.ui?.define === 'function') {
+	if (typeof globalThis.sap?.ui?.define === "function") {
 		globalThis.sap.ui.define([], fClass, /* bExport */ true);
 	} else {
 		globalThis.DataProviderBase = fClass();
 	}
 })(function() {
-	'use strict';
+	"use strict";
 
 	// eslint-disable-next-line
-	/* global URL, XMLHttpRequest */
+	/* global URL */
 
 	/**
 	 *	Default DataProviderBase implementation that is capable to handle
@@ -24,7 +24,7 @@
 	 * @param {object} mSettings Data service related part of the export configuration
 	 *
 	 * @author SAP SE
-	 * @version 1.130.0
+	 * @version 1.131.0
 	 *
 	 * @constructor
 	 * @class DataProviderBase
@@ -32,42 +32,41 @@
 	 * @since 1.77
 	 * @private
 	 */
-	var DataProviderBase = function(mSettings) {
+	const DataProviderBase = function(mSettings) {
 
 		this.mSettings = mSettings;
 		this.bCanceled = false;
 		this.iAvailableRows = 0;
 		this.mRequest = null;
 		this.iCount = Math.min(mSettings.dataSource.count || DataProviderBase.MAX_ROWS, DataProviderBase.MAX_ROWS);
-
-		if (this.mSettings.dataSource.downloadLimit) {
-			this.iTotalRows = this.mSettings.dataSource.downloadLimit;
-		} else {
-			this.iTotalRows = DataProviderBase.MAX_ROWS;
-		}
-
+		this.iTotalRows = mSettings.dataSource.downloadLimit ?? DataProviderBase.MAX_ROWS;
 		this.iBatchSize = Math.min(mSettings.dataSource.sizeLimit || DataProviderBase.MAX_ROWS, this.iTotalRows);
+		this.fnConvertData = DataProviderBase.getDataConverter(mSettings);
 
 		this._prepareDataUrl();
 	};
 
 	DataProviderBase.MAX_ROWS = 1048575; // Spreadsheet limit minus 1 for the header row: 1,048,575
-	DataProviderBase.HTTP_ERROR_MSG = 'HTTP connection error';
-	DataProviderBase.HTTP_WRONG_RESPONSE_MSG = 'Unexpected server response:\n';
+	DataProviderBase.HTTP_ERROR_MSG = "HTTP connection error";
+	DataProviderBase.HTTP_WRONG_RESPONSE_MSG = "Unexpected server response:\n";
 
 	/**
 	 * Creates a pseudo random GUID. This algorithm is not suitable for
-	 * cryptographic purposes and should not be used therefore.
+	 * cryptographic purposes and should not be used for such.
 	 *
-	 * @returns {string} - Generated GUID
+	 * @returns {string} Generated GUID
 	 *
 	 * @static
 	 * @private
 	 */
 	DataProviderBase._createGuid = function() {
-		return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-			var r = Math.random() * 16 | 0, // Bitwise OR is equivalent to Math.floor() but faster
-				v = c === 'x' ? r : ((r & 0x3) | 0x8); // In case of c != 'x', the value is always between 0x8 and 0xB
+		if (globalThis.crypto?.randomUUID) {
+			return globalThis.crypto.randomUUID();
+		}
+
+		return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+			const r = Math.random() * 16 | 0, // Bitwise OR is equivalent to Math.floor() but faster
+				v = c === "x" ? r : ((r & 0x3) | 0x8); // In case of c != "x", the value is always between 0x8 and 0xB
 
 			return v.toString(16);
 		});
@@ -77,18 +76,17 @@
 	 * The function returns array of columns that need special conversion for values.
 	 * E.g. handling data from association/navigationProperty
 	 *
-	 * @param {Array} aColumns - Configuration object
-	 * @returns {Array} - Collection of columns that need special conversion for their values
+	 * @param {Array} aColumns Configuration object
+	 * @returns {Array} Collection of columns that need special conversion for their values
 	 *
 	 * @static
 	 * @private
 	 */
 	DataProviderBase.getColumnsToConvert = function(aColumns) {
 		return aColumns.reduce(function(result, col) {
-			var properties;
 
 			// Handle aggregated properties and single properties
-			properties = col.property instanceof Array ? col.property : [col.property];
+			const properties = col.property instanceof Array ? col.property : [col.property];
 			// Handle unitProperty which too could be from an association
 			if (col.unitProperty) {
 				properties.push(col.unitProperty);
@@ -97,7 +95,7 @@
 			properties.forEach(function(property) {
 
 				// Convert navigation property and date fields
-				var aKeys = property.split('/');
+				const aKeys = property.split("/");
 
 				if (aKeys.length > 1) {
 					result.push({
@@ -122,9 +120,7 @@
 	 * @public
 	 */
 	DataProviderBase.getDataConverter = function(mSettings) {
-		var aColumns, aColumnsToConvert;
-
-		aColumns = mSettings.workbook.columns;
+		let aColumns = mSettings.workbook.columns;
 
 		/* Add hierarachyLevel as virtual column for NavigationProperty conversion */
 		if (mSettings.workbook.hierarchyLevel) {
@@ -133,7 +129,7 @@
 			}]);
 		}
 
-		aColumnsToConvert = this.getColumnsToConvert(aColumns);
+		const aColumnsToConvert = this.getColumnsToConvert(aColumns);
 
 		return function(aRows) {
 			return DataProviderBase._convertData(aRows, aColumnsToConvert);
@@ -143,9 +139,9 @@
 	/**
 	 * Function to process the JSON result array from a ODataService.
 	 *
-	 * @param {Array} aRows - Data array that contains the received data
-	 * @param {Array} aCols - Columns that need to be converted
-	 * @returns {Array} - An array of rows
+	 * @param {Array} aRows Data array that contains the received data
+	 * @param {Array} aCols Columns that need to be converted
+	 * @returns {Array} An array of rows
 	 *
 	 * @static
 	 * @private
@@ -164,10 +160,10 @@
 	 * Gets converted property value from raw data.
 	 * Navigation properties are parsed.
 	 *
-	 * @param {object} oRow - Raw data row
-	 * @param {object} oCol - Column information
-	 * @param {Array} oCol.keys - Property name or key path for navigation properties
-	 * @returns {number|string|boolean} - The converted property value
+	 * @param {object} oRow Raw data row
+	 * @param {object} oCol Column information
+	 * @param {Array} oCol.keys Property name or key path for navigation properties
+	 * @returns {number|string|boolean} The converted property value
 	 *
 	 * @static
 	 * @private
@@ -175,7 +171,7 @@
 	DataProviderBase._getValue = function(oRow, oCol) {
 
 		// Get property value
-		var value = oCol.keys.reduce(function(obj, key) {
+		const value = oCol.keys.reduce(function(obj, key) {
 			return obj && obj[key];
 		}, oRow);
 
@@ -186,23 +182,22 @@
 	 * The function requests several chunks of data until the maximum
 	 * amount of data is fetched.
 	 *
-	 * @param {function} fnProcessCallback - Callback function that is triggered when data is received
-	 * @returns {object} - Object reference that allows to cancel the current processing
+	 * @param {function} fnProcessCallback Callback function that is triggered when data is received
+	 * @returns {object} Object reference that allows to cancel the current processing
 	 *
 	 * @since 1.77
 	 * @public
 	 */
 	DataProviderBase.prototype.requestData = function(fnProcessCallback) {
-		var mDataSource = this.mSettings.dataSource;
+		const mDataSource = this.mSettings.dataSource;
 
-		this.fnConvertData = DataProviderBase.getDataConverter(this.mSettings);
 		this.fnProcessCallback = fnProcessCallback;
 
 		// Execution
 		this.mRequest = {
 			serviceUrl: this._cleanUrl(mDataSource.serviceUrl),
 			dataUrl: this._getUrl(0, this.iBatchSize),
-			method: mDataSource.useBatch ? 'BATCH' : 'GET',
+			useBatch: mDataSource.useBatch,
 			headers: mDataSource.headers
 		};
 
@@ -214,8 +209,8 @@
 			cancel: function() {
 				this.bCanceled = true;
 
-				if (this.oPendingXHR instanceof XMLHttpRequest) {
-					this.oPendingXHR.abort();
+				if (this._oPendingRequest instanceof AbortController) {
+					this._oPendingRequest.abort();
 				}
 			}.bind(this)
 		};
@@ -226,36 +221,32 @@
 	 * the data before executing the callback function allows to
 	 * apply transformations to the data.
 	 *
-	 * @param {object} oResult - The result object that is provided by the Promise resolve.
+	 * @param {Response} oResponse The <code>Response</code> object that was received
 	 *
+	 * @async
 	 * @private
 	 */
-	DataProviderBase.prototype.fnOnDataReceived = function(oResult) {
-		var aData, sNextUrl, iFetchedRows, iRemainingRows;
-		var mCallbackParams = {};
-		this.oPendingXHR = null;
+	DataProviderBase.prototype.fnOnDataReceived = async function(oResponse) {
+		this._oPendingRequest = null;
+
 		if (this.bCanceled) {
-			return; // Canceled by the application
+			return; // Cancelled by the application
 		}
 
-		/* 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 : [];
-		iFetchedRows = aData.length;
+		const {data: aData, nextUrl: sNextUrl} = await DataProviderBase.getHarmonizedBodyFrom(oResponse);
+		const bWasServerSidePaging = this.mRequest?.dataUrl.includes("$skiptoken");
+		const iFetchedRows = aData.length;
 
 		this.iAvailableRows += iFetchedRows;
 
-		// Check if next url is provided
-		sNextUrl = (oResult && oResult['@odata.nextLink'] || (oResult.d && oResult.d.__next)) || null;
-
-		iRemainingRows = this.iTotalRows - this.iAvailableRows;
+		const iRemainingRows = this.iTotalRows - this.iAvailableRows;
+		const mCallbackParams = {};
 
-		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;
 
-
 		if (!mCallbackParams.finished) {
 			// Trigger next page request before processing received data. Fetch only configured/max limit rows
 			this.mRequest.dataUrl = this._getUrl(this.iAvailableRows, Math.min(this.iBatchSize, iRemainingRows), sNextUrl);
@@ -272,26 +263,54 @@
 	};
 
 	/**
-	 * 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
+	 * The function checks if the finish condition is met. This depends on
+	 * multiple parameters like the amount of fetched rows, the next URL,
+	 * the remaining rows and if server side paging was used.
+	 *
+	 * If the request was fulfilled, the function returns <code>false</code>
+	 * to allow fetching additional data. If no data was fetched, the function
+	 * returns <code>true</code>. If the remaining rows are less or equal to
+	 * zero, the function returns <code>true</code>. If next URL is provided
+	 * or server side paging was used while less data than expected was
+	 * returned, the function returns <code>false</code>.
+	 *
+	 * If none of the beforementioned conditions are met, the function returns
+	 * <code>true</code>.
+	 *
+	 * @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
+	 *
+	 * @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) {
+		// Most common scenario - request gets fulfilled
+		if (iFetchedRows === this.iBatchSize) {
+			return false;
+		}
+
+		if (iFetchedRows === 0 || iRemainingRows <= 0) {
+			return true;
+		}
+
+		if (sNextUrl) {
+			return false;
+		}
+
+		// If server side paging was used, the data chunks can be smaller than the batch size
+		if (iFetchedRows < this.iBatchSize && bWasServerSidePaging) {
+			return false;
+		}
+
+		return true;
 	};
 
 	/**
 	 * Inner function that processes request handler exceptions.
 	 *
-	 * @param {string} sMessage - Error message.
+	 * @param {string} sMessage Error message.
 	 *
 	 * @private
 	 */
@@ -304,22 +323,20 @@
 	/**
 	 * Nested function to remove not used information from the URL
 	 *
-	 * @param {string} sUrl - A URL that may contain a path, hash and request parameters
-	 * @returns {string} - A clean URL
+	 * @param {string} sUrl A URL that may contain a path, hash and request parameters
 	 *
+	 * @returns {string} A clean URL
 	 * @private
 	 */
 	DataProviderBase.prototype._cleanUrl = function(sUrl) {
-		var oURL;
-
 		if (!sUrl) {
-			return '';
+			return "";
 		}
 
-		oURL = new URL(sUrl);
+		const oURL = new URL(sUrl);
 
-		oURL.hash = oURL.search = '';
-		oURL.pathname += oURL.pathname.endsWith('/') ? '' : '/';
+		oURL.hash = oURL.search = "";
+		oURL.pathname += oURL.pathname.endsWith("/") ? "" : "/";
 
 		return oURL.toString();
 	};
@@ -330,25 +347,26 @@
 	 * @private
 	 */
 	DataProviderBase.prototype._prepareDataUrl = function() {
-		var mDataSource = this.mSettings.dataSource;
-		var mDataUrl, reSkip = /\$skip\=[0-9]+/, reTop = /\$top\=[0-9]+/;
+		const mDataSource = this.mSettings.dataSource;
+		const reSkip = /\$skip\=[0-9]+/, reTop = /\$top\=[0-9]+/;
 
 		if (!mDataSource.dataUrl) {
-			throw 'Unable to load data - no URL provided.';
+			throw "Unable to load data - no URL provided.";
 		}
 
-		mDataUrl = new URL(mDataSource.dataUrl);
-		mDataUrl.search = mDataUrl.search || '';
+		const mDataUrl = new URL(mDataSource.dataUrl);
+
+		mDataUrl.search = mDataUrl.search || "";
 
 		// Add missing $skip if needed
 		if (!reSkip.test(mDataUrl.search)) {
 			// Apply $skip with some numeric dummy value that matches the regexp in DataProviderBase#_getUrl
-			mDataUrl.search += (mDataUrl.search.length ? '&$skip=' : '$skip=') + 0;
+			mDataUrl.search += (mDataUrl.search.length ? "&$skip=" : "$skip=") + 0;
 		}
 		// Add missing $top if needed
 		if (!reTop.test(mDataUrl.search)) {
 			// Apply $top with some numeric dummy value that matches the regexp in DataProviderBase#_getUrl
-			mDataUrl.search += '&$top=' + 0;
+			mDataUrl.search += "&$top=" + 0;
 		}
 
 		this.mSettings.dataSource.dataUrl = mDataUrl.toString();
@@ -357,17 +375,15 @@
 	/**
 	 * Creates the download URL for the next query.
 	 *
-	 * @param {number} iSkip - The amount of items that are already present and will be skipped
-	 * @param {number} iTop - The amount of items that should be requested with this query
-	 * @param {string} [sNextUrl] - A reference to the next bulk of data that was returned by the previous request
-	 * @returns {string} - The URL for the next query
+	 * @param {number} iSkip The amount of items that are already present and will be skipped
+	 * @param {number} iTop The amount of items that should be requested with this query
+	 * @param {string} [sNextUrl] A reference to the next bulk of data that was returned by the previous request
 	 *
+	 * @returns {string} The URL for the next query
 	 * @private
 	 */
 	DataProviderBase.prototype._getUrl = function(iSkip, iTop, sNextUrl) {
-		var oDataUrl, oNextUrl;
-
-		oDataUrl = new URL(this.mSettings.dataSource.dataUrl);
+		const oDataUrl = new URL(this.mSettings.dataSource.dataUrl);
 
 		/*
 		 * Use $skiptoken from response to query the next items.
@@ -378,185 +394,243 @@
 		 */
 		if (sNextUrl) {
 			// sNextUrl can be relative, therefore we need to apply a base even though it is not used
-			oNextUrl = new URL(sNextUrl, oDataUrl.origin);
+			const oNextUrl = new URL(sNextUrl, oDataUrl.origin);
+
 			oDataUrl.search = oNextUrl.search;
 		} else { // Use $skip and $top
-			oDataUrl.search = (oDataUrl.search || '')
-				.replace(/\$skip\=[0-9]+/g, '$skip=' + iSkip)
-				.replace(/\$top\=[0-9]+/g, '$top=' + iTop);
+			oDataUrl.search = (oDataUrl.search || "")
+				.replace(/\$skip\=[0-9]+/g, "$skip=" + iSkip)
+				.replace(/\$top\=[0-9]+/g, "$top=" + iTop);
 		}
 
 		return oDataUrl.toString();
 	};
 
 	/**
-	 * This method creates an XMLHttpRequest from the provided
-	 * configuration and requests the data from the backend. The
-	 * configuration is configured to use OData services.
-	 *
-	 * @param {object} oRequest - Request configuration object
-	 * @param {string} oRequest.method - References the HTTP method that is used (default: GET)
-	 * @param {string} oRequest.dataUrl - References the resource URL that gets invoked
-	 * @param {string} oRequest.serviceUrl - References the service URL that gets invoked
-	 * @return {Promise} Returns a Promise that will be resolve once the requested data was fetched
+	 * This method creates a fetch Request from the provided configuration and
+	 * requests the data from the backend. If the data is requested via $batch
+	 * the corresponding Reponse is unwrapped and returned. This allows direct
+	 * access to the result of the inner request and provides a harmonized API
+	 * for consuming the data.
 	 *
+	 * @param {object} mSettings Request configuration object
+	 * @param {string} mSettings.useBatch Defines if the data is requested via GET or $batch request
+	 * @param {string} mSettings.dataUrl References the resource URL that gets invoked
+	 * @param {string} mSettings.serviceUrl References the service URL that gets invoked
+	 *
+	 * @return {Promise} Returns a Promise that will be resolve once the requested data was fetched
+	 * @async
 	 * @private
 	 */
-	DataProviderBase.prototype.sendRequest = function(oRequest) {
-		var fnSendRequest;
+	DataProviderBase.prototype.sendRequest = async function(mSettings) {
+		if (typeof mSettings !== "object" || mSettings === null || typeof mSettings.dataUrl !== "string") {
+			throw new Error("Unable to send request - Mandatory parameters missing.");
+		}
 
-		if (typeof oRequest !== 'object' || oRequest === null || typeof oRequest.dataUrl !== 'string') {
-			throw new Error('Unable to send request - Mandatory parameters missing.');
+		const bBatchRequest = mSettings.useBatch && mSettings.serviceUrl;
+		const oAbortController = new AbortController();
+		const oRequest = bBatchRequest ?
+			DataProviderBase.createBatchRequest(mSettings, oAbortController) : DataProviderBase.createGetRequest(mSettings, oAbortController);
+		let oResponse;
+
+		try {
+			this._oPendingRequest = oAbortController;
+			oResponse = await fetch(oRequest);
+		} catch (oError) {
+			this._oPendingRequest = null;
+
+			if (oError.name === "AbortError") {
+				throw null; // Explicitly reject the Promise without an error to indicate user cancellation
+			} else {
+				throw oError; // Technical request error
+			}
 		}
 
-		fnSendRequest = (oRequest.method === 'BATCH' && oRequest.serviceUrl ? this.sendBatchRequest : this.sendGetRequest).bind(this);
+		oResponse = bBatchRequest ? await DataProviderBase.getBatchResponse(oResponse) : oResponse;
 
-		return fnSendRequest(oRequest);
+		if (!oResponse.ok) {
+			const sMessage = await oResponse.text();
+			throw new Error(DataProviderBase.HTTP_WRONG_RESPONSE_MSG + sMessage);
+		}
+
+		return oResponse;
 	};
 
 	/**
-	 * Creates a $batch request and sends it to the backend service.
+	 * Creates a <code>Request</code> object for an OData GET request.
 	 *
-	 * @param {object} oRequest - Request object that contains all necessary information to create the batch request
-	 * @returns {Promise} - A Promise that resolves in a JSON object containing the fetched data
+	 * @param {object} mSettings Request configuration
+	 * @param {string} mSettings.dataUrl References the resource URL that gets invoked
+	 * @param {AbortController} oAbortController AbortController instance to cancel the request
 	 *
+	 * @returns {Request} The request object
+	 * @static
 	 * @private
 	 */
-	DataProviderBase.prototype.sendBatchRequest = function(oRequest) {
-		return new Promise(function(fnResolve, fnReject) {
-			var xhr = new XMLHttpRequest();
-			var boundary = 'batch_' + DataProviderBase._createGuid();
-			var getUrl = oRequest.dataUrl.split(oRequest.serviceUrl)[1];
-			var body = [];
-			var sKey, sValue;
-
-			xhr.onload = function() {
-				var responseText, aLines, iEnd, iLength, iStart, sHttpStatus, aMatch;
-
-				aLines = this.responseText.split('\r\n');
-
-				// TBD: check return codes
-				iStart = 0;
-				iLength = aLines.length;
-				iEnd = iLength - 1;
-
-				aLines.forEach(function(sLine) {
-					aMatch = sLine.match(/^HTTP\/1\.[0|1] ([1-9][0-9]{2})/);
-
-					if (Array.isArray(aMatch) && aMatch[1]) {
-						sHttpStatus = aMatch[1];
-					}
-				});
-
-				while (iStart < iLength && aLines[iStart].slice(0, 1) !== '{') {
-					iStart++;
-				}
+	DataProviderBase.createGetRequest = function(mSettings, oAbortController) {
+		const oHeaders = new Headers(mSettings.headers);
 
-				while (iEnd > 0 && aLines[iEnd].slice(-1) !== '}') {
-					iEnd--;
-				}
-				aLines = aLines.slice(iStart, iEnd + 1);
-				responseText = aLines.join('\r\n');
+		oHeaders.set("Accept", "application/json");
 
-				if (sHttpStatus && parseInt(sHttpStatus) >= 400) {
-					// Provide a fallback in case the responseText is empty
-					fnReject(DataProviderBase.HTTP_WRONG_RESPONSE_MSG + responseText);
+		return new Request(mSettings.dataUrl, {
+			cache: "no-store",
+			headers: oHeaders,
+			signal: oAbortController.signal
+		});
+	};
 
-					return;
-				}
+	/**
+	 * Creates a <code>Request</code> object for an OData $batch request.
+	 *
+	 * @param {object} mSettings Request configuration
+	 * @param {string} mSettings.dataUrl References the resource URL that gets invoked
+	 * @param {string} mSettings.serviceUrl References the service URL that gets invoked
+	 * @param {AbortController} oAbortController AbortController instance to cancel the request
+	 *
+	 * @returns {Request} The request object
+	 * @static
+	 * @private
+	 */
+	DataProviderBase.createBatchRequest = function(mSettings, oAbortController) {
+		const sUrl = mSettings.dataUrl.split(mSettings.serviceUrl)[1];
+		const sBoundary = "batch_" + DataProviderBase._createGuid();
+		const oHeaders = new Headers(mSettings.headers);
+		const sBody = DataProviderBase.createRequestBody(sUrl, sBoundary, oHeaders);
+
+		oHeaders.set("Accept", "multipart/mixed");
+		oHeaders.set("Content-Type", "multipart/mixed;boundary=" + sBoundary);
+
+		return new Request(mSettings.serviceUrl + "$batch", {
+			body: sBody,
+			cache: "no-store",
+			headers: oHeaders,
+			method: "POST",
+			signal: oAbortController.signal
+		});
+	};
 
-				try {
-					fnResolve(JSON.parse(responseText));
-				} catch (e) {
-					fnReject(DataProviderBase.HTTP_WRONG_RESPONSE_MSG + responseText);
-				}
-			};
+	/**
+	 * Creates the request body for a $batch request.
+	 *
+	 * @param {string} sUrl The URL that is requested
+	 * @param {string} sBoundary The boundary id for the inner request
+	 * @param {Headers} oHeaders The headers that are sent with the request
+	 *
+	 * @returns {string} The request body
+	 * @static
+	 * @private
+	 */
+	DataProviderBase.createRequestBody = function(sUrl, sBoundary, oHeaders) {
+		const aBody = [];
 
-			/* Handle technical request errors like timeout, disconnect, etc. */
-			xhr.onerror = function() {
-				fnReject(this.responseText || DataProviderBase.HTTP_ERROR_MSG);
-			};
+		aBody.push("--" + sBoundary);
+		aBody.push("Content-Type: application/http");
+		aBody.push("Content-Transfer-Encoding: binary");
+		aBody.push("");
+		aBody.push(`GET ${sUrl} HTTP/1.1`);
 
-			// Create request
-			xhr.open('POST', oRequest.serviceUrl + '$batch', true);
+		/* Set header information */
+		aBody.push("Accept:application/json");
 
-			xhr.setRequestHeader('Accept', 'multipart/mixed');
-			xhr.setRequestHeader('Content-Type', 'multipart/mixed;boundary=' + boundary);
+		for (const [sKey, sValue] of oHeaders.entries()) {
 
-			body.push('--' + boundary);
-			body.push('Content-Type: application/http');
-			body.push('Content-Transfer-Encoding: binary');
-			body.push('');
-			body.push('GET ' + getUrl + ' HTTP/1.1');
+			if (sKey != "accept") {
+				aBody.push(sKey + ":" + sValue);
+			}
+		}
 
-			/* Set header information on the request as well as on the batch request */
-			body.push('Accept:application/json');
+		aBody.push("");
+		aBody.push("");
+		aBody.push("--" + sBoundary + "--");
+		aBody.push("");
 
-			for (sKey in oRequest.headers) {
-				sValue = oRequest.headers[sKey];
+		return aBody.join("\r\n");
+	};
 
-				if (sKey.toLowerCase() != 'accept') {
-					xhr.setRequestHeader(sKey, sValue);
-					body.push(sKey + ':' + sValue);
-				}
-			}
+	/**
+	 * Extracts the response body from a $batch request and returns
+	 * it as <code>Response</code> object.
+	 *
+	 * @param {Response} oResponse The response object that contains the $batch response
+	 *
+	 * @returns {Response} The response object for the inner request
+	 * @static
+	 * @async
+	 * @private
+	 */
+	DataProviderBase.getBatchResponse = async function(oResponse) {
+		const sResponseBody = await oResponse.text();
+
+		if (!oResponse.ok) {
+			throw new Error(DataProviderBase.HTTP_WRONG_RESPONSE_MSG + sResponseBody);
+		}
+
+		const aLines = sResponseBody.split("\r\n");
+
+		// Remove all lines prior to HTTP status
+		aLines.splice(0, aLines.findIndex((sLine) => /^HTTP\/1\.[0|1] ([1-9][0-9]{2})/.test(sLine)));
 
-			body.push('');
-			body.push('');
-			body.push('--' + boundary + '--');
-			body.push('');
-			body = body.join('\r\n');
-			xhr.send(body);
+		const [, iStatusCode, sStatusText] = aLines[0].match(/^HTTP\/1\.[0|1] ([1-9][0-9]{2}) ?([\w ]*)$/);
+		const sBody = aLines.find((sLine) => sLine.startsWith("{") && sLine.endsWith("}"));
 
-			this.oPendingXHR = xhr;
-		}.bind(this));
+		const reHeaders = /^([\w\-]+): ?([\d\w\./]+)/;
+		const oHeaders = aLines
+			.filter((sLine) => reHeaders.test(sLine))
+			.reduce((oAccumulator, sLine) => {
+				const [, sKey, sValue] = sLine.match(reHeaders);
+
+				oAccumulator.set(sKey, sValue);
+
+				return oAccumulator;
+			}, new Headers());
+
+		return new Response(sBody, {
+			status: iStatusCode,
+			statusText: sStatusText,
+			headers: oHeaders
+		});
 	};
 
 	/**
-	 * Creates and sends a GET request to the backend service.
+	 * Extracts the JSON data from the <code>Response</code> object and returns a harmonized result.
+	 * It evaluates the result in the following order:
+	 * 1. OData V4
+	 * 2. OData V2
+	 * 3. Default
+	 *
+	 * If the result is not an array, an empty array is returned.
 	 *
-	 * @param {object} oRequest - Request object that contains all necessary information to create the batch request
-	 * @returns {Promise} - A Promise that resolves in a JSON object containing the fetched data
+	 * @param {Response} oResponse The response body that contains the data
 	 *
+	 * @returns {Array} The response data as Array
+	 * @static
+	 * @async
 	 * @private
 	 */
-	DataProviderBase.prototype.sendGetRequest = function(oRequest) {
-		return new Promise(function(fnResolve, fnReject) {
-			var sHeaderKey;
-			var xhr = new XMLHttpRequest();
+	DataProviderBase.getHarmonizedBodyFrom = async function(oResponse) {
+		const oResult = {
+			data: []
+		};
 
-			xhr.onload = function() {
-				if (this.status >= 400) {
-					// Provide a fallback in case the responseText is empty
-					fnReject(this.responseText || this.statusText || DataProviderBase.HTTP_ERROR_MSG);
+		if (!oResponse) {
+			return oResult;
+		}
 
-					return;
-				}
-				try {
-					fnResolve(JSON.parse(this.responseText));
-				} catch (e) {
-					fnReject(DataProviderBase.HTTP_WRONG_RESPONSE_MSG + this.responseText);
-				}
-			};
+		const oBody = await oResponse.json();
 
-			/* Handle technical request errors like timeout, disconnect, etc. */
-			xhr.onerror = function() {
-				fnReject(this.responseText || DataProviderBase.HTTP_ERROR_MSG);
-			};
+		if (!oBody) {
+			return oResult;
+		}
 
-			xhr.open('GET', oRequest.dataUrl, true);
-			xhr.setRequestHeader('accept', 'application/json');
+		const aData = oBody.value || oBody.d?.results || oBody.d || oBody;
 
-			/* Set custom header information on the request */
-			for (sHeaderKey in oRequest.headers) {
-				if (sHeaderKey.toLowerCase() !== 'accept') {
-					xhr.setRequestHeader(sHeaderKey, oRequest.headers[sHeaderKey]);
-				}
-			}
+		oResult.nextUrl = oBody["@odata.nextLink"] ??  oBody.d?.__next;
+
+		if (Array.isArray(aData)) {
+			oResult.data = aData;
+		}
 
-			xhr.send();
-			this.oPendingXHR = xhr;
-		}.bind(this));
+		return oResult;
 	};
 
 	return 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.130.0
+	 * @version 1.131.0
 	 *
 	 * @since 1.110
 	 * @alias sap.ui.export.util.Filter