@openui5/sap.ui.mdc 1.95.0 → 1.96.3

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	'sap/ui/model/FilterProcessor',
 	'sap/ui/mdc/util/Common',
 	'sap/base/strings/formatMessage',
+	'sap/base/util/merge',
 	'sap/ui/mdc/enum/SelectType',
 	'sap/base/Log'
 ], function(
@@ -28,6 +29,7 @@ sap.ui.define([
 	FilterProcessor,
 	Common,
 	formatMessage,
+	merge,
 	SelectType,
 	Log
 ) {
@@ -36,6 +38,22 @@ sap.ui.define([
 	var ListMode = library.ListMode;
 	var Sticky = library.Sticky;
 
+	/**
+	 * 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.
+	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
+	 * @version 1.96.3
+	 * @constructor
+	 * @abstract
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
+	 * @since 1.95.0
+	 * @alias sap.ui.mdc.valuehelp.content.MTable
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
 	var MTable = FilterableListContent.extend("sap.ui.mdc.valuehelp.content.MTable", /** @lends sap.ui.mdc.valuehelp.content.MTable.prototype */
 	{
 		metadata: {
@@ -48,12 +66,18 @@ sap.ui.define([
 
 			},
 			aggregations: {
+				/**
+				 * Table to be used in value help
+				 */
 				table: {
 					type: "sap.m.Table",
 					multiple: false
 				}
 			},
 			events: {
+				/**
+				 * This event is fired if the content of the table is updated
+				 */
 				contentUpdated: {} // TODO: Better way to solve missing popover maxheight? Part of ITypeahead? Or is this explicitly for IPopoverContent?
 			},
 			defaultAggregation: "table"
@@ -85,13 +109,13 @@ sap.ui.define([
 
 	function _updateSelection () {
 		if (this._oTable) {
-//			var aSelectedIds = this.get_conditions().filter(function (oCondition) {
+//			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.get_conditions();
+			var aConditions = this.getConditions();
 
 			for (var iId in aItems) {
 				var oItem = aItems[iId];
@@ -115,7 +139,9 @@ sap.ui.define([
 
 		if ((!oListBinding || !bValueHelpDelegateInitialized) && (this.isContainerOpening() || this.isTypeahead())) {
 				Promise.all([this._retrievePromise("listBinding"), this._awaitValueHelpDelegate()]).then(function () {
-					this.applyFilters(sFieldSearch);
+					if (!this.bIsDestroyed) {
+						this.applyFilters(sFieldSearch);
+					}
 				}.bind(this));
 			return;
 		}
@@ -125,11 +151,10 @@ sap.ui.define([
 		}
 
 		var oDelegate = this._getValueHelpDelegate();
-		var oValueHelpModel = this.getModel("$valueHelp");
-		var oDelegatePayload = oValueHelpModel && oValueHelpModel.getObject("/delegate").payload;
+		var oDelegatePayload = this._getValueHelpDelegatePayload();
 
 		var oFilterBar = this._getPriorityFilterBar();
-		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this.getProperty("_inConditions"); // use InParameter if no FilterBar
+		var oConditions = oFilterBar ? oFilterBar.getInternalConditions() : this.getProperty("inConditions"); // use InParameter if no FilterBar
 		var oConditionTypes = oConditions && this._getTypesForConditions(oConditions);
 		var oFilter = oConditions && FilterConverter.createFilters( oConditions, oConditionTypes, undefined, this.getCaseSensitive());
 		var aFilters = oFilter && [oFilter];
@@ -181,8 +206,6 @@ sap.ui.define([
 			var oParams = oEvent.getParameters();
 			var aListItems = oParams.listItems || oParams.listItem && [oParams.listItem];
 			var aConditions = aListItems.map(function (oItem) {
-//				var sKey = _getListItemKey.call(this, oItem);
-//				return sKey && this._createCondition(sKey);
 				var oValues = this._getItemFromContext(oItem.getBindingContext());
 				return oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
 			}.bind(this));
@@ -195,7 +218,6 @@ sap.ui.define([
 
 	MTable.prototype._handleItemPress = function (oEvent) {
 		var oItem = oEvent.getParameter("listItem");
-//		var oKey = _getListItemKey.call(this, oItem);
 		var oValues = this._getItemFromContext(oItem.getBindingContext());
 		var bIsSingleSelect = this._isSingleSelect();
 		var bSelected = bIsSingleSelect ? true : !oItem.getSelected();
@@ -205,7 +227,6 @@ sap.ui.define([
 			oItem.setSelected(bSelected);
 			sSelectType = bSelected ? SelectType.Add : SelectType.Remove;
 		}
-//		var oCondition = this._createCondition(oKey);
 		var oCondition = this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
 		this.fireSelect({type: sSelectType, conditions: [oCondition]});
 		if (this.isTypeahead()) {
@@ -218,12 +239,6 @@ sap.ui.define([
 		this.fireContentUpdated();
 	};
 
-	MTable.prototype.getContentHeight = function () {	// Part of iTypeAhead? iPopover? Better solution for popover height?
-		var oTable = this._getTable();
-		var oDomRef = oTable && oTable.getDomRef();
-		return oDomRef && Math.round(oDomRef.getBoundingClientRect().height);
-	};
-
 	MTable.prototype._getTable = function () {
 		return this._oTable;
 	};
@@ -261,23 +276,26 @@ sap.ui.define([
 					"sap/ui/layout/FixFlex",
 					"sap/m/VBox",
 					"sap/m/Panel",
-					"sap/m/ScrollContainer"
+					"sap/m/ScrollContainer",
+					"sap/ui/model/resource/ResourceModel"
 				]).then(function(aModules) {
 
 					var FixFlex = aModules[0];
 					var VBox = aModules[1];
 					var Panel = aModules[2];
 					var ScrollContainer = aModules[3];
+					var ResourceModel = aModules[4];
 
 					if (!this._oContentLayout) {
 
-						this._oFilterBarVBox = new VBox(this.getId() + "-FilterBarBox", {visible: "{$this>/_filterBarVisible}"});
+						this._oFilterBarVBox = new VBox(this.getId() + "-FilterBarBox");
 						this._oFilterBarVBox.addStyleClass("sapMdcValueHelpPanelFilterbar");
 						this._oFilterBarVBox._oWrapper = this;
 						this._oFilterBarVBox.getItems = function () {
 							return [this._oWrapper._getPriorityFilterBar.call(this._oWrapper)];
 						};
 
+						this.setModel(new ResourceModel({ bundleName: "sap/ui/mdc/messagebundle", async: false }), "$i18n");
 						var _formatTableTitle = function (sText) {
 							var iItems = 0; //TODO from where do we get the count
 							if (iItems === 0) {
@@ -310,7 +328,7 @@ sap.ui.define([
 						this._oTablePanel.addContent(this._oScrollContainer);
 					}
 
-					this.setAggregation("_displayContent", this._oContentLayout);
+					this.setAggregation("displayContent", this._oContentLayout);
 
 					var oFilterBar = this._getPriorityFilterBar();
 					if (!oFilterBar) {
@@ -325,32 +343,6 @@ sap.ui.define([
 		return this._oTable;
 	};
 
-	MTable.prototype.getFooterContent = function () {
-		return this._retrievePromise("footer", function () {
-			return this._retrievePromise("listBinding").then(function (oListBinding) {
-				var oBindingInfo = this._getListBindingInfo();
-				if (oBindingInfo && oBindingInfo.length) {
-					return loadModules(["sap/m/Button", "sap/m/Toolbar", "sap/m/ToolbarSpacer"]).then(function (aModules) {
-						var Button = aModules[0];
-						var Toolbar = aModules[1];
-						var ToolbarSpacer = aModules[2];
-						var oShowAllItemsButton = new Button(this.getId() + "-showAllItems", {
-							text: this._oMResourceBundle.getText("INPUT_SUGGESTIONS_SHOW_ALL"),
-							press: function () {
-								this.fireRequestSwitchToDialog();
-							}.bind(this)
-						});
-						var aToolbarContent = [new ToolbarSpacer(this.getId() + "-Spacer")].concat(oShowAllItemsButton);
-						var oFooter = new Toolbar(this.getId() + "-TB", {
-							content: aToolbarContent
-						});
-						return oFooter;
-					}.bind(this));
-				}
-			}.bind(this));
-		}.bind(this));
-	};
-
 	MTable.prototype.getItemForValue = function (oConfig) {
 
 		if (!oConfig.checkKey && oConfig.parsedValue && !oConfig.checkDescription) {
@@ -365,10 +357,10 @@ sap.ui.define([
 		*/
 		oConfig.caseSensitive = oConfig.caseSensitive || this.getCaseSensitive();
 
-		return _checkListBindingPending.call(this).then(function(bReady) {
+		return _checkListBindingPending.call(this).then(function(bPending) {
 			var oResult;
 
-			if (bReady) {
+			if (!bPending) {
 				var oTable = this.getTable();
 				oResult = _filterItems.call(this, oConfig, oTable.getItems());
 			}
@@ -385,19 +377,22 @@ sap.ui.define([
 	function _checkListBindingPending() {
 		return this._retrievePromise("listBinding").then(function (oListBinding) {
 			var oDelegate = this._getValueHelpDelegate();
-			var oValueHelpModel = this.getModel("$valueHelp");
-			var oDelegatePayload = oValueHelpModel && oValueHelpModel.getObject("/delegate").payload;
+			var oDelegatePayload = this._getValueHelpDelegatePayload();
 			var oListBindingInfo = this._getListBindingInfo();
 			if (oListBinding && oDelegate){
 				return oDelegate.checkListBindingPending(oDelegatePayload, oListBinding, oListBindingInfo);
 			} else {
-				return false;
+				return true;
 			}
 		}.bind(this));
 	}
 
 	function _filterItems(oConfig, aItems) {
 
+		if (aItems.length === 0) {
+			return;
+		}
+
 		var aFields = [];
 
 		if (oConfig.checkKey && oConfig.hasOwnProperty("parsedValue")) { // empty string or false could be key too
@@ -438,7 +433,7 @@ sap.ui.define([
 				if (!oConfig.inParameters.aFilters) {
 					aInParameters.push(oConfig.inParameters.sPath);
 				} else {
-					for (var i = 0; i < oConfig.inParameters.aFilters.length; i++) {
+					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);
 						}
@@ -458,7 +453,9 @@ sap.ui.define([
 		} else if (aFilteredItems.length > 1) {
 			if (!oConfig.caseSensitive) {
 				// try with case sensitive search
-				return _filterItems.call(this, oConfig, aItems);
+				var oNewConfig = merge({}, oConfig);
+				oNewConfig.caseSensitive = true;
+				return _filterItems.call(this, oNewConfig, aItems);
 			}
 			throw _createException.call(this, oConfig.exception, true, aFields[0].value);
 		}
@@ -497,8 +494,7 @@ sap.ui.define([
 		var sPath = oListBinding && oListBinding.getPath();
 
 		var oDelegate = this._getValueHelpDelegate();
-		var oValueHelpModel = this.getModel("$valueHelp");
-		var oDelegatePayload = oValueHelpModel && oValueHelpModel.getObject("/delegate").payload;
+		var oDelegatePayload = this._getValueHelpDelegatePayload();
 
 		var sPromiseKey = ["loadItemForValue", sPath, sKeyPath, oConfig.parsedValue || oConfig.value].join("_");
 
@@ -516,11 +512,21 @@ sap.ui.define([
 			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++) {
+						if (aInParameters.indexOf(oConfig.inParameters.aFilters[i].sPath) < 0) {
+							aInParameters.push(oConfig.inParameters.aFilters[i].sPath);
+						}
+					}
+				}
 			}
-
 //			if (oConfig.oOutParameters) {
 //				// use out-parameters as additional filters (only if not already set by InParameter
 //				if (oConfig.oInParameters) {
@@ -556,7 +562,7 @@ sap.ui.define([
 				}, 0);
 
 				if (aContexts.length && (aContexts.length < 2 || bUseFirstMatch)) {
-					return this._getItemFromContext(aContexts[0], {keyPath: sKeyPath, descriptionPath: sDescriptionPath});
+					return this._getItemFromContext(aContexts[0], {keyPath: sKeyPath, descriptionPath: sDescriptionPath, inParameters: aInParameters});
 				} else if (oConfig.checkKey && oConfig.parsedValue === "" && aContexts.length === 0) {
 					// nothing found for empty key -> this is not an error
 					return null;
@@ -586,35 +592,13 @@ sap.ui.define([
 		return true;
 	};
 
-	MTable.prototype._isTableReady = function () {
-		var oTable = this._getTable();
-		var oListBinding = oTable && oTable.getBinding("items");
-
-		if (!oTable || !oListBinding) {
-			return false;
-		}
-
-		if (oListBinding && (oListBinding.isSuspended() || oListBinding.getLength() === 0)) {
-			return false; // if no context exist, Table is not ready
-		}
-
-		return true;
-	};
-
-
 	MTable.prototype.navigate = function (iStep) {
 
 		var oListBinding = this._getListBinding();
 
-		if (!oListBinding) { // collect navigates until listbinding is available
-			return this._retrievePromise("listBinding").then(function (oAsyncListBinding) {
-				return this.navigate(iStep);
-			}.bind(this));
-		}
-
-		if (!oListBinding.getLength()) {
-			return _checkListBindingPending.call(this).then(function (bReady) {
-				if (bReady) {
+		if (!oListBinding || !oListBinding.getLength()) {
+			return _checkListBindingPending.call(this).then(function (bPending) {
+				if (!bPending && oListBinding.getLength() !== 0) { // if no items - no navigation is possible
 					return this.navigate(iStep);
 				}
 				return false;
@@ -665,6 +649,19 @@ sap.ui.define([
 				iSelectedIndex--;
 			}
 		}
+		if (iSelectedIndex < 0 || iSelectedIndex > iItems - 1) {
+			// find last not groupable item
+			bSearchForNext = !bSearchForNext;
+			bLeaveFocus = iSelectedIndex < 0;
+			iSelectedIndex = iSelectedIndex < 0 ? 0 : iItems - 1;
+			while (aItems[iSelectedIndex] && aItems[iSelectedIndex].isA("sap.m.GroupHeaderListItem")) { // ignore group headers
+				if (bSearchForNext) {
+					iSelectedIndex++;
+				} else {
+					iSelectedIndex--;
+				}
+			}
+		}
 
 		var oItem = aItems[iSelectedIndex];
 		if (oItem) {
@@ -674,7 +671,7 @@ sap.ui.define([
 
 				var oValues = this._getItemFromContext(oItem.getBindingContext());
 				oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
-				this.setProperty("_conditions", [oCondition], true);
+				this.setProperty("conditions", [oCondition], true);
 
 				if (this._bVisible) {
 					this._handleScrolling(oItem);
@@ -728,6 +725,43 @@ sap.ui.define([
 		};
 	};
 
+	MTable.prototype.getContainerConfig = function () {
+		return {
+			'sap.ui.mdc.valuehelp.Popover': {
+				getContentHeight: function () {
+					var oTable = this._getTable();
+					var oDomRef = oTable && oTable.getDomRef();
+					return oDomRef && Math.round(oDomRef.getBoundingClientRect().height);
+				}.bind(this),
+				getFooter: function () {
+					return this._retrievePromise("footer", function () {
+						return this._retrievePromise("listBinding").then(function (oListBinding) {
+							var oBindingInfo = this._getListBindingInfo();
+							if (oBindingInfo && oBindingInfo.length) {
+								return loadModules(["sap/m/Button", "sap/m/Toolbar", "sap/m/ToolbarSpacer"]).then(function (aModules) {
+									var Button = aModules[0];
+									var Toolbar = aModules[1];
+									var ToolbarSpacer = aModules[2];
+									var oShowAllItemsButton = new Button(this.getId() + "-showAllItems", {
+										text: this._oMResourceBundle.getText("INPUT_SUGGESTIONS_SHOW_ALL"),
+										press: function () {
+											this.fireRequestSwitchToDialog();
+										}.bind(this)
+									});
+									var aToolbarContent = [new ToolbarSpacer(this.getId() + "-Spacer")].concat(oShowAllItemsButton);
+									var oFooter = new Toolbar(this.getId() + "-TB", {
+										content: aToolbarContent
+									});
+									return oFooter;
+								}.bind(this));
+							}
+						}.bind(this));
+					}.bind(this));
+				}.bind(this)
+			}
+		};
+	};
+
 	function _adjustTable () {
 		if (this._oTable && this.getParent()) {
 
@@ -756,7 +790,7 @@ sap.ui.define([
 	};
 
 	var _handleSearch = function () {
-		return this.applyFilters(this.get_filterValue());
+		return this.applyFilters(this.getFilterValue());
 	};
 
 	MTable.prototype._observeChanges = function (oChanges) {
@@ -776,7 +810,7 @@ sap.ui.define([
 
 		if (oChanges.name === "filterBar") {
 			oFilterBar = oChanges.child;
-			oDefaultFilterBar = this.get_defaultFilterBar();
+			oDefaultFilterBar = this.getAggregation("_defaultFilterBar");
 			if (oChanges.mutation === "insert") {
 				if (oDefaultFilterBar) {
 					oDefaultFilterBar.detachSearch(_handleSearch, this);
@@ -787,10 +821,11 @@ sap.ui.define([
 					oDefaultFilterBar.attachSearch(_handleSearch, this);
 				}
 				oFilterBar.detachSearch(_handleSearch, this);
+				this._createDefaultFilterBar(); // TODO: should this be part of FilterableListContent?
 			}
 		}
 
-		if (oChanges.name === "_config") {
+		if (oChanges.name === "config") {
 			_adjustTable.call(this);
 		}
 

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

@@ -4,7 +4,8 @@
 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/filterbar/TestObjects",
+	"test-resources/sap/ui/mdc/testutils/opa/chartNew/TestObjects"
 ], function() {
 	"use strict";
 });

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

@@ -0,0 +1,48 @@
+/*!
+ * ${copyright}
+ */
+
+sap.ui.define([
+	"sap/ui/test/actions/Action"
+], function(Action) {
+	"use strict";
+
+	/**
+	 * @class
+	 * The <code>ContextMenu</code> action is used to simulate a right-click interaction
+	 * with a control.
+	 *
+	 * @extends sap.ui.test.actions.Action
+	 * @public
+	 * @alias sap.ui.mdc.ActionToolbarTesting.pages.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 */ {
+		metadata : {
+			publicMethods : [ "executeOn" ]
+		},
+
+		/**
+		 * Focuses on a given control and triggers a <code>contextmenu</code> event for it.
+		 * Logs an error if the control is not visible (for example, if it has no DOM representation)
+		 *
+		 * @param {sap.ui.core.Control} oControl The control on which the <code>contextmenu</code> event is triggered
+		 * @public
+		 */
+		executeOn : function (oControl) {
+			var $ActionDomRef = this.$(oControl);
+
+			if ($ActionDomRef.length) {
+				this.oLogger.timestamp("sap.ui.comp.actions.ContextMenu");
+				this.oLogger.debug("Right-clicked the control " + oControl);
+
+				this._tryOrSimulateFocusin($ActionDomRef, oControl);
+
+				$ActionDomRef.triggerHandler("contextmenu");
+			}
+		}
+	});
+
+	return ContextMenu;
+});