@openui5/sap.ui.mdc 1.97.1 → 1.100.0

package/src/sap/ui/mdc/valuehelp/Popover.js

@@ -7,11 +7,13 @@
 sap.ui.define([
 	'sap/ui/mdc/valuehelp/base/Container',
 	'sap/ui/mdc/util/loadModules',
-	"sap/ui/dom/units/Rem"
+	"sap/ui/dom/units/Rem",
+	"sap/ui/thirdparty/jquery"
 ], function(
 	Container,
 	loadModules,
-	Rem
+	Rem,
+	jQuery
 ) {
 	"use strict";
 
@@ -24,12 +26,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the <code>sap.ui.mdc.ValueHelp</code> element showing a popover.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.Popover
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/base/Container.js

@@ -24,12 +24,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the <code>ValueHelp</code> element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.Container
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/base/Content.js

@@ -32,12 +32,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.Content
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/base/DialogTab.js

@@ -20,12 +20,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.content.Dialog</code> element.
 	 * @extends sap.ui.core.Control
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.DialogTab
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.js

@@ -34,12 +34,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.FilterableListContent
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -115,14 +116,14 @@ sap.ui.define([
 				 * FilterBar
 				 */
 				filterBar: {
-					type: "sap.ui.mdc.filterbar.FilterBarBase",
+					type: "sap.ui.mdc.filterbar.vh.FilterBar",
 					multiple: false
 				},
 				/**
 				 * Default FilterBar, ceated internally if none given.
 				 */
 				_defaultFilterBar: {
-					type: "sap.ui.mdc.filterbar.FilterBarBase",
+					type: "sap.ui.mdc.filterbar.vh.FilterBar",
 					multiple: false,
 					visibility: "hidden"
 				}
@@ -572,7 +573,7 @@ sap.ui.define([
 			var oListBinding = this._getListBinding();
 			var oDelegate = this._getValueHelpDelegate();
 			var oDelegatePayload = this._getValueHelpDelegatePayload();
-			bSearchSupported = oDelegate && oDelegate.isSearchSupported(oDelegatePayload, oListBinding);
+			bSearchSupported = oDelegate && oDelegate.isSearchSupported(oDelegatePayload, this, oListBinding);
 		}
 
 		return bSearchSupported;

package/src/sap/ui/mdc/valuehelp/base/ListContent.js

@@ -20,12 +20,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.base.ListContent
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/content/Bool.js

@@ -22,12 +22,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element to provide a value help for boolean fields.
 	 * @extends sap.ui.mdc.valuehelp.content.FixedList
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.Bool
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

package/src/sap/ui/mdc/valuehelp/content/Conditions.js

@@ -25,12 +25,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element showing a condition panel.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.Conditions
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -227,7 +228,7 @@ sap.ui.define([
 //		FilterOperatorUtil.updateConditionsValues(aConditions); // to remove static text from static conditions
 //
 //		this.fireSetConditions({conditions: aConditions});
-		this.fireConfirm();
+		this.fireConfirm({close: true});
 	}
 
 	function _handleConditionProcessed(oEvent) {
@@ -260,6 +261,7 @@ sap.ui.define([
 			oFormatOptions.payload = oConfig.payload;
 			oFormatOptions.operators = oConfig.operators;
 			oFormatOptions.display = oConfig.display;
+			oFormatOptions.defaultOperatorName = oConfig.defaultOperatorName;
 		}
 
 		return oFormatOptions;

package/src/sap/ui/mdc/valuehelp/content/FixedList.js

@@ -8,14 +8,14 @@ sap.ui.define([
 	"sap/ui/mdc/valuehelp/base/ListContent",
 	"sap/ui/mdc/util/loadModules",
 	"sap/ui/mdc/enum/ConditionValidated",
-	"sap/ui/model/ParseException",
-	"sap/ui/mdc/enum/SelectType"
+	"sap/ui/mdc/enum/SelectType",
+	"sap/ui/model/ParseException"
 ], function(
 	ListContent,
 	loadModules,
 	ConditionValidated,
-	ParseException,
-	SelectType
+	SelectType,
+	ParseException
 ) {
 	"use strict";
 
@@ -25,13 +25,14 @@ sap.ui.define([
 	 * @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 Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element showing a list with fix values.
-	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.97.1
+	 * @extends sap.ui.mdc.valuehelp.base.ListContent
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.FixedList
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -117,7 +118,8 @@ sap.ui.define([
 				"sap/m/library",
 				"sap/ui/model/Filter",
 				"sap/ui/model/Sorter",
-				"sap/ui/model/base/ManagedObjectModel"
+				"sap/ui/model/base/ManagedObjectModel",
+				"sap/base/strings/whitespaceReplacer"
 			]).then(function (aModules) {
 					var List = aModules[0];
 					var DisplayListItem = aModules[1];
@@ -125,13 +127,14 @@ sap.ui.define([
 					var Filter = aModules[3];
 					var Sorter = aModules[4];
 					var ManagedObjectModel = aModules[5];
+					var whitespaceReplacer = aModules[6];
 
 					this._oManagedObjectModel = new ManagedObjectModel(this);
 
 					var oItemTemplate = new DisplayListItem(this.getId() + "-item", {
 						type: mLibrary.ListType.Active,
-						label: "{$help>text}",
-						value: "{$help>additionalText}",
+						label: {path: "$help>text", formatter: whitespaceReplacer},
+						value: {path: "$help>additionalText", formatter: whitespaceReplacer},
 						valueTextDirection: "{$help>textDirection}"
 					}).addStyleClass("sapMComboBoxNonInteractiveItem"); // to add focus outline to selected items
 
@@ -316,13 +319,13 @@ sap.ui.define([
 				return null;
 			}
 
-			if (oConfig.checkDescription && this.getUseFirstMatch()) {
+			if (this.getUseFirstMatch()) {
 				for (i = 0; i < aItems.length; i++) {
 					oItem = aItems[i];
-					sText = oItem.getText();
+					sText = oConfig.checkDescription ? oItem.getText() : oItem.getKey(); // don't use oConfig.checkKey as entered value non't neet to be a valid (complete) key
 					if (_filterText.call(this, sText, oConfig.value)) {
 						vKey = _getKey.call(this, oItem);
-						return {key: vKey, description: sText};
+						return {key: vKey, description: oItem.getText()};
 					}
 				}
 			}
@@ -339,6 +342,10 @@ sap.ui.define([
 		return true;
 	};
 
+	FixedList.prototype.isSearchSupported = function () {
+		return true;
+	};
+
 	FixedList.prototype._handleConditionsUpdate = function(oChanges) {
 		_updateSelection.call(this);
 	};
@@ -436,9 +443,11 @@ sap.ui.define([
 
 		var oItem = aItems[iSelectedIndex];
 		if (oItem) {
-			if (oItem !== oSelectedItem) {
+			var bUseFirstMatch = this.getUseFirstMatch(); // if item for first match is selected, navigate to it needs to fire the event
+			if (oItem !== oSelectedItem || (bUseFirstMatch && !bLeaveFocus)) {
 				var oOriginalItem = _getOriginalItem.call(this, oItem);
 				var vKey = _getKey.call(this, oOriginalItem);
+				var sDescription = oOriginalItem.getText();
 
 				if (this.getParent().isOpen()) {
 					oList.scrollToIndex(iSelectedIndex); // only possible if open
@@ -447,7 +456,7 @@ sap.ui.define([
 				}
 
 				oItem.setSelected(true);
-				var oCondition = _setConditions.call(this, vKey, oItem.getLabel());
+				var oCondition = _setConditions.call(this, vKey, sDescription);
 				this.fireNavigated({condition: oCondition, itemId: oItem.getId(), leaveFocus: false});
 			} else if (bLeaveFocus) {
 				this.fireNavigated({condition: undefined, itemId: undefined, leaveFocus: bLeaveFocus});

package/src/sap/ui/mdc/valuehelp/content/MDCTable.js

@@ -12,8 +12,7 @@ sap.ui.define([
 	'sap/ui/mdc/library',
 	'sap/m/library',
 	"sap/ui/table/library",
-	"sap/ui/mdc/p13n/Engine",
-	"sap/ui/mdc/enum/PersistenceMode"
+	"sap/ui/thirdparty/jquery"
 
 ], function(
 	FilterableListContent,
@@ -23,8 +22,7 @@ sap.ui.define([
 	library,
 	mLibrary,
 	uiTableLibrary,
-	Engine,
-	PersistenceMode
+	jQuery
 ) {
 	"use strict";
 
@@ -224,9 +222,7 @@ sap.ui.define([
 					return false;
 				},
 				getContexts: function () {
-					return oListBinding && (oListBinding.aContexts || (oListBinding.aIndices && oListBinding.aIndices.map(function (iIndex) {
-						return oInnerTable.getContextByIndex(iIndex);
-					})) || oListBinding.getContexts());
+					return oListBinding && oListBinding.getAllCurrentContexts();
 				},
 				handleListBinding: function () {
 					oListBinding.attachEvent("change", this._handleUpdateFinished.bind(this));
@@ -254,7 +250,6 @@ sap.ui.define([
 		}
 	}
 
-	// TODO:  @ui5-restricted sap.ui.mdc
 	/**
 	 * Constructor for a new <code>MDCTable</code> content.
 	 *
@@ -262,11 +257,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element using a sap.ui.mdc.Table.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.MDCTable
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -282,6 +279,9 @@ sap.ui.define([
 			aggregations: {
 				/**
 				 * Table to be used in value help
+				 *
+				 * <b>Note:</b> Set the right selection mode (multiple selection or single selection) as it cannot be determined automatically
+				 * for every case. (Maybe for multi-value <code>FilterField</code> controls only single selection from table might be wanted.)
 				 */
 				table: {
 					type: "sap.ui.mdc.Table",
@@ -431,14 +431,12 @@ sap.ui.define([
 		if (oChanges.name === "table") { // outer table
 			var oTable = oChanges.child;
 			if (oChanges.mutation === "remove") {
-				Engine.getInstance().defaultProviderRegistry.detach(oTable);
 				this._oObserver.unobserve(oTable);
 				this._oTable = null;
 				this._oTableHelper = null;
 				this._addPromise("listBinding");
 			} else {
 				this._oTable = oTable;
-				Engine.getInstance().defaultProviderRegistry.attach(oTable, PersistenceMode.Transient);
 				this._oObserver.observe(oTable, {aggregations: ["_content"]});
 				this._sTableType = _getMDCTableType(oTable);
 				oTable.addDelegate({ onmouseover: function (oEvent) {	// Fix m.Table itemPress
@@ -492,10 +490,6 @@ sap.ui.define([
 	}
 
 	function _adjustTable () {
-		if (this._oTable) {
-			this._oTable.setSelectionMode(this._isSingleSelect() ? MDCSelectionMode.Single : MDCSelectionMode.Multi);
-		}
-
 		if (this._oTableHelper) {
 			this._oTableHelper.adjustTable.call(this);
 		}
@@ -519,14 +513,18 @@ sap.ui.define([
 					this._oFilterBarVBox.addStyleClass("sapMdcValueHelpPanelFilterbar");
 					this._oFilterBarVBox._oWrapper = this;
 					this._oFilterBarVBox.getItems = function () {
-						return [this._oWrapper._getPriorityFilterBar.call(this._oWrapper)];
+						var oFilterBar = this._oWrapper._getPriorityFilterBar.call(this._oWrapper);
+						var aItems = oFilterBar ? [oFilterBar] : [];
+						return aItems;
 					};
 
 					this._oTableBox = new VBox(this.getId() + "-TB", {height: "100%"});
 					this._oTableBox.addStyleClass("sapMdcValueHelpPanelTableBox");
 					this._oTableBox._oWrapper = this;
 					this._oTableBox.getItems = function () {
-						return [this._oWrapper._sTableType === "ResponsiveTable" ? this._oWrapper._oScrollContainer : this._oWrapper._oTable];
+						var oTable = this._oWrapper._sTableType === "ResponsiveTable" ? this._oWrapper._oScrollContainer : this._oWrapper._oTable;
+						var aItems = oTable ? [oTable] : [];
+						return aItems;
 					};
 
 					this._oContentLayout = new FixFlex(this.getId() + "-FF", {minFlexSize: 200, fixContent: this._oFilterBarVBox, flexContent: this._oTableBox});
@@ -552,6 +550,7 @@ sap.ui.define([
 
 				if (!this._getPriorityFilterBar()) {
 					return this._createDefaultFilterBar().then(function () {
+						this._oFilterBarVBox.invalidate(); // to rerender if FilterBar added
 						return this._oContentLayout;
 					}.bind(this));
 				}
@@ -569,6 +568,21 @@ sap.ui.define([
 		return this._oTableHelper && this._oTableHelper.getListBindingInfo();
 	};
 
+	MDCTable.prototype.onShow = function () {
+		if (this._oTable) {
+			// check if selection mode is fine
+			var sSelectionMode = FilterableListContent.prototype._isSingleSelect.apply(this) ? MDCSelectionMode.Single : MDCSelectionMode.Multi;
+			if (this._oTable.getSelectionMode() === MDCSelectionMode.None) { // only set automatically if not provided from outside (and do it only once)
+				this._oTable.setSelectionMode(sSelectionMode);
+			}
+			if (this._oTable.getSelectionMode() !== sSelectionMode) {
+				throw new Error("Table selectionMode needs to be " + sSelectionMode);
+			}
+		}
+
+		FilterableListContent.prototype.onShow.apply(this, arguments);
+	};
+
 	MDCTable.prototype.applyFilters = function(sSearch) { // TODO the arguments are not passed as expected.
 
 		var oTable = this.getTable();
@@ -639,5 +653,20 @@ sap.ui.define([
 		_adjustTable.call(this);
 	};
 
+	MDCTable.prototype._isSingleSelect = function() {
+
+		// use selection mode of table if set
+		if (this._oTable) {
+			if (this._oTable.getSelectionMode() === MDCSelectionMode.Multi) {
+				return false;
+			} else {
+				return true;
+			}
+		} else {
+			return FilterableListContent.prototype._isSingleSelect.apply(this, arguments);
+		}
+
+	};
+
 	return MDCTable;
 });

package/src/sap/ui/mdc/valuehelp/content/MTable.js

@@ -19,7 +19,8 @@ sap.ui.define([
 	'sap/base/strings/formatMessage',
 	'sap/base/util/merge',
 	'sap/ui/mdc/enum/SelectType',
-	'sap/base/Log'
+	'sap/base/Log',
+	'sap/ui/thirdparty/jquery'
 ], function(
 	FilterableListContent,
 	Condition,
@@ -35,7 +36,8 @@ sap.ui.define([
 	formatMessage,
 	merge,
 	SelectType,
-	Log
+	Log,
+	jQuery
 ) {
 	"use strict";
 
@@ -49,12 +51,13 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element using a sap.m.Table.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @since 1.95.0
+	 * @experimental As of version 1.95
 	 * @alias sap.ui.mdc.valuehelp.content.MTable
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -72,6 +75,9 @@ sap.ui.define([
 			aggregations: {
 				/**
 				 * Table to be used in value help
+				 *
+				 * <b>Note:</b> Set the right selection mode (multiple selection or single selection) as it cannot be determined automatically
+				 * for every case. (In type-ahead also for multi-value <code>FilterField</code> controls only single selection from table might be wanted.)
 				 */
 				table: {
 					type: "sap.m.Table",
@@ -113,20 +119,13 @@ sap.ui.define([
 
 	function _updateSelection () {
 		if (this._oTable) {
-//			var aSelectedIds = this.getConditions().filter(function (oCondition) {
-//				return oCondition.operator === "EQ";
-//			}).map(function (oCondition) {
-//				return oCondition.values[0];
-//			});
 			var aItems = this._oTable.getItems();
 			var aConditions = this.getConditions();
+			var bHideSelection = this._isSingleSelect() && !FilterableListContent.prototype._isSingleSelect.apply(this); // if table is in single selection but Fild allows multiple values, don'tr select items
 
 			for (var iId in aItems) {
 				var oItem = aItems[iId];
-//				var oContext = oItem && oItem.getBindingContext();
-//				var oContextValue = oContext && oContext.getObject();
-//				var bSelected = oContextValue && aSelectedIds.indexOf(oContextValue[this.getKeyPath()]) >= 0;
-				var bSelected = this._isItemSelected(oItem, aConditions);
+				var bSelected = bHideSelection ? false : this._isItemSelected(oItem, aConditions);
 				oItem.setSelected(bSelected);
 			}
 		}
@@ -191,7 +190,7 @@ sap.ui.define([
 			bUseFilter = false;
 		}
 
-		if (sFilterFields === "$search" && oDelegate && oDelegate.isSearchSupported(oDelegatePayload, oListBinding)){
+		if (sFilterFields === "$search" && oDelegate && oDelegate.isSearchSupported(oDelegatePayload, this, oListBinding)){
 			if (!oListBinding.isSuspended() && bUseFilter) {
 				// as we trigger two changes this would result to two requests therefore we suspend the binding
 				oListBinding.suspend();
@@ -262,6 +261,17 @@ sap.ui.define([
 			if (!oTable.hasStyleClass("sapMComboBoxList")) { // TODO: only in typeahead case?
 				oTable.addStyleClass("sapMComboBoxList"); // to allow focus outline in navigation
 			}
+			// check if selection mode is fine
+			var sSelectionMode = this.isTypeahead() ? ListMode.SingleSelectMaster : ListMode.SingleSelectLeft;
+			if (!FilterableListContent.prototype._isSingleSelect.apply(this) && oTable.getMode() !== sSelectionMode) { // if in multi-select mode only single-selection on table is allowed this is also OK
+				sSelectionMode = ListMode.MultiSelect;
+			}
+			if (oTable.getMode() === ListMode.None) { // only set automatically if not provided from outside (and do it only once)
+				oTable.setMode(sSelectionMode);
+			}
+			if (oTable.getMode() !== sSelectionMode) {
+				throw new Error("Table selection mode needs to be " + sSelectionMode);
+			}
 		}
 
 		FilterableListContent.prototype.onShow.apply(this, arguments);
@@ -534,8 +544,15 @@ sap.ui.define([
 					aInParameters.push(oConfig.inParameters.sPath);
 				} else {
 					for (var i = 0; i < oConfig.inParameters.aFilters.length; i++) {
-						if (aInParameters.indexOf(oConfig.inParameters.aFilters[i].sPath) < 0) {
-							aInParameters.push(oConfig.inParameters.aFilters[i].sPath);
+						var oInFilter = oConfig.inParameters.aFilters[i];
+						if (oInFilter.aFilters) {
+							for (var j = 0; j < oInFilter.aFilters.length; j++) {
+								if (oInFilter.aFilters[j].sPath && aInParameters.indexOf(oInFilter.aFilters[j].sPath) < 0) {
+									aInParameters.push(oInFilter.aFilters[j].sPath);
+								}
+							}
+						} else if (oInFilter.sPath && aInParameters.indexOf(oInFilter.sPath) < 0) {
+							aInParameters.push(oInFilter.sPath);
 						}
 					}
 				}
@@ -783,18 +800,6 @@ sap.ui.define([
 				// make headers sticky
 				this._oTable.setSticky([Sticky.ColumnHeaders]);
 			}
-
-			if (this.isTypeahead()) {
-				if (this._isSingleSelect()) {
-					this._oTable.setMode(ListMode.SingleSelectMaster);
-				} else {
-					this._oTable.setMode(ListMode.MultiSelect);
-				}
-			} else if (this._isSingleSelect()) {
-					this._oTable.setMode(ListMode.SingleSelectLeft);
-			} else {
-				this._oTable.setMode(ListMode.MultiSelect);
-			}
 		}
 	}
 	MTable.prototype.setParent = function(oParent) {
@@ -915,6 +920,22 @@ sap.ui.define([
 		return true;
 	};
 
+	MTable.prototype._isSingleSelect = function() {
+
+		// use selection mode of table if set
+		var oTable = this._getTable();
+		if (oTable) {
+			if (oTable.getMode() === ListMode.MultiSelect) {
+				return false;
+			} else {
+				return true;
+			}
+		} else {
+			return FilterableListContent.prototype._isSingleSelect.apply(this, arguments);
+		}
+
+	};
+
 	MTable.prototype.exit = function () {
 
 		Common.cleanup(this, [

package/test/sap/ui/mdc/testutils/opa/TestLibrary.js

@@ -5,7 +5,9 @@ sap.ui.define([
 	"sap/ui/test/Opa5",
 	"test-resources/sap/ui/mdc/testutils/opa/table/TestObjects",
 	"test-resources/sap/ui/mdc/testutils/opa/filterbar/TestObjects",
-	"test-resources/sap/ui/mdc/testutils/opa/chartNew/TestObjects"
+	"test-resources/sap/ui/mdc/testutils/opa/chart/TestObjects",
+	"test-resources/sap/ui/mdc/testutils/opa/link/TestObjects",
+	"test-resources/sap/ui/mdc/testutils/opa/valueHelp/TestObjects"
 ], function() {
 	"use strict";
 });

package/test/sap/ui/mdc/testutils/opa/actions/OpenContextMenu.js

@@ -14,11 +14,11 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.test.actions.Action
 	 * @public
-	 * @alias sap.ui.mdc.ActionToolbarTesting.pages.OpenContextMenu
+	 * @alias sap.ui.mdc.actions.OpenContextMenu
 	 * @author SAP SE
 	 * @since 1.96
 	 */
-	var ContextMenu = Action.extend("sap.ui.mdc.ActionToolbarTesting.pages.OpenContextMenu", /** @lends sap.ui.mdc.ActionToolbarTesting.pages.OpenContextMenu.prototype */ {
+	var ContextMenu = Action.extend("sap.ui.mdc.actions.OpenContextMenu", /** @lends sap.ui.mdc.actions.OpenContextMenu.prototype */ {
 		metadata : {
 			publicMethods : [ "executeOn" ]
 		},
@@ -34,7 +34,7 @@ sap.ui.define([
 			var $ActionDomRef = this.$(oControl);
 
 			if ($ActionDomRef.length) {
-				this.oLogger.timestamp("sap.ui.comp.actions.ContextMenu");
+				this.oLogger.timestamp("sap.ui.mdc.actions.OpenContextMenu");
 				this.oLogger.debug("Right-clicked the control " + oControl);
 
 				this._tryOrSimulateFocusin($ActionDomRef, oControl);

package/test/sap/ui/mdc/testutils/opa/{chartNew → chart}/ActionsBase.js

@@ -11,10 +11,10 @@ sap.ui.define([
     var waitForMDCChartWithId = function(sId, oSettings) {
         return this.waitFor({
             id: sId,
-            controlType: "sap.ui.mdc.ChartNew",
-            success: function(oMDCChartNew) {
+            controlType: "sap.ui.mdc.Chart",
+            success: function(oMDCChart) {
                 if (oSettings && typeof oSettings.success === "function") {
-                    oSettings.success.call(this, oMDCChartNew);
+                    oSettings.success.call(this, oMDCChart);
                 }
             },
             actions: oSettings.actions ? oSettings.actions : []

package/test/sap/ui/mdc/testutils/opa/{chartNew → chart}/AssertionsBase.js

@@ -11,7 +11,7 @@ sap.ui.define([
 		//return Opa5.assert.ok(true);
 
 			return this.waitFor({
-				controlType: "sap.ui.mdc.ChartNew",
+				controlType: "sap.ui.mdc.Chart",
 				check: function(aChart) {
 					return aChart.length === 1;
 				},