@openui5/sap.ui.mdc 1.100.0 → 1.102.1

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

@@ -10,23 +10,28 @@
 
 sap.ui.define([
 	"sap/ui/mdc/BaseDelegate",
-	"sap/ui/model/FilterType"
+	"sap/ui/model/FilterType",
+	"sap/ui/mdc/enum/ConditionValidated"
 ], function(
 	BaseDelegate,
-	FilterType
+	FilterType,
+	ConditionValidated
 ) {
 	"use strict";
 
 	/**
-	 * @class Delegate class for {@link sap.ui.mdc.ValueHelp ValueHelp}.<br>
+	 * Delegate for {@link sap.ui.mdc.ValueHelp ValueHelp}.<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.
 	 *
+	 * @namespace
 	 * @author SAP SE
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.ValueHelp
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @experimental As of version 1.95
 	 * @since 1.95.0
-	 * @alias sap.ui.mdc.ValueHelpDelegate
+	 * @extends module:sap/ui/mdc/BaseDelegate
+	 * @alias module:sap/ui/mdc/ValueHelpDelegate
 	 */
 	var ValueHelpDelegate = Object.assign({}, BaseDelegate);
 
@@ -41,12 +46,14 @@ sap.ui.define([
 	 *
 	 * @param {object} oPayload Payload for delegate
 	 * @param {sap.ui.mdc.valuehelp.base.Container} oContainer Container instance
+	 * @param {string} sContentId id of the content shown after this call to retrieveContent
+	 *
 	 * @returns {Promise} Promise that is resolved if all content is available
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 */
-	ValueHelpDelegate.retrieveContent = function (oPayload, oContainer) {
+	ValueHelpDelegate.retrieveContent = function (oPayload, oContainer, sContentId) {
 		return Promise.resolve();
 	};
 
@@ -151,7 +158,7 @@ sap.ui.define([
 	/**
 	 * Checks if the <code>ListBinding</code> is waiting for an update.
 	 * As long as the context has not been set for <code>ListBinding</code>,
-	 * <code>FieldValueHelp</code> needs to wait.
+	 * <code>ValueHelp</code> needs to wait.
 	 *
 	 * @param {object} oPayload Payload for delegate
 	 * @param {sap.ui.model.ListBinding} oListBinding <code>ListBinding</code> to check
@@ -164,5 +171,150 @@ sap.ui.define([
 		return false;
 	};
 
+	//  InOut =====
+
+	/**
+	 * Callback invoked everytime a {@link sap.ui.mdc.ValueHelp ValueHelp} fires a select event or the value of the corresponding field changes
+	 * This callback may be used to update external fields.
+	 *
+	 * @param {object} oPayload Payload for delegate
+  	 * @param {sap.ui.mdc.ValueHelp} oValueHelp <code>ValueHelp</code> control instance receiving the <code>controlChange</code>
+	 * @param {sap.ui.mdc.enum.PropagationReason} sReason Reason why the method was invoked
+ 	 * @param {object} oConfig current configuration provided by the calling control
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.onConditionPropagation = function (oPayload, oValueHelp, sReason, oConfig) {
+
+	};
+
+	/**
+	 * Provides an initial condition configuration everytime a value help content is shown.
+	 *
+	 * <b>Note:</b> Make sure to provide the type information to the corresponding properties of
+	 * the {@link sap.ui.mdc.filterbar.vh.FilterBar FilterBar}.
+	 *
+	 * <b>Note:</b> Be aware that setting the condition for the search field or type-ahead could
+	 * lead to unwanted side effects.
+	 *
+	 * @param {object} oPayload Payload for delegate
+ 	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent ValueHelp content requesting conditions configuration
+	 * @param {sap.ui.core.Control} oControl Instance of the calling control
+	 * @returns {Promise<object>|object} Returns a map of conditions suitable for a sap.ui.mdc.FilterBar control
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.getInitialFilterConditions = function (oPayload, oContent, oControl) {
+
+		var oConditions = {};
+		return oConditions;
+
+	};
+
+	/**
+	 * Provides the possibility to customize selections in 'Select from list' scenarios.
+	 * By default, only condition keys are considered. This may be extended with payload dependent filters.
+	 *
+	 * @param {object} oPayload Payload for delegate
+ 	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {sap.ui.core.Element} oItem Entry of a given list
+	 * @param {sap.ui.mdc.condition.ConditionObject[]} aConditions current conditions
+	 * @returns {boolean} True, if item is selected
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.isFilterableListItemSelected = function (oPayload, oContent, oItem, aConditions) {
+		var sModelName = oContent._getListBindingInfo().model;
+		var oContext = oItem && oItem.getBindingContext(sModelName);
+		var oItemData = oContent._getItemFromContext(oContext);
+
+		for (var i = 0; i < aConditions.length; i++) {
+			var oCondition = aConditions[i];
+			if (oCondition.validated === ConditionValidated.Validated && oItemData.key === oCondition.values[0]) { // TODO: check for specific EQ operator
+				return true;
+			}
+		}
+
+		return false;
+	};
+
+	/**
+	 * Provides the possibility to customize selection events in 'Select from list' scenarios.
+	 * This enables an application to reuse conditions in collective search scenarios, instead of always creating new ones.
+	 *
+	 * @param {object} oPayload Payload for delegate
+ 	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {object} oChange Selection event configuration
+	 * @param {sap.ui.mdc.enum.SelectType} oChange.type Type of the selection change (add, remove)
+	 * @param {object[]} oChange.conditions Array of changed conditions with structure {@link sap.ui.mdc.condition.ConditionObject ConditionObject}
+	 * @returns {object} oRestult Selection event configuration object
+	 * @returns {sap.ui.mdc.enum.SelectType} oRestult.type Type of the selection change (add, remove)
+	 * @returns {object[]} oRestult.conditions Array of changed conditions with structure {@link sap.ui.mdc.condition.ConditionObject ConditionObject}
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.modifySelectionBehaviour = function (oPayload, oContent, oChange) {
+		return oChange;
+	};
+
+	/**
+	 * Provides the possibility to convey custom data in conditions.
+	 * This enables an application to enhance conditions with data relevant for combined key or outparameter scenarios.
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {any[]} aValues key, description pair for the condition which is to be created.
+	 * @param {sap.ui.model.Context} [oContext] optional additional context
+	 * @returns {undefined|object} Optionally returns a serializeable object to be stored in the condition payload field.
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.createConditionPayload = function (oPayload, oContent, aValues, oContext) {
+		return undefined;
+	};
+
+	/**
+	 * Provides type information for listcontent filtering
+	 *
+	 * @param {object} oPayload Payload for delegate
+	 * @param {sap.ui.mdc.valuehelp.base.FilterableListContent} oContent <code>ValueHelp</code> content instance
+	 * @param {object} oConditions set of conditions to create filters for
+	 * @returns {object} Returns a type map for property paths
+	 * @private
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.101.0
+	 */
+	ValueHelpDelegate.getTypesForConditions = function (oPayload, oContent, oConditions) {	// TODO: MDC.Table add UI.Table support
+		var oConditionTypes = {};
+		var oListBindingInfo = oContent && oContent._getListBindingInfo();
+
+		if (oListBindingInfo && oListBindingInfo.template) {
+			oListBindingInfo.template.mAggregations.cells.forEach(function (oCell) {
+				Object.values(oCell.mBindingInfos).forEach(function (oBindingInfo) {
+					oBindingInfo.parts.forEach(function (oPartInfo) {
+						oConditionTypes[oPartInfo.path] = {type: oPartInfo.type || null};
+					});
+				});
+			}, {});
+		}
+
+		return oConditionTypes;
+	};
+
+	/* ValueHelpDelegate.getCount = function (oPayload, oContent, aConditions, sGroup) {
+		return 0;
+	}; */
+
 	return ValueHelpDelegate;
 });

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.100.0
+	 * @version 1.102.1
 	 * @constructor
 	 * @private
 	 * @since 1.58

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

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

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

@@ -42,7 +42,7 @@ sap.ui.define([
          * @class The ChartToolbar control is a sap.m.OverflowToolbar based on metadata and the configuration specified.
          * @extends sap.ui.mdc.ActionToolbar
          * @author SAP SE
-         * @version 1.100.0
+         * @version 1.102.1
          * @constructor
          * @experimental As of version 1.88
          * @private
@@ -163,13 +163,18 @@ sap.ui.define([
 					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
                     enabled: false,
                     press: function (oEvent) {
+                        var aP13nMode = oMDCChart.getP13nMode();
+                        var iIdx = aP13nMode.indexOf("Type");
+						if (iIdx > -1) {
+							aP13nMode.splice(iIdx, 1);
+						}
 
                         //TODO: Move this to p13n functionality?
                         if (oMDCChart.isPropertyHelperFinal()){
-                            oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
+                            oMDCChart.getEngine().uimanager.show(oMDCChart, aP13nMode);
                         } else {
                             oMDCChart.finalizePropertyHelper().then(function(){
-                                oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
+                                oMDCChart.getEngine().uimanager.show(oMDCChart, aP13nMode);
                             });
                         }
                     }

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

@@ -182,12 +182,21 @@ sap.ui.define([
 								sap.ui.require([
 									"sap/ui/mdc/p13n/FlexUtil", "sap/ui/mdc/flexibility/Chart.flexibility"
 								], function(FlexUtil,ChartFlex) {
-									var aChanges = [];
+									//var aChanges = [];
+
+									oMDCChart.getEngine().createChanges({
+										control: oMDCChart,
+										key: "Type",
+										state: {
+											type: oObj.key
+										}
+									});
+									/*
 									aChanges.push(ChartFlex["setChartType"].changeHandler.createChange({
 										control: oMDCChart,
 										chartType: oObj.key
 									}));
-									FlexUtil.handleChanges(aChanges);
+									FlexUtil.handleChanges(aChanges);*/
 								});
 							}
 						}

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

@@ -26,6 +26,8 @@ sap.ui.define([
 
     DrillBreadcrumbs.prototype.init = function(){
         Breadcrumbs.prototype.init.apply(this, arguments);
+
+        this.addStyleClass("sapUiMDCChartBreadcrumbs");
     };
 
 

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

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

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

@@ -23,13 +23,12 @@ sap.ui.define([
 		 */
 
 		/**
-		 *
 		 * Utilities to create conditions to be used in {@link sap.ui.mdc.FilterField FilterField},
 		 * {@link sap.ui.mdc.FilterBar FilterBar} or {@link sap.ui.mdc.condition.ConditionModel ConditionModel}
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *
@@ -53,6 +52,7 @@ sap.ui.define([
 				 * @property {object} [outParameters] Out parameters of the condition. For each field path, a value is stored
 				 * @property {boolean} [isEmpty] If set, the condition is empty (used as dummy condition in {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel})
 				 * @property {sap.ui.mdc.enum.ConditionValidated} validated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel} control
+				 * @property {object} [payload] Payload of the condition. Set by application. Data needs to be stringified. (as stored and loaded in variants)
 				 * @private
 				 * @ui5-restricted sap.fe
 				 * @MDC_PUBLIC_CANDIDATE
@@ -66,15 +66,16 @@ sap.ui.define([
 				 *
 				 * @param {string} sKey Operator for the condition
 				 * @param {string} sDescription Description of the operator
-				 * @param {object} oInParameters In parameters of the condition
-				 * @param {object} oOutParameters Out parameters of the condition
+				 * @param {object} [oInParameters] In parameters of the condition
+				 * @param {object} [oOutParameters] Out parameters of the condition
+				 * @param {object} [oPayload] Payload of the condition
 				 * @returns {sap.ui.mdc.condition.ConditionObject} The new condition object with the EQ operator along with <code>sKey</code> and <code>sDescription</code> as <code>aValues</code>
 				 * @private
 				 * @ui5-restricted sap.fe
 				 * @MDC_PUBLIC_CANDIDATE
 				 *
 				 */
-				createItemCondition: function(sKey, sDescription, oInParameters, oOutParameters) {
+				createItemCondition: function(sKey, sDescription, oInParameters, oOutParameters, oPayload) {
 					var sValidated = ConditionValidated.NotValidated;
 					var aValues = [sKey, sDescription];
 					if (sDescription === null || sDescription === undefined) {
@@ -82,7 +83,7 @@ sap.ui.define([
 					} else {
 						sValidated = ConditionValidated.Validated; // if there is a description set it is validated (even if empty string)
 					}
-					return this.createCondition("EQ", aValues, oInParameters, oOutParameters, sValidated);
+					return this.createCondition("EQ", aValues, oInParameters, oOutParameters, sValidated, oPayload);
 				},
 
 				/**
@@ -90,16 +91,17 @@ sap.ui.define([
 				 *
 				 * @param {string} sOperator Operator for the condition
 				 * @param {any[]} aValues Array of values for the condition
-				 * @param {object} oInParameters In parameters of the condition
-				 * @param {object} oOutParameters Out parameters of the condition
+				 * @param {object} [oInParameters] In parameters of the condition
+				 * @param {object} [oOutParameters] Out parameters of the condition
 				 * @param {sap.ui.mdc.enum.ConditionValidated} sValidated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the <code>DefineConditionPanel</code> control
+				 * @param {object} [oPayload] Payload of the condition
 				 * @returns {sap.ui.mdc.condition.ConditionObject} The new condition object with the given operator and values
 				 * @private
 				 * @ui5-restricted sap.fe
 				 * @MDC_PUBLIC_CANDIDATE
 				 *
 				 */
-				createCondition: function(sOperator, aValues, oInParameters, oOutParameters, sValidated) {
+				createCondition: function(sOperator, aValues, oInParameters, oOutParameters, sValidated, oPayload) {
 					var oCondition = { operator: sOperator, values: aValues, isEmpty: null, validated: sValidated }; // use null as undefined is not recognized by filter
 					if (oInParameters) {
 						oCondition.inParameters = oInParameters;
@@ -107,6 +109,9 @@ sap.ui.define([
 					if (oOutParameters) {
 						oCondition.outParameters = oOutParameters;
 					}
+					if (oPayload) {
+						oCondition.payload = oPayload;
+					}
 					return oCondition;
 				},
 

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

@@ -32,7 +32,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
 		 * @experimental As of version 1.74
@@ -60,12 +60,13 @@ sap.ui.define([
 
 				// convert using "normalized" data type
 				var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
-				var aValues = _valuesToString(oCondition.values, _getLocalTypeConfig(oCondition, oTypeUtil, oTypeConfig, oOperator) || oTypeConfig, oOperator);
+				var aValues = _valuesToString(oCondition.values, _getLocalTypeConfig(oTypeUtil, oTypeConfig, oOperator) || oTypeConfig, oOperator);
 
 				// inParameter, OutParameter
 				// TODO: we need the types of the in/out parameter
 				var oInParameters;
 				var oOutParameters;
+				var oPayload;
 
 				if (oCondition.inParameters) {
 					oInParameters = merge({}, oCondition.inParameters);
@@ -74,7 +75,11 @@ sap.ui.define([
 					oOutParameters = merge({}, oCondition.outParameters);
 				}
 
-				var oResult = Condition.createCondition(oCondition.operator, aValues, oInParameters, oOutParameters, oCondition.validated);
+				if (oCondition.payload) {
+					oPayload = merge({}, oCondition.payload);
+				}
+
+				var oResult = Condition.createCondition(oCondition.operator, aValues, oInParameters, oOutParameters, oCondition.validated, oPayload);
 				return oResult;
 
 			},
@@ -97,12 +102,13 @@ sap.ui.define([
 			toType: function(oCondition, oTypeConfig, oTypeUtil) {
 				// convert using "normalized" data type
 				var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
-				var aValues = _stringToValues(oCondition.values, _getLocalTypeConfig(oCondition, oTypeUtil, oTypeConfig, oOperator) || oTypeConfig);
+				var aValues = _stringToValues(oCondition.values, _getLocalTypeConfig(oTypeUtil, oTypeConfig, oOperator) || oTypeConfig);
 
 				// inParameter, OutParameter
 				// TODO: we need the types of the in/out parameter
 				var oInParameters;
 				var oOutParameters;
+				var oPayload;
 
 				if (oCondition.inParameters) {
 					oInParameters = merge({}, oCondition.inParameters);
@@ -111,7 +117,11 @@ sap.ui.define([
 					oOutParameters = merge({}, oCondition.outParameters);
 				}
 
-				var oResult = Condition.createCondition(oCondition.operator, aValues, oInParameters, oOutParameters, oCondition.validated);
+				if (oCondition.payload) {
+					oPayload = merge({}, oCondition.payload);
+				}
+
+				var oResult = Condition.createCondition(oCondition.operator, aValues, oInParameters, oOutParameters, oCondition.validated, oPayload);
 
 				if (oResult.validated !== ConditionValidated.Validated && oOperator.validateInput) {
 					// let the operator check if the condition could be validated. (Use result to not change original condition.)
@@ -120,10 +130,52 @@ sap.ui.define([
 
 				return oResult;
 
+			},
+			/**
+			 * creates a Condition from internal values
+			 *
+			 * @param {string} sOperator Name of operator
+			 * @param {any[]} aValues values
+			 * @param {sap.ui.mdc.enum.ConditionValidated} sValidated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the <code>DefineConditionPanel</code> control
+			 * @param {object} [oPayload] payload of condition
+			 * @param {sap.ui.model.Type} oType Data type of the values
+			 * @param {sap.ui.mdc.util.TypeUtil} oTypeUtil delegate dependent <code>TypeUtil</code> implementation
+			 * @returns {sap.ui.mdc.condition.ConditionObject} stringified condition
+			 * @private
+			 * @ui5-restricted sap.ui.mdc
+			 * @MDC_PUBLIC_CANDIDATE
+			 * @since 1.100.0
+			 */
+			 createExternalCondition: function(sOperator, aValues, sValidated, oPayload, oType, oTypeUtil) {
+				// convert using "normalized" data type
+				var oOperator = FilterOperatorUtil.getOperator(sOperator);
+				var oTypeConfig = oTypeUtil.getTypeConfig(oType);
+				aValues = _valuesToString(aValues, _getLocalTypeConfig(oTypeUtil, oTypeConfig, oOperator) || oTypeConfig, oOperator);
+				var oCondition = Condition.createCondition(sOperator, aValues, undefined, undefined, sValidated); // TODO_ add payload
+				return oCondition;
+			},
+			/**
+			 * gets internal values from stringified condition
+			 *
+			 * @param {sap.ui.mdc.condition.ConditionObject} oCondition stringified condition
+			 * @param {sap.ui.model.Type} oType Data type of the values
+			 * @param {sap.ui.mdc.util.TypeUtil} oTypeUtil delegate dependent <code>TypeUtil</code> implementation
+			 * @returns {any[]} internal values
+			 * @private
+			 * @ui5-restricted sap.ui.mdc
+			 * @MDC_PUBLIC_CANDIDATE
+			 * @since 1.100.0
+			 */
+			 getInternalValues: function(oCondition, oType, oTypeUtil) {
+				// convert using "normalized" data type
+				var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
+				var oTypeConfig = oTypeUtil.getTypeConfig(oType);
+				var aValues = _stringToValues(oCondition.values, _getLocalTypeConfig(oTypeUtil, oTypeConfig, oOperator) || oTypeConfig);
+				return aValues;
 			}
 		};
 
-		function _getLocalTypeConfig (oCondition, oTypeUtil, oTypeConfig, oOperator) {
+		function _getLocalTypeConfig (oTypeUtil, oTypeConfig, oOperator) {
 			if (oOperator && oOperator.valueTypes[0] && (oOperator.valueTypes[0] !== Operator.ValueType.Self && oOperator.valueTypes[0] !== Operator.ValueType.Static)) {
 				// we have to create the type instance for the values
 				return oTypeUtil.getTypeConfig(oOperator._createLocalType(oOperator.valueTypes[0], oTypeConfig && oTypeConfig.typeInstance)); // TODO type for all values must be the same})

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.100.0
+		 * @version 1.102.1
 		 * @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.100.0
+	 * @version 1.102.1
 	 * @since 1.78.0
 	 * @alias sap.ui.mdc.condition.FilterConverter
 	 *

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

@@ -56,7 +56,7 @@ function(
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.100.0
+		 * @version 1.102.1
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *
@@ -81,7 +81,7 @@ function(
 							Description: "{1}",
 							Value: "{0}"
 						},
-						format: function(oCondition, oType, sDisplayFormat, bHideOperator) {
+						format: function(oCondition, oType, sDisplayFormat, bHideOperator, aCompositeTypes) {
 							sDisplayFormat = sDisplayFormat || FieldDisplay.DescriptionValue;
 							var iCount = this.valueTypes.length;
 							var aValues = oCondition.values;
@@ -100,26 +100,30 @@ function(
 									vValue = "";
 								}
 
-								if (i == 0 && oType && (typeof oType.formatValue === "function")) {
+								if (i == 0) {
 									// only the first value can be formatted. second value is the description string
-									sReplace = oType.formatValue(vValue, "string");
+									sReplace = this._formatValue(vValue, oType, aCompositeTypes);
 								} else {
 									sReplace = vValue;
 								}
 
-								sTokenText = sReplace == null ? null : sTokenText.replace(new RegExp("\\$" + i + "|" + i + "\\$" + "|" + "\\{" + i + "\\}", "g"), sReplace);
+								if (sReplace === null) {
+									sTokenText = null; // some types (like Unit) return null if no value is given, in this case stop formating and return null
+									break;
+								}
+								sTokenText = sTokenText.replace(new RegExp("\\$" + i + "|" + i + "\\$" + "|" + "\\{" + i + "\\}", "g"), sReplace);
 							}
 
 							return sTokenText;
 						},
-						parse: function(sText, oType, sDisplayFormat, bDefaultOperator) {
+						parse: function(sText, oType, sDisplayFormat, bDefaultOperator, aCompositeTypes) {
 							sDisplayFormat = sDisplayFormat || FieldDisplay.DescriptionValue;
-							var aResult = Operator.prototype.parse.apply(this, [sText, oType, sDisplayFormat, bDefaultOperator]);
+							var aResult = Operator.prototype.parse.apply(this, [sText, oType, sDisplayFormat, bDefaultOperator, aCompositeTypes]);
 
 							if (bDefaultOperator && (!aResult || aResult[0] === null || aResult[0] === undefined) && sDisplayFormat !== FieldDisplay.Value) {
 								// in default case and no key determined (simple-EQ case)-> use text as key (parse again to use type)
 								sDisplayFormat = FieldDisplay.Value;
-								aResult = Operator.prototype.parse.apply(this, [sText, oType, sDisplayFormat, bDefaultOperator]);
+								aResult = Operator.prototype.parse.apply(this, [sText, oType, sDisplayFormat, bDefaultOperator, aCompositeTypes]);
 							}
 							if (aResult && (aResult[1] === null || aResult[1] === undefined) && sDisplayFormat === FieldDisplay.Value) {
 								aResult = [aResult[0]]; // only key
@@ -774,7 +778,7 @@ function(
 							oDate = UniversalDateUtils.getMonthStartDate(oDate);
 							return UniversalDateUtils.getRange(0, "MONTH", oDate);
 						},
-						format: function(oCondition, oType, sDisplayFormat, bHideOperator) {
+						format: function(oCondition, oType, sDisplayFormat, bHideOperator, aCompositeTypes) {
 							var iValue = oCondition.values[0];
 							var sTokenText = this.tokenFormat;
 							var sReplace = _getMonths.apply(this)[iValue];
@@ -844,7 +848,7 @@ function(
 							oDate = UniversalDateUtils.getMonthStartDate(oDate);
 							return UniversalDateUtils.getRange(0, "MONTH", oDate);
 						},
-						format: function(oCondition, oType, sDisplayFormat, bHideOperator) {
+						format: function(oCondition, oType, sDisplayFormat, bHideOperator, aCompositeTypes) {
 							var iValue = oCondition.values[0];
 							var iYear = oCondition.values[1];
 							var sTokenText = this.tokenFormat;