@openui5/sap.ui.mdc 1.101.0 → 1.103.0

package/src/sap/ui/mdc/Table.js

@@ -29,7 +29,6 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/model/Sorter",
-	"sap/ui/dom/containsOrEquals",
 	"sap/base/strings/capitalize",
 	"sap/base/util/deepEqual",
 	"sap/base/util/Deferred",
@@ -73,7 +72,6 @@ sap.ui.define([
 	coreLibrary,
 	KeyCodes,
 	Sorter,
-	containsOrEquals,
 	capitalize,
 	deepEqual,
 	Deferred,
@@ -97,7 +95,6 @@ sap.ui.define([
 
 	var SelectionMode = library.SelectionMode;
 	var TableType = library.TableType;
-	var RowAction = library.RowAction;
 	var P13nMode = library.TableP13nMode;
 	var ToolbarDesign = MLibrary.ToolbarDesign;
 	var ToolbarStyle = MLibrary.ToolbarStyle;
@@ -172,16 +169,6 @@ sap.ui.define([
 					defaultValue: null,
 					invalidate: true
 				},
-				/**
-				 * Actions available for a table row.
-				 *
-				 * @since 1.60
-				 * @deprecated as of version 1.98, use row settings instead.
-				 */
-				rowAction: {
-					type: "sap.ui.mdc.RowAction[]",
-					defaultValue: []
-				},
 				/**
 				 * Personalization options for the table.<br>
 				 * <b>Note:</b> The order of the options does not influence the position on the UI.
@@ -889,11 +876,6 @@ sap.ui.define([
 	// ----End Type----
 
 	Table.prototype.setRowSettings = function(oRowSettings) {
-		if (this._oTableRowAction) {
-			if (oRowSettings.getRowActions().length == 0) {
-				oRowSettings.addRowAction(this._oTableRowAction);
-			}
-		}
 		this.setAggregation("rowSettings", oRowSettings, true);
 
 		if (this._oTable) {
@@ -922,11 +904,8 @@ sap.ui.define([
 	};
 
 	Table.prototype.focus = function(oFocusInfo) {
-		//see Element.prototype.focus, MDCTable does not have any own focusable DOM, therefor forward to inner control
-		var oDomRef = this.getDomRef();
-
-		if (this._oTable && oDomRef && !containsOrEquals(oDomRef, document.activeElement)) {
-			this._oTable.focus();
+		if (this._oTable) {
+			this._oTable.focus(oFocusInfo);
 		}
 	};
 
@@ -968,24 +947,6 @@ sap.ui.define([
 		return this;
 	};
 
-	// TODO: Temporary solution until apps adapted changes. Remove this, as this is replaced by rowSettings
-	Table.prototype.setRowAction = function(aActions) {
-		this.setProperty("rowAction", aActions, true);
-
-		var oRowSettings = this.getRowSettings() || new RowSettings();
-
-		oRowSettings.destroyRowActions();
-		if (this.getRowAction().indexOf(RowAction.Navigation) > -1) {
-			this._oTableRowAction = new RowActionItem({
-				type: RowAction.Navigation
-			});
-			oRowSettings.addRowAction(this._oTableRowAction);
-		}
-		this.setRowSettings(oRowSettings);
-
-		return this;
-	};
-
 	Table.prototype.setCreationRow = function(oCreationRow) {
 		this.setAggregation("creationRow", oCreationRow, true);
 
@@ -1117,13 +1078,13 @@ sap.ui.define([
 	function updateFilterInfoBar(oTable) {
 		var oFilterInfoBar = getFilterInfoBar(oTable);
 		var oFilterInfoBarText = getFilterInfoBarText(oTable);
-		var aFilteredProperties = getFilteredProperties(oTable);
+		var aFilteredProperties = getInternallyFilteredProperties(oTable);
 
 		if (!oFilterInfoBar) {
 			return;
 		}
 
-		if (aFilteredProperties.length === 0 || !oTable.isFilteringEnabled()) {
+		if (aFilteredProperties.length === 0) {
 			var oFilterInfoBarDomRef = oFilterInfoBar.getDomRef();
 
 			if (oFilterInfoBarDomRef && oFilterInfoBarDomRef.contains(document.activeElement)) {
@@ -1131,7 +1092,7 @@ sap.ui.define([
 			}
 
 			oFilterInfoBar.setVisible(false);
-			oTable._oTable.removeAriaLabelledBy(oFilterInfoBarText);
+			getFilterInfoBarInvisibleText(oTable).setText("");
 
 			return;
 		}
@@ -1147,10 +1108,10 @@ sap.ui.define([
 
 			if (!oFilterInfoBar.getVisible()) {
 				oFilterInfoBar.setVisible(true);
-				oTable._oTable.addAriaLabelledBy(oFilterInfoBarText);
 			}
 
 			oFilterInfoBarText.setText(sFilterText);
+			getFilterInfoBarInvisibleText(oTable).setText(sFilterText);
 		});
 	}
 
@@ -1173,9 +1134,19 @@ sap.ui.define([
 			oTable._oTable.insertExtension(oFilterInfoBar, 1);
 		}
 
-		if (oFilterInfoBar.getVisible()) {
-			oTable._oTable.addAriaLabelledBy(getFilterInfoBarText(oTable));
+		var oInvisibleText = getFilterInfoBarInvisibleText(oTable);
+		oTable._oTable.addAriaLabelledBy(oInvisibleText.getId());
+	}
+
+	function getFilterInfoBarInvisibleText(oTable) {
+		if (!oTable) {
+			return null;
+		}
+
+		if (!oTable._oFilterInfoBarInvisibleText) {
+			oTable._oFilterInfoBarInvisibleText = new InvisibleText().toStatic();
 		}
+		return oTable._oFilterInfoBarInvisibleText;
 	}
 
 	function createFilterInfoBar(oTable) {
@@ -1300,13 +1271,13 @@ sap.ui.define([
 			return oRb.getText("table.NO_DATA");
 		}
 
-	// Table is bound, but does not show any data
-	// If table-internal or external (for example FilterBar) filters are set, then show the message that the data not found and also ask to adjust the filters.
-		var oExternalFilter = Core.byId(this.getFilter());
-		if ((this.isFilteringEnabled() && getFilteredProperties(this).length > 0) ||  //internal filters check
-			(oExternalFilter && getFilteredProperties(oExternalFilter).length > 0)) { //external filters check
+		// Table is bound, but does not show any data.
+		// If the table is filtered internally or externally, e.g. FilterBar, then show the message that no data was found and that filters can be
+		// adjusted.
+		if (isFiltered(this)) {
 			return oRb.getText("table.NO_RESULTS");
 		}
+
 		// If no filters set, show only message that the data are not found, and nothing about the filters.
 		return oRb.getText("table.NO_DATA");
 	};
@@ -1550,12 +1521,44 @@ sap.ui.define([
 		return this.getEngine().readXConfig(this);
 	};
 
-	// oControl can be a Table or FilterBar - any Control that is able to have Filter
-	function getFilteredProperties(oControl) {
-		var mFilterConditions = oControl.getFilterConditions();
+	/**
+	 * Gets the keys of properties that are filtered internally via the inbuilt filtering ({@link sap.ui.mdc.filterbar.p13n.AdaptationFilterBar}).
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table.
+	 * @returns {string[]} The keys of the filtered properties.
+	 */
+	function getInternallyFilteredProperties(oTable) {
+		return oTable.isFilteringEnabled() ? getFilteredProperties(oTable.getFilterConditions()) : [];
+	}
+
+	/**
+	 * Gets the keys of properties that are filtered externally via the associated filter ({@link sap.ui.mdc.IFilter}).
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table.
+	 * @returns {string[]} The keys of the filtered properties.
+	 */
+	function getExternallyFilteredProperties(oTable) {
+		var oFilter = Core.byId(oTable.getFilter());
+		return oFilter ? getFilteredProperties(oFilter.getConditions()) : [];
+	}
+
+	/**
+	 * Whether the table is filtered internally via the inbuilt filtering ({@link sap.ui.mdc.filterbar.p13n.AdaptationFilterBar}), or externally via
+	 * the associated filter ({@link sap.ui.mdc.IFilter}).
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table.
+	 * @return {boolean} Whether the table is filtered (internally or externally).
+	 */
+	function isFiltered(oTable) {
+		var oFilter = Core.byId(oTable.getFilter());
+		return getInternallyFilteredProperties(oTable).length > 0
+			   || getExternallyFilteredProperties(oTable).length > 0
+			   || oFilter && oFilter.getSearch() !== "";
+	}
 
-		return Object.keys(mFilterConditions).filter(function(sProperty) {
-			return mFilterConditions[sProperty].length > 0;
+	function getFilteredProperties(mConditions) {
+		return Object.keys(mConditions || {}).filter(function(sProperty) {
+			return mConditions[sProperty].length > 0;
 		});
 	}
 
@@ -1685,23 +1688,17 @@ sap.ui.define([
 			return null;
 		}
 
-		var mDefaultExportSettings = {
-			fileName: this.getHeader()
-		};
-
-		if (!this._cachedExportSettings) {
-			this._cachedExportSettings = mDefaultExportSettings;
-		}
-
 		if (!this._oExportButton) {
 			this._oExportButton = TableSettings.createExportButton(this.getId(), {
 				"default": [
 					function() {
-						this._onExport(mDefaultExportSettings);
+						this._onExport();
 					}, this
 				],
 				"exportAs": [
-					this._onExportAs, this
+					function() {
+						this._onExport(true);
+					}, this
 				]
 			});
 		}
@@ -1734,8 +1731,7 @@ sap.ui.define([
 	 * @returns {Promise} Column configuration to be exported
 	 * @private
 	 */
-	Table.prototype._createExportColumnConfiguration = function(mCustomConfig) {
-		var bSplitCells = mCustomConfig && mCustomConfig.splitCells;
+	Table.prototype._createExportColumnConfiguration = function() {
 		var aColumns = this.getColumns();
 
 		return this._fullyInitialized().then(function() {
@@ -1743,26 +1739,35 @@ sap.ui.define([
 			var aSheetColumns = [];
 
 			aColumns.forEach(function(oColumn) {
-				var aColumnExportSettings = oPropertyHelper.getColumnExportSettings(oColumn, bSplitCells);
+				var aColumnExportSettings = oPropertyHelper.getColumnExportSettings(oColumn);
 				aSheetColumns = aSheetColumns.concat(aColumnExportSettings);
 			}, this);
-			return [aSheetColumns, oPropertyHelper];
+			return aSheetColumns;
 		}.bind(this));
 	};
 
+	/**
+	 * Returns the label/header text of the column
+	 * @param {string} sPath column key
+	 * @returns {string|null} column label/header text. Returns null if no column or header/label text is available.
+	 * @private
+	 */
+	Table.prototype._getColumnLabel = function(sPath) {
+		var oPropertyHelper = this.getPropertyHelper();
+		var mPropertyInfo = oPropertyHelper.getProperty(sPath);
+		return mPropertyInfo && mPropertyInfo.label;
+	};
+
 	/**
 	 * Triggers export via "sap.ui.export"/"Document Export Services" export functionality
 	 *
-	 * @param {Object} mCustomConfig Custom config for the spreadsheet export
+	 * @param {boolean} bExportAs controls whether the regular export or the Export As dialog should be called
 	 * @returns {Promise} export build process promise
 	 * @private
 	 */
-	Table.prototype._onExport = function(mCustomConfig) {
+	Table.prototype._onExport = function(bExportAs) {
 		var that = this;
-		return this._createExportColumnConfiguration(mCustomConfig).then(function(aResult) {
-			var aSheetColumns = aResult[0];
-			var oPropertyHelper = aResult[1];
-
+		return this._createExportColumnConfiguration().then(function(aSheetColumns) {
 			// If no columns exist, show message and return without exporting
 			if (!aSheetColumns || !aSheetColumns.length) {
 				sap.ui.require(["sap/m/MessageBox"], function(MessageBox) {
@@ -1774,95 +1779,39 @@ sap.ui.define([
 			}
 
 			var oRowBinding = that._getRowBinding();
+			var fnGetColumnLabel = that._getColumnLabel.bind(that);
 			var mExportSettings = {
 				workbook: {
 					columns: aSheetColumns,
 					context: {
-						title: that.getHeader() || mCustomConfig.fileName
+						title: that.getHeader()
 					}
 				},
 				dataSource: oRowBinding,
-				fileType: mCustomConfig.selectedFileType,
-				fileName: mCustomConfig ? mCustomConfig.fileName : this.getHeader()
+				fileName: that.getHeader()
 			};
 
-			var mPDFUserSettings = {
-				border: mCustomConfig.border,
-				fontSize: mCustomConfig.fontSize,
-				paperSize: mCustomConfig.selectedPaperSize,
-				doEnableAccessibility: mCustomConfig.doEnableAccessibility,
-				signature: mCustomConfig.signature,
-				signatureReason: mCustomConfig.signatureReason,
-				orientation: mCustomConfig.selectedOrientation,
-				fitToPage: mCustomConfig.fitToPage,
-				pdfArchive: mCustomConfig.pdfArchive
-			};
-
-			if (mExportSettings.fileType === "PDF") {
-				Object.assign(mExportSettings, mPDFUserSettings);
-			}
-
 			that._loadExportLibrary().then(function() {
-				sap.ui.require(["sap/ui/export/ExportUtils"], function(ExportUtils) {
-					var oProcessor = Promise.resolve();
-
-					if (mCustomConfig.includeFilterSettings) {
-						oProcessor = ExportUtils.parseFilterConfiguration(oRowBinding, function(sPropertyName) {
-							return oPropertyHelper.hasProperty(sPropertyName) ? oPropertyHelper.getProperty(sPropertyName).label : null;
-						}).then(function(oFilterConfig) {
-							if (oFilterConfig) {
-								var oContext = mExportSettings.workbook.context;
-
-								oContext.metaSheetName =  oFilterConfig.name;
-								oContext.metainfo = [oFilterConfig];
-							}
-						});
-					}
-
-					oProcessor.then(function() {
-						var mUserSettings = {
-							splitCells: false,
-							includeFilterSettings: false
-						};
-
-						if (mCustomConfig) {
-							mUserSettings.splitCells = mCustomConfig.splitCells;
-							mUserSettings.includeFilterSettings = mCustomConfig.includeFilterSettings;
-						}
-
-						ExportUtils.getExportInstance(mExportSettings).then(function(oSheet){
-							oSheet.attachBeforeExport(function(oEvent) {
-							var oExportSettings = oEvent.getParameter("exportSettings");
-
-							that.fireBeforeExport({
-								exportSettings: oExportSettings,
-								userExportSettings: mUserSettings
-							  });
-						    }, that);
-							oSheet.build().finally(function() {
-								oSheet.destroy();
+				sap.ui.require(["sap/ui/export/ExportHandler"], function(ExportHandler) {
+					var oHandler;
+
+					that.getControlDelegate().fetchExportCapabilities(that).then(function(oExportCapabilities) {
+						if (!that._oExportHandler) {
+							oHandler = new ExportHandler(oExportCapabilities);
+
+							oHandler.attachBeforeExport(function(oEvent) {
+								that.fireBeforeExport({
+									exportSettings: oEvent.getParameter('exportSettings'),
+									userExportSettings: oEvent.getParameter('userExportSettings')
+								});
 							});
-						});
-					});
-				});
-			});
-		});
-	};
-
-	/**
-	 * Opens the export settings dialog for providing user specific export settings.
-	 *
-	 * @private
-	 */
-	Table.prototype._onExportAs = function(mCustomConfig) {
-		var that = this;
-
-		this._loadExportLibrary().then(function() {
-			sap.ui.require(['sap/ui/export/ExportUtils'], function(ExportUtils) {
-				that.getControlDelegate().fetchExportCapabilities().then(function(oExportCapabilities) {
-					ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, oExportCapabilities, that).then(function(oUserInput) {
-						that._cachedExportSettings = oUserInput;
-						that._onExport(oUserInput);
+							that._oExportHandler = oHandler;
+						}
+						if (bExportAs) {
+							that._oExportHandler.exportAs(mExportSettings, fnGetColumnLabel);
+						} else {
+							that._oExportHandler.export(mExportSettings, fnGetColumnLabel);
+						}
 					});
 				});
 			});
@@ -1895,7 +1844,7 @@ sap.ui.define([
 
 		if ((oEvent.metaKey || oEvent.ctrlKey) && oEvent.shiftKey && oEvent.which === KeyCodes.E) {
 			if (this.getEnableExport() && this._oExportButton && this._oExportButton.getEnabled()) {
-				this._onExportAs();
+				this._onExport(true);
 				oEvent.setMarked();
 				oEvent.preventDefault();
 			}
@@ -2078,10 +2027,6 @@ sap.ui.define([
 					this._oItemContainer.initializeItems()
 				]).then(function() {
 					if (this._oQuickActionContainer.hasQuickActions() || this._oItemContainer.hasItems()) {
-						if (this._oColumnHeaderMenu._oItemsContainer) {
-							this._oColumnHeaderMenu._oItemsContainer.destroy();
-							this._oColumnHeaderMenu._oItemsContainer = null;
-						}
 						this._oColumnHeaderMenu.openBy(oColumn);
 					}
 				}.bind(this));
@@ -2296,6 +2241,10 @@ sap.ui.define([
 		if (iIndex >= 0) {
 			this._oTemplate.insertCell(oCellTemplate, iIndex);
 			this._oTable.getItems().forEach(function(oItem) {
+				// ignore group headers since it does not have "cells" aggregation
+				if (oItem.isA("sap.m.GroupHeaderListItem")) {
+					return;
+				}
 				// Add lightweight placeholders that can be rendered - if they cannot be rendered, there will be errors in the console.
 				// The actual cells are created after rebind.
 				oItem.insertAggregation("cells", new InvisibleText(), iIndex, true);
@@ -2793,6 +2742,11 @@ sap.ui.define([
 		this._oFullInitialize = null;
 		this._oPasteButton = null;
 
+		if (this._oFilterInfoBarInvisibleText) {
+			this._oFilterInfoBarInvisibleText.destroy();
+			this._oFilterInfoBarInvisibleText = null;
+		}
+
 		Control.prototype.exit.apply(this, arguments);
 	};
 

package/src/sap/ui/mdc/TableDelegate.js

@@ -206,32 +206,12 @@ sap.ui.define([
 	/**
 	 * Returns the feature set for exporting data in the MDC Table.
 	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the MDC table
 	 * @returns {Promise} Export capabilities with specific features
 	 * @protected
 	 */
-	TableDelegate.fetchExportCapabilities = function() {
-		var oExportCapabilities = {
-			"XLSX": {} // default
-		};
-
-		// This is a temporary approach for testing purposes
-		if (new URL(window.location.href).search.indexOf("sap-ui-xx-enablePDFExport=true") > -1) {
-			oExportCapabilities["PDF"] = {
-				DocumentDescriptionReference: "../../../../default/iwbep/common/0001/$metadata",
-				DocumentDescriptionCollection: "MyDocumentDescriptions",
-				ArchiveFormat: true,
-				Border: true,
-				CoverPage: true,
-				FitToPage: true,
-				FontName: true,
-				FontSize: true,
-				Margin: true,
-				Signature: true,
-				ResultSizeDefault: 5000,
-				ResultSizeMaximum: 20000
-			};
-		}
-		return Promise.resolve(oExportCapabilities);
+	TableDelegate.fetchExportCapabilities = function(oTable) {
+		return Promise.resolve({ XLSX: {} });
 	};
 
 	TableDelegate.getSupportedP13nModes = function(oTable) {