@openui5/sap.ui.mdc 1.95.0 → 1.96.3

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

@@ -18,7 +18,23 @@ sap.ui.define([
 	Common
 ) {
 	"use strict";
-	var Conditions = Content.extend(
+	/**
+	 * Constructor for a new <code>Conditions</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 showing a condition panel.
+	 * @extends sap.ui.mdc.valuehelp.base.Content
+	 * @version 1.96.3
+	 * @constructor
+	 * @abstract
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
+	 * @since 1.95.0
+	 * @alias sap.ui.mdc.valuehelp.content.Conditions
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	 var Conditions = Content.extend(
 		"sap.ui.mdc.valuehelp.content.Conditions" /** @lends sap.ui.mdc.valuehelp.content.Conditions.prototype */,
 		{
 			metadata: {
@@ -37,6 +53,9 @@ sap.ui.define([
 //						defaultValue: true,
 //						visibility: "hidden"
 //					}
+					/**
+					 * Label shown on condition panel.
+					 */
 					label: {
 						type: "string"
 					}
@@ -87,9 +106,9 @@ sap.ui.define([
 						this.getId() + "-DCP",
 						{
 							label: "{$help>/label}",
-							conditions: "{$help>/_conditions}",
+							conditions: "{$help>/conditions}",
 							inputOK: "{$valueHelp>/_valid}",
-							formatOptions: {path: "$help>/_config", formatter: _convertConfig}, // TODO: change DefineConditionPanel to use Config
+							formatOptions: {path: "$help>/config", formatter: _convertConfig}, // TODO: change DefineConditionPanel to use Config
 							conditionProcessed: _handleConditionProcessed.bind(this)
 						}
 					).setModel(this._oManagedObjectModel, "$help");
@@ -110,36 +129,15 @@ sap.ui.define([
 						}
 						return aContent;
 					};
-					this.setAggregation("_displayContent", this._oScrollContainer);
+					this.setAggregation("displayContent", this._oScrollContainer);
 					return this._oScrollContainer;
 				}.bind(this));
 		}.bind(this));
 	};
 
-	Conditions.prototype.getFooterContent = function () {
-		return this._retrievePromise("footerContent", function () {
-			return loadModules(["sap/m/library", "sap/m/Button"]).then(function (aModules) {
-				var oMLibrary = aModules[0];
-				var ButtonType = oMLibrary.ButtonType;
-				var Button = aModules[1];
-				var oButtonOK = new Button(this.getId() + "-ok", {
-					text: this._oResourceBundle.getText("valuehelp.OK"),
-					enabled: "{$valueHelp>/_valid}",
-					type: ButtonType.Emphasized,
-					press: _handleOK.bind(this)
-				});
-				var oButtonCancel = new Button(this.getId() + "-cancel", {
-					text: this._oResourceBundle.getText("valuehelp.CANCEL"),
-					press: this.fireCancel.bind(this)
-				});
-				return [oButtonOK, oButtonCancel];
-			}.bind(this));
-		}.bind(this));
-	};
-
 	Conditions.prototype.getCount = function (aConditions) {
 		var iCount = 0;
-		// var aConditions = arguments[0] || this.get_conditions();
+
 		for (var i = 0; i < aConditions.length; i++) {
 			var oCondition = aConditions[i];
 			if (oCondition.isEmpty !== true && oCondition.validated === ConditionValidated.NotValidated) {
@@ -159,6 +157,12 @@ sap.ui.define([
 
 	};
 
+	Conditions.prototype.isFocusInHelp = function() {
+
+		return true;
+
+	};
+
 	Conditions.prototype.getRequiresTokenizer = function() {
 		// when only the conditions content is on the dialog the tokenizer should be hidden.
 		return false;
@@ -172,12 +176,12 @@ sap.ui.define([
 		return sTitle;
 	};
 
-	Conditions.prototype.getFormattedSubTitle = function() {
-		var sSubTitle = this.getSubTitle();
-		if (!sSubTitle) {
-			sSubTitle = this._oResourceBundle.getText("valuehelp.DEFINECONDITIONS.Subtitle");
+	Conditions.prototype.getFormattedShortTitle = function() {
+		var sShortTitle = this.getShortTitle();
+		if (!sShortTitle) {
+			sShortTitle = this._oResourceBundle.getText("valuehelp.DEFINECONDITIONS.Shorttitle");
 		}
-		return sSubTitle;
+		return sShortTitle;
 	};
 
 	Conditions.prototype.getAriaAttributes = function(iMaxConditions) {
@@ -190,16 +194,38 @@ sap.ui.define([
 
 	};
 
-	//Part of IPopover?
-	Conditions.prototype.getPopoverConfiguration = function () {
+	Conditions.prototype.getContainerConfig = function () {
 		return {
-			showArrow: true,
-			showHeader: true
+			'sap.ui.mdc.valuehelp.Popover': {
+				showArrow: true,
+				showHeader: true,
+				getContentWidth: function () { return "500px"; },
+				getFooter: function () {
+					return this._retrievePromise("footer", function () {
+						return loadModules(["sap/m/library", "sap/m/Button"]).then(function (aModules) {
+							var oMLibrary = aModules[0];
+							var ButtonType = oMLibrary.ButtonType;
+							var Button = aModules[1];
+							var oButtonOK = new Button(this.getId() + "-ok", {
+								text: this._oResourceBundle.getText("valuehelp.OK"),
+								enabled: "{$valueHelp>/_valid}",
+								type: ButtonType.Emphasized,
+								press: _handleOK.bind(this)
+							});
+							var oButtonCancel = new Button(this.getId() + "-cancel", {
+								text: this._oResourceBundle.getText("valuehelp.CANCEL"),
+								press: this.fireCancel.bind(this)
+							});
+							return [oButtonOK, oButtonCancel];
+						}.bind(this));
+					}.bind(this));
+				}.bind(this)
+			}
 		};
 	};
 
 	function _handleOK(oEvent) {
-//		var aConditions = this.get_conditions();
+//		var aConditions = this.getConditions();
 //
 //		// remove empty conditions
 //		aConditions = Condition._removeEmptyConditions(aConditions);
@@ -211,7 +237,7 @@ sap.ui.define([
 	}
 
 	function _handleConditionProcessed(oEvent) {
-		var aNextConditions = this.get_conditions();
+		var aNextConditions = this.getConditions();
 
 		if (this._getMaxConditions() === 1) {	// TODO: Better treatment of conditions? DefineConditionPanel currently hijacks conditions
 			aNextConditions = aNextConditions.filter(function(oCondition){
@@ -237,7 +263,7 @@ sap.ui.define([
 			oFormatOptions.maxConditions = oConfig.maxConditions;
 			oFormatOptions.delegate = oConfig.delegate;
 			oFormatOptions.delegateName = oConfig.delegateName;
-			oFormatOptions.payload = oConfig.paylod;
+			oFormatOptions.payload = oConfig.payload;
 			oFormatOptions.operators = oConfig.operators;
 			oFormatOptions.display = oConfig.display;
 		}

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

@@ -8,19 +8,33 @@ sap.ui.define([
 	"sap/ui/mdc/valuehelp/base/ListContent",
 	"sap/ui/mdc/util/loadModules",
 	"sap/ui/mdc/enum/ConditionValidated",
-	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
-	'sap/ui/mdc/enum/SelectType'
+	"sap/ui/mdc/enum/SelectType"
 ], function(
 	ListContent,
 	loadModules,
 	ConditionValidated,
-	FormatException,
 	ParseException,
 	SelectType
 ) {
 	"use strict";
 
+	/**
+	 * Constructor for a new <code>FixedList</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 showing a list with fix values.
+	 * @extends sap.ui.mdc.valuehelp.base.Content
+	 * @version 1.96.3
+	 * @constructor
+	 * @abstract
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
+	 * @since 1.95.0
+	 * @alias sap.ui.mdc.valuehelp.content.FixedList
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
 	var FixedList = ListContent.extend("sap.ui.mdc.valuehelp.content.FixedList", /** @lends sap.ui.mdc.valuehelp.content.FixedList.prototype */
 	{
 		metadata: {
@@ -30,7 +44,10 @@ sap.ui.define([
 				"sap.ui.mdc.valuehelp.IDialogContent"
 			],
 			properties: {
-				groupable: {
+				/**
+				 * If set, the items of the list can be grouped
+				 */
+				 groupable: {
 					type: "boolean",
 					group: "Appearance",
 					defaultValue : false
@@ -118,7 +135,7 @@ sap.ui.define([
 						valueTextDirection: "{$help>textDirection}"
 					}).addStyleClass("sapMComboBoxNonInteractiveItem"); // to add focus outline to selected items
 
-					var oFilter = new Filter("text", _suggestFilter.bind(this));
+					var oFilter = new Filter({path: "text", test: _suggestFilter.bind(this), caseSensitive: true}); // caseSensitive at it is checked in filter-function
 
 					// add sorter only if supported
 					var oSorter;
@@ -137,7 +154,7 @@ sap.ui.define([
 
 					oList.setModel(this._oManagedObjectModel, "$help");
 //					oList.bindElement({ path: "/", model: "$help" });
-					this.setAggregation("_displayContent", oList, true); // to have in control tree
+					this.setAggregation("displayContent", oList, true); // to have in control tree
 
 					return oList;
 				}.bind(this));
@@ -146,7 +163,7 @@ sap.ui.define([
 
 	function _getList() {
 
-		return this.getAggregation("_displayContent");
+		return this.getAggregation("displayContent");
 
 	}
 
@@ -158,10 +175,10 @@ sap.ui.define([
 		if (bSelected) {
 			var oOriginalItem = _getOriginalItem.call(this, oItem);
 			var vKey = _getKey.call(this, oOriginalItem);
-//			this.fireRemoveConditions({conditions: this.get_conditions()});
+//			this.fireRemoveConditions({conditions: this.getConditions()});
 			_setConditions.call(this, vKey, oItem.getLabel());
-//			this.fireAddConditions({conditions: this.get_conditions()});
-			this.fireSelect({type: SelectType.Set, conditions: this.get_conditions()});
+//			this.fireAddConditions({conditions: this.getConditions()});
+			this.fireSelect({type: SelectType.Set, conditions: this.getConditions()});
 			this.fireConfirm();
 		}
 
@@ -170,7 +187,7 @@ sap.ui.define([
 	function _setConditions(vKey, sValue) {
 
 		var oCondition = this._createCondition(vKey, sValue);
-		this.setProperty("_conditions", [oCondition], true);
+		this.setProperty("conditions", [oCondition], true);
 
 		return oCondition;
 
@@ -180,7 +197,7 @@ sap.ui.define([
 
 		var bFilterList = this.getFilterList();
 
-		return !bFilterList || _filterText.call(this, sText, this.get_filterValue());
+		return !bFilterList || _filterText.call(this, sText, this.getFilterValue());
 
 	}
 
@@ -215,9 +232,9 @@ sap.ui.define([
 
 		var oList = _getList.call(this);
 		if (oList) {
-			var aConditions = this.get_conditions();
+			var aConditions = this.getConditions();
 			var vSelectedKey;
-			var sFilterValue = this.get_filterValue();
+			var sFilterValue = this.getFilterValue();
 			var bUseFirstMatch = this.getUseFirstMatch();
 			var bFistFilterItemSelected = false;
 //			var oOperator = this._getOperator();
@@ -311,11 +328,9 @@ sap.ui.define([
 			}
 
 			var sError = this._oResourceBundle.getText("valuehelp.VALUE_NOT_EXIST", [oConfig.value]);
-			if (oConfig.checkKey && !oConfig.checkDescription) {
-				throw new FormatException(sError);
-			} else {
-				throw new ParseException(sError);
-			}
+			var Exception = oConfig.exception || ParseException;
+			throw new Exception(sError);
+
 		}.bind(this));
 
 	};
@@ -356,7 +371,7 @@ sap.ui.define([
 		var iItems = aItems.length;
 		var iSelectedIndex = 0;
 		var bFilterList = this.getFilterList();
-		var sFilterValue = this.get_filterValue();
+		var sFilterValue = this.getFilterValue();
 		var bLeaveFocus = false;
 
 		if (!bFilterList && !oSelectedItem) {
@@ -364,14 +379,14 @@ sap.ui.define([
 			var i = 0;
 			if (iStep >= 0) {
 				for (i = 0; i < aItems.length; i++) {
-					if (_filterText.call(this, aItems[i].getLabel(), sFilterValue)) {
+					if (!aItems[i].isA("sap.m.GroupHeaderListItem") && _filterText.call(this, aItems[i].getLabel(), sFilterValue)) {
 						iSelectedIndex = i;
 						break;
 					}
 				}
 			} else {
 				for (i = aItems.length - 1; i >= 0; i--) {
-					if (_filterText.call(this, aItems[i].getLabel(), sFilterValue)) {
+					if (!aItems[i].isA("sap.m.GroupHeaderListItem") && _filterText.call(this, aItems[i].getLabel(), sFilterValue)) {
 						iSelectedIndex = i;
 						break;
 					}
@@ -386,25 +401,38 @@ sap.ui.define([
 			iSelectedIndex = iItems + iStep;
 		}
 
-		var bSeachForNext;
+		var bSearchForNext;
 		if (iSelectedIndex < 0) {
 			iSelectedIndex = 0;
-			bSeachForNext = true;
+			bSearchForNext = true;
 			bLeaveFocus = true;
 		} else if (iSelectedIndex >= iItems - 1) {
 			iSelectedIndex = iItems - 1;
-			bSeachForNext = false;
+			bSearchForNext = false;
 		} else {
-			bSeachForNext = iStep >= 0;
+			bSearchForNext = iStep >= 0;
 		}
 
 		while (aItems[iSelectedIndex] && aItems[iSelectedIndex].isA("sap.m.GroupHeaderListItem")) { // ignore group headers
-			if (bSeachForNext) {
+			if (bSearchForNext) {
 				iSelectedIndex++;
 			} else {
 				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) {

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

@@ -174,7 +174,7 @@ sap.ui.define([
 					});
 					var aAddConditions = [], aRemoveConditions = [];
 					var aSelectedRows = MDCTableHelperConfig["Table"].getSelectedItems();
-					var aCurrentConditions = this.get_conditions();
+					var aCurrentConditions = this.getConditions();
 					aRows.forEach(function (oRow, i) {
 						var bIsInSelectedConditions = this._isItemSelected(oRow, aCurrentConditions);
 						var bIsRowSelected = aSelectedRows.indexOf(oRow) !== -1;
@@ -241,7 +241,7 @@ sap.ui.define([
 		if (this._oTableHelper) {
 			this._bSelectionIsUpdating = true;
 			var aItems = this._oTableHelper.getItems();
-			var aConditions = this.get_conditions();
+			var aConditions = this.getConditions();
 			var aModifications = [];
 			for (var iId in aItems) {
 				var oItem = aItems[iId];
@@ -254,6 +254,22 @@ sap.ui.define([
 		}
 	}
 
+	// TODO:  @ui5-restricted sap.ui.mdc
+	/**
+	 * Constructor for a new <code>MDCTable</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.ui.mdc.Table.
+	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
+	 * @version 1.96.3
+	 * @constructor
+	 * @abstract
+	 * @private
+	 * @since 1.95.0
+	 * @alias sap.ui.mdc.valuehelp.content.MDCTable
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
 	var MDCTable = FilterableListContent.extend("sap.ui.mdc.valuehelp.content.MDCTable", /** @lends sap.ui.mdc.valuehelp.content.MDCTable.prototype */
 	{
 		metadata: {
@@ -264,6 +280,9 @@ sap.ui.define([
 			properties: {
 			},
 			aggregations: {
+				/**
+				 * Table to be used in value help
+				 */
 				table: {
 					type: "sap.ui.mdc.Table",
 					multiple: false
@@ -368,7 +387,7 @@ sap.ui.define([
 	};
 
 	var _handleSearch = function () {
-		return this.applyFilters(this.get_filterValue());
+		return this.applyFilters(this.getFilterValue());
 	};
 
 	MDCTable.prototype._observeChanges = function (oChanges) {
@@ -389,7 +408,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);
@@ -441,7 +460,7 @@ sap.ui.define([
 			return;
 		}
 
-		if (oChanges.name === "_config") {
+		if (oChanges.name === "config") {
 			_adjustTable.call(this);
 		}
 
@@ -524,7 +543,7 @@ sap.ui.define([
 					};
 				}
 
-				this.setAggregation("_displayContent", this._oContentLayout);
+				this.setAggregation("displayContent", this._oContentLayout);
 
 				if (!this._getPriorityFilterBar()) {
 					return this._createDefaultFilterBar().then(function () {