@sapui5/sap.ui.export 1.101.0 → 1.102.0

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

@@ -23,9 +23,11 @@ sap.ui.define([
 	var ValueState = coreLibrary.ValueState;
 	var FileType = library.FileType;
 	var EdmType = library.EdmType;
+	var Destination = library.Destination;
 	var uiVersion = null;
 
 	/* Async call to resource bundle */
+	var oResourceBundle;
 	var oResourceBundlePromise = Core.getLibraryResourceBundle('sap.ui.export', true);
 
 	var CLASS_NAME = 'sap.ui.export.ExportUtils';
@@ -44,16 +46,20 @@ sap.ui.define([
 	});
 
 	/* Returns the Export Settings used by the User Settings Dialog */
-	function getDefaultSettings(oCustomConfig, oResourceBundle, oExportCapabilities) {
+	function getDefaultSettings(oCustomConfig, oResourceBundle, oExportCapabilities, bRemoteDestination) {
 		var sSelectedKey;
 		var aSupportedFormats = Object.keys(oExportCapabilities);
 
 		var oDefaultConfig = {
 			fileName: 'Standard',
-			fileType: [],
-			selectedFileType: 'XLSX',
-			selectedPaperSize: 'DIN_A4',
-			selectedOrientation: 'LANDSCAPE',
+			fileTypeCollection: [],
+			fileType: 'XLSX',
+			destinationCollection: [
+				{key: Destination.LOCAL, text: oResourceBundle.getText('DESTINATION_LOCAL')}
+			],
+			destination: Destination.LOCAL,
+			paperSize: 'DIN_A4',
+			orientation: 'LANDSCAPE',
 			splitCells: false,
 			includeFilterSettings: false,
 			addDateTime: false,
@@ -61,11 +67,11 @@ sap.ui.define([
 			pdfArchive: false,
 			capabilities: oExportCapabilities,
 			fitToPage: false,
-			paperSize: [
+			paperSizeCollection: [
 				{key: "DIN_A4", text: oResourceBundle.getText("PAPER_SIZE_A4")},
 				{key: "US_LETTER", text: oResourceBundle.getText("PAPER_SIZE_US_LETTER")}
 			],
-			orientation: [
+			orientationCollection: [
 				{key:"LANDSCAPE", text: oResourceBundle.getText("ORIENTATION_LAND")},
 				{key:"PORTRAIT", text: oResourceBundle.getText("ORIENTATION_PORT")}
 			],
@@ -75,23 +81,30 @@ sap.ui.define([
 		};
 
 		aSupportedFormats.forEach(function(sFormat) {
-			oDefaultConfig.fileType.push({key: sFormat.toUpperCase()});
+			oDefaultConfig.fileTypeCollection.push({key: sFormat.toUpperCase()});
 		});
 
+		if (bRemoteDestination) {
+			oDefaultConfig.destinationCollection.push({
+				key: 'REMOTE',
+				text:  oResourceBundle.getText('DESTINATION_REMOTE')
+			});
+		}
+
 		var oExportConfig = Object.assign({}, oDefaultConfig, oCustomConfig || {});
 
-		for (var i = 0; i < oExportConfig.fileType.length; i++) {
+		for (var i = 0; i < oExportConfig.fileTypeCollection.length; i++) {
 			sSelectedKey = null;
 
-			if (!oExportConfig.fileType[i].text) {
-				oExportConfig.fileType[i].text = oResourceBundle.getText(oExportConfig.fileType[i].key + '_FILETYPE');
+			if (!oExportConfig.fileTypeCollection[i].text) {
+				oExportConfig.fileTypeCollection[i].text = oResourceBundle.getText(oExportConfig.fileTypeCollection[i].key + '_FILETYPE');
 			}
-			if (oExportConfig.fileType[i].key === oExportConfig.selectedFileType) {
-				sSelectedKey = oExportConfig.fileType[i].key;
+			if (oExportConfig.fileTypeCollection[i].key === oExportConfig.fileType) {
+				sSelectedKey = oExportConfig.fileTypeCollection[i].key;
 			}
 		}
 		if (!sSelectedKey) {
-			oExportConfig.selectedFileType = oExportConfig.fileType[0].key;
+			oExportConfig.fileType = oExportConfig.fileTypeCollection[0].key;
 		}
 
 		return oExportConfig;
@@ -100,7 +113,7 @@ sap.ui.define([
 	function processExportSettings(oSettings) {
 		var oFinalSettings = {};
 
-		["fileName", "selectedFileType", "selectedPaperSize", "selectedOrientation", "splitCells", "includeFilterSettings", "addDateTime", "doEnableAccessibility", "fitToPage", "fontSize", "signature", "signatureReason", "pdfArchive"].forEach(function(sProperty) {
+		["fileName", "fileType", "paperSize", "orientation", "splitCells", "includeFilterSettings", "addDateTime", "doEnableAccessibility", "fitToPage", "fontSize", "signature", "signatureReason", "pdfArchive", 'destination'].forEach(function(sProperty) {
 			oFinalSettings[sProperty] = oSettings[sProperty];
 		});
 
@@ -111,7 +124,7 @@ sap.ui.define([
 	 * Utilities related to export to enable reuse in integration scenarios (e.g. tables).
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.102.0
 	 *
 	 * @since 1.59
 	 * @name sap.ui.export.ExportUtils
@@ -162,8 +175,9 @@ sap.ui.define([
 		/**
 		 * Creates the Export settings dialog that can be used for configuring the spreadsheet before exporting.
 		 *
-		 * @param {Object} mCustomConfig Initial configuration of the settings dialog
-		 * @param {Object} oExportCapabilities Definition of supported export features
+		 * @param {object} mCustomConfig Initial configuration of the settings dialog
+		 * @param {object} oExportCapabilities Definition of supported export features
+		 * @param {boolean} [bRemoteDestination] Activates remote destinations for export
 		 * @param {sap.ui.core.Control} [oOpener] The opener of the dialog
 		 * @param {function(sap.m.Dialog)} [fnCallback] Handler function that is called once the dialog has been opened. A reference to the dialog is passed as parameter
 		 *
@@ -171,14 +185,22 @@ sap.ui.define([
 		 *
 		 * @static
 		 */
-		getExportSettingsViaDialog: function(mCustomConfig, oExportCapabilities, oOpener, fnCallback) {
+		getExportSettingsViaDialog: function(mCustomConfig, oExportCapabilities, bRemoteDestination, oOpener, fnCallback) {
 			return new Promise(function (fnResolve, fnReject) {
 				var oExportSettingsDialog;
 
+				// Shift optional arguments
+				if (typeof bRemoteDestination === 'object') {
+					fnCallback = oOpener;
+					oOpener = bRemoteDestination;
+				} else if (typeof bRemoteDestination === 'function') {
+					fnCallback = bRemoteDestination;
+				}
+
 				oResourceBundlePromise.then(function (oResourceBundle) {
 					var oExportConfigModel = new JSONModel();
 
-					oExportConfigModel.setData(getDefaultSettings(mCustomConfig, oResourceBundle, oExportCapabilities));
+					oExportConfigModel.setData(getDefaultSettings(mCustomConfig, oResourceBundle, oExportCapabilities, bRemoteDestination));
 
 					Fragment.load({
 						name: 'sap.ui.export.fragments.SettingsDialog',
@@ -190,6 +212,12 @@ sap.ui.define([
 							isXLSX: function(sValue) {
 								return sValue === FileType.XLSX;
 							},
+							hasDestinations: function(sFileType, aDestinationCollection) {
+								return sFileType === FileType.XLSX && aDestinationCollection.length > 1;
+							},
+							formatExportButton: function(sDestination) {
+								return sDestination === Destination.LOCAL ? oResourceBundle.getText('EXPORT_BUTTON') : oResourceBundle.getText('DIALOG_BUTTON_CLOUD_DESTINATION');
+							},
 							onCancel: function() {
 								oExportSettingsDialog.close();
 							},
@@ -225,10 +253,11 @@ sap.ui.define([
 								oExportBtn.setEnabled(!bValidate);
 							},
 							onFileTypeChange: function(oEvent) {
-								var oSelectedItem = oEvent.getParameter("selectedItem");
+								var oSelectedItem = oEvent.getParameter('selectedItem');
 								if (oSelectedItem && oSelectedItem.getKey() === FileType.PDF) {
-									oExportConfigModel.setProperty("/splitCells", true);
-									oExportConfigModel.setProperty("/includeFilterSettings", false);
+									oExportConfigModel.setProperty('/splitCells', true);
+									oExportConfigModel.setProperty('/includeFilterSettings', false);
+									oExportConfigModel.setProperty('/destination', Destination.LOCAL);
 								} else {
 									Core.byId('exportSettingsDialog-signatureReason').setVisible(false);
 									Core.byId('exportSettingsDialog-signatureReasonLabel').setVisible(false);
@@ -299,7 +328,7 @@ sap.ui.define([
 		 * Combines the filter operator with the value and
 		 * creates a textual representation.
 		 *
-		 * @param {Object} oFilter A single filter object according to ListBinding#getFilterInfo
+		 * @param {object} oFilter A single filter object according to ListBinding#getFilterInfo
 		 * @returns {string} Textual representation of the filter operation and value
 		 * @private
 		 */
@@ -329,7 +358,7 @@ sap.ui.define([
 		/**
 		 * Parse filter tree recursively.
 		 *
-		 * @param {Object} oFilter Filter configuration according to ListBinding#getFilterInfo
+		 * @param {object} oFilter Filter configuration according to ListBinding#getFilterInfo
 		 * @returns {Array} Array of filter entries
 		 * @private
 		 */
@@ -352,7 +381,7 @@ sap.ui.define([
 		 * Parses a logical filter and concatenates all
 		 * subsequent filters.
 		 *
-		 * @param {Object} oLogicalFilter Filter object according to ListBinding#getFilterInfo
+		 * @param {object} oLogicalFilter Filter object according to ListBinding#getFilterInfo
 		 * @returns {Array} Array containing evaluated filter settings
 		 * @private
 		 */
@@ -414,7 +443,7 @@ sap.ui.define([
 		 * Parses a binary filter and returns an Array that
 		 * contains this explicit filter item.
 		 *
-		 * @param {Object} oBinaryFilter Filter object according to ListBinding#getFilterInfo
+		 * @param {object} oBinaryFilter Filter object according to ListBinding#getFilterInfo
 		 * @returns {Array} Array containing this explicit filter setting
 		 * @private
 		 */
@@ -434,7 +463,7 @@ sap.ui.define([
 		 * Parses an unary filter and returns a modified
 		 * subsequent filter.
 		 *
-		 * @param {Object} oUnaryFilter Filter object according to ListBinding#getFilterInfo
+		 * @param {object} oUnaryFilter Filter object according to ListBinding#getFilterInfo
 		 * @returns {Array} Array containing the modified subsequent filter
 		 * @private
 		 */
@@ -455,7 +484,7 @@ sap.ui.define([
 		 * Parses an call filter and returns an Array containing
 		 * this particular filter configuration.
 		 *
-		 * @param {Object} oCallFilter Filter object according to ListBinding#getFilterInfo
+		 * @param {object} oCallFilter Filter object according to ListBinding#getFilterInfo
 		 * @returns {Array} Array containing this explicit filter setting
 		 * @private
 		 */
@@ -540,41 +569,6 @@ sap.ui.define([
 			});
 		},
 
-		/**
-		 * Queries the Fiori Launchpad service for available cloud
-		 * export targets. If no cloud service is available or the
-		 * the user has no cloud export subscription, the Promise
-		 * returns an empty Array.
-		 *
-		 * @returns {Promise}
-		 * Array of available targets
-		 */
-		getAvailableCloudExportTargets: function() {
-			var servicePromise = Utils.getCloudExportService();
-
-			return servicePromise.then(function(service) {
-				return service && service.getSupportedTargets ? service.getSupportedTargets() : [];
-			}).catch(function() {
-				return [];
-			});
-		},
-
-		/**
-		 * Returns the cloud export service. The availability of the service is
-		 * independent of a cloud export subscription. If no cloud export
-		 * service is available, which is the case on an On-Premise system, the
-		 * function returns null.
-		 *
-		 * @returns {Promise}
-		 * Promise that returns the cloud export service once it is resolved
-		 */
-		getCloudExportService: function() {
-			return sap.ushell
-				&& sap.ushell.Container
-				&& sap.ushell.Container.getServiceAsync
-					? sap.ushell.Container.getServiceAsync('ProductivityIntegration') : Promise.reject();
-		},
-
 		/**
 		 * This function saves the provided Blob to the local file system.
 		 * The parameter name is optional and depending on the browser it
@@ -633,33 +627,24 @@ sap.ui.define([
 		 * can lead to throwing an <code>Error</code>. Missing or incorrect information might get adjusted by either
 		 * default values or by truncating the original value.
 		 *
-		 * @param {Object} mSettings Export settings that will be validated
+		 * @param {object} mSettings Export settings that will be validated
 		 * @param {number} mSettings.count Expected amount of data that will be available on the service
-		 * @param {Object} mSettings.dataSource DataSource configuration that will be used to fetch the data
+		 * @param {object} mSettings.dataSource DataSource configuration that will be used to fetch the data
 		 * @param {string} mSettings.fileName Name of the exported file
 		 * @param {string} mSettings.fileType Member of sap.ui.export.FileType
 		 * @param {boolean} mSettings.showProgress Controls whether the progress dialog will be shown during export or not
-		 * @param {Object} mSettings.workbook Export settings that are relevant for the file structure
+		 * @param {object} mSettings.workbook Export settings that are relevant for the file structure
 		 * @param {boolean} mSettings.worker Controls whether the export will be run in a dedicated Web Worker or not
-		 * @param {Object} mSettings.customizing Contains export customizing like currency and unit scale settings
+		 * @param {object} mSettings.customizing Contains export customizing like currency and unit scale settings
 		 *
 		 * @since 1.78
 		 */
 		validateSettings: function(mSettings) {
-			var sExtension;
 
 			/* Validate dataSource */
 			Utils._validateDataSource(mSettings.dataSource);
 
-			/* Validate fileName and fileType */
-			mSettings.fileType = FileType[mSettings.fileType] ? mSettings.fileType : FileType.XLSX;
-			sExtension = '.' + mSettings.fileType.toLowerCase();
-			mSettings.fileName = mSettings.fileName || 'export' + sExtension;
-
-			if (!mSettings.fileName.endsWith(sExtension)) {
-				mSettings.fileName += sExtension;
-				Log.warning(CLASS_NAME + ': fileName was missing the proper file extension - extension has been added');
-			}
+			Utils.validateFileSettings(mSettings);
 
 			/* Validate showProgress */
 			if (typeof mSettings.showProgress !== 'boolean') {
@@ -679,10 +664,24 @@ sap.ui.define([
 			Utils._validateScaleCustomizing(mSettings.customizing, 'unit');
 		},
 
+		validateFileSettings: function(mSettings) {
+			var sExtension;
+
+			/* Validate fileName and fileType */
+			mSettings.fileType = FileType[mSettings.fileType] ? mSettings.fileType : FileType.XLSX;
+			sExtension = '.' + mSettings.fileType.toLowerCase();
+			mSettings.fileName = mSettings.fileName || 'export' + sExtension;
+
+			if (!mSettings.fileName.endsWith(sExtension)) {
+				mSettings.fileName += sExtension;
+				Log.info(CLASS_NAME + ': fileName was missing the proper file extension - extension has been added');
+			}
+		},
+
 		/**
 		 * Validates the datasource configuration.
 		 *
-		 * @param {Object} mDataSource DataSource configuration that will be used to fetch the data
+		 * @param {object} mDataSource DataSource configuration that will be used to fetch the data
 		 * @param {number|null} mDataSource.count Amount of data that will be requested from the service
 		 * @param {Array} [mDataSource.data] Array of data that will be exported
 		 * @param {string} [mDataSource.dataUrl] URL that is used to request the data from the backend
@@ -766,9 +765,9 @@ sap.ui.define([
 		 * Validates the workbook configuration that contains information about the columns,
 		 * the hierarchyLevel and meta information.
 		 *
-		 * @param {Object} mWorkbook Configuration of the Spreadsheet workbook
+		 * @param {object} mWorkbook Configuration of the Spreadsheet workbook
 		 * @param {Array} mWorkbook.columns Column definition of the worksheet
-		 * @param {Object} mWorkbook.context Meta information that is written to the generated file
+		 * @param {object} mWorkbook.context Meta information that is written to the generated file
 		 * @param {string} mWorkbook.hierarchyLevel Name of the property that contains the hierarchy level information
 		 *
 		 * @since 1.78
@@ -933,7 +932,7 @@ sap.ui.define([
 		/**
 		 * Validates and fixes the type definition of a particular column if possible.
 		 *
-		 * @param {Object} oColumn Export settings of a particular column
+		 * @param {object} oColumn Export settings of a particular column
 		 * @since 1.84
 		 * @private
 		 */
@@ -973,9 +972,9 @@ sap.ui.define([
 		/**
 		 * Validates the context object on the workbook definition.
 		 *
-		 * @param {Object} oContext Context object
+		 * @param {object} oContext Context object
 		 * @param {string} [oContext.application] Name of the application (default: "SAP UI5")
-		 * @param {string} [oContext.version] Application version (default: "1.101.0")
+		 * @param {string} [oContext.version] Application version (default: "1.102.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
@@ -1019,7 +1018,7 @@ sap.ui.define([
 		 * the value will be adjusted or discarded and the function writes an entry to the Log. If the property value
 		 * exceeds the maximum allowed length, it will be truncated.
 		 *
-		 * @param {Object} oContext Context on which the property is defined
+		 * @param {object} oContext Context on which the property is defined
 		 * @param {string} sProperty Name of the property
 		 * @param {string} sDefaultValue Default value that gets applied in case of an invalid value - null if not defined
 		 * @param {number} [iMaxLength] Maximum allowed length.
@@ -1052,7 +1051,7 @@ sap.ui.define([
 		 * Once the property value does not meet the criteria, the value will be discarded and
 		 * the function writes an entry to the Log.
 		 *
-		 * @param {Object} oContext Context on which the property is defined
+		 * @param {object} oContext Context on which the property is defined
 		 * @param {string} sProperty Name of the property
 		 * @param {string} sType Expected type of the property
 		 * @param {Any} [defaultValue] Default value that gets applied if the initial value is invalid
@@ -1076,9 +1075,9 @@ sap.ui.define([
 		 * Validates the unit specific scale settings and ensures
 		 * that the format is according to the definition.
 		 *
-		 * @param {Object} oCustomizing General export customizing
-		 * @param {Object} oCustomizing.currency Currency specific customizing
-		 * @param {Object} oCustomizing.unit Unit of measure specific customizing
+		 * @param {object} oCustomizing General export customizing
+		 * @param {object} oCustomizing.currency Currency specific customizing
+		 * @param {object} oCustomizing.unit Unit of measure specific customizing
 		 * @param {string} sProperty Key property of the specific customizing setting
 		 * @private
 		 */
@@ -1112,7 +1111,7 @@ sap.ui.define([
 		 * by FileType. The default class is sap/ui/export/Spreadsheet when
 		 * no specific FileType is defined in the export settings.
 		 *
-		 * @param {Object} mSettings Export configuration with optional FileType
+		 * @param {object} mSettings Export configuration with optional FileType
 		 * @returns {Promise} A Promise that gets resolved with the requested instance
 		 */
 		getExportInstance: function(mSettings) {
@@ -1159,6 +1158,84 @@ sap.ui.define([
 			}
 
 			return iCount;
+		},
+
+		/**
+		 * Splits up all column settings that reference multiple
+		 * properties as well as amounts and currency codes.
+		 *
+		 * The function returns an array with the updated column
+		 * configuration for the export.
+		 *
+		 * @param {Array} aColumns Export-related column configuration that will be split up if necessary
+		 * @param {function} [fnResolveColumnLabel] Resolves the label for a particular column that is not directly reflected
+		 * @returns {Array} Updated column configuration
+		 */
+		splitColumns: function(aColumns, fnResolveColumnLabel) {
+			var aResult = [];
+
+			aColumns.forEach(function(oColumn) {
+				var aSplittedColumns, oUpdatedColumn, oAdditionalColumn, sColumnLabel;
+
+				/* Split EdmType.String columns with multiple properties */
+				if (Array.isArray(oColumn.property) && oColumn.property.length > 1) {
+					oUpdatedColumn = Object.assign({}, oColumn);
+					aSplittedColumns = [oUpdatedColumn];
+
+					/* Ignore the leading property */
+					oUpdatedColumn.property.slice(1).forEach(function(sProperty, iIndex) {
+						sColumnLabel = typeof fnResolveColumnLabel === 'function' ? fnResolveColumnLabel(sProperty) : null;
+						oAdditionalColumn = {
+							property: sProperty,
+							label: sColumnLabel || oColumn.label + ' (' + (iIndex + 1) +  ')'
+						};
+
+						aSplittedColumns.push(oAdditionalColumn);
+					});
+
+					oUpdatedColumn.property = oUpdatedColumn.property[0];
+					delete oUpdatedColumn.template;
+				}
+
+				/* Split EdmType.Currency and EdmType.Number columns */
+				if (oColumn.unitProperty && oColumn.displayUnit !== false) { // displayUnit is assumed to be true by default - so undefined needs to be treated like true
+					oUpdatedColumn = Object.assign({}, oColumn);
+					sColumnLabel = typeof fnResolveColumnLabel === 'function' ? fnResolveColumnLabel(oColumn.unitProperty) : null;
+					aSplittedColumns = [oUpdatedColumn, {
+						property: oColumn.unitProperty,
+						label: sColumnLabel || oColumn.label + ' (1)'
+					}];
+
+					if (oUpdatedColumn.type === EdmType.Currency) {
+						oUpdatedColumn.displayUnit = false;
+					}
+
+					if (oUpdatedColumn.type === EdmType.Number) {
+						delete oUpdatedColumn.unitProperty;
+					}
+				}
+
+				aResult.push(aSplittedColumns || oColumn);
+			});
+
+			return aResult.flat();
+		},
+
+		/**
+		 * Returns a <code>Promise</code> that resolves with the
+		 * <code>ResourceBundle</code> of the sap.ui.export library.
+		 *
+		 * @returns {Promise} <code>Promise</code> with the <code>ResourceBundle</code>
+		 */
+		getResourceBundle: function() {
+			if (!oResourceBundle) {
+				return Core.getLibraryResourceBundle('sap.ui.export', true).then(function(oBundle) {
+					oResourceBundle = oBundle;
+
+					return oResourceBundle;
+				});
+			}
+			return Promise.resolve(oResourceBundle);
 		}
 	};
 

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

@@ -5,18 +5,19 @@
 
 sap.ui.define([
 	'sap/base/Log',
+	'sap/m/MessageToast',
 	'sap/ui/core/Core',
 	'sap/ui/export/ExportBase',
 	'sap/ui/export/ExportUtils',
 	'sap/ui/model/odata/v4/ODataModel'
-], function(Log, Core, ExportBase, ExportUtils, ODataModel) {
+], function(Log, MessageToast, Core, ExportBase, ExportUtils, ODataModel) {
 	'use strict';
 
 	/**
 	 * @constructor 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.101.0
+	 * @version 1.102.0
 	 *
 	 * @since 1.96
 	 * @alias sap.ui.export.PortableDocument
@@ -42,9 +43,9 @@ sap.ui.define([
 	 * Sets the data source configuration that will be used for exporting the data. If the passed parameter is null,
 	 * the call will be ignored.
 	 *
-	 * @param {Object|sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oDataSource Possible types are a data
+	 * @param {object|sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oDataSource Possible types are a data
 	 * source configuration, a <code>sap.ui.model.ListBinding</code> or <code>sap.ui.model.TreeBinding</code>
-	 * @returns {Object|null} - Valid dataSource object or null in case the dataSource configuration is not supported
+	 * @returns {object|null} - Valid dataSource object or null in case the dataSource configuration is not supported
 	 *
 	 * @since 1.96
 	 * @public
@@ -78,7 +79,7 @@ sap.ui.define([
 	 * Creates a valid dataSource configuration
 	 *
 	 * @param {sap.ui.model.ListBinding|sap.ui.model.TreeBinding} oBinding - A subclass of <code>sap.ui.model.ListBinding</code> or <code>sap.ui.model.TreeBinding</code>
-	 * @returns {Object} - Valid data source configuration built upon the ListBinding
+	 * @returns {object} - Valid data source configuration built upon the ListBinding
 	 */
 	 PortableDocument.prototype.createDataSourceFromBinding = function(oBinding) {
 
@@ -135,8 +136,8 @@ sap.ui.define([
 	 * Creates the DocumentDescription based on the given export
 	 * settings and assigns a unique Id to it.
 	 *
-	 * @param {Object} mSettings Export settings
-	 * @returns {Object} DocumentDescription object that contains all relevant export settings
+	 * @param {object} mSettings Export settings
+	 * @returns {object} DocumentDescription object that contains all relevant export settings
 	 * @private
 	 */
 	PortableDocument.prototype._createDocumentDescription = function(mSettings) {
@@ -199,7 +200,7 @@ sap.ui.define([
 			}
 		}
 
-		/* Eliminate duplicates and navigation properties before adding columns */
+		/* Eliminate duplicates before adding columns */
 		oWorkbook.columns.filter(function(oColumn, iIndex, aArray) {
 			var sProperty = Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property;
 
@@ -207,7 +208,7 @@ sap.ui.define([
 				var sOtherProperty = Array.isArray(oOtherColumn.property) ? oOtherColumn.property[0] : oOtherColumn.property;
 
 				return sProperty === sOtherProperty;
-			}) === iIndex && !/^to_\w+\/\w+/.test(sProperty);
+			}) === iIndex;
 		}).forEach(function(oColumn) {
 			oDocumentDescription["TableColumns"].push({
 				"Name": Array.isArray(oColumn.property) ? oColumn.property[0] : oColumn.property,
@@ -221,7 +222,7 @@ sap.ui.define([
 	/**
 	 * Returns the name of the EntitySet that is being used with the given OData version.
 	 *
-	 * @param {Object} mDataSource DataSource object containing information about OData version
+	 * @param {object} mDataSource DataSource object containing information about OData version
 	 * @returns {string} Name of the EntitySet according to the OData version
 	 */
 	PortableDocument.prototype._getEntitySetName = function(mDataSource) {
@@ -233,7 +234,7 @@ sap.ui.define([
 	/**
 	 * Returns the specific ODataModel that is being used for binding to the DocumentDescription EntitySet
 	 *
-	 * @param {Object} oDataSource DataSource settings of the export configuration
+	 * @param {object} oDataSource DataSource settings of the export configuration
 	 * @returns {ODataModel} ODataModel, either V2 or V4.
 	 */
 	PortableDocument.prototype._getModel = function(oDataSource) {
@@ -248,7 +249,7 @@ sap.ui.define([
 	/**
 	 * Applies default settings to the export configuration.
 	 *
-	 * @param {Object} mSettings Export configuration object
+	 * @param {object} mSettings Export configuration object
 	 * @returns {Promise} Promise that gets resolved when the default settings have been applied
 	 */
 	PortableDocument.prototype.setDefaultExportSettings = function(mSettings) {
@@ -272,8 +273,8 @@ sap.ui.define([
 	 * DocumentDescription. The corresponding Id is assigned by
 	 * the backend and passed to the event handler functions.
 	 *
-	 * @param {Object} oDocumentDescription DocumentDescription instance that is being created
-	 * @param {Object} oDataSource DataSource settings of the export configuration
+	 * @param {object} oDocumentDescription DocumentDescription instance that is being created
+	 * @param {object} oDataSource DataSource settings of the export configuration
 	 *
 	 * @returns {Promise} A Promise that resolves with the newly created Id of the DocumentDescription
 	 */
@@ -325,7 +326,7 @@ sap.ui.define([
 	 * Triggers the export process and returns a Promise the
 	 * gets resolved as soon as the export is finished.
 	 *
-	 * @param {Object} mSettings Export settings
+	 * @param {object} mSettings Export settings
 	 * @returns {Promise} Promise that is being resolved as soon as the PDF export is finished
 	 */
 	PortableDocument.prototype.createBuildPromise = function(mSettings) {
@@ -335,11 +336,11 @@ sap.ui.define([
 		var oResourceBundle = Core.getLibraryResourceBundle('sap.ui.export');
 
 		oBusyDialog = new sap.m.BusyDialog('PDFExportBusyDialog', {
-			title: oResourceBundle.getText("PROGRESS_TITLE"),
-			text: oResourceBundle.getText("PDF_GENERATION_IN_PROGRESS"),
+			title: oResourceBundle.getText('PROGRESS_TITLE'),
+			text: oResourceBundle.getText('PDF_GENERATION_IN_PROGRESS'),
 			showCancelButton: true,
 			close: function(oEvent) {
-				if (oEvent.getParameter("cancelPressed")) {
+				if (oEvent.getParameter('cancelPressed')) {
 					that.cancel();
 					oBusyDialog.destroy();
 					oBusyDialog = null;
@@ -351,12 +352,13 @@ sap.ui.define([
 
 		return that.postDocumentDescription(oDocumentDescription, mSettings.dataSource).then(function(sDocumentDescriptionId) {
 			oBusyDialog.open();
+
 			return oBusyDialog && that.sendRequest(mSettings.dataSource.dataUrl, sDocumentDescriptionId).then(function(response) {
 				ExportUtils.saveAsFile(response, mSettings.fileName);
-				oBusyDialog && oBusyDialog.destroy();
-			}).catch(function(e) {
-				oBusyDialog && oBusyDialog.destroy();
-				new sap.m.MessageToast.show("Error during PDF export!");
+				oBusyDialog.destroy();
+			}).catch(function(oError) {
+				oBusyDialog.destroy();
+				sap.m.MessageToast.show('Error during PDF export!');
 			});
 		});
 	};
@@ -375,8 +377,8 @@ sap.ui.define([
 			/* Send GET request to receive PDF file */
 			oXHR.open('GET', sUrl);
 			oXHR.responseType = 'blob';
-			oXHR.setRequestHeader("Accept", "application/pdf");
-			oXHR.setRequestHeader("SAP-Document-Description-Id", sDocumentDescriptionId);
+			oXHR.setRequestHeader('Accept', this.getMimeType());
+			oXHR.setRequestHeader('SAP-Document-Description-Id', sDocumentDescriptionId);
 
 			oXHR.addEventListener('abort', function() {
 				fnReject('Request aborted');
@@ -400,6 +402,15 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	/**
+	 * Returns the specific MIME type
+	 *
+	 * @returns {string} MIME type for Portable Document Format
+	 */
+	PortableDocument.prototype.getMimeType = function() {
+		return 'application/pdf';
+	};
+
 	/**
 	 * Cancels the active request. If the request has not been sent
 	 * or the response has been received already, this function has