@openui5/sap.ui.mdc 1.101.0 → 1.102.2

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

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @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.101.0
+	 * @version 1.102.2
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -152,7 +152,7 @@ sap.ui.define([
 
 		var sFilterFields = this.getFilterFields();
 		var oFilterBar = this._getPriorityFilterBar();
-		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this._oInitialFilterConditions;
+		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this._oInitialFilterConditions || {};
 
 		if (!oFilterBar && sFieldSearch && sFilterFields && sFilterFields !== "$search") {
 			// add condition for Search value
@@ -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:

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

@@ -34,7 +34,7 @@ sap.ui.define([
                  * 4. Closes the personalization dialog.
                  */
                 iPersonalizeChart: function(oChart, aConfigurations){
-                    return p13nActions.iPersonalizeChart.call(this, oChart, null, aConfigurations, true);
+                    return p13nActions.iPersonalizeChart.call(this, oChart, null, aConfigurations, true, chartActions.iOpenThePersonalizationDialog);
                 },
                 /**
                  * @typedef {object} SortPersonalizationConfiguration
@@ -51,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
@@ -63,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);
                 },
 
                 /**

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

@@ -34,7 +34,7 @@ sap.ui.define([
                  * 4. Closes the personalization dialog.
                  */
                 iPersonalizeChart: function(oChart, aConfigurations){
-                    return p13nActions.iPersonalizeChart.call(this, oChart, null, aConfigurations, true);
+                    return p13nActions.iPersonalizeChart.call(this, oChart, null, aConfigurations, true, chartActions.iOpenThePersonalizationDialog);
                 },
                 /**
                  * @typedef {object} SortPersonalizationConfiguration
@@ -51,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
@@ -63,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);
                 },
 
                 /**

package/test/sap/ui/mdc/testutils/opa/filterbar/Actions.js

@@ -13,7 +13,10 @@ sap.ui.define([
 	"sap/ui/test/actions/EnterText",
 	"./Util",
 	"../p13n/Actions",
-	"../p13n/Util"
+	"../p13n/Util",
+	"../p13n/waitForP13nButtonWithMatchers",
+	"../p13n/waitForP13nDialog",
+	"sap/ui/core/Core"
 ], function(
 	Opa5,
 	Matcher,
@@ -25,10 +28,15 @@ sap.ui.define([
 	EnterText,
 	FilterBarUtil,
 	p13nActions,
-	p13nUtil
+	p13nUtil,
+	waitForP13nButtonWithMatchers,
+	waitForP13nDialog,
+	oCore
 ) {
 	"use strict";
 
+	var oMDCBundle = oCore.getLibraryResourceBundle("sap.ui.mdc");
+
 	var iEnterFilterValue = function(oGroupViewItem, mSettings) {
 		// Get sap.m.Panel of GroupViewItem
 		this.waitFor({
@@ -126,7 +134,48 @@ sap.ui.define([
 		});
 	};
 
-    return {
+    var oActions = {
+		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 text
+					var oMatcher = new Matcher();
+					oMatcher.isMatching = function(oButton) {
+						return oButton.getText().includes(oMDCBundle.getText("filterbar.ADAPT"));
+					};
+					aButtonMatchers.push(oMatcher);
+					aDialogMatchers.push(new Properties({
+						title: oMDCBundle.getText("filterbar.ADAPT_TITLE")
+					}));
+
+					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."
+			});
+		},
 		iExpectSearch: function(oFilterBar) {
 			var sFilterBarId = typeof oFilterBar === "string" ? oFilterBar : oFilterBar.getId();
 			var sText = FilterBarUtil.texts.go;
@@ -153,7 +202,7 @@ sap.ui.define([
 		},
 		iEnterFilterValue: function(oFilterBar, mSettings) {
 			var sIcon = p13nUtil.icons.group;
-			return p13nActions.iOpenThePersonalizationDialog.call(this, oFilterBar, {
+			return oActions.iOpenThePersonalizationDialog.call(this, oFilterBar, {
 				success: function(oP13nDialog) {
 					this.waitFor({
 						controlType: "sap.m.Button",
@@ -247,4 +296,6 @@ sap.ui.define([
 		}
     };
 
+	return oActions;
+
 });

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

@@ -38,7 +38,7 @@ sap.ui.define([
 				 * @returns
 				 */
 				iPersonalizeFilter: function(oFilterBar, oSettings) {
-					return p13nActions.iPersonalizeFilterBar.call(this, oFilterBar, oSettings);
+					return p13nActions.iPersonalizeFilterBar.call(this, oFilterBar, oSettings, filterBarActions.iOpenThePersonalizationDialog);
 				},
 				/**
 				 * OPA5 test action
@@ -60,7 +60,7 @@ sap.ui.define([
 				 * @returns
 				 */
 				iResetThePersonalization: function(oFilterBar) {
-					return p13nActions.iResetThePersonalization.call(this, oFilterBar);
+					return p13nActions.iResetThePersonalization.call(this, oFilterBar, filterBarActions.iOpenThePersonalizationDialog);
 				},
 				/**
 				 * OPA5 test action

package/test/sap/ui/mdc/testutils/opa/link/Actions.js

@@ -4,32 +4,73 @@
 
 sap.ui.define([
 	"sap/ui/test/Opa5",
-	"sap/ui/test/matchers/Matcher",
-	"sap/ui/test/matchers/Properties",
 	"sap/ui/test/matchers/Ancestor",
 	"sap/ui/test/matchers/Descendant",
 	"sap/ui/test/matchers/PropertyStrictEquals",
 	"sap/ui/test/actions/Press",
-	"sap/ui/test/actions/EnterText",
-	"../p13n/Actions",
-	"../p13n/Util",
-    "./waitForLink"
+    "../p13n/waitForP13nButtonWithMatchers",
+    "../p13n/waitForP13nDialog",
+    "./waitForLink",
+    "sap/ui/core/Core"
 ], function(
 	Opa5,
-	Matcher,
-	Properties,
 	Ancestor,
 	Descendant,
 	PropertyStrictEquals,
 	Press,
-	EnterText,
-	p13nActions,
-	p13nUtil,
-    waitForLink
+    waitForP13nButtonWithMatchers,
+    waitForP13nDialog,
+    waitForLink,
+    oCore
 ) {
 	"use strict";
 
+    var oMDCBundle = oCore.getLibraryResourceBundle("sap.ui.mdc");
+
     return {
+        iOpenThePersonalizationDialog: function(oControl, oSettings) {
+            var sControlId = typeof oControl === "string" ? oControl : oControl.getId();
+            return this.waitFor({
+                id: sControlId,
+                success: function(oControlInstance) {
+                    Opa5.assert.ok(oControlInstance);
+
+                    new Press().executeOn(oControlInstance);
+                    this.waitFor({
+                        controlType: "sap.ui.mdc.link.Panel",
+                        success: function(aPanels) {
+                            Opa5.assert.equal(aPanels.length, 1, "mdc.link.Panel found");
+                            var oPanel = aPanels[0];
+
+                            waitForP13nButtonWithMatchers.call(this, {
+                                actions: new Press(),
+                                matchers: [
+                                    new Ancestor(oPanel, false),
+                                    new PropertyStrictEquals({
+                                        name: "text",
+                                        value: oMDCBundle.getText("info.POPOVER_DEFINE_LINKS")
+                                    })
+                                ],
+                                success: function() {
+                                    waitForP13nDialog.call(this, {
+                                        matchers: new PropertyStrictEquals({
+                                            name: "title",
+                                            value: oMDCBundle.getText("info.SELECTION_DIALOG_ALIGNEDTITLE")
+                                        }),
+                                        success:  function(oP13nDialog) {
+                                            if (oSettings && typeof oSettings.success === "function") {
+                                                oSettings.success.call(this, oP13nDialog);
+                                            }
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                    });
+                },
+                errorMessage: "Control '" + sControlId + "' not found."
+            });
+        },
         iPressTheLink: function(oLinkIdentifier) {
             return waitForLink.call(this, oLinkIdentifier, {
                 actions: new Press()

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

@@ -5,14 +5,14 @@ sap.ui.define([
 	"sap/ui/test/Opa5",
 	"./Actions",
 	"./Assertions",
-	"../p13n/Actions",
-    "./waitForLink"
+    "./waitForLink",
+	"../p13n/Actions"
 ], function(
 	Opa5,
 	linkActions,
 	linkAssertions,
-	p13nActions,
-    waitForLink
+    waitForLink,
+	p13nActions
 ) {
 	"use strict";
 
@@ -37,7 +37,7 @@ sap.ui.define([
                 iPersonalizeTheLinks: function(oLinkIdentifier, aLinks) {
                     return waitForLink.call(this, oLinkIdentifier, {
                         success: function(oLink) {
-                            p13nActions.iPersonalizeLink.call(this, oLink, aLinks);
+                            p13nActions.iPersonalizeLink.call(this, oLink, aLinks, linkActions.iOpenThePersonalizationDialog);
                         }
                     });
                 },
@@ -53,7 +53,7 @@ sap.ui.define([
                 iResetThePersonalization: function(oLinkIdentifier) {
                     return waitForLink.call(this, oLinkIdentifier, {
                         success: function(oLink) {
-                            p13nActions.iResetThePersonalization.call(this, oLink);
+                            p13nActions.iResetThePersonalization.call(this, oLink, linkActions.iOpenThePersonalizationDialog);
                         }
                     });
                 },