@sapui5/sap.ui.export 1.128.0 → 1.130.0

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

@@ -2,11 +2,20 @@
  * SAPUI5
  * (c) Copyright 2009-2024 SAP SE. All rights reserved.
  */
-sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabilities', 'sap/m/MessageToast', 'sap/ui/core/Core', 'sap/ui/base/EventProvider', 'sap/ui/model/odata/v4/ODataModel', 'sap/ui/util/openWindow'], function(library, ExportUtils, ExportDialog, PDFCapabilities, MessageToast, Core, EventProvider, ODataModel, openWindow) {
-	'use strict';
-
-	var Destination = library.Destination;
-	var FileType = library.FileType;
+sap.ui.define([
+	"./library",
+	"./ExportUtils",
+	"./ExportDialog",
+	"./util/PDFCapabilities",
+	"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) {
+	"use strict";
+
+	const Destination = library.Destination;
+	const FileType = library.FileType;
 
 	/**
 	 * Any export-related functionality is encapsulated in the <code>ExportHandler</code> that also stores user settings throughout the session.
@@ -18,16 +27,16 @@ 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.128.0
+	 * @version 1.130.0
 	 *
 	 * @since 1.102
 	 * @alias sap.ui.export.ExportHandler
 	 * @extends sap.ui.base.EventProvider
 	 * @public
 	 */
-	var ExportHandler = EventProvider.extend('sap.ui.export.ExportHandler', {
+	const ExportHandler = EventProvider.extend("sap.ui.export.ExportHandler", {
 		constructor: function(mCapabilities) {
-			var that = this;
+			const that = this;
 
 			EventProvider.call(this);
 
@@ -35,9 +44,9 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 			this._mCapabilities = mCapabilities instanceof Object ? mCapabilities : { XLSX: {} };
 
 			if (this._mCapabilities.PDF) {
-				var oCapabilities = this._mCapabilities.PDF;
+				const oCapabilities = this._mCapabilities.PDF;
 
-				if (typeof oCapabilities.isA !== 'function' || !oCapabilities.isA('sap.ui.export.util.PDFCapabilities')) {
+				if (!oCapabilities?.isA?.("sap.ui.export.util.PDFCapabilities")) {
 					this._mCapabilities.PDF = new PDFCapabilities(oCapabilities);
 				}
 
@@ -47,8 +56,8 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 			}
 
 			/* Activate Google Sheet support */
-			this._initialized = new Promise(function(fnResolve) {
-				that.isGoogleSheetSupported().then(function(bSupported) {
+			this._initialized = new Promise((fnResolve) => {
+				this.isGoogleSheetSupported().then((bSupported) => {
 					if (bSupported) {
 						that._mCapabilities[FileType.GSHEET] = {};
 
@@ -96,7 +105,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @public
 	 */
 	ExportHandler.prototype.attachBeforeExport = function(oData, fnHandler, oListener) {
-		return this.attachEvent('beforeExport', oData, fnHandler, oListener);
+		return this.attachEvent("beforeExport", oData, fnHandler, oListener);
 	};
 
 	/**
@@ -112,7 +121,7 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @public
 	 */
 	ExportHandler.prototype.detachBeforeExport = function(fnHandler, oListener) {
-		return this.detachEvent('beforeExport', fnHandler, oListener);
+		return this.detachEvent("beforeExport", fnHandler, oListener);
 	};
 
 	/**
@@ -138,27 +147,19 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	ExportHandler.prototype.destroy = function() {
 		EventProvider.prototype.destroy.apply(this, arguments);
 
-		if (this._oModel) {
-			this._oModel.destroy();
-		}
-
-		if (this._oFileShareBinding) {
-			this._oFileShareBinding.destroy();
-		}
-
-		if (this._oExportDialog) {
-			this._oExportDialog.destroy();
-		}
-
-		if (this._oFilePicker) {
-			this._oFilePicker.destroy();
-		}
+		this._oExportDialog?.destroy();
+		this._oFilePicker?.destroy();
+		this._oFileShareBinding?.destroy();
+		this._oModel?.destroy();
 
 		this._mCapabilities = null;
-		this._oDataSource = null;
 		this._mDialogSettings = null;
-		this._oModel = null;
+		this._oDataSource = null;
+		this._oExportDialog = null;
+		this._oFilePicker = null;
 		this._oFileShareBinding = null;
+		this._oModel = null;
+
 		this.bIsDestroyed = true;
 	};
 
@@ -170,20 +171,21 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 *
 	 * @returns {Promise<sap.ui.model.odata.v4.Context[]>} <code>Promise</code> that gets resolved with the requested FileShare <code>Context</code> <code>Array</code>
 	 *
+	 * @async
 	 * @private
 	 */
-	ExportHandler.prototype.getFileShareContexts = function() {
-		return this.getFileShareModel().then(function(oModel) {
-			if (!oModel) {
-				return Promise.resolve([]);
-			}
+	ExportHandler.prototype.getFileShareContexts = async function() {
+		const oModel = await this.getFileShareModel();
 
-			if (!this._oFileShareBinding) {
-				this._oFileShareBinding = oModel.bindList('/FileShares');
-			}
+		if (!oModel) {
+			return Promise.resolve([]);
+		}
+
+		if (!this._oFileShareBinding) {
+			this._oFileShareBinding = oModel.bindList("/FileShares");
+		}
 
-			return this._oFileShareBinding.requestContexts(0);
-		}.bind(this));
+		return this._oFileShareBinding.requestContexts(0);
 	};
 
 	/**
@@ -195,61 +197,52 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @param {string} [sFileName] Suggested name of the file including file extension
 	 * @returns {Promise} Resolves with the file location selected in the <code>CloudFilePicker</code>
 	 *
+	 * @async
 	 * @private
 	 */
-	ExportHandler.prototype.getRemoteFileLocation = function(sFileName) {
-		var that = this;
-
-		return new Promise(function(fnResolve, fnReject) {
-			Promise.all([
-				ExportUtils.getResourceBundle(),
-				that.getFileShareModel()
-			]).then(function(aResolve) {
-				var oResourceBundle = aResolve[0];
-				var oModel = aResolve[1];
-
-				sap.ui.require(['sap/suite/ui/commons/CloudFilePicker'], function(CloudFilePicker) {
-					var oFilePicker;
-
-					that._oFilePicker = oFilePicker = new CloudFilePicker({
-						sharedModel: oModel,
-						suggestedFileName: sFileName,
-						enableDuplicateCheck: true,
-						fileNameMandatory: true,
-						confirmButtonText: oResourceBundle.getText('EXPORT_BUTTON'),
-						title: oResourceBundle.getText('DESTINATION_DIALOG_TITLE')
-					});
-
-					oFilePicker.attachSelect(function(oEvent) {
-						var aSelectedFiles, oSelectedFolder, bReplaceFile, mCloudFileInfo = {};
-
-						aSelectedFiles = oEvent.getParameter('selectedFiles');
-						oSelectedFolder = oEvent.getParameter('selectedFolder');
-						bReplaceFile = oEvent.getParameter('replaceExistingFile');
-
-						mCloudFileInfo = {};
-						mCloudFileInfo['FileShare'] = oSelectedFolder.getFileShareId();
-						mCloudFileInfo['FileShareItemKind'] = 'document';
-						mCloudFileInfo['FileShareItemName'] = oEvent.getParameter('selectedFileName');
-						mCloudFileInfo['ParentFileShareItem'] = oSelectedFolder.getFileShareItemId();
-
-						if (bReplaceFile && Array.isArray(aSelectedFiles) && aSelectedFiles.length > 0) {
-							var oCloudFile = aSelectedFiles.shift();
-
-							mCloudFileInfo['FileShareItem'] = oCloudFile.getFileShareItemId();
-						}
-
-						/* Check whether the user has selected a valid FileShare */
-						if (!mCloudFileInfo['FileShare']) {
-							fnReject(oResourceBundle.getText('DESTINATION_SELECTION_INCOMPLETE'));
-						}
-
-						fnResolve(mCloudFileInfo);
-					});
-
-					oFilePicker.open();
-				});
+	ExportHandler.prototype.getRemoteFileLocation = async function(sFileName) {
+		const [oResourceBundle, oModel, CloudFilePicker] = await Promise.all([
+			ExportUtils.getResourceBundle(),
+			this.getFileShareModel(),
+			ExportUtils.loadClass("sap/suite/ui/commons/CloudFilePicker")
+		]);
+
+		const oFilePicker = this._oFilePicker = new CloudFilePicker({
+			sharedModel: oModel,
+			suggestedFileName: sFileName,
+			enableDuplicateCheck: true,
+			fileNameMandatory: true,
+			confirmButtonText: oResourceBundle.getText("EXPORT_BUTTON"),
+			title: oResourceBundle.getText("DESTINATION_DIALOG_TITLE")
+		});
+
+		return new Promise((fnResolve, fnReject) => {
+			oFilePicker.attachSelect(function(oEvent) {
+				const aSelectedFiles = oEvent.getParameter("selectedFiles");
+				const oSelectedFolder = oEvent.getParameter("selectedFolder");
+				const bReplaceFile = oEvent.getParameter("replaceExistingFile");
+
+				const mCloudFileInfo = {
+					FileShare: oSelectedFolder.getFileShareId(),
+					FileShareItemKind: "document",
+					FileShareItemName: oEvent.getParameter("selectedFileName"),
+					ParentFileShareItem: oSelectedFolder.getFileShareItemId()
+				};
+
+				if (bReplaceFile && Array.isArray(aSelectedFiles) && aSelectedFiles.length > 0) {
+					const oCloudFile = aSelectedFiles.shift();
+
+					mCloudFileInfo.FileShareItem = oCloudFile.getFileShareItemId();
+				}
+
+				if (!mCloudFileInfo.FileShare) {
+					fnReject(oResourceBundle.getText("DESTINATION_SELECTION_INCOMPLETE"));
+				}
+
+				fnResolve(mCloudFileInfo);
 			});
+
+			oFilePicker.open();
 		});
 	};
 
@@ -263,113 +256,109 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @param {object} mCloudFileInfo FileShareItem representation of the file
 	 * @returns {Promise} A <code>Promise</code> that resolves with the desired export instance
 	 *
+	 * @async
 	 * @private
 	 */
-	ExportHandler.prototype.getExportInstance = function(mExportSettings, mCustomSettings, mCloudFileInfo) {
-		var that = this;
+	ExportHandler.prototype.getExportInstance = async function(mExportSettings, mCustomSettings, mCloudFileInfo) {
+		const that = this;
 
-		return Promise.all([
+		const [oResourceBundle, oExportInstance] = await Promise.all([
 			ExportUtils.getResourceBundle(),
-			ExportUtils.getExportInstance(mExportSettings, this._mCapabilities)
-		]).then(function(aResolve) {
-			var oResourceBundle = aResolve[0];
-			var oExportInstance = aResolve[1];
-			var aFilters = [];
-			var oFilterConfig;
-
-			if (mCustomSettings && mCustomSettings.includeFilterSettings) {
-				var oContext = mExportSettings.workbook.context;
-
-				if (!oContext) {
-					oContext = mExportSettings.workbook.context = {
-						metainfo: []
-					};
-				}
+			ExportUtils.getExportInstance(mExportSettings, this._mCapabilities, mCloudFileInfo)
+		]);
 
-				oFilterConfig = {
-					name: oResourceBundle.getText('FILTER_HEADER'),
-					items: []
-				};
-				aFilters = mCustomSettings.includeFilterSettings ? ExportUtils.getFilters(mExportSettings.dataSource) : [];
-				oContext.metaSheetName = oFilterConfig.name;
+		let aFilters = [];
+		const oFilterConfig = {
+			name: oResourceBundle.getText("FILTER_HEADER"),
+			items: []
+		};
+
+		if (mCustomSettings?.includeFilterSettings) {
+			let oContext = mExportSettings.workbook.context;
 
-				oContext.metainfo.push(oFilterConfig);
+			if (!oContext) {
+				oContext = mExportSettings.workbook.context = {
+					metainfo: []
+				};
 			}
 
-			oExportInstance.attachBeforeExport(function(oEvent) {
-				var mEventExportSettings = oEvent.getParameter('exportSettings');
+			aFilters = ExportUtils.getFilters(mExportSettings.dataSource);
+			oContext.metaSheetName = oFilterConfig.name;
 
-				const bExecuteDefaultAction = that.fireEvent('beforeExport', {
-					exportSettings: mEventExportSettings,
-					userExportSettings: mCustomSettings || {},
-					filterSettings: aFilters
-				}, true, false);
+			oContext.metainfo.push(oFilterConfig);
+		}
 
-				if (!bExecuteDefaultAction) {
-					oEvent.preventDefault();
-					return;
-				}
+		oExportInstance.attachBeforeExport(function(oEvent) {
+			const bExecuteDefaultAction = that.fireEvent("beforeExport", {
+				exportSettings: oEvent.getParameter("exportSettings"),
+				userExportSettings: mCustomSettings || {},
+				filterSettings: aFilters
+			}, true, false);
 
-				/* Sort filterSettings and write to metainfo */
-				aFilters.filter(function(oFilter) {
-					return oFilter && typeof oFilter.isA === 'function' && oFilter.isA('sap.ui.export.util.Filter');
-				}).sort(function(firstElement, secondElement) {
-					var sFirst = firstElement.getLabel().toLowerCase();
-					var sSecond = secondElement.getLabel().toLowerCase();
+			if (!bExecuteDefaultAction) {
+				oEvent.preventDefault();
+				return;
+			}
 
-					if (sFirst > sSecond) {
-						return 1;
-					}
+			/* Sort filterSettings and write to metainfo */
+			aFilters.filter((oFilter) => {
+				return oFilter?.isA?.("sap.ui.export.util.Filter");
+			}).sort((firstElement, secondElement) => {
+				const sFirst = firstElement.getLabel().toLowerCase();
+				const sSecond = secondElement.getLabel().toLowerCase();
 
-					if (sFirst < sSecond) {
-						return -1;
-					}
+				if (sFirst > sSecond) {
+					return 1;
+				}
 
-					return 0;
-				}).forEach(function(oFilter) {
-					oFilterConfig.items.push({
-						key: oFilter.getLabel(),
-						value: oFilter.getValue()
-					});
+				if (sFirst < sSecond) {
+					return -1;
+				}
+
+				return 0;
+			}).forEach((oFilter) => {
+				oFilterConfig.items.push({
+					key: oFilter.getLabel(),
+					value: oFilter.getValue()
 				});
 			});
+		});
 
-			if (mCloudFileInfo && typeof oExportInstance.attachBeforeSave === 'function') {
-				oExportInstance.attachBeforeSave(function(oEvent) {
-					var aArrayBuffer, oExportDialog;
+		if (mCloudFileInfo && typeof oExportInstance.attachBeforeSave === "function") {
+			oExportInstance.attachBeforeSave(function(oEvent) {
+				const aArrayBuffer = oEvent.getParameter("data");
+				const oExportDialog = oEvent.getParameter("exportDialog");
 
-					aArrayBuffer = oEvent.getParameter('data');
-					oExportDialog = oEvent.getParameter('exportDialog');
-					mCloudFileInfo['FileShareItemContentType'] = oExportInstance.getMimeType();
-					mCloudFileInfo['FileShareItemConvertToMimeType'] = oExportInstance.getMimeType();
+				mCloudFileInfo.FileShareItemContentType = oExportInstance.getMimeType();
+				mCloudFileInfo.FileShareItemConvertToMimeType = oExportInstance.getMimeType();
 
-					/* Enforce file conversion for Google Sheet */
-					if (mExportSettings.fileType === FileType.GSHEET) {
-						mCloudFileInfo['FileShareItemConvertToMimeType'] = 'application/vnd.google-apps.spreadsheet';
-					}
+				/* Enforce file conversion for Google Sheet */
+				if (mExportSettings.fileType === FileType.GSHEET) {
+					mCloudFileInfo.FileShareItemConvertToMimeType = "application/vnd.google-apps.spreadsheet";
+				}
 
-					var uInt8Array = new Uint8Array(aArrayBuffer);
-					var stringArray = new Array(uInt8Array.length);
-					for (var i = 0; i < uInt8Array.length; i++) {
-						stringArray[i] = String.fromCharCode(uInt8Array[i]); // often a bit faster, especially with huge files, than string concatenation
-					}
-					mCloudFileInfo['FileShareItemContent'] = btoa(stringArray.join(""));
-
-					oExportDialog.updateStatus(oResourceBundle.getText('DESTINATION_DIALOG_STATUS'));
-					oEvent.preventDefault();
-
-					that.uploadFile(mCloudFileInfo).then(function() {
-						MessageToast.show(oResourceBundle.getText('DESTINATION_TRANSFER_SUCCESS'));
-					}).catch(function() {
-						ExportDialog.showErrorMessage(oResourceBundle.getText('DESTINATION_TRANSFER_ERROR'));
-					}).finally(function() {
-						oExportDialog.finish();
-					});
+				const uInt8Array = new Uint8Array(aArrayBuffer);
+				const stringArray = new Array(uInt8Array.length);
+
+				for (let i = 0; i < uInt8Array.length; i++) {
+					stringArray[i] = String.fromCharCode(uInt8Array[i]); // often a bit faster, especially with huge files, than string concatenation
+				}
+				mCloudFileInfo.FileShareItemContent = btoa(stringArray.join(""));
+
+				oExportDialog.updateStatus(oResourceBundle.getText("DESTINATION_DIALOG_STATUS"));
+				oEvent.preventDefault();
+
+				this.uploadFile(mCloudFileInfo).then(() => {
+					MessageToast.show(oResourceBundle.getText("DESTINATION_TRANSFER_SUCCESS"));
+				}).catch(() => {
+					ExportDialog.showErrorMessage(oResourceBundle.getText("DESTINATION_TRANSFER_ERROR"));
+				}).finally(() => {
+					oExportDialog.finish();
 				});
-			}
+			}, this);
+		}
 
-			return oExportInstance;
-		});
+		return oExportInstance;
 	};
 
 	/**
@@ -378,52 +367,48 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @param {object} mCloudFileInfo FileShareItem representation of the file
 	 * @returns {Promise} A <code>Promise</code> that gets resolved after the generated file has been transferred to the FileShareSupport OData service
 	 *
+	 * @async
 	 * @private
 	 */
-	ExportHandler.prototype.uploadFile = function(mCloudFileInfo) {
-		return this.getFileShareModel().then(function(oModel) {
-			var oBinding, oContext, sContentProperty, sTypeProperty, sPath;
-
-			sContentProperty = 'FileShareItemContent';
-			sTypeProperty = 'FileShareItemContentType';
-
-			/* Overwrite existing file */
-			if (mCloudFileInfo['FileShareItem']) {
-				oContext = oModel.getKeepAliveContext("/FileShareItems(FileShare='" + mCloudFileInfo.FileShare + "',FileShareItem='" + mCloudFileInfo.FileShareItem + "')");
-
-				/*
-				 * We have to set the FileShareItemContentLink as well
-				 * as the FileShareItemContentType property explicitly
-				 * to ensure that the properties will be filled with
-				 * the content of the PATCH response when updating the
-				 * FileShareItemContent. Adding the <code>null</code>
-				 * prevents an additional PATCH for the link. It is also
-				 * important to set all properties without waiting for
-				 * the <code>Promise</code> to resolve. This allows the
-				 * binding to bundle multiple PATCH requests into a
-				 * single $batch.
-				 */
-				oContext.setProperty('FileShareItemContentLink', '', null);
-				oContext.setProperty(sTypeProperty, mCloudFileInfo[sTypeProperty]);
-				return oContext.setProperty(sContentProperty, mCloudFileInfo[sContentProperty]).then(function() {
-					return oContext.getProperty('FileShareItemContentLink');
-				});
-			}
-
-			/* Creating new file in specific folder or _Root */
-			if (mCloudFileInfo.ParentFileShareItem) {
-				sPath = "/FileShareItems(FileShare='" + mCloudFileInfo.FileShare + "',FileShareItem='" + mCloudFileInfo.ParentFileShareItem + "')/_Children";
-			} else {
-				sPath = "/FileShares(FileShare='" + mCloudFileInfo.FileShare + "')/_Root/_Children";
-			}
+	ExportHandler.prototype.uploadFile = async function(mCloudFileInfo) {
+		let sUrl;
+		const oModel = await this.getFileShareModel();
+
+		const sContentProperty = "FileShareItemContent";
+		const sTypeProperty = "FileShareItemContentType";
+
+		if (mCloudFileInfo.FileShareItem) { // Overwrite existing file
+			const oContext = oModel.getKeepAliveContext(`/FileShareItems(FileShare='${mCloudFileInfo.FileShare}',FileShareItem='${mCloudFileInfo.FileShareItem}')`);
+
+			/*
+			 * We have to set the FileShareItemContentLink as well
+			 * as the FileShareItemContentType property explicitly
+			 * to ensure that the properties will be filled with
+			 * the content of the PATCH response when updating the
+			 * FileShareItemContent. Adding the <code>null</code>
+			 * prevents an additional PATCH for the link. It is also
+			 * important to set all properties without waiting for
+			 * the <code>Promise</code> to resolve. This allows the
+			 * binding to bundle multiple PATCH requests into a
+			 * single $batch.
+			 */
+			oContext.setProperty("FileShareItemContentLink", "", null);
+			oContext.setProperty(sTypeProperty, mCloudFileInfo[sTypeProperty]);
+			await oContext.setProperty(sContentProperty, mCloudFileInfo[sContentProperty]);
+
+			sUrl = oContext.getProperty("FileShareItemContentLink");
+
+		} else { // Creating new file in specific folder or _Root
+			const sPath = mCloudFileInfo.ParentFileShareItem ?
+				`/FileShareItems(FileShare='${mCloudFileInfo.FileShare}',FileShareItem='${mCloudFileInfo.ParentFileShareItem}')/_Children` : `/FileShares(FileShare='${mCloudFileInfo.FileShare}')/_Root/_Children`;
+
+			const oBinding = oModel.bindList(sPath);
+			sUrl = await this._createFile(oBinding, mCloudFileInfo);
+		}
 
-			oBinding = oModel.bindList(sPath);
-			return this._createFile(oBinding, mCloudFileInfo);
-		}.bind(this)).then(function(sUrl) {
-			if (sUrl) {
-				openWindow(sUrl);
-			}
-		});
+		if (sUrl) {
+			openWindow(sUrl);
+		}
 	};
 
 	/**
@@ -437,16 +422,13 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @private
 	 */
 	ExportHandler.prototype._createFile = function(oBinding, mCloudFileInfo) {
-		return new Promise(function(fnResolve, fnReject) {
+		return new Promise((fnResolve, fnReject) => {
 			function fnCreateCompleted(oEvent) {
-				var bSuccess, oContext;
-
-				bSuccess = oEvent.getParameter('success');
-				oContext = oEvent.getParameter('context');
+				const { success: bSuccess, context: oContext } = oEvent.getParameters();
 
 				if (bSuccess) {
 					oBinding.detachCreateCompleted(fnCreateCompleted);
-					fnResolve(oContext.getProperty('FileShareItemContentLink'));
+					fnResolve(oContext.getProperty("FileShareItemContentLink"));
 				} else {
 					oContext.destroy();
 					fnReject();
@@ -469,18 +451,21 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @returns {Promise} A <code>Promise</code> that gets resolved after the export process has been finished
 	 *
 	 * @since 1.102
+	 * @async
 	 * @public
 	 */
-	ExportHandler.prototype.export = function(mExportSettings) {
+	ExportHandler.prototype.export = async function(mExportSettings) {
 		if (this.bIsDestroyed) {
-			Promise.reject('ExportHandler must not be used after calling #destroy');
+			Promise.reject("ExportHandler must not be used after calling #destroy");
 		}
 
-		return this.getExportInstance(mExportSettings).then(function(oExportInstance) {
-			return oExportInstance.build().finally(function() {
-				oExportInstance.destroy();
-			});
-		});
+		const oExportInstance = await this.getExportInstance(mExportSettings);
+
+		try {
+			await oExportInstance.build();
+		} finally {
+			oExportInstance.destroy();
+		}
 	};
 
 	/**
@@ -494,81 +479,75 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @returns {Promise} A <code>Promise</code> that resolves once the data has been exported
 	 *
 	 * @since 1.102
+	 * @async
 	 * @public
 	 */
-	ExportHandler.prototype.exportAs = function(oSettings, fnResolveColumnLabel) {
-		var that = this;
-		var mExportSettings;
-		var mUserSettings = {};
-
+	ExportHandler.prototype.exportAs = async function(oSettings, fnResolveColumnLabel) {
 		if (this.bIsDestroyed) {
-			return Promise.reject('ExportHandler must not be used after calling #destroy');
+			throw new Error("ExportHandler must not be used after calling #destroy");
 		}
 
-		return this.initialized().then(function() {
-			mExportSettings = Object.assign({}, oSettings, that._mDialogSettings);
+		await this.initialized();
 
-			return that.getFileShareContexts();
-		}).then(function(aContexts) {
-			return ExportUtils.getExportSettingsViaDialog(mExportSettings, that._mCapabilities, aContexts.length > 0, function(oDialog) { that._oExportDialog = oDialog; });
-		}).then(function(mDialogSettings) {
+		const mExportSettings = Object.assign({}, oSettings, this._mDialogSettings);
+		const aContexts = await this.getFileShareContexts();
+		const mDialogSettings =
+			await ExportUtils.getExportSettingsViaDialog(mExportSettings, this._mCapabilities, aContexts.length > 0, (oDialog) => { this._oExportDialog = oDialog; });
 
-			/* Cache settings dialog settings */
-			that._mDialogSettings = mDialogSettings;
+		/* Cache dialog settings */
+		this._mDialogSettings = mDialogSettings;
 
-			/* Merge export settings with user settings from the dialog */
-			Object.assign(mExportSettings, mDialogSettings);
+		/* Merge export settings with user settings from the dialog */
+		Object.assign(mExportSettings, mDialogSettings);
 
-			ExportUtils.validateFileSettings(mExportSettings);
+		ExportUtils.validateFileSettings(mExportSettings);
 
-			mUserSettings.splitCells = mDialogSettings.splitCells;
-			mUserSettings.includeFilterSettings = mDialogSettings.includeFilterSettings;
+		const mUserSettings = {
+			splitCells: mDialogSettings.splitCells,
+			includeFilterSettings: mDialogSettings.includeFilterSettings
+		};
 
-			/* Enforce split cells option for fileType PDF without persisting the value in the settings dialog */
-			if (mExportSettings.fileType === FileType.PDF || mDialogSettings.splitCells) {
-				mExportSettings.workbook.columns = ExportUtils.splitColumns(mExportSettings.workbook.columns, fnResolveColumnLabel);
-			}
-			if (mExportSettings.includeFilterSettings) {
-				return ExportUtils.parseTechnicalConfiguration();
+		/* Enforce split cells option for fileType PDF without persisting the value in the settings dialog */
+		if (mExportSettings.fileType === FileType.PDF || mDialogSettings.splitCells) {
+			mExportSettings.workbook.columns = ExportUtils.splitColumns(mExportSettings.workbook.columns, fnResolveColumnLabel);
+		}
+
+		if (mExportSettings.includeFilterSettings) {
+			const oUserConfig = await ExportUtils.parseTechnicalConfiguration();
+			let oContext = mExportSettings.workbook.context;
+
+			if (!oContext) {
+				oContext = mExportSettings.workbook.context = {};
 			}
 
-			return Promise.resolve();
-		}).then(function(oUserConfig) {
-			if (oUserConfig) {
-				var oContext = mExportSettings.workbook.context;
+			oContext.metainfo = Array.isArray(oContext.metainfo) ? oContext.metainfo.push(oUserConfig) : [oUserConfig];
+		}
 
-				if (!oContext) {
-					oContext = mExportSettings.workbook.context = {};
-				}
+		let mCloudFileInfo;
 
-				oContext.metainfo = Array.isArray(oContext.metainfo) ? oContext.metainfo.push(oUserConfig) : [oUserConfig];
-			}
-		}).then(function() {
-			if (mExportSettings.destination === Destination.LOCAL) {
-				return Promise.resolve();
-			}
+		if (mExportSettings.destination === Destination.REMOTE) {
+			mCloudFileInfo = await this.getRemoteFileLocation(mExportSettings.fileName);
+		}
 
-			return that.getRemoteFileLocation(mExportSettings.fileName);
-		}).then(function(mCloudFileInfo) {
+		/* Validate file name only if file does not exist */
+		if (mCloudFileInfo && !mCloudFileInfo.FileShareItem) {
+			mCloudFileInfo.FileShareItemName = ExportUtils.validateFileName(mCloudFileInfo.FileShareItemName, mExportSettings.fileType);
+		}
 
-			/* Validate file name only if file does not exist */
-			if (mCloudFileInfo && !mCloudFileInfo['FileShareItem']) {
-				mCloudFileInfo.FileShareItemName = ExportUtils.validateFileName(mCloudFileInfo.FileShareItemName, mExportSettings.fileType);
-			}
+		/* Verify that selected FileShare is a Google Workspace */
+		if (mExportSettings.fileType === FileType.GSHEET) {
+			await this.validateFileShare(mCloudFileInfo);
+		}
 
-			/* Verify that selected FileShare is a Google Workspace */
-			if (mExportSettings.fileType === FileType.GSHEET) {
-				return that.validateFileShare(mCloudFileInfo);
-			}
+		const oExportInstance = await this.getExportInstance(mExportSettings, mUserSettings, mCloudFileInfo);
 
-			return mCloudFileInfo;
-		}).then(function(mCloudFileInfo) {
-			return that.getExportInstance(mExportSettings, mUserSettings, mCloudFileInfo).then(function(oExportInstance) {
-				return oExportInstance.build().finally(function() {
-					oExportInstance.destroy();
-				});
-			});
-		}).catch(ExportDialog.showErrorMessage);
+		try {
+			await oExportInstance.build();
+		} catch (oError) {
+			ExportDialog.showErrorMessage(oError);
+		} finally {
+			oExportInstance.destroy();
+		}
 	};
 
 	/**
@@ -585,16 +564,14 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 		return Promise.all([
 			ExportUtils.getResourceBundle(),
 			this.getFileShareContexts()
-		]).then(function(aResolve) {
-			var oResourceBundle = aResolve[0];
-			var aContexts = aResolve[1];
-
-			var oFileShareContext = aContexts.find(function(oContext) {
-				return oContext.getProperty('FileShare') === mCloudFileInfo.FileShare;
+		]).then((aResolve) => {
+			const [oResourceBundle, aContexts] = aResolve;
+			const oFileShareContext = aContexts.find((oContext) => {
+				return oContext.getProperty("FileShare") === mCloudFileInfo.FileShare;
 			});
 
-			return this.isGoogleWorkspace(oFileShareContext) ? mCloudFileInfo : Promise.reject(oResourceBundle.getText('DESTINATION_ERROR_NOT_GOOGLE'));
-		}.bind(this));
+			return this.isGoogleWorkspace(oFileShareContext) ? mCloudFileInfo : Promise.reject(oResourceBundle.getText("DESTINATION_ERROR_NOT_GOOGLE"));
+		});
 	};
 
 	/**
@@ -605,22 +582,22 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 *
 	 * @private
 	 */
-	ExportHandler.prototype.getFileShareModel = function() {
+	ExportHandler.prototype.getFileShareModel = async function() {
 
 		if (this._oModel) {
-			return Promise.resolve(this._oModel);
+			return this._oModel;
 		}
 
-		return ExportUtils.fetchDataSource().then(function(oDataSource) {
-			if (oDataSource) {
-				this._oModel = new ODataModel({
-					serviceUrl: oDataSource.uri,
-					autoExpandSelect: true
-				});
-			}
+		const oDataSource = await ExportUtils.fetchDataSource();
 
-			return this._oModel;
-		}.bind(this));
+		if (oDataSource) {
+			this._oModel = new ODataModel({
+				serviceUrl: oDataSource.uri,
+				autoExpandSelect: true
+			});
+		}
+
+		return this._oModel;
 	};
 
 	/**
@@ -630,10 +607,10 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 *
 	 * @private
 	 */
-	ExportHandler.prototype.isGoogleSheetSupported = function() {
-		return this.getFileShareContexts().then(function(aContexts) {
-			return aContexts.some(this.isGoogleWorkspace);
-		}.bind(this));
+	ExportHandler.prototype.isGoogleSheetSupported = async function() {
+		const aContexts = await this.getFileShareContexts();
+
+		return aContexts.some(this.isGoogleWorkspace);
 	};
 
 	/**
@@ -645,13 +622,11 @@ sap.ui.define(['./library', './ExportUtils', './ExportDialog', './util/PDFCapabi
 	 * @private
 	 */
 	ExportHandler.prototype.isGoogleWorkspace = function(oContext) {
-		var sDescription, sVendorType;
-
-		sVendorType = oContext.getProperty('FileShareVendorType');
-		sDescription = oContext.getProperty('FileShareDescription');
+		const sVendorType = oContext.getProperty("FileShareVendorType");
+		const sDescription = oContext.getProperty("FileShareDescription");
 
-		return sVendorType === 'GOOGLE'
-			|| (typeof sDescription === 'string' && sDescription.indexOf('Google') > -1);
+		return sVendorType === "GOOGLE"
+			|| (typeof sDescription === "string" && sDescription.indexOf("Google") > -1);
 	};
 
 	return ExportHandler;