@openui5/sap.ui.mdc 1.99.1 → 1.102.0

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";
 
@@ -45,11 +47,11 @@ sap.ui.define([
 	/**
 	 * Constructor for a new <code>MTable</code> content.
 	 *
-	 * @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 using a sap.m.Table.
+	 * @param {string} [sId] ID for the new element, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new element
+	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.m.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -75,7 +77,7 @@ sap.ui.define([
 				 * 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.)
+				 * for every case. (In type-ahead also for multi-value {@link sap.ui.mdc.FilterField FilterField} controls only single selection from table might be wanted.)
 				 */
 				table: {
 					type: "sap.m.Table",
@@ -128,17 +130,11 @@ sap.ui.define([
 			}
 		}
 	}
-
-//	function _getListItemKey(oListItem) {
-//		var oContext = oListItem.getBindingContext();
-//		var oContextValue = oContext && oContext.getObject();
-//		return oContextValue && oContextValue[this.getKeyPath()];
-//	}
 	MTable.prototype.applyFilters = function(sFieldSearch) {
-		var oListBinding = this._getListBinding();
+		var oListBinding = this.getListBinding();
 		var bValueHelpDelegateInitialized = this._isValueHelpDelegateInitialized();
 
-		if ((!oListBinding || !bValueHelpDelegateInitialized) && (this.isContainerOpening() || this.isTypeahead())) {
+		if ((!oListBinding || !bValueHelpDelegateInitialized)/* && (this.isContainerOpening() || this.isTypeahead())*/) {
 				Promise.all([this._retrievePromise("listBinding"), this._awaitValueHelpDelegate()]).then(function () {
 					if (!this.bIsDestroyed) {
 						this.applyFilters(sFieldSearch);
@@ -156,7 +152,7 @@ sap.ui.define([
 
 		var sFilterFields = this.getFilterFields();
 		var oFilterBar = this._getPriorityFilterBar();
-		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this.getProperty("inConditions"); // use InParameter if no FilterBar
+		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this._oInitialFilterConditions || {};
 
 		if (!oFilterBar && sFieldSearch && sFilterFields && sFilterFields !== "$search") {
 			// add condition for Search value
@@ -188,7 +184,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();
@@ -211,15 +207,17 @@ sap.ui.define([
 	};
 
 	MTable.prototype._handleSelectionChange = function (oEvent) {
+		var sModelName = oEvent.getSource().getBindingInfo("items").model;
 		var bIsTypeahead = this.isTypeahead();
 		if (!bIsTypeahead || !this._isSingleSelect()) {
 			var oParams = oEvent.getParameters();
 			var aListItems = oParams.listItems || oParams.listItem && [oParams.listItem];
 			var aConditions = aListItems.map(function (oItem) {
-				var oValues = this._getItemFromContext(oItem.getBindingContext());
-				return oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
+				var oItemContext = oItem.getBindingContext(sModelName);
+				var oValues = this._getItemFromContext(oItemContext);
+				return oValues && this._createCondition(oValues.key, oValues.description, oValues.payload);
 			}.bind(this));
-			this.fireSelect({type: oParams.selected ? SelectType.Add : SelectType.Remove, conditions: aConditions});
+			this._fireSelect({type: oParams.selected ? SelectType.Add : SelectType.Remove, conditions: aConditions});
 			if (bIsTypeahead) {
 				this.fireConfirm();
 			}
@@ -227,8 +225,10 @@ sap.ui.define([
 	};
 
 	MTable.prototype._handleItemPress = function (oEvent) {
+		var sModelName = oEvent.getSource().getBindingInfo("items").model;
 		var oItem = oEvent.getParameter("listItem");
-		var oValues = this._getItemFromContext(oItem.getBindingContext());
+		var oItemContext = oItem.getBindingContext(sModelName);
+		var oValues = this._getItemFromContext(oItemContext);
 		var bIsSingleSelect = this._isSingleSelect();
 		var bSelected = bIsSingleSelect ? true : !oItem.getSelected();
 		var sSelectType = SelectType.Set;
@@ -237,8 +237,8 @@ sap.ui.define([
 			oItem.setSelected(bSelected);
 			sSelectType = bSelected ? SelectType.Add : SelectType.Remove;
 		}
-		var oCondition = this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
-		this.fireSelect({type: sSelectType, conditions: [oCondition]});
+		var oCondition = this._createCondition(oValues.key, oValues.description, oValues.payload);
+		this._fireSelect({type: sSelectType, conditions: [oCondition]});
 		if (this.isTypeahead()) {
 			this.fireConfirm({close: true});
 		}
@@ -369,6 +369,12 @@ sap.ui.define([
 		if (!oConfig.checkKey && oConfig.parsedValue && !oConfig.checkDescription) {
 			return null;
 		}
+		if (oConfig.checkKey && !this.getKeyPath()) {
+			throw new Error("MTable: KeyPath missing! " + this.getId());
+		}
+		if (oConfig.checkDescription && !this.getDescriptionPath()) {
+			throw new Error("MTable: DescriptionPath missing! " + this.getId());
+		}
 
 		/* load data from model if nothing is found in the current items / contexts
 		/  steps:
@@ -378,16 +384,23 @@ sap.ui.define([
 		*/
 		oConfig.caseSensitive = oConfig.caseSensitive || this.getCaseSensitive();
 
-		return _checkListBindingPending.call(this).then(function(bPending) {
+		var oPromise1 = _checkListBindingPending.call(this);
+		var oDelegate = this._getValueHelpDelegate();
+		var oDelegatePayload = this._getValueHelpDelegatePayload();
+		var oPromise2 = oDelegate && oDelegate.getInitialFilterConditions(oDelegatePayload, this, oConfig.control);
+
+		return Promise.all([oPromise1, oPromise2]).then(function(aResult) {
+			var bPending = aResult[0];
+			var oInitialConditions = aResult[1];
 			var oResult;
 
 			if (!bPending) {
 				var oTable = this.getTable();
-				oResult = _filterItems.call(this, oConfig, oTable.getItems());
+				oResult = _filterItems.call(this, oConfig, oTable.getItems(), oInitialConditions);
 			}
 
 			if (!oResult) {
-				oResult = this._loadItemForValue(oConfig);
+				oResult = this._loadItemForValue(oConfig, oInitialConditions);
 			}
 
 			return oResult;
@@ -395,95 +408,83 @@ sap.ui.define([
 
 	};
 
-	function _checkListBindingPending() {
-		return this._retrievePromise("listBinding").then(function (oListBinding) {
-			var oDelegate = this._getValueHelpDelegate();
-			var oDelegatePayload = this._getValueHelpDelegatePayload();
-			var oListBindingInfo = this._getListBindingInfo();
-			if (oListBinding && oDelegate){
-				return oDelegate.checkListBindingPending(oDelegatePayload, oListBinding, oListBindingInfo);
-			} else {
-				return true;
-			}
-		}.bind(this));
-	}
-
-	function _filterItems(oConfig, aItems) {
+	function _filterItems(oConfig, aItems, oInitialConditions) {
 
 		if (aItems.length === 0) {
 			return;
 		}
 
-		var aFields = [];
-
-		if (oConfig.checkKey && oConfig.hasOwnProperty("parsedValue")) { // empty string or false could be key too
-			aFields.push({path: this.getKeyPath(), value: oConfig.parsedValue});
-		}
-		if (oConfig.checkDescription && oConfig.value) {
-			aFields.push({path: this.getDescriptionPath(), value: oConfig.value});
-		}
+		var oBindingInfo = this._getListBindingInfo();
+		var sModelName = oBindingInfo.model;
 
 		var _getFilterValue = function(oItem, sPath) {
-			var oBindingContext = oItem.isA("sap.ui.model.Context") ? oItem : oItem.getBindingContext();
+			var oBindingContext = oItem.isA("sap.ui.model.Context") ? oItem : oItem.getBindingContext(sModelName);
 			return oBindingContext.getProperty(sPath);
 		};
 
-		var oFilter;
-		var aFilters = [];
 		var aInParameters;
 		var aOutParameters;
-		var i = 0;
 
-		for (i = 0; i < aFields.length; i++) {
-			if (!aFields[i].path) {
-				throw new Error("path for filter missing"); // as we cannot filter key or description without path
-			}
-			aFilters.push(new Filter({path: aFields[i].path, operator: FilterOperator.EQ, value1: aFields[i].value, caseSensitive: oConfig.caseSensitive}));
-		}
-		if (aFilters.length === 1) {
-			oFilter = aFilters[0];
-		} else {
-			oFilter = new Filter({filters: aFilters, and: false}); // key OR description
-		}
-
-		if (oConfig.inParameters/* || oConfig.outParameters*/) {
-			aFilters = [oFilter];
-			if (oConfig.inParameters) {
-				aFilters.push(oConfig.inParameters);
-				aInParameters = []; // TODO: maybe provide paths from outside? No need to analyze Filters backwards
-				if (!oConfig.inParameters.aFilters) {
-					aInParameters.push(oConfig.inParameters.sPath);
-				} else {
-					for (i = 0; i < oConfig.inParameters.aFilters.length; i++) {
-						if (aInParameters.indexOf(oConfig.inParameters.aFilters[i].sPath) < 0) {
-							aInParameters.push(oConfig.inParameters.aFilters[i].sPath);
-						}
-					}
-				}
-			}
-//			if (oConfig.outParameters) {
-//				aFilters.push(oConfig.outParameters);
-//			}
-			oFilter = new Filter({filters: aFilters, and: true});
-		}
+		var oFilter = _createItemFilters.call(this, oConfig, oInitialConditions);
 
 		var aFilteredItems = FilterProcessor.apply(aItems, oFilter, _getFilterValue);
 		if (aFilteredItems.length === 1) {
-			var oValue = this._getItemFromContext(aFilteredItems[0].getBindingContext(), {inParameters: aInParameters, outParameters: aOutParameters});
-			return {key: oValue.key, description: oValue.description, inParameters: oValue.inParameters, outParameters: oValue.outParameters};
+			var oBindingContext = aFilteredItems[0].getBindingContext(sModelName);
+			var oValue = this._getItemFromContext(oBindingContext, {inParameters: aInParameters, outParameters: aOutParameters});
+			return {key: oValue.key, description: oValue.description, payload: oValue.payload};
 		} else if (aFilteredItems.length > 1) {
 			if (!oConfig.caseSensitive) {
 				// try with case sensitive search
 				var oNewConfig = merge({}, oConfig);
 				oNewConfig.caseSensitive = true;
-				return _filterItems.call(this, oNewConfig, aItems);
+				return _filterItems.call(this, oNewConfig, aItems, oInitialConditions);
+			}
+			throw _createException.call(this, oConfig.exception, true, oConfig.parsedValue || oConfig.value);
+		}
+
+	}
+
+	function _createItemFilters(oConfig, oInitialConditions) {
+
+		var bCaseSensitive = oConfig.caseSensitive;
+		var sKeyPath = this.getKeyPath();
+		var sDescriptionPath = this.getDescriptionPath();
+		var aFilters = [];
+		if (oConfig.checkKey && oConfig.hasOwnProperty("parsedValue")) { // empty string or false could be key too
+			aFilters.push(new Filter({ path: sKeyPath, operator: FilterOperator.EQ, value1: oConfig.parsedValue, caseSensitive: bCaseSensitive}));
+		}
+		if (oConfig.checkDescription && oConfig.value) {
+			aFilters.push(new Filter({path: sDescriptionPath, operator: FilterOperator.EQ, value1: oConfig.value, caseSensitive: bCaseSensitive}));
+		}
+
+		var oFilter = aFilters.length > 1 ? new Filter({filters: aFilters, and: false}) : aFilters[0];
+
+		if (oInitialConditions) {
+			var oConditionTypes = this._getTypesForConditions(oInitialConditions);
+			var oConditionsFilter = FilterConverter.createFilters(oInitialConditions, oConditionTypes, undefined, this.getCaseSensitive());
+			if (oConditionsFilter) {
+				oFilter = new Filter({filters: [oFilter, oConditionsFilter], and: true});
 			}
-			throw _createException.call(this, oConfig.exception, true, aFields[0].value);
 		}
 
+		return 	oFilter;
+
+	}
+
+	function _checkListBindingPending() {
+		return this._retrievePromise("listBinding").then(function (oListBinding) {
+			var oDelegate = this._getValueHelpDelegate();
+			var oDelegatePayload = this._getValueHelpDelegatePayload();
+			var oListBindingInfo = this._getListBindingInfo();
+			if (oListBinding && oDelegate){
+				return oDelegate.checkListBindingPending(oDelegatePayload, oListBinding, oListBindingInfo);
+			} else {
+				return true;
+			}
+		}.bind(this));
 	}
 
-	MTable.prototype._getListBinding = function () {
+	MTable.prototype.getListBinding = function () {
 		var oTable = this._getTable();
 		return oTable && oTable.getBinding("items");
 	};
@@ -493,7 +494,7 @@ sap.ui.define([
 		return oTable && oTable.getBindingInfo("items");
 	};
 
-	MTable.prototype._loadItemForValue = function (oConfig) {
+	MTable.prototype._loadItemForValue = function (oConfig, oInitialConditions) {
 
 		if (!oConfig.checkKey && oConfig.parsedValue && !oConfig.checkDescription) {
 			return null;
@@ -506,7 +507,6 @@ sap.ui.define([
 		var sKeyPath = this.getKeyPath();
 		var sDescriptionPath = this.getDescriptionPath();
 		var bUseFirstMatch = this.getUseFirstMatch();
-		var bCaseSensitive = oConfig.caseSensitive;
 
 		var oTable = this._getTable();
 		var oListBinding = oTable && oTable.getBinding("items"); //this.getListBinding();
@@ -520,66 +520,7 @@ sap.ui.define([
 		var sPromiseKey = ["loadItemForValue", sPath, sKeyPath, oConfig.parsedValue || oConfig.value].join("_");
 
 		return this._retrievePromise(sPromiseKey, function () {
-
-			var aFilters = [];
-
-			if (oConfig.checkKey && oConfig.hasOwnProperty("parsedValue")) { // empty string or false could be key too
-				aFilters.push(new Filter({ path: sKeyPath, operator: FilterOperator.EQ, value1: oConfig.parsedValue, caseSensitive: bCaseSensitive}));
-			}
-			if (oConfig.checkDescription && oConfig.value) {
-				aFilters.push(new Filter({path: sDescriptionPath, operator: FilterOperator.EQ, value1: oConfig.value, caseSensitive: bCaseSensitive}));
-			}
-
-			var oFilter = aFilters.length > 1 ? new Filter({filters: aFilters, and: false}) : aFilters[0];
-			aFilters = [oFilter];
-
-			var aInParameters;
-			if (oConfig.inParameters) {
-				// use in-parameters as additional filters
-				aFilters.push(oConfig.inParameters);
-				aInParameters = []; // TODO: maybe provide paths from outside? No need to analyze Filters backwards
-				if (!oConfig.inParameters.aFilters) {
-					aInParameters.push(oConfig.inParameters.sPath);
-				} else {
-					for (var i = 0; i < oConfig.inParameters.aFilters.length; i++) {
-						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);
-						}
-					}
-				}
-			}
-//			if (oConfig.oOutParameters) {
-//				// use out-parameters as additional filters (only if not already set by InParameter
-//				if (oConfig.oInParameters) {
-//					var aOutFilters = oConfig.oOutParameters.aFilters ? oConfig.oOutParameters.aFilters : [oConfig.oOutParameters];
-//					var aInFilters = oConfig.oInParameters.aFilters ? oConfig.oInParameters.aFilters : [oConfig.oInParameters];
-//					for (var i = 0; i < aOutFilters.length; i++) {
-//						var oOutFilter = aOutFilters[i];
-//						var bFound = false;
-//						for (var j = 0; j < aInFilters.length; j++) {
-//							var oInFilter = aInFilters[j];
-//							if (oInFilter.sPath === oOutFilter.sPath && oInFilter.oValue1 === oOutFilter.oValue1 && oInFilter.oValue2 === oOutFilter.oValue2) {
-//								bFound = true;
-//								break;
-//							}
-//						}
-//						if (!bFound) {
-//							aFilters.push(oOutFilter);
-//						}
-//					}
-//				} else {
-//					aFilters.push(oConfig.oOutParameters);
-//				}
-//			}
-
-			oFilter = aFilters.length > 1 ? new Filter({filters: aFilters, and: true}) : aFilters[0];
+			var oFilter = _createItemFilters.call(this, oConfig, oInitialConditions);
 			var oFilterListBinding = oModel.bindList(sPath, oBindingContext);
 
 			return oDelegate.executeFilter(oDelegatePayload, oFilterListBinding, oFilter, 2).then(function (oBinding) {
@@ -590,7 +531,7 @@ sap.ui.define([
 				}, 0);
 
 				if (aContexts.length && (aContexts.length < 2 || bUseFirstMatch)) {
-					return this._getItemFromContext(aContexts[0], {keyPath: sKeyPath, descriptionPath: sDescriptionPath, inParameters: aInParameters});
+					return this._getItemFromContext(aContexts[0], {keyPath: sKeyPath, descriptionPath: sDescriptionPath, inParameters: undefined});
 				} else if (oConfig.checkKey && oConfig.parsedValue === "" && aContexts.length === 0) {
 					// nothing found for empty key -> this is not an error
 					return null;
@@ -622,7 +563,7 @@ sap.ui.define([
 
 	MTable.prototype.navigate = function (iStep) {
 
-		var oListBinding = this._getListBinding();
+		var oListBinding = this.getListBinding();
 
 		if (!oListBinding || !oListBinding.getLength()) {
 			return _checkListBindingPending.call(this).then(function (bPending) {
@@ -697,8 +638,11 @@ sap.ui.define([
 			if (oItem !== oSelectedItem) {
 				oItem.setSelected(true);
 
-				var oValues = this._getItemFromContext(oItem.getBindingContext());
-				oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
+				var oBindingInfo = this._getListBindingInfo();
+				var sModelName = oBindingInfo.model;
+				var oItemContext = oItem.getBindingContext(sModelName);
+				var oValues = this._getItemFromContext(oItemContext);
+				oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.payload);
 				this.setProperty("conditions", [oCondition], true);
 
 				if (this._bVisible) {
@@ -805,41 +749,12 @@ sap.ui.define([
 		_adjustTable.call(this);
 	};
 
-	var _handleSearch = function () {
+	MTable.prototype._handleSearch = function (oEvent) {
 		return this.applyFilters(this.getFilterValue());
 	};
 
 	MTable.prototype._observeChanges = function (oChanges) {
 
-		var oFilterBar, oDefaultFilterBar;
-		if (oChanges.name === "_defaultFilterBar") {
-			oDefaultFilterBar = oChanges.child;
-			if (oChanges.mutation === "insert") {
-				oFilterBar = this.getFilterBar();
-				if (!oFilterBar) {
-					oDefaultFilterBar.attachSearch(_handleSearch, this);
-				}
-			} else {
-				oDefaultFilterBar.detachSearch(_handleSearch, this);
-			}
-		}
-
-		if (oChanges.name === "filterBar") {
-			oFilterBar = oChanges.child;
-			oDefaultFilterBar = this.getAggregation("_defaultFilterBar");
-			if (oChanges.mutation === "insert") {
-				if (oDefaultFilterBar) {
-					oDefaultFilterBar.detachSearch(_handleSearch, this);
-				}
-				oFilterBar.attachSearch(_handleSearch, this);
-			} else {
-				if (oDefaultFilterBar) {
-					oDefaultFilterBar.attachSearch(_handleSearch, this);
-				}
-				oFilterBar.detachSearch(_handleSearch, this);
-			}
-		}
-
 		if (oChanges.name === "config") {
 			_adjustTable.call(this);
 		}

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

@@ -1,12 +1,18 @@
 sap.ui.define([
+    "sap/ui/test/Opa5",
     "sap/ui/test/actions/Press",
     "sap/base/Log",
     "sap/ui/test/matchers/Ancestor",
-    "sap/ui/test/matchers/PropertyStrictEquals"
-], function (Press, Log, Ancestor, PropertyStrictEquals) {
+    "sap/ui/test/matchers/PropertyStrictEquals",
+    "sap/ui/test/matchers/Properties",
+    "../p13n/Util",
+	"../p13n/waitForP13nButtonWithMatchers",
+	"../p13n/waitForP13nDialog"
+], function (Opa5, Press, Log, Ancestor, PropertyStrictEquals, Properties, p13nUtil, waitForP13nButtonWithMatchers, waitForP13nDialog) {
 	"use strict";
 
     var oCore = sap.ui.test.Opa5.getWindow().sap.ui.getCore();
+    var oMDCBundle = oCore.getLibraryResourceBundle("sap.ui.mdc");
 
     var waitForMDCChartWithId = function(sId, oSettings) {
         return this.waitFor({
@@ -85,6 +91,46 @@ sap.ui.define([
     };
 
 	return {
+        iOpenThePersonalizationDialog: function(oControl, oSettings) {
+            var sControlId = typeof oControl === "string" ? oControl : oControl.getId();
+            var aDialogMatchers = [];
+            var aButtonMatchers = [];
+            return this.waitFor({
+                id: sControlId,
+                success: function(oControlInstance) {
+                    Opa5.assert.ok(oControlInstance);
+
+                    aButtonMatchers.push(new Ancestor(oControlInstance));
+
+                    aDialogMatchers.push(new Ancestor(oControlInstance, false));
+
+                    // Add matcher for p13n button icon
+                    aButtonMatchers.push(new Properties({
+                        icon: p13nUtil.icons.settings
+                    }));
+                    aDialogMatchers.push(new Properties({
+                        title: oMDCBundle.getText("p13nDialog.VIEW_SETTINGS")
+                    }));
+
+                    waitForP13nButtonWithMatchers.call(this, {
+                        actions: new Press(),
+                        matchers: aButtonMatchers,
+                        success: function() {
+                            waitForP13nDialog.call(this, {
+                                matchers: aDialogMatchers,
+                                success:  function(oP13nDialog) {
+                                    if (oSettings && typeof oSettings.success === "function") {
+                                        oSettings.success.call(this, oP13nDialog);
+                                    }
+                                }
+                            });
+                        },
+                        errorMessage: "Control '" + sControlId + "' has no P13n button"
+                    });
+                },
+                errorMessage: "Control '" + sControlId + "' not found."
+            });
+        },
         /**
          * Clicks on the "Zoom In" button in the toolbar of a mdc chart.
          * @param {string} sId The id of the mdc chart

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

@@ -26,7 +26,6 @@ sap.ui.define([
                  * 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.
@@ -34,8 +33,8 @@ sap.ui.define([
                  * 3. Executes the given ChartPersonalizationConfigurations.
                  * 4. Closes the personalization dialog.
                  */
-                iPersonalizeChart: function(oChart, sChartType, aConfigurations){
-                    return p13nActions.iPersonalizeChart.call(this, oChart, sChartType, aConfigurations);
+                iPersonalizeChart: function(oChart, aConfigurations){
+                    return p13nActions.iPersonalizeChart.call(this, oChart, null, aConfigurations, true, chartActions.iOpenThePersonalizationDialog);
                 },
                 /**
                  * @typedef {object} SortPersonalizationConfiguration
@@ -52,7 +51,7 @@ sap.ui.define([
                  * 3. Closes the personalization dialog.
                  */
                 iPersonalizeSort: function(oChart, aConfigurations) {
-                    return p13nActions.iPersonalizeSort.call(this, oChart, aConfigurations);
+                    return p13nActions.iPersonalizeSort.call(this, oChart, aConfigurations, chartActions.iOpenThePersonalizationDialog);
                 },
                 /**
                  * Opa5 test action
@@ -64,7 +63,7 @@ sap.ui.define([
                  * 4. Closes the personalization dialog.
                  */
                 iResetThePersonalization: function(oChart) {
-                    return p13nActions.iResetThePersonalization.call(this, oChart);
+                    return p13nActions.iResetThePersonalization.call(this, oChart, chartActions.iOpenThePersonalizationDialog);
                 },
 
                 /**
@@ -268,6 +267,7 @@ sap.ui.define([
                 },
                 /**
                  * Assertion to check visible dimensions on the MDC Chart
+                 * @param {array} aDimensions
                  * @param {string} sId Id of the MDC Chart
                  * @returns {Promise} OPA waitFor
                  */
@@ -276,6 +276,7 @@ sap.ui.define([
                 },
                 /**
                  * Assertion to check visible measures on the MDC Chart
+                 * @param {array} aMeasures
                  * @param {string} sId Id of the MDC Chart
                  * @returns {Promise} OPA waitFor
                 */

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

@@ -26,7 +26,6 @@ sap.ui.define([
                  * 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.
@@ -34,8 +33,8 @@ sap.ui.define([
                  * 3. Executes the given ChartPersonalizationConfigurations.
                  * 4. Closes the personalization dialog.
                  */
-                iPersonalizeChart: function(oChart, sChartType, aConfigurations){
-                    return p13nActions.iPersonalizeChart.call(this, oChart, sChartType, aConfigurations);
+                iPersonalizeChart: function(oChart, aConfigurations){
+                    return p13nActions.iPersonalizeChart.call(this, oChart, null, aConfigurations, true, chartActions.iOpenThePersonalizationDialog);
                 },
                 /**
                  * @typedef {object} SortPersonalizationConfiguration
@@ -52,7 +51,7 @@ sap.ui.define([
                  * 3. Closes the personalization dialog.
                  */
                 iPersonalizeSort: function(oChart, aConfigurations) {
-                    return p13nActions.iPersonalizeSort.call(this, oChart, aConfigurations);
+                    return p13nActions.iPersonalizeSort.call(this, oChart, aConfigurations, chartActions.iOpenThePersonalizationDialog);
                 },
                 /**
                  * Opa5 test action
@@ -64,7 +63,7 @@ sap.ui.define([
                  * 4. Closes the personalization dialog.
                  */
                 iResetThePersonalization: function(oChart) {
-                    return p13nActions.iResetThePersonalization.call(this, oChart);
+                    return p13nActions.iResetThePersonalization.call(this, oChart, chartActions.iOpenThePersonalizationDialog);
                 },
 
                 /**