@openui5/sap.ui.mdc 1.96.5 → 1.99.0

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

@@ -254,7 +254,6 @@ sap.ui.define([
 		}
 	}
 
-	// TODO:  @ui5-restricted sap.ui.mdc
 	/**
 	 * Constructor for a new <code>MDCTable</code> content.
 	 *
@@ -262,11 +261,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.96.5
+	 * @version 1.99.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 +283,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",
@@ -386,8 +390,13 @@ sap.ui.define([
 		}
 	};
 
-	var _handleSearch = function () {
-		return this.applyFilters(this.getFilterValue());
+	var _handleSearch = function (oEvent) {
+		var sFilterFields = this.getFilterFields();
+		var oFilterBar = oEvent.getSource();
+		var oConditions = oFilterBar.getInternalConditions();
+		var oCondition = sFilterFields && oConditions[sFilterFields] && oConditions[sFilterFields][0];
+		var sFilterValue = oCondition && oCondition.values[0];
+		this.setFilterValue(sFilterValue);
 	};
 
 	MDCTable.prototype._observeChanges = function (oChanges) {
@@ -487,10 +496,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);
 		}
@@ -514,14 +519,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});
@@ -547,6 +556,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));
 				}
@@ -564,6 +574,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();
@@ -634,5 +659,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

@@ -6,7 +6,9 @@
 
 sap.ui.define([
 	'sap/ui/mdc/valuehelp/base/FilterableListContent',
+	'sap/ui/mdc/condition/Condition',
 	'sap/ui/mdc/condition/FilterConverter',
+	'sap/ui/mdc/enum/ConditionValidated',
 	'sap/ui/mdc/util/loadModules',
 	'sap/m/library',
 	'sap/ui/model/FilterType',
@@ -20,7 +22,9 @@ sap.ui.define([
 	'sap/base/Log'
 ], function(
 	FilterableListContent,
+	Condition,
 	FilterConverter,
+	ConditionValidated,
 	loadModules,
 	library,
 	FilterType,
@@ -45,12 +49,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.96.5
+	 * @version 1.99.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
 	 */
@@ -68,6 +73,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",
@@ -109,20 +117,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);
 			}
 		}
@@ -153,8 +154,16 @@ sap.ui.define([
 		var oDelegate = this._getValueHelpDelegate();
 		var oDelegatePayload = this._getValueHelpDelegatePayload();
 
+		var sFilterFields = this.getFilterFields();
 		var oFilterBar = this._getPriorityFilterBar();
 		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this.getProperty("inConditions"); // use InParameter if no FilterBar
+
+		if (!oFilterBar && sFieldSearch && sFilterFields && sFilterFields !== "$search") {
+			// add condition for Search value
+			var oCondition = Condition.createCondition("Contains", [sFieldSearch], undefined, undefined, ConditionValidated.NotValidated);
+			oConditions[sFilterFields] = [oCondition];
+		}
+
 		var oConditionTypes = oConditions && this._getTypesForConditions(oConditions);
 		var oFilter = oConditions && FilterConverter.createFilters( oConditions, oConditionTypes, undefined, this.getCaseSensitive());
 		var aFilters = oFilter && [oFilter];
@@ -179,12 +188,13 @@ sap.ui.define([
 			bUseFilter = false;
 		}
 
-		if (oDelegate && oDelegate.isSearchSupported(oDelegatePayload, oListBinding)){
+		if (sFilterFields === "$search" && oDelegate && oDelegate.isSearchSupported(oDelegatePayload, oListBinding)){
 			if (!oListBinding.isSuspended() && bUseFilter) {
 				// as we trigger two changes this would result to two requests therefore we suspend the binding
 				oListBinding.suspend();
 			}
 
+			sSearch = oDelegate.adjustSearch(oDelegatePayload, this.isTypeahead(), sSearch);
 			oDelegate.executeSearch(oDelegatePayload, oListBinding, sSearch);
 			Log.info("ValueHelp-Search: " + sSearch);
 		}
@@ -249,6 +259,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);
@@ -521,8 +542,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);
 						}
 					}
 				}
@@ -770,18 +798,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) {
@@ -821,7 +837,6 @@ sap.ui.define([
 					oDefaultFilterBar.attachSearch(_handleSearch, this);
 				}
 				oFilterBar.detachSearch(_handleSearch, this);
-				this._createDefaultFilterBar(); // TODO: should this be part of FilterableListContent?
 			}
 		}
 
@@ -903,6 +918,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;
 				},

package/test/sap/ui/mdc/testutils/opa/chart/TestObjects.js

@@ -0,0 +1,289 @@
+/*!
+ * ${copyright}
+ */
+sap.ui.define([
+	"sap/ui/test/Opa5",
+	"./ActionsViz",
+	"./AssertionsViz",
+	"../p13n/Actions"
+], function(
+	Opa5,
+	chartActions,
+	chartAssertions,
+	p13nActions
+) {
+	"use strict";
+
+	Opa5.createPageObjects({
+		onTheMDCChart: {
+			actions: {
+                /**
+                 * @typedef {object} ChartPersonalizationConfiguration
+                 * @property {string} key Key of the value that is the result of the personalization
+                 * @property {string} role Role of the given value
+                 */
+                /**
+                 * OPA5 test action
+                 * This only works with the new chart personalization
+                 * @param {sap.ui.core.Control | string} oChart Instance / ID of the <code>MDCChart</code> that is personalized
+                 * @param {string} sChartType String containing the type of chart that is displayed
+                 * @param {ChartPersonalizationConfiguration[]} aConfigurations Array containing the chart personalization configuration objects
+                 * @returns {Promise} OPA waitFor
+                 * 1. Opens the personalization dialog of a given chart.
+                 * 2. Selects a chart type given by <code>sChartType</code>.
+                 * 3. Executes the given ChartPersonalizationConfigurations.
+                 * 4. Closes the personalization dialog.
+                 */
+                iPersonalizeChart: function(oChart, sChartType, aConfigurations){
+                    return p13nActions.iPersonalizeChart.call(this, oChart, sChartType, aConfigurations);
+                },
+                /**
+                 * @typedef {object} SortPersonalizationConfiguration
+                 * @property {string} key Key of the item that is the result of the personalization
+                 * @property {boolean} descending Determines whether the sort direction is descending
+                 */
+                /**
+                 * OPA5 test action
+                 * @param {sap.ui.core.Control | string} oChart Instance / ID of the <code>MDCChart</code> that is sorted
+                 * @param {SortPersonalizationConfiguration[]} aConfigurations Array containing the sort personalization configuration objects
+                 * @returns {Promise} OPA waitFor
+                 * 1. Opens the personalization dialog of a given chart.
+                 * 2. Executes the given SortPersonalizationConfiguration.
+                 * 3. Closes the personalization dialog.
+                 */
+                iPersonalizeSort: function(oChart, aConfigurations) {
+                    return p13nActions.iPersonalizeSort.call(this, oChart, aConfigurations);
+                },
+                /**
+                 * Opa5 test action
+                 * @param {sap.ui.core.Control | string} oChart Instance / ID of the <code>MDCChart</code> that is reset
+                 * @returns {Promise} OPA waitFor
+                 * 1. Opens the personalization dialog of a given chart.
+                 * 2. Clicks on the reset personalization button.
+                 * 3. Confirms the reset dialog.
+                 * 4. Closes the personalization dialog.
+                 */
+                iResetThePersonalization: function(oChart) {
+                    return p13nActions.iResetThePersonalization.call(this, oChart);
+                },
+
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Zoom In" button in the toolbar of a mdc chart.
+                 * @param {string} sId The id of the mdc chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnZoomIn : function(sId){
+                    return chartActions.iClickOnZoomIn.call(this, sId);
+                },
+
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Zoom Out" button in the toolbar of a mdc chart.
+                 * @param {string} sId The id of the mdc chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnZoomOut : function(sId){
+                    return chartActions.iClickOnZoomOut.call(this, sId);
+                },
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Legend" toggle button in the toolbar of a mdc chart.
+                 * @param {string} sId The id of the mdc chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnTheLegendToggleButton : function(sId){
+                    return chartActions.iClickOnTheLegendToggleButton.call(this, sId);
+                },
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Show Details" button in the toolbar of a mdc chart.
+                 * @param {*} sId The id of the mdc chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnTheSelectionDetailsButton: function(sId){
+                    return chartActions.iClickOnTheSelectionDetailsButton.call(this, sId);
+                },
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Drilldown" button in the toolbar of a mdc chart.
+                 * @param {string} sId The id of the mdc chart.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnTheDrillDownButton: function(sId){
+                    return chartActions.iClickOnTheDrillDownButton.call(this, sId);
+                },
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Chart Type" button in the toolbar of a mdc chart.
+                 * @param {string} sId The id of the mdc chart.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnTheChartTypeButton: function(sId){
+                    return chartActions.iClickOnTheChartTypeButton.apply(this, arguments);
+                },
+                /**
+                 * OPA5 test action
+                 * Clicks on the "Personalisation" button in the toolbar of a mdc chart.
+                 * @param {string} sId The id of the mdc chart.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnThePersonalisationButton: function(sId){
+                    return chartActions.iClickOnThePersonalisationButton.call(this, sId);
+                },
+                /**
+                 * OPA5 test action
+                 * Selects a specific chart type for a mdc chart in an open chart type popover
+                 * @param {string} sChartTypeName The name of the chart type
+                 * @returns {Promise} OPA waitFor
+                 */
+                iSelectChartTypeInPopover: function(sChartTypeName){
+                   return chartActions.iSelectChartTypeInPopover.call(this, sChartTypeName);
+                },
+                /**
+                 * OPA5 test action
+                 * Clicks on an drill-down breadcrumb with given name for given mdc chart
+                 * @param {string} sName The name of the breadcrumbs
+                 * @param {string} sId Id of the mdc chart.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iClickOnTheBreadcrumbWithName: function(sName, sId){
+                    return chartActions.iClickOnTheBreadcrumbWithName.call(this, sName, sId);
+                },
+                /**
+                 * OPA5 test action
+                 * Selects a specific dimension to drill-down for a mdc chart in an open chart drill-down popover
+                 * @param {string} sDrillName Name of the Dimension which should be drilled-down
+                 * @returns {Promise} OPA waitFor
+                 */
+                iSelectANewDrillDimensionInPopover: function(sDrillName){
+                    return chartActions.iSelectANewDrillDimensionInPopover.call(this, sDrillName);
+                },
+                /**
+                 * OPA5 test action
+                * Selects given datapoints on given chart.
+                * @param {array} aDataPoints Datapoint objects to select
+                * @param {string} sId Id of the mdc chart
+                * @returns {Promise} OPA waitFor
+                */
+               iSelectTheDatapoint: function (aDataPoints, sId){
+                    return chartActions.iSelectTheDatapoint.call(this, aDataPoints, sId);
+               },
+               /**
+                * OPA5 test action
+                * Selectes given categories (dimensions) for the given mdc chart
+                * @param {object} oCategories Categories to select
+                * @param {string} sId Id of the mdc chart
+                * @returns {Promise} OPA waitFor
+                */
+               iSelectTheCategories: function (oCategories, sId){
+                    return chartActions.iSelectTheDatapoint.call(this, oCategories, sId);
+               },
+               /**
+                * OPA5 test action
+                * Performs a drill-down on the MDC Chart
+                * @param {string} sId The id of the MDC Chart.
+                * @param {string} sDrillName Name of the Dimension which should be drilled-down.
+                * @returns {Promise} OPA waitFor
+                */
+                iDrillDownInDimension: function(sId, sDrillName) {
+                   return chartActions.iDrillDownInDimension.call(this, sId, sDrillName);
+               },
+               /**
+                * OPA5 test action
+                * Performs a drill-down on the MDC Chart
+                * @param {string} sId The id of the MDC Chart
+                * @param {string} sChartTypeName Name of the Dimension which should be drilled-down.
+                * @returns {Promise} OPA waitFor
+                */
+                iSelectAChartType: function(sId, sChartTypeName) {
+                    return chartActions.iSelectAChartType.call(this, sId, sChartTypeName);
+                }
+
+            },
+            assertions: {
+                /**
+                 * OPA5 assertion
+                 * Assertion to check that there is a mdc chart visible on the screen.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeAChart: function() {
+                    return chartAssertions.iShouldSeeAChart.call(this);
+                },
+                /**
+                 * Assertion to check that there is a legend visible on the screen for given mdc chart.
+                 * @param {string} sId Id of the chart to be checked for a visible legend
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeALegend: function(sId) {
+                    return chartAssertions.iShouldSeeALegend.call(this, sId);
+                },
+                /**
+                 * Assertion to check that there is no legend visible on the screen for given mdc chart.
+                 * @param {string} sId Id of the chart to be checked for a visible legend
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeNoLegend: function(sId) {
+                    return chartAssertions.iShouldSeeNoLegend.call(this, sId);
+                },
+
+                /**
+                 * Assertion to check that there is a chart type popover visible on the screen.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeAChartTypePopover: function() {
+                    return chartAssertions.iShouldSeeAChartTypePopover.call(this);
+                },
+                /**
+                 * Assertion to check that there is chart visible with given chart type.
+                 * @param {string} sChartId Id of the chart to be checked for a chart type
+                 * @param {string} sChartType Chart type which should be selected for the given chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeTheChartWithChartType: function(sChartId,  sChartType){
+                    return chartAssertions.iShouldSeeTheChartWithChartType.call(this, sChartId, sChartType);
+                },
+                /**
+                 * Assertion to check that there is a chart with given drillstack visible.
+                 * @param {array} aCheckDrillStack Drillstack to check for
+                 * @param {string} sChartId Id of the mdc chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeTheDrillStack: function(aCheckDrillStack, sChartId) {
+                    return chartAssertions.iShouldSeeTheDrillStack.call(this, aCheckDrillStack, sChartId);
+                },
+                /**
+                 * Assertion to check that there is a drilldown popover visible.
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeADrillDownPopover: function() {
+                    return chartAssertions.iShouldSeeADrillDownPopover.call(this);
+                },
+                /**
+                * Assertion to check that there is a drilldown popover visible.
+                * @returns {Promise} OPA waitFor
+                */
+               iShouldSeeADetailsPopover: function() {
+                 return chartAssertions.iShouldSeeADetailsPopover.call(this);
+                },
+                /**
+                 * Assertion to check visible dimensions on the MDC Chart
+                 * @param {string} sId Id of the MDC Chart
+                 * @returns {Promise} OPA waitFor
+                 */
+                iShouldSeeVisibleDimensionsInOrder: function(aDimensions, sId) {
+                    return chartAssertions.iShouldSeeVisibleDimensionsInOrder.call(this, aDimensions, sId);
+                },
+                /**
+                 * Assertion to check visible measures on the MDC Chart
+                 * @param {string} sId Id of the MDC Chart
+                 * @returns {Promise} OPA waitFor
+                */
+                iShouldSeeVisibleMeasuresInOrder: function(aMeasures, sId) {
+                    return chartAssertions.iShouldSeeVisibleMeasuresInOrder.call(this, aMeasures, sId);
+                }
+			}
+        }
+    });
+
+});