@sapui5/sap.ui.export 1.120.35 → 1.120.36

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.ui.export",
-	"version": "1.120.35",
+	"version": "1.120.36",
 	"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.120.35</version>
+	<version>1.120.36</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.120.35
+	 * @version 1.120.36
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.ExportBase

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

@@ -16,7 +16,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.120.35
+	 * @version 1.120.36
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler

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

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

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.120.35")</li>
+		 *          <li><code>version</code> (string) - Application version that creates the XLSX document (default: "1.120.36")</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.120.35',
+		 *         version: '1.120.36',
 		 *         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.120.35
+		 * @version 1.120.36
 		 *
 		 * @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.120.35
+	 * @version 1.120.36
 	 *
 	 * @alias sap.ui.export.SpreadsheetExport
 	 * @private
@@ -51,8 +51,8 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 				});
 			}
 
-			function onError(error) {
-				postMessage({ error: error.message || error });
+			function onError(oError) {
+				postMessage({ error: oError.message || oError });
 			}
 
 			function onFinish(oArrayBuffer) {
@@ -62,8 +62,8 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 			// Export directly from an array in memory.
 			// TBD: convert dates as in exportUtils
 			function exportArray() {
-				var oSpreadsheet;
-				var fnConvertData;
+				let oSpreadsheet;
+				let fnConvertData;
 
 				function start(DataProvider, XLSXBuilder) {
 					fnConvertData = DataProvider.getDataConverter(mParams);
@@ -85,7 +85,7 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 			}
 
 			function exportInProcess() {
-				var oSpreadsheet, oRequest;
+				let oSpreadsheet, oRequest;
 
 				function start(DataProvider, XLSXBuilder) {
 					var provider = new DataProvider(mParams);
@@ -122,42 +122,64 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 			}
 
 			function exportInWorker() {
-				var spreadsheetWorker;
-				var workerParams = {};
+				let oSpreadsheetWorker;
+				const mWorkerParams = {};
 
 				var fnCancel = function() {
-					spreadsheetWorker.postMessage({ cancel: true });
+					oSpreadsheetWorker.postMessage({ cancel: true });
 					onFinish();
 				};
 
-				function createWorker(url) {
-					var worker = new Worker(url);
-					worker.onmessage = postMessage;
-
-					// Skips error handling if fired in Firefox with cross origin
-					if (navigator.userAgent.indexOf("Firefox") === -1 || isSameOrigin(url)) {
-						worker.onerror = onError;
-					}
+				function createWorker(sUrl) {
+					const {promise: oPromise, resolve: fnResolve, reject: fnReject} = Promise.withResolvers();
+					const oWorker = new Worker(sUrl);
+					const errorHandler = (oEvent) => {
+						oWorker.terminate();
+						fnReject(oEvent);
+					};
+					const messageHandler = (oEvent) => {
+						if (oEvent.data.initialized) {
+							oWorker.removeEventListener("message", messageHandler);
+							oWorker.removeEventListener("error", errorHandler);
+
+							oWorker.addEventListener("message", postMessage);
+							oWorker.addEventListener("error", onError);
+							fnResolve(oWorker);
+						}
+					};
 
-					worker.postMessage(mParams);
+					oWorker.addEventListener("message", messageHandler);
+					oWorker.addEventListener("error", errorHandler);
 
-					return worker;
+					return oPromise;
 				}
 
-				function isSameOrigin(url) {
-					return url.indexOf(window.location.host) > 0
-						|| /^[^/]+\/[^/].*$|^\/[^/].*$/i.test(url); //check for relative address
-				}
+				function createBlobWorker() {
+					Log.warning('Direct worker is not allowed. Load the worker via Blob.');
 
-				function blobWorker() {
-					var sBlobCode, oBlobURL;
+					const sBlobCode = `self.origin = "${mWorkerParams.base}"; importScripts("${mWorkerParams.src}");`;
+					const oBlobURL = window.URL.createObjectURL(new Blob([sBlobCode]));
 
-					Log.warning('Direct worker is not allowed. Load the worker via blob.');
+					return createWorker(oBlobURL);
+				}
 
-					sBlobCode = 'self.origin = "' + workerParams.base + '"; ' + 'importScripts("' + workerParams.src + '")';
-					oBlobURL = window.URL.createObjectURL(new Blob([sBlobCode]));
+				/**
+				 * Returns a worker instance. First tries to create a direct worker, if this fails, e.g. due to
+				 * cross-origin or CSP restrictions, a blob worker is created. When no worker can be created, the
+				 * Promise is rejected.
+				 *
+				 * @returns {Promise<Worker>} Worker instance
+				 */
+				async function getWorker() {
+					let oWorker;
 
-					return createWorker(oBlobURL);
+					try {
+						oWorker =  await createWorker(mWorkerParams.src);
+					} catch (oError) {
+						oWorker = await createBlobWorker();
+					}
+
+					return oWorker;
 				}
 
 				function noWorker() {
@@ -165,34 +187,23 @@ sap.ui.define(['sap/base/Log', 'sap/ui/export/ExportUtils'], function(Log, Expor
 					fnCancel = exportInProcess(mParams).cancel;
 				}
 
-				function start() {
+				async function start() {
 					try {
-						spreadsheetWorker = createWorker(workerParams.src);
-						spreadsheetWorker.addEventListener('error', function (e) { // Firefox fires an error event instead of a security exception
-							spreadsheetWorker = blobWorker();
-							spreadsheetWorker.addEventListener('error', function (e) {
-								noWorker();
-								e.preventDefault();
-							});
-							e.preventDefault();
-						});
-					} catch (err1) {
-						try {
-							spreadsheetWorker = blobWorker();
-						} catch (err2) {
-							noWorker();
-						}
+						oSpreadsheetWorker = await getWorker();
+						oSpreadsheetWorker.postMessage(mParams);
+					} catch (oError) {
+						noWorker();
 					}
 				}
 
 				// worker settings
-				workerParams.base = ExportUtils.normalizeUrl(sap.ui.require.toUrl('sap/ui/export/js/'));
-				workerParams.src = workerParams.base + 'SpreadsheetWorker.js';
+				mWorkerParams.base = ExportUtils.normalizeUrl(sap.ui.require.toUrl('sap/ui/export/js/'));
+				mWorkerParams.src = `${mWorkerParams.base}SpreadsheetWorker.js`;
 
 				start();
 
 				// fnCancel may be overwritten asynchronously after return, therefore it should be wrapped into a closure
-				return {cancel: function() {fnCancel();}};
+				return {cancel: () => { fnCancel(); }};
 			}
 
 			if (mParams.dataSource.type === 'array') {

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

@@ -12,6 +12,10 @@ importScripts(origin + 'XLSXBuilder.js');
 importScripts(origin + '../provider/DataProviderBase.js');
 importScripts(origin + 'libs/JSZip3.js');
 
+postMessage({
+	initialized: true
+});
+
 self.onmessage = function(oMessage) {
 	'use strict';
 

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

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

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