@openui5/sap.ui.mdc 1.102.1 → 1.103.0

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.102.1
+		 * @version 1.103.0
 		 * @since 1.48.0
 		 * @alias sap.ui.mdc.condition.ConditionModel
 		 *
@@ -259,21 +259,44 @@ sap.ui.define([
 			var i = 0;
 			var oCondition;
 
-			this.setProperty("/conditions", {}, undefined, true); // async checkUpdate
-
 			if (Array.isArray(oConditions)) {
 				throw new Error("setConditions with an Array of condition is not supported! " + this);
 			} else {
-				this._bNoSingleEvent = true;
-				for (var sMyFieldPath in oConditions) {
-					this._getFieldPathProperty(sMyFieldPath); // to initialize FieldPath
-					for (i = 0; i < oConditions[sMyFieldPath].length; i++) {
-						oCondition = oConditions[sMyFieldPath][i];
-						this.insertCondition(sMyFieldPath, -1, oCondition, true);
+				this._bNoSingleEvent = true; // to fire event only once per FieldPath
+				var bUpdate = false;
+				var sExternalFieldPath; // used for FieldPath from outside
+				var sFieldPath; // used for escaped FieldPath
+				// check old conditions to fire right propertyChange events
+				var oOldConditions = merge({}, this.getProperty("/conditions")); // in oOldConditions the escaped FieldPath is used
+				for (sExternalFieldPath in oConditions) { // in oConditions the external FieldPath is used
+					this._getFieldPathProperty(sExternalFieldPath); // to initialize FieldPath
+					sFieldPath = _escapeFieldPath.call(this, sExternalFieldPath);
+					var aOldConditions = oOldConditions[sFieldPath] || [];
+					var aConditions = oConditions[sExternalFieldPath] || [];
+					if (!FilterOperatorUtil.compareConditionsArray(aOldConditions, aConditions)) {
+						bUpdate = true;
+						this.removeAllConditions(sExternalFieldPath);
+						for (i = 0; i < oConditions[sExternalFieldPath].length; i++) {
+							oCondition = oConditions[sExternalFieldPath][i];
+							this.insertCondition(sExternalFieldPath, -1, oCondition, true);
+						}
+						this.firePropertyChange({ reason: ChangeReason.Binding, path: "/conditions/" + sExternalFieldPath, context: undefined, value: oConditions[sExternalFieldPath] });
+					}
+					delete oOldConditions[sFieldPath]; // is processed
+				}
+
+				var oFieldPath = this.getProperty("/fieldPath");
+				for (sFieldPath in oOldConditions) { // just entries without update left here
+					if (oOldConditions[sFieldPath].length > 0) { // there where conditions and no there are none -> update
+						bUpdate = true;
+						sExternalFieldPath = oFieldPath[sFieldPath].fieldPath;
+						this.removeAllConditions(sExternalFieldPath);
+						this.firePropertyChange({ reason: ChangeReason.Binding, path: "/conditions/" + sExternalFieldPath, context: undefined, value: [] });
 					}
-					this.firePropertyChange({ reason: ChangeReason.Add, path: "/conditions/" + sMyFieldPath, context: undefined, value: oConditions[sMyFieldPath] });
 				}
-				this.checkUpdate(true, true);
+				if (bUpdate) {
+					this.checkUpdate(false, true); // do not force, only fire real updates. But do async as not known if any other changes via api triggered.
+				}
 				this._bNoSingleEvent = false;
 			}
 
@@ -343,8 +366,8 @@ sap.ui.define([
 			}
 
 			if (!this._bNoSingleEvent) {
-				this.checkUpdate(true, true);
-				this.firePropertyChange({ reason: ChangeReason.Add, path: "/conditions/" + sFieldPath, context: undefined, value: aConditions });
+				this.checkUpdate(false, true); // do not force, only fire real updates. But do async as not known if any other changes via api triggered.
+				this.firePropertyChange({ reason: ChangeReason.Binding, path: "/conditions/" + sFieldPath, context: undefined, value: aConditions });
 			}
 
 			return this;
@@ -386,7 +409,7 @@ sap.ui.define([
 		 * Removes a condition for a specified <code>FieldPath</code>.
 		 *
 		 * @param {string} sFieldPath fieldPath of the condition
-		 * @param {int|{sap.ui.mdc.condition.ConditionObject} vCondition condition or index of the condition
+		 * @param {int|sap.ui.mdc.condition.ConditionObject} vCondition condition or index of the condition
 		 * @returns {boolean} flag if condition was removed.
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
@@ -409,8 +432,8 @@ sap.ui.define([
 				var aConditions = this.getConditions(sFieldPath);
 				if (aConditions.length > iIndex) {
 					aConditions.splice(iIndex, 1);
-					this.checkUpdate(true, true);
-					this.firePropertyChange({ reason: ChangeReason.Remove, path: "/conditions/" + sFieldPath, context: undefined, value: aConditions });
+					this.checkUpdate(false, true); // do not force, only fire real updates. But do async as not known if any other changes via api triggered.
+					this.firePropertyChange({ reason: ChangeReason.Binding, path: "/conditions/" + sFieldPath, context: undefined, value: aConditions });
 					return true;
 				}
 			}
@@ -435,20 +458,26 @@ sap.ui.define([
 				var sEscapedFieldPath = _escapeFieldPath.call(this, sFieldPath);
 				if (oConditions[sEscapedFieldPath] && oConditions[sEscapedFieldPath].length > 0) {
 					oConditions[sEscapedFieldPath] = [];
-					this.firePropertyChange({ reason: ChangeReason.Remove, path: "/conditions/" + sFieldPath, context: undefined, value: oConditions[sFieldPath] });
+					if (!this._bNoSingleEvent) {
+						this.firePropertyChange({ reason: ChangeReason.Binding, path: "/conditions/" + sFieldPath, context: undefined, value: oConditions[sEscapedFieldPath] });
+					}
 				}
 			} else {
 				for (var sMyFieldPath in oConditions) {
 					if (oConditions[sMyFieldPath] && oConditions[sMyFieldPath].length > 0) {
 						oConditions[sMyFieldPath] = [];
-						var oFieldPath = this.getProperty("/fieldPath");
-						var sOriginalFieldPath = oFieldPath[sMyFieldPath].fieldPath;
-						this.firePropertyChange({ reason: ChangeReason.Remove, path: "/conditions/" + sOriginalFieldPath, context: undefined, value: oConditions[sMyFieldPath] });
+						if (!this._bNoSingleEvent) {
+							var oFieldPath = this.getProperty("/fieldPath");
+							var sOriginalFieldPath = oFieldPath[sMyFieldPath].fieldPath;
+							this.firePropertyChange({ reason: ChangeReason.Binding, path: "/conditions/" + sOriginalFieldPath, context: undefined, value: oConditions[sMyFieldPath] });
+						}
 					}
 				}
 			}
 
-			this.checkUpdate(true, true);
+			if (!this._bNoSingleEvent) {
+				this.checkUpdate(false, true); // do not force, only fire real updates. But do async as not known if any other changes via api triggered.
+			}
 
 			return this;
 

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

@@ -24,7 +24,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.0
 	 * @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.102.1
+		 * @version 1.103.0
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *
@@ -1208,7 +1208,7 @@ function(
 				/**
 				 * Returns the operator object for the given operator name.
 				 * @param {string} sOperator Name of the operator
-				 * @returns {sap.ui.mdc.condition.Operator} the operator object, or undefined if the operator with the requested name does not exist
+				 * @returns {sap.ui.mdc.condition.Operator|undefined} the operator object, or <code>undefined<code> if the operator with the requested name does not exist
 				 *
 				 * @private
 				 * @ui5-restricted sap.fe
@@ -1471,7 +1471,7 @@ function(
 				 * Returns the operator object for the given <code>DynamicDateOption</code> name.
 				 * @param {string} sOption Name of the operator
 				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
-				 * @returns {sap.ui.mdc.condition.Operator} the operator object, or undefined if the operator with the requested name does not exist
+				 * @returns {sap.ui.mdc.condition.Operator|undefined} the operator object, or <code>undefined</code> if the operator with the requested name does not exist
 				 *
 				 * @protected
 				 * @since: 1.100.0

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

@@ -84,7 +84,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.102.1
+		 * @version 1.103.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE

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

@@ -51,7 +51,7 @@ sap.ui.define([
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.0
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc

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

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.102.1
+		 * @version 1.103.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE

package/src/sap/ui/mdc/designtime/actiontoolbar/ActionToolbar.designtime.js

@@ -5,8 +5,9 @@
  */
 sap.ui.define([
     "sap/ui/mdc/ActionToolbar",
+    "sap/ui/mdc/p13n/Engine",
     "../Util"
-], function (ActionToolbar, Util) {
+], function (ActionToolbar, Engine, Util) {
 	"use strict";
 
     var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
@@ -20,7 +21,7 @@ sap.ui.define([
                 settings: {
                     name: oResourceBundle.getText("actiontoolbar.RTA_SETTINGS_NAME"),
                     handler: function (oControl, mPropertyBag) {
-                        return sap.ui.mdc.p13n.Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, "actionsKey").then(function(aChanges){
+                        return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, "actionsKey").then(function(aChanges){
                             return aChanges;
                         });
                     },
@@ -28,7 +29,9 @@ sap.ui.define([
                 }
             }
 	    },
-        aAllowedAggregations = [],
+        aAllowedAggregations = [
+            "actions"
+        ],
         aAllProperties = [];
 
     return Util.getDesignTime(ActionToolbar, aAllProperties, aAllowedAggregations, oDesignTime);

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

@@ -0,0 +1,53 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([
+    "sap/ui/mdc/actiontoolbar/ActionToolbarAction",
+    "../Util"
+], function (ActionToolbarAction, Util) {
+	"use strict";
+
+    var oDesignTime = {
+            description: "{description}",
+            name: "{name}",
+            aggregations: {
+                action: {
+                    propagateMetadata: function(oInnerControl) {
+                        return {
+                            actions: {
+                                rename: { // mandatory
+                                    changeType: "rename", // mandatory
+                                    domRef: function (oControl){ // mandatory
+                                        return oControl.$();
+                                    },
+                                    getTextMutators: function (oControl) { // optional
+                                        return {
+                                            getText: function () {
+                                                return oControl.getDomRef().textContent;
+                                            },
+                                            setText: function (sNewText) {
+                                                oControl.getDomRef().textContent = sNewText;
+                                            }
+                                        };
+                                    }
+                                },
+                                remove: null,
+                                reveal: null
+                            }
+                        };
+                    }
+                }
+            },
+            properties: {},
+            actions: {}
+	    },
+        aAllowedAggregations = [
+            "action"
+        ],
+        aAllProperties = [];
+
+    return Util.getDesignTime(ActionToolbarAction, aAllProperties, aAllowedAggregations, oDesignTime);
+
+});

package/src/sap/ui/mdc/designtime/field/Field.designtime.js

@@ -4,10 +4,15 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['sap/ui/fl/Utils', 'sap/ui/fl/apply/api/FlexRuntimeInfoAPI'], function(Utils, FlexRuntimeInfoAPI) {
+sap.ui.define([
+	'sap/ui/fl/Utils',
+	'sap/ui/fl/apply/api/FlexRuntimeInfoAPI',
+	'sap/ui/mdc/p13n/Engine',
+	'sap/ui/core/Core'
+], function(Utils, FlexRuntimeInfoAPI, Engine, oCore) {
 	"use strict";
 
-    var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+    var oResourceBundle = oCore.getLibraryResourceBundle("sap.ui.mdc");
 
 	return {
         properties: {
@@ -24,7 +29,7 @@ sap.ui.define(['sap/ui/fl/Utils', 'sap/ui/fl/apply/api/FlexRuntimeInfoAPI'], fun
                 return [];
             }
             var oFieldInfo = oField.getFieldInfo();
-            var oControl = typeof oFieldInfo.getSourceControl() === "string" ? sap.ui.getCore().byId(oFieldInfo.getSourceControl()) : oFieldInfo.getSourceControl();
+            var oControl = typeof oFieldInfo.getSourceControl() === "string" ? oCore.byId(oFieldInfo.getSourceControl()) : oFieldInfo.getSourceControl();
             if (!oControl) {
                 oControl = oField;
             }
@@ -54,7 +59,7 @@ sap.ui.define(['sap/ui/fl/Utils', 'sap/ui/fl/apply/api/FlexRuntimeInfoAPI'], fun
                             return FlexRuntimeInfoAPI.waitForChanges({
                                 element: oPanel
                             }).then(function() {
-                                var oEngine = sap.ui.mdc.p13n.Engine.getInstance();
+                                var oEngine = Engine.getInstance();
                                 mPropertyBag.fnAfterClose = function() {
                                     oPanel.destroy();
                                 };

package/src/sap/ui/mdc/designtime/table/Table.designtime.js

@@ -28,7 +28,7 @@ sap.ui.define([
 		aggregations: {
 			_content: {
 				propagateMetadata: function(oElement) {
-					if (oElement.isA("sap.ui.mdc.ActionToolbar")) {
+					if (oElement.isA("sap.ui.mdc.ActionToolbar") || (oElement.getParent() && oElement.getParent().isA("sap.ui.mdc.actiontoolbar.ActionToolbarAction"))) {
 						return {
 							actions: {
 								settings: {}

package/src/sap/ui/mdc/field/BoolFieldHelp.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls that shows a list for Boolean values.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.102.1
+	 * @version 1.103.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase

package/src/sap/ui/mdc/field/ConditionFieldHelp.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association in <code>FieldBase</code> controls to show a popover of conditions.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.102.1
+	 * @version 1.103.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe

package/src/sap/ui/mdc/field/ConditionType.js

@@ -39,6 +39,9 @@ sap.ui.define([
 	) {
 	"use strict";
 
+	var sTargetTypeRaw = "sap.ui.mdc.raw";
+	var sTargetTypeRawComposite = "sap.ui.mdc.raw:";
+
 	/**
 	 * Constructor for a Condition type.
 	 *
@@ -48,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -56,7 +59,7 @@ sap.ui.define([
 	 * @MDC_PUBLIC_CANDIDATE
 	 *
 	 * @param {object} [oFormatOptions] Formatting options
-	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting and parsing)
+	 * @param {sap.ui.model.Type} [oFormatOptions.valueType] Type of the value of the condition (used for formatting, parsing and validating)
 	 * @param {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
 	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize a value
 	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help to determine the key and description // TODO: async request????
@@ -104,7 +107,28 @@ sap.ui.define([
 
 	};
 
-	ConditionType.prototype.formatValue = function(oCondition, sInternalType) {
+	/**
+	 * Formats the given condition to an output value of the given target type.
+	 * This values are formatted using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a description will be determined via given value help or delegate.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject} oCondition
+	 *	The condition to be formatted
+	 * @param {string} sTargetType
+	 *	The target type; see {@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard target types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not formatted and just
+	 *	forwarded to the target. If the value is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {any|Promise}
+	 *	The formatted output value or a <code>Promise</code> resolving with the formatted value
+	 * @throws {sap.ui.model.FormatException}
+	 *	If formatting to the target type is not possible
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionType.prototype.formatValue = function(oCondition, sTargetType) {
 
 		if (oCondition == undefined || oCondition == null || this._bDestroyed) { // if destroyed do nothing
 			return null;
@@ -115,8 +139,8 @@ sap.ui.define([
 			throw new FormatException("No valid condition provided");
 		}
 
-		if (!sInternalType) {
-			sInternalType = "string";
+		if (!sTargetType) {
+			sTargetType = "string";
 		}
 
 		var oType = _getValueType.call(this);
@@ -125,7 +149,7 @@ sap.ui.define([
 
 		_attachCurrentValueAtType.call(this, oCondition, oType); // use original condition
 
-		switch (this.getPrimitiveType(sInternalType)) {
+		switch (this.getPrimitiveType(sTargetType)) {
 			case "string":
 			case "any":
 				var sDisplay = _getDisplay.call(this);
@@ -146,7 +170,7 @@ sap.ui.define([
 					var vKey = bIsUnit ? oCondition.values[0][1] : oCondition.values[0];
 
 					return SyncPromise.resolve().then(function() {
-						return _getDescription.call(this, vKey, oCondition, oBindingContext, oConditionModel, sConditionModelName);
+						return _getDescription.call(this, vKey, oCondition, oType, oBindingContext, oConditionModel, sConditionModelName);
 					}.bind(this)).then(function(vDescription) { // if description needs to be requested -> return if it is resolved
 						if (vDescription) {
 							oCondition = merge({}, oCondition); // do not manipulate original object
@@ -181,12 +205,20 @@ sap.ui.define([
 
 				return _returnResult.call(this, oCondition, undefined, iCallCount, true, oType);
 			default:
-				// operators can only be formatted to string. But other controls (like Slider) might just use the value
-				if (oType && oCondition.values.length >= 1) {
-					return oType.formatValue(oCondition.values[0], sInternalType);
+				var iIndex = _getIndexOfRawValue(sTargetType);
+				if (iIndex >= 0) {
+					if (_isCompositeType.call(this, oType)) {
+						//used for compositeTypes if just one value needs to be transfered without any formatting (e.g. for Timezone)
+						return oCondition.values.length >= 1 ? oCondition.values[0][iIndex] : null;
+					}
+				} else if (sTargetType === sTargetTypeRaw) {
+					return oCondition.values.length >= 1 ? oCondition.values[0] : null; // TODO: how to handle operators <> EQ
+				} else if (oType && oCondition.values.length >= 1) {
+					// operators can only be formatted to string. But other controls (like Slider) might just use the value
+					return oType.formatValue(oCondition.values[0], sTargetType);
 				}
 
-				throw new FormatException("Don't know how to format Condition to " + sInternalType);
+				throw new FormatException("Don't know how to format Condition to " + sTargetType);
 		}
 
 	};
@@ -256,22 +288,47 @@ sap.ui.define([
 
 	}
 
-	ConditionType.prototype.parseValue = function(vValue, sInternalType) {
+	/**
+	 * Parses an external value of the given source type to a condition that holds the value in model
+	 * representation.
+	 * These values are parsed using the given data type. Depending of the operator
+	 * and the configuration (set in <code>FormatOptions</code>) a value will be determined via given value help or delegate.
+	 *
+	 * @param {any} vValue
+	 *	The value to be parsed
+	 * @param {string} sSourceType
+	 *	The type of the given value; see
+	 *	{@link topic:ac56d92162ed47ff858fdf1ce26c18c4 Allowed Property Types}
+	 *	In addition to the standard source types <code>sap.ui.mdc.raw</code> can be used. In this case the value is not parsed and just
+	 *	used in the condition. If the value of the condition is an array representing data for a <code>CompositeType</code> the index of the needed raw value can be added to the
+	 *	name (For example if a unit should be forwarded as raw value <code>sap.ui.mdc.raw:1</code> can be used).
+	 * @return {null|sap.ui.mdc.condition.ConditionObject|Promise<null|sap.ui.mdc.condition.ConditionObject>}
+	 *	The condition or a <code>Promise</code> resolving with the condition.
+	 *  If there is no value <code>null</code> is returned.
+	 * @throws {sap.ui.model.ParseException}
+	 *	If parsing to the model type is not possible; the message of the exception is language
+	 *	dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
+	ConditionType.prototype.parseValue = function(vValue, sSourceType) {
 
 		if (this._bDestroyed) { // if destroyed do nothing
 			return null;
 		}
 
-		if (!sInternalType) {
-			sInternalType = "string";
-		} else if (sInternalType === "any" && typeof vValue === "string") {
-			sInternalType = "string";
+		if (!sSourceType) {
+			sSourceType = "string";
+		} else if (sSourceType === "any" && typeof vValue === "string") {
+			sSourceType = "string";
 		}
 
 		var oNavigateCondition = this.oFormatOptions.navigateCondition;
 		if (oNavigateCondition) {
 			// condition already known from navigation. Just check if it is really the same as the input.
-			var vOutput = this.formatValue(oNavigateCondition, sInternalType);
+			var vOutput = this.formatValue(oNavigateCondition, sSourceType);
 			if (vOutput === vValue) {
 				return merge({}, oNavigateCondition); // use copy
 			}
@@ -293,7 +350,7 @@ sap.ui.define([
 
 		_initCurrentValueAtType.call(this, oType);
 
-		switch (this.getPrimitiveType(sInternalType)) {
+		switch (this.getPrimitiveType(sSourceType)) {
 			case "string":
 				var oOperator;
 				var bCheckForDefault = false;
@@ -396,10 +453,22 @@ sap.ui.define([
 						}
 					}
 					if (sDefaultOperator) {
-						return Condition.createCondition(sDefaultOperator, [oType.parseValue(vValue, sInternalType)], undefined, undefined, ConditionValidated.NotValidated);
+						var iIndex = _getIndexOfRawValue(sSourceType);
+						if (iIndex >= 0) {
+							if (_isCompositeType.call(this, oType)) {
+								//used for compositeTypes if just one value needs to be transfered without any parsing (Timezone)
+								var aValue = merge([], oType._aCurrentValue);
+								aValue[iIndex] = vValue;
+								return Condition.createCondition(sDefaultOperator, [aValue], undefined, undefined, ConditionValidated.NotValidated);
+							}
+						} else if (sSourceType === sTargetTypeRaw) {
+							return Condition.createCondition(sDefaultOperator, [vValue], undefined, undefined, ConditionValidated.NotValidated);
+						} else {
+							return Condition.createCondition(sDefaultOperator, [oType.parseValue(vValue, sSourceType)], undefined, undefined, ConditionValidated.NotValidated);
+						}
 					}
 				}
-				throw new ParseException("Don't know how to parse Condition from " + sInternalType);
+				throw new ParseException("Don't know how to parse Condition from " + sSourceType);
 		}
 
 	};
@@ -557,7 +626,7 @@ sap.ui.define([
 		}
 
 		return SyncPromise.resolve().then(function() {
-			return _getItemForValue.call(this, vCheckValue, vCheckParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+			return _getItemForValue.call(this, vCheckValue, vCheckParsedValue, oType, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
 		}.bind(this)).then(function(oResult) {
 			return fnGetResult.call(this, oResult, fnSuccess);
 		}.bind(this)).catch(function(oException) {
@@ -617,6 +686,21 @@ sap.ui.define([
 
 	}
 
+	/**
+	 * Validates a given condition. The values of the condition are validated using the given data type.
+	 *
+	 * @param {sap.ui.mdc.condition.ConditionObject} oCondition
+	 *	The condition to be validated
+	 * @returns {void|Promise}
+	 *	<code>undefined</code> or a <code>Promise</code> resolving with an undefined value
+	 * @throws {sap.ui.model.ValidateException}
+	 *	If at least one of the values of the condition is not valid for the given data type; the message of the exception is
+	 *	language dependent as it may be displayed on the UI
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 */
 	ConditionType.prototype.validateValue = function(oCondition) {
 
 		var oType = _getValueType.call(this);
@@ -886,7 +970,7 @@ sap.ui.define([
 
 	}
 
-	function _getItemForValue(vValue, vParsedValue, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
+	function _getItemForValue(vValue, vParsedValue, oType, oBindingContext, bCheckKeyFirst, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oDelegate = this.oFormatOptions.delegate;
@@ -895,6 +979,7 @@ sap.ui.define([
 		var oConfig = {
 				value: vValue,
 				parsedValue: vParsedValue,
+				dataType: oType,
 				inParameters: undefined, // TODO: needed?
 				outParameters: undefined, // TODO: needed?
 				bindingContext: oBindingContext,
@@ -917,31 +1002,32 @@ sap.ui.define([
 
 	}
 
-	function _getDescription(vKey, oCondition, oBindingContext, oConditionModel, sConditionModelName) {
+	function _getDescription(vKey, oCondition, oType, oBindingContext, oConditionModel, sConditionModelName) {
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oDelegate = this.oFormatOptions.delegate;
 		var oPayload = this.oFormatOptions.payload;
 		var oControl = this.oFormatOptions.control;
 		if (oDelegate) {
-			return oDelegate.getDescription(oPayload, oFieldHelp, vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, oConditionModel, sConditionModelName, oCondition.payload, oControl);
+			return oDelegate.getDescription(oPayload, oFieldHelp, vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, oConditionModel, sConditionModelName, oCondition.payload, oControl, oType);
 		} else if (oFieldHelp) {
 			if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-					var oConfig = {
-						value: vKey,
-						parsedValue: vKey,
-						context: {inParameters: oCondition.inParameters, outParameters: oCondition.outParameters, payload: oCondition.payload},
-						bindingContext: oBindingContext,
-						conditionModel: oConditionModel,
-						conditionModelName: sConditionModelName,
-						checkKey: true,
-						checkDescription: false,
-						caseSensitive: true, // case sensitive as used to get description for known key
-						exception: FormatException,
-						control: oControl
-					};
-					return oFieldHelp.getItemForValue(oConfig);
-				} else {
+				var oConfig = {
+					value: vKey,
+					parsedValue: vKey,
+					dataType: oType,
+					context: {inParameters: oCondition.inParameters, outParameters: oCondition.outParameters, payload: oCondition.payload},
+					bindingContext: oBindingContext,
+					conditionModel: oConditionModel,
+					conditionModelName: sConditionModelName,
+					checkKey: true,
+					checkDescription: false,
+					caseSensitive: true, // case sensitive as used to get description for known key
+					exception: FormatException,
+					control: oControl
+				};
+				return oFieldHelp.getItemForValue(oConfig);
+			} else {
 				return oFieldHelp.getTextForKey(vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, oConditionModel, sConditionModelName);
 			}
 		}
@@ -974,6 +1060,16 @@ sap.ui.define([
 
 	}
 
+	function _getIndexOfRawValue(sType) {
+
+		var iIndex = -1;
+		if (sType.startsWith(sTargetTypeRawComposite)) {
+			iIndex = parseInt(sType[sTargetTypeRawComposite.length]);
+		}
+		return iIndex;
+
+	}
+
 	return ConditionType;
 
 });