@openui5/sap.ui.mdc 1.97.1 → 1.99.1

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

@@ -23,6 +23,7 @@ sap.ui.define([
 	"sap/ui/core/dnd/DragDropInfo",
 	"sap/ui/core/Item",
 	"sap/ui/core/format/ListFormat",
+	"sap/ui/core/library",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/model/Sorter",
 	"sap/ui/dom/containsOrEquals",
@@ -59,6 +60,7 @@ sap.ui.define([
 	DragDropInfo,
 	Item,
 	ListFormat,
+	coreLibrary,
 	KeyCodes,
 	Sorter,
 	containsOrEquals,
@@ -85,6 +87,7 @@ sap.ui.define([
 	var ToolbarDesign = MLibrary.ToolbarDesign;
 	var ToolbarStyle = MLibrary.ToolbarStyle;
 	var MultiSelectMode = library.MultiSelectMode;
+	var TitleLevel = coreLibrary.TitleLevel;
 	var internalMap = new window.WeakMap();
 	var internal = function(oTable) {
 		if (!internalMap.has(oTable)) {
@@ -108,14 +111,13 @@ sap.ui.define([
 	 * Constructor for a new <code>MDCTable</code>.
 	 *
 	 * @param {string} [sId] Optional ID for the new control; generated automatically if no non-empty ID is given
-	 * <b>Note:</b> this can be omitted, no matter whether <code>mSettings</code> will be given or not.
+	 * <b>Note:</b> The optional ID can be omitted, no matter whether <code>mSettings</code> is given or not.
 	 * @param {object} [mSettings] Object with initial settings for the new control
 	 * @class
-	 * <p>
-	 *     A metadata-driven table to simplify the usage of existing tables, such as the <code>ResponsiveTable</code> and <code>GridTable</code>
-	 *     controls. The metadata needs to be provided via the {@link sap.ui.mdc.TableDelegate TableDelegate} implementation in the form of a
-	 *     <code>PropertyInfo</code>.
-	 * </p>
+	 * A metadata-driven table to simplify the usage of existing tables, such as the <code>ResponsiveTable</code> and <code>GridTable</code>
+	 * controls. The metadata needs to be provided via the {@link module:sap/ui/mdc/TableDelegate TableDelegate} implementation as
+	 * {@link sap.ui.mdc.table.PropertyInfo}.
+	 *
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
 	 * @private
@@ -196,7 +198,7 @@ sap.ui.define([
 				headerLevel: {
 					type: "sap.ui.core.TitleLevel",
 					group: "Appearance",
-					defaultValue: sap.ui.core.TitleLevel.Auto
+					defaultValue: TitleLevel.Auto
 				},
 				/**
 				 * Determines whether to bind the table automatically after the initial creation or re-creation of the table.
@@ -264,7 +266,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Determines the text shown when the table has no data.
+				 * Determines the text shown if the table has no data.
 				 *
 				 * @since 1.63
 				 */
@@ -273,10 +275,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Sort conditions.
+				 * Defines the sort conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is used exclusively for handling SAPUI5 flexibility changes. Do not use it otherwise.
 				 *
 				 * @since 1.73
 				 */
@@ -285,10 +287,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Filter conditions.
+				 * Defines the filter conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is used exclusively for handling SAPUI5 flexibility changes. Do not use it otherwise.
 				 *
 				 * @since 1.80.0
 				 */
@@ -298,10 +300,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Group conditions.
+				 * Defines the group conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is used exclusively for handling SAPUI5 flexibility changes. Do not use it otherwise.
 				 *
 				 * @since 1.87
 				 */
@@ -310,10 +312,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Aggregate conditions.
+				 * Defines the aggregate conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is exclusively used for handling SAPUI5 flexibility changes.
 				 *
 				 * @since 1.87
 				 */
@@ -322,7 +324,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Determines whether table data export is enabled.
+				 * Determines whether the table data export is enabled.
 				 *
 				 * @since 1.75
 				 */
@@ -385,12 +387,14 @@ sap.ui.define([
 				/**
 				 * Enables automatic column width calculation based on metadata information if set to <code>true</code>.
 				 * The column width calculation takes the type, column label, referenced properties, and many other metadata parameters into account.
-				 * Providing a more precise <code>maxLength</code> value for the <code>String</code> type or <code>precision</code> value for numeric types can help this algorithm to produce better results.
+				 * Providing a more precise <code>maxLength</code> value for the <code>String</code> type or <code>precision</code> value for numeric
+				 * types can help this algorithm to produce better results.
 				 * The calculated column widths can have a minimum of 3rem and a maximum of 20rem.
 				 *
-				 * <b>Note:</b> To customize the automatic column width calculation the <code>visualSettings.widthSettings</code> key of the <code>PropertyInfo</code> can be used.
-				 * To avoid the heuristic column width calculation for a particular column, the <code>visualSettings.widthSettings</code> key of the <code>PropertyInfo</code> must be set to <code>null</code>.
-				 * This feature has no effect if the <code>width</code> property of the column is bound or its value is set.
+				 * <b>Note:</b> To customize the automatic column width calculation, the <code>visualSettings.widthSettings</code> key of the
+				 * <code>PropertyInfo</code> can be used. To avoid the heuristic column width calculation for a particular column, the
+				 * <code>visualSettings.widthSettings</code> key of the <code>PropertyInfo</code> must be set to <code>null</code>. This feature has
+				 * no effect if the <code>width</code> property of the column is bound or its value is set.
 				 *
 				 * @since 1.95
 				 */
@@ -426,7 +430,7 @@ sap.ui.define([
 
 				/**
 				 * This row can be used for user input to create new data if {@link sap.ui.mdc.TableType TableType} is "<code>Table</code>".
-				 * <b>Note:</b> Once the binding implements support for creating transient records, this aggregation will be removed.
+				 * <b>Note:</b> Once the binding supports creating transient records, this aggregation will be removed.
 				 */
 				creationRow: {
 					type: "sap.ui.mdc.table.CreationRow",
@@ -472,9 +476,9 @@ sap.ui.define([
 				/**
 				 * <code>DataStateIndicator</code> plugin that can be used to show binding-related messages.
 				 *
-				 * <b>Note:</b> The message filtering is not yet supported for this control therefore
-				 * {@link sap.m.plugins.DataStateIndicator#getEnableFiltering enableFiltering} property of the <code>DataStateIndicator</code> must
-				 * not be set to <code>true</code>.
+				 * <b>Note:</b> The message filtering is not yet supported for this control. Therefore the
+				 * {@link sap.m.plugins.DataStateIndicator#getEnableFiltering enableFiltering} property of the <code>DataStateIndicator</code> plugin
+				 * must not be set to <code>true</code>.
 				 *
 				 * @since 1.89
 				 */
@@ -495,7 +499,7 @@ sap.ui.define([
 			},
 			events: {
 				/**
-				 * Fired when a row in the table is pressed.
+				 * This event is fired when a row in the table is pressed.
 				 */
 				rowPress: {
 					parameters: {
@@ -508,7 +512,7 @@ sap.ui.define([
 					}
 				},
 				/**
-				 * Fired when the selection in the table is changed.
+				 * This event is fired when the selection in the table is changed.
 				 */
 				selectionChange: {
 					parameters: {
@@ -525,7 +529,7 @@ sap.ui.define([
 							type: "boolean"
 						},
 						/**
-						 * Identifies whether selectAll was pressed
+						 * Identifies whether the Select All checkbox was pressed
 						 */
 						selectAll: {
 							type: "boolean"
@@ -533,7 +537,7 @@ sap.ui.define([
 					}
 				},
 				/**
-				 * Fired right before the export is triggered.
+				 * This event is fired right before the export is triggered.
 				 *
 				 * For more information about the export settings, see {@link sap.ui.export.Spreadsheet} or
 				 * {@link topic:7e12e6b9154a4607be9d6072c72d609c Spreadsheet Export Configuration}.
@@ -560,7 +564,7 @@ sap.ui.define([
 					}
 				},
 				/**
-				 * Fired when the user pastes content from the clipboard to the table.
+				 * This event is fired when the user pastes content from the clipboard to the table.
 				 */
 				paste: {
 					parameters: {
@@ -715,7 +719,7 @@ sap.ui.define([
 	Table.prototype._onApplyMessageFilter = function(oEvent) {
 		this._oMessageFilter = oEvent.getParameter("filter");
 		oEvent.preventDefault();
-		this.rebind();
+		this._rebind();
 	};
 
 	/**
@@ -725,7 +729,7 @@ sap.ui.define([
 	Table.prototype._onClearMessageFilter = function(oEvent) {
 		this._oMessageFilter = null;
 		oEvent.preventDefault();
-		this.rebind();
+		this._rebind();
 	};
 
 	// ----Type----
@@ -876,7 +880,7 @@ sap.ui.define([
 			}
 
 			this._bForceRebind = true;
-			this.checkAndRebind();
+			this._rebind();
 		}
 
 		return this;
@@ -1371,7 +1375,7 @@ sap.ui.define([
 			}
 
 			if (this.getAutoBindOnInit()) {
-				this.checkAndRebind();
+				this.rebind();
 			}
 
 			return this.awaitPropertyHelper();
@@ -1493,7 +1497,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the current filter conditions present on the table
+	 * Returns the current filter conditions present on the table.
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -1729,13 +1733,28 @@ sap.ui.define([
 			var oRowBinding = that._getRowBinding();
 			var mExportSettings = {
 				workbook: {
-					columns: aSheetColumns
+					columns: aSheetColumns,
+					context: {title: that.getHeader()}
 				},
 				dataSource: oRowBinding,
 				fileType: mCustomConfig.selectedFileType == "pdf" ? "PDF" : "XLSX",
-				fileName: mCustomConfig ? mCustomConfig.fileName : that.getHeader()
+				fileName: mCustomConfig ? mCustomConfig.fileName : this.getHeader()
+			};
+
+			var mPDFUserSettings = {
+				border: mCustomConfig.border,
+				fontSize: mCustomConfig.fontSize,
+				paperSize: mCustomConfig.selectedPaperSize,
+				doEnableAccessibility: mCustomConfig.doEnableAccessibility,
+				signature: mCustomConfig.signature,
+				signatureReason: mCustomConfig.signatureReason,
+				orientation: mCustomConfig.selectedOrientation
 			};
 
+			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();
@@ -1745,12 +1764,10 @@ sap.ui.define([
 							return oPropertyHelper.hasProperty(sPropertyName) ? oPropertyHelper.getProperty(sPropertyName).label : null;
 						}).then(function(oFilterConfig) {
 							if (oFilterConfig) {
-								mExportSettings.workbook.context = {
-									metaSheetName: oFilterConfig.name,
-									metainfo: [
-										oFilterConfig
-									]
-								};
+								var oContext = mExportSettings.workbook.context;
+
+								oContext.metaSheetName =  oFilterConfig.name;
+								oContext.metainfo = [oFilterConfig];
 							}
 						});
 					}
@@ -1795,10 +1812,11 @@ sap.ui.define([
 
 		this._loadExportLibrary().then(function() {
 			sap.ui.require(['sap/ui/export/ExportUtils'], function(ExportUtils) {
-				var bEnablePDFExport = new URL(window.location.href).search.indexOf("sap-ui-xx-enablePDFExport=true");
-				ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, that, undefined, bEnablePDFExport).then(function(oUserInput) {
-					that._cachedExportSettings = oUserInput;
-					that._onExport(oUserInput);
+				that.getControlDelegate().fetchExportCapabilities().then(function(oExportCapabilities) {
+					ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, that, undefined, oExportCapabilities).then(function(oUserInput) {
+						that._cachedExportSettings = oUserInput;
+						that._onExport(oUserInput);
+					});
 				});
 			});
 		});
@@ -2395,14 +2413,14 @@ sap.ui.define([
 		this._onColumnPress(oEvent.getParameter("column"));
 	};
 
-	// TODO: maybe selectedContexts should be an association
-	// TODO: The API is unstable/unreliable in GridTable scenarios and has to be worked upon
 	/**
-	 * Gets contexts from the table that have been selected by the user.
+	 * Gets contexts that have been selected by the user.
 	 *
-	 * @returns {Array} Contexts of rows/items selected by the user
+	 * @returns {sap.ui.model.Context[]} The selected contexts
 	 * @private
-	 * @experimental The API is unstable/unreliable in GridTable scenarios
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
+	 * @experimental The API is subject to change.
 	 */
 	Table.prototype.getSelectedContexts = function() {
 		if (this._oTable) {
@@ -2420,9 +2438,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * API to get clear selection from the table.
+	 * Clears the selection.
 	 *
 	 * @private
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
 	 */
 	Table.prototype.clearSelection = function() {
 		if (this._oTable) {
@@ -2438,7 +2458,7 @@ sap.ui.define([
 
 	Table.prototype._registerInnerFilter = function(oFilter) {
 		oFilter.attachSearch(function() {
-			this.rebind();
+			this._rebind();
 		}, this);
 	};
 
@@ -2467,7 +2487,7 @@ sap.ui.define([
 
 		var oBindingInfo = {};
 
-		this.getControlDelegate().updateBindingInfo(this, this.getPayload(), oBindingInfo);
+		this.getControlDelegate().updateBindingInfo(this, oBindingInfo);
 
 		if (oBindingInfo.path) {
 			this._oTable.setShowOverlay(false);
@@ -2604,7 +2624,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Gets the row count of the table
+	 * Gets the row count of the table.
 	 *
 	 * @private
 	 * @returns {int} the row count
@@ -2689,20 +2709,15 @@ sap.ui.define([
 		}
 	};
 
-	// TODO: Delete!
-	Table.prototype.rebindTable = function() {
-		this.rebind();
-	};
-
 	/**
 	 * Rebinds the table rows.
 	 */
-	Table.prototype.rebind = function() {
+	Table.prototype._rebind = function() {
 		// Bind the rows/items of the table, only once it is initialized.
 		if (this._bFullyInitialized) {
 			this.bindRows();
 		} else {
-			this._fullyInitialized().then(this.rebind.bind(this));
+			this._fullyInitialized().then(this._rebind.bind(this));
 		}
 	};
 
@@ -2743,7 +2758,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Termination of the <code>MDCTable</code> control
+	 * Terminates the <code>MDCTable</code> control.
 	 * @private
 	 */
 	Table.prototype.exit = function() {

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

@@ -14,12 +14,14 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * Base delegate class for <code>sap.ui.mdc.Table</code>.
+	 * Base delegate for {@link sap.ui.mdc.Table}.
 	 *
 	 * @author SAP SE
+	 * @namespace
+	 * @alias module:sap/ui/mdc/TableDelegate
+	 * @extends module:sap/ui/mdc/AggregationBaseDelegate
 	 * @experimental
 	 * @since 1.60
-	 * @alias sap.ui.mdc.TableDelegate
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * MDC_PUBLIC_CANDIDATE
@@ -30,11 +32,10 @@ sap.ui.define([
 	 * Provides a hook to update the binding info object that is used to bind the table to the model.
 	 *
 	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
-	 * @param {object} oDelegatePayload The delegate payload
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @protected
 	 */
-	TableDelegate.updateBindingInfo = function(oMDCTable, oDelegatePayload, oBindingInfo) {
+	TableDelegate.updateBindingInfo = function(oMDCTable, oBindingInfo) {
 		oBindingInfo.parameters = {};
 
 		if (oMDCTable._oMessageFilter) {
@@ -49,15 +50,15 @@ sap.ui.define([
 	 * Updates the row binding of the table.
 	 *
 	 * The default implementation rebinds the table, but model-specific subclasses must call dedicated binding methods to update the binding instead
-	 * of using {@link #rebindTable}.
+	 * of using {@link #rebind}.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @param {sap.ui.model.ListBinding} [oBinding] The binding instance of the table
 	 * @protected
 	 */
 	TableDelegate.updateBinding = function(oMDCTable, oBindingInfo, oBinding) {
-		this.rebindTable(oMDCTable, oBindingInfo);
+		this.rebind(oMDCTable, oBindingInfo);
 	};
 
 	TableDelegate.validateState = function(oControl, oState, sKey) {
@@ -79,16 +80,16 @@ sap.ui.define([
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @protected
 	 */
-	TableDelegate.rebindTable = function(oMDCTable, oBindingInfo) {
+	TableDelegate.rebind = function (oMDCTable, oBindingInfo) {
 		if (oMDCTable._oTable) {
 			oMDCTable._oTable.bindRows(oBindingInfo);
 		}
 	};
 
 	/**
-	 * Returns the filter delegate of the table that provides basic filter functionality such as adding filter fields.
-	 * <b>Note:</b> The functionality provided in this delegate should act as a subset of a <code>FilterBarDelegate</code> to enable the
-	 * table for inbuilt filtering.
+	 * Returns the filter delegate of the table that provides basic filter functionality, such as adding filter fields.
+	 * <b>Note:</b> The functionality provided in this delegate acts as a subset of a <code>FilterBarDelegate</code> to enable the table for inbuilt
+	 * filtering.
 	 *
 	 * @example <caption>Example usage of <code>getFilterDelegate</code></caption>
 	 * oFilterDelegate = {
@@ -107,7 +108,7 @@ sap.ui.define([
 			 *
 			 * @param {string} sPropertyName The property name
 			 * @param {sap.ui.mdc.Table} oTable Instance of the table
-			 * @returns {Promise<sap.ui.mdc.FilterField>} Promise that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
+			 * @returns {Promise<sap.ui.mdc.FilterField>} <code>Promise</code> that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
 			 * @see sap.ui.mdc.AggregationBaseDelegate#addItem
 			 */
 			addItem: function(sPropertyName, oTable) {
@@ -116,5 +117,32 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Returns the feature set for exporting data in 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,
+				Signature: true,
+				CoverPage: true,
+				FitToPage: false,
+				ResultSizeDefault: 5000,
+				ResultSizeMaximum: 20000
+			};
+		}
+		return Promise.resolve(oExportCapabilities);
+	};
+
 	return TableDelegate;
 });

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

@@ -69,13 +69,14 @@ sap.ui.define([
 	 * @class Element for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.97.1
+	 * @version 1.99.1
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
-	 * @since 1.91.0
+	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.ValueHelp
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -454,6 +455,11 @@ sap.ui.define([
 	ValueHelp.prototype.open = function(bTypeahead) {
 		var oContainer = bTypeahead ? this.getTypeahead() : _getValueHelpContainer.call(this);
 
+		var oOtherContainer = bTypeahead ? this.getDialog() : this.getTypeahead();
+		if (oOtherContainer && oContainer !== oOtherContainer && (oOtherContainer.isOpen() || oOtherContainer.isOpening())) {
+			oOtherContainer.close(); 	// TODO: Check container to be fully closed via promise
+		}
+
 		if (oContainer && !oContainer.isOpen() && !oContainer.isOpening()) {
 			this._removePromise("delegateContent" + "--" + oContainer.getId());
 			oContainer.open(this._retrieveDelegateContent(oContainer, true));
@@ -765,11 +771,13 @@ sap.ui.define([
 
 						return oTypeahead.getItemForValue(oConfig).then(function(oItem) {
 							_cleanupParameterBinding.call(this, aInBindings);
-							if (oItem.inParameters) {
-								oItem.inParameters = _mapParametersToField.call(this, oItem.inParameters, this.getInParameters());
-							}
-							if (oItem.outParameters) {
-								oItem.outParameters = _mapParametersToField.call(this, oItem.outParameters, this.getOutParameters());
+							if (oItem) {
+								if (oItem.inParameters) {
+									oItem.inParameters = _mapParametersToField.call(this, oItem.inParameters, this.getInParameters());
+								}
+								if (oItem.outParameters) {
+									oItem.outParameters = _mapParametersToField.call(this, oItem.outParameters, this.getOutParameters());
+								}
 							}
 							return oItem;
 						}.bind(this));
@@ -1124,14 +1132,16 @@ sap.ui.define([
 			if (!vValue && bInitialValueFilterEmpty) {
 				oCondition = Condition.createCondition("Empty", []);
 				oCondition.isEmpty = false; // no explicit check needed
-			} else {
+			} else if (vValue !== null) {
 				// TODO: way to provide description on InParameter
 				// validated to let FilterField determine description if visible on FilterBar.
 				// Also to show it as selected on table in FieldHelp of FilterField.
 				oCondition = Condition.createItemCondition(vValue);
 				oCondition.validated = ConditionValidated.Validated;
 			}
-			oInConditions[sFilterPath].push(oCondition);
+			if (oCondition) {
+				oInConditions[sFilterPath].push(oCondition);
+			}
 		}
 
 		this.setProperty("_inConditions", oInConditions, true);

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @class The action for an {@link sap.ui.mdc.ActionToolbar ActionToolbar}) control
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.99.1
 	 * @constructor
 	 * @private
 	 * @since 1.58
@@ -93,7 +93,7 @@ sap.ui.define([
 
     /**
      *
-     * @returns {String} a text defining the label of this <code>ActionToolbarAction</code> defined by the inner action.
+     * @returns {string} a text defining the label of this <code>ActionToolbarAction</code> defined by the inner action.
      */
     ActionToolbarAction.prototype.getLabel = function() {
         var oAction = this.getAction();

package/src/sap/ui/mdc/{chartNew/ChartSelectionDetailsNew.js → chart/ChartSelectionDetails.js}

@@ -11,7 +11,7 @@ sap.ui.define([
         "sap/m/SelectionDetailsItem",
         "sap/m/SelectionDetailsItemLine",
         "sap/m/SelectionDetailsRenderer",
-        "./SelectionDetailsActionsNew"
+        "./SelectionDetailsActions"
     ],
     function (
         Core,
@@ -26,24 +26,24 @@ sap.ui.define([
 
         /**
          /**
-         * Constructor for a new ChartSelectionDetailsNew.
+         * Constructor for a new ChartSelectionDetails.
          *
          * @param {string} [sId] id for the new control, generated automatically if no id is given
          * @param {object} [mSettings] initial settings for the new control
-         * @class The ChartSelectionDetailsNew control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
+         * @class The ChartSelectionDetails control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.97.1
+         * @version 1.99.1
          * @constructor
          * @experimental As of version ...
          * @private
          * @ui5-restricted sap.fe
          * @MDC_PUBLIC_CANDIDATE
          * @since 1.88
-         * @alias sap.ui.mdc.chartNew.ChartSelectionDetailsNew
+         * @alias sap.ui.mdc.chart.ChartSelectionDetails
          * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
          */
-        var ChartSelectionDetails = SelectionDetails.extend("sap.ui.mdc.chartNew.ChartSelectionDetailsNew", /** @lends sap.ui.mdc.chartNew.ChartSelectionDetailsNew.prototype */ {
+        var ChartSelectionDetails = SelectionDetails.extend("sap.ui.mdc.chart.ChartSelectionDetails", /** @lends sap.ui.mdc.chart.ChartSelectionDetails.prototype */ {
             metadata: {
                 library: "sap.ui.mdc",
                 interfaces: [
@@ -110,7 +110,7 @@ sap.ui.define([
         ChartSelectionDetails.prototype._hasNavigationTargets = function(aData) {
             return false;
         };
-        //TODO: Consider implementation and handling within ChartToolbarNew like the update of actions as well
+        //TODO: Consider implementation and handling within ChartToolbar like the update of actions as well
         ChartSelectionDetails.prototype._attachEvents = function() {
             // Attach to navigation event of selectionDetails
             // for semantic object navigation
@@ -145,4 +145,4 @@ sap.ui.define([
         };
 
         return ChartSelectionDetails;
-    }, true);
+    });