@openui5/sap.ui.mdc 1.96.2 → 1.97.0

package/src/sap/ui/mdc/TableDelegate.js

@@ -14,21 +14,22 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * Base delegate class for sap.ui.mdc.Table.<br>
-	 * <b>Note:</b> The class is experimental and the API/behavior is not finalized and hence this should not be used for productive usage.
+	 * Base delegate class for <code>sap.ui.mdc.Table</code>.
 	 *
 	 * @author SAP SE
-	 * @private
 	 * @experimental
 	 * @since 1.60
 	 * @alias sap.ui.mdc.TableDelegate
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
 	 */
 	var TableDelegate = Object.assign({}, AggregationBaseDelegate);
 
 	/**
-	 * Provides hook to update the binding info object that is used to bind the table to the model.
+	 * Provides a hook to update the binding info object that is used to bind the table to the model.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
 	 * @param {object} oDelegatePayload The delegate payload
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @protected
@@ -47,9 +48,10 @@ sap.ui.define([
 	/**
 	 * Updates the row binding of the table.
 	 *
-	 * The default implementation rebinds the table but model-specific subclasses must call dedicated binding methods to update the binding instead of using {@link #rebindTable}.
+	 * The default implementation rebinds the table, but model-specific subclasses must call dedicated binding methods to update the binding instead
+	 * of using {@link #rebindTable}.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @param {sap.ui.model.ListBinding} [oBinding] The binding instance of the table
 	 * @protected
@@ -73,7 +75,7 @@ sap.ui.define([
 	/**
 	 * Rebinds the table.
 	 *
-	 * @param {sap.ui.mdc.Table} oMDCTable The MDC table instance
+	 * @param {sap.ui.mdc.Table} oMDCTable Instance of the MDC table
 	 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding info object to be used to bind the table to the model
 	 * @protected
 	 */
@@ -84,9 +86,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Provides the table's filter delegate that provides basic filter functionality such as adding filter fields.
-	 * <b>Note:</b> The functionality provided in this delegate should act as a subset of a FilterBarDelegate
-	 * to enable the table for inbuilt filtering.
+	 * Returns the filter delegate of the table that provides basic filter functionality such as adding filter fields.
+	 * <b>Note:</b> The functionality provided in this delegate should act as a subset of a <code>FilterBarDelegate</code> to enable the
+	 * table for inbuilt filtering.
 	 *
 	 * @example <caption>Example usage of <code>getFilterDelegate</code></caption>
 	 * oFilterDelegate = {

package/src/sap/ui/mdc/ValueHelp.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @class Element for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -327,7 +327,16 @@ sap.ui.define([
 	 * belongs to, not by the application.
 	 *
 	 * @param {sap.ui.core.Control} oControl Control to which the <code>FieldHelp</code> element is connected to
-	 * @param {object} oConfig Configuration object that holds needed data of the connected control
+	 * @param {object} [oConfig] Configuration object that holds required data of the connected control
+	 * @param {int} [oConfig.maxConditions=-1] Maximum number of allowed conditions
+	 * @param {sap.ui.model.Type} [oConfig.dataType] Type of the key (required for condition panel)
+	 * @param {string[]} [oConfig.operators] Possible operators to be used in the condition
+	 * @param {sap.ui.mdc.enum.FieldDisplay} [oConfig.display] Defines whether the value and/or description of the field is shown and in what order
+	 * @param {object} [oConfig.delegate] Field delegate to handle model-specific logic (required for condition panel)
+	 * @param {object} [oConfig.delegateName] Field delegate name to handle model-specific logic (required for condition panel)
+	 * @param {object} [oConfig.payload] Payload of the field delegate (required for condition panel)
+	 * @param {string} [oConfig.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one (required if used for {@link sap.ui.mdc.FilterField FilterField})
+	 * @param {string} [oConfig.defaultOperatorName] Name of the default <code>Operator</code> (required if used for {@link sap.ui.mdc.FilterField FilterField})
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase
@@ -358,9 +367,10 @@ sap.ui.define([
 		var oTypeahead = this.getTypeahead();
 		var oDialog = this.getDialog();
 
-		if (oTypeahead && oTypeahead.isOpen()) {
+		// check for opening too as focus move sometimes to valuehelp before handleOpened finished
+		if (oTypeahead && (oTypeahead.isOpen() || oTypeahead.isOpening())) {
 			return oTypeahead.getDomRef();
-		} else if (oDialog && oDialog.isOpen()) {
+		} else if (oDialog && (oDialog.isOpen() || oDialog.isOpening())) {
 			return oDialog.getDomRef();
 		}
 
@@ -542,7 +552,16 @@ sap.ui.define([
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	ValueHelp.prototype.skipOpening = function() { // ? Use close based logic instead?
-		this.close();
+		var oTypeahead = this.getTypeahead();
+		var oDialog = this.getDialog();
+
+		if (oTypeahead && oTypeahead.isOpening()) {
+			oTypeahead.close();
+		}
+
+		if (oDialog && oDialog.isOpening()) {
+			oDialog.close();
+		}
 	};
 
 	/**
@@ -579,7 +598,14 @@ sap.ui.define([
 	 */
 	ValueHelp.prototype.isTypeaheadSupported = function() { // always return promise ?
 
-		return Promise.resolve(!!this.getTypeahead()); // TODO: need to check for search supported or should TypeAhead not be added at all if search is not supported?
+		var oTypeahead = this.getTypeahead();
+		if (oTypeahead) {
+			return this._retrieveDelegateContent(oTypeahead).then(function () {
+				return !!oTypeahead && oTypeahead.isTypeaheadSupported(); // as might depend on binding in content
+			});
+		} else {
+			return Promise.resolve(false);
+		}
 
 	};
 
@@ -892,7 +918,7 @@ sap.ui.define([
 
 	ValueHelp.prototype.getMaxConditions = function() { // ?
 		var oConfig = this.getProperty("_config");
-		return oConfig && oConfig.maxConditions;
+		return (oConfig && oConfig.maxConditions) || -1;
 	};
 
 	ValueHelp.prototype.getDisplay = function() { // ? currently necessary to determine how to render the tokens in valuehelp

package/src/sap/ui/mdc/ValueHelpDelegate.js

@@ -77,6 +77,26 @@ sap.ui.define([
 		return Promise.resolve();
 	};
 
+	/**
+	 * Changes the search string.
+	 *
+	 * If <code>$search</code> is used, depending on which back-end service is used, the search string might need to be escaped.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {boolean} bTypeahead <code>true</code> if the search is called for a type-ahead
+	 * @param {string} sSearch Search string
+	 * @returns {string} Search string to use
+	 * @since 1.97.0
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	 ValueHelpDelegate.adjustSearch = function(oPayload, bTypeahead, sSearch) {
+
+		return sSearch;
+
+	};
+
 	/**
 	 * Executes a filter in a <code>ListBinding</code>.
 	 *

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @class The action for an {@link sap.ui.mdc.ActionToolbar ActionToolbar}) control
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 * @constructor
 	 * @private
 	 * @since 1.58

package/src/sap/ui/mdc/chart/SelectionDetailsActions.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 * @alias sap.ui.mdc.chart.SelectionDetailsActions
 	 *
 	 * @private

package/src/sap/ui/mdc/chart/ToolbarHandler.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	  * @class The ToolbarHandler control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
 	  * @extends sap.m.OverflowToolbar
 	  * @author SAP SE
-	  * @version 1.96.2
+	  * @version 1.97.0
 	  * @constructor
 	  * @experimental As of version ...
 	  * @private

package/src/sap/ui/mdc/chartNew/ChartSelectionDetailsNew.js

@@ -33,7 +33,7 @@ sap.ui.define([
          * @class The ChartSelectionDetailsNew control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.96.2
+         * @version 1.97.0
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chartNew/ChartToolbarNew.js

@@ -41,7 +41,7 @@ sap.ui.define([
          * @class The ChartToolbarNew control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
          * @extends sap.m.OverflowToolbar
          * @author SAP SE
-         * @version 1.96.2
+         * @version 1.97.0
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chartNew/PropertyHelperNew.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/condition/Condition.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.97.0
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *

package/src/sap/ui/mdc/condition/ConditionConverter.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.97.0
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
 		 * @experimental As of version 1.74

package/src/sap/ui/mdc/condition/ConditionModel.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.json.JSONModel
 		 *
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.97.0
 		 * @since 1.48.0
 		 * @alias sap.ui.mdc.condition.ConditionModel
 		 *

package/src/sap/ui/mdc/condition/FilterConverter.js

@@ -24,7 +24,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.97.0
 	 * @since 1.78.0
 	 * @alias sap.ui.mdc.condition.FilterConverter
 	 *

package/src/sap/ui/mdc/condition/FilterOperatorUtil.js

@@ -52,7 +52,7 @@ function(
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.97.0
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *
@@ -66,6 +66,7 @@ function(
 				_mOperators: {
 					equal: new Operator({
 						name: "EQ",
+						alias: "DATE",
 						filterOperator: ModelOperator.EQ,
 						tokenParse: "^=([^=].*)$",
 						tokenFormat: "{1} ({0})", // all placeholder should use the {x} format - the text could be store in the resourcebundel file.
@@ -202,6 +203,7 @@ function(
 					}),
 					between: new Operator({
 						name: "BT",
+						alias: "DATERANGE",
 						filterOperator: ModelOperator.BT,
 						tokenParse: "^([^!].*)\\.\\.\\.(.+)$", // TODO: does this work?? At least also matches crap like ".....". I guess validation of value types needs to get rid of those.
 						tokenFormat: "{0}...{1}",
@@ -270,6 +272,7 @@ function(
 					}),
 					lessEqual: new Operator({
 						name: "LE",
+						alias: "TO",
 						filterOperator: ModelOperator.LE,
 						tokenParse: "^<=(.+)$",
 						tokenFormat: "<={0}",
@@ -285,6 +288,7 @@ function(
 					}),
 					greaterEqual: new Operator({
 						name: "GE",
+						alias: "FROM",
 						filterOperator: ModelOperator.GE,
 						tokenParse: "^>=(.+)$",
 						tokenFormat: ">={0}",
@@ -679,7 +683,7 @@ function(
 					}),
 					specificMonth: new RangeOperator({
 						name: "SPECIFICMONTH",
-						valueTypes: [{ name: "sap.ui.model.type.Integer", constraints: { minimum: 0, maximun: 11 }}],
+						valueTypes: [{ name: "sap.ui.model.type.Integer", constraints: { minimum: 0, maximum: 11 }}],
 						paramTypes: ["(.+)"],
 						additionalInfo: "",
 						// defaultValues: [0],

package/src/sap/ui/mdc/condition/Operator.js

@@ -83,7 +83,7 @@ sap.ui.define([
 		 * @param {string} [oConfiguration.additionalInfo] additionalInfo text for the operator. Will be shown in the operator suggest as second column. If not used (undefined) the Include or Exclude information of the operator is used.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.96.2
+		 * @version 1.97.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE
@@ -198,15 +198,15 @@ sap.ui.define([
 				this.exclude = !!oConfiguration.exclude; // to have always a boolean value
 				this.validateInput = !!oConfiguration.validateInput; // to have always a boolean value
 
-				// if (oConfiguration.group) {
-				// 	this.group = oConfiguration.group;
-				// } else {
-				this.group = {id: !this.exclude ? "1" : "2"};
-				// }
-				if (!this.group.text) {
-					this.group.text = oMessageBundle.getText("VALUEHELP.OPERATOR.GROUP" + this.group.id);
+				if (oConfiguration.group) {
+					this.group = oConfiguration.group;
+				} else {
+					this.group = {id: !this.exclude ? "1" : "2"};
+					if (!this.group.text) {
+						this.group.text = oMessageBundle.getText("VALUEHELP.OPERATOR.GROUP" + this.group.id);
+					}
 				}
-		}
+			}
 		});
 
 		/**