@openui5/sap.ui.mdc 1.110.0 → 1.111.0

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.110.0
+		 * @version 1.111.0
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE

package/src/sap/ui/mdc/designtime/chart/Chart.designtime.js

@@ -85,6 +85,9 @@ sap.ui.define([
 			},
 			headerLevel : {
 				ignore: false
+			},
+			headerVisible : {
+				ignore: false
 			}
 		},
 		aggregations: {

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

@@ -19,7 +19,9 @@ sap.ui.define([
 				//RTA expects the settings to be returned as function
 				return {
 					handler: function (oControl, mPropertyBag) {
-						return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getActiveP13nModes());
+						return oControl.finalizePropertyHelper().then(function(){
+							return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getActiveP13nModes());
+						});
 					}
 				};
 			}

package/src/sap/ui/mdc/enum/FilterBarValidationStatus.js

@@ -0,0 +1,56 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides enumeration sap.ui.mdc.enum.FilterBarValidationStatus
+sap.ui.define(function() {
+	"use strict";
+
+	/**
+	 * Enumeration of the possible validation types.
+	 *
+	 * @enum {int}
+	 * @public
+	 * @since 1.110
+	 * @alias sap.ui.mdc.enum.FilterBarValidationStatus
+	 */
+	var FilterBarValidationStatus = {
+
+			/**
+			 * No errors detected.
+			 * @public
+			 */
+			NoError: -1,
+
+			/**
+			 * Required filter filed without a value.
+			 * @public
+			 */
+			RequiredHasNoValue: 0,
+
+			/**
+			 * Filter field in error state.
+			 * @public
+			 */
+			FieldInErrorState: 1,
+
+			/**
+			 * Ongoing asynchronous validation.
+			 * @private
+			 * @ui5-restricted sap.ui.mdc
+			 */
+			AsyncValidation: 2,
+
+			/**
+			 * Change is being applied.
+			 * @private
+			 * @ui5-restricted sap.ui.mdc
+			 */
+			OngoingChangeAppliance: 3
+	};
+
+	return FilterBarValidationStatus;
+
+}, /* bExport= */ true);

package/src/sap/ui/mdc/enum/ReasonMode.js

@@ -0,0 +1,53 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides enumeration sap.ui.mdc.enum.ReasonMode
+sap.ui.define(function() {
+	"use strict";
+
+
+	/**
+	 * Enumeration of the possible reasons for the search event.
+	 *
+	 * @enum {string}
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
+	 * @since 1.111.0
+	 * @alias sap.ui.mdc.enum.ReasonMode
+	 */
+	var ReasonMode = {
+		/**
+		 * The applied variant is marked as Apply Automatically.
+		 * @private
+		 * @ui5-restricted sap.ui.mdc
+		 */
+		Variant: "Variant",
+
+		/**
+		 * Enter pressed in filter field.
+		 * @private
+		 * @ui5-restricted sap.ui.mdc
+		 */
+		Enter: "Enter",
+
+		/**
+		 * Go button pressed.
+		 * @private
+		 * @ui5-restricted sap.ui.mdc
+		 */
+		Go: "Go",
+
+		/**
+		 * Used if the mentioned reasons are not applicable.
+		 * @private
+		 * @ui5-restricted sap.ui.mdc
+		 */
+		Unclear: ""
+	};
+
+	return ReasonMode;
+
+}, /* bExport= */ true);

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -77,8 +77,6 @@ sap.ui.define([
 	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
 	 * @param {object} [oFormatOptions.payload] Payload of the delegate
 	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
-	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
-	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
 	 * @param {boolean} [oFormatOptions.convertWhitespaces] If set, whitespaces will be replaced by special characters to display whitespaces in HTML
 	 * @param {sap.ui.core.Control} [oFormatOptions.control] Instance if the calling control
@@ -167,12 +165,10 @@ sap.ui.define([
 						(bIsUnit || (oCondition.operator === oEQOperator.name && !oCondition.values[1]))) {
 					// handle sync case and async case similar
 					var oBindingContext = this.oFormatOptions.bindingContext;
-					var oConditionModel = this.oFormatOptions.conditionModel;
-					var sConditionModelName = this.oFormatOptions.conditionModelName;
 					var vKey = bIsUnit ? oCondition.values[0][1] : oCondition.values[0];
 
 					return SyncPromise.resolve().then(function() {
-						return _getDescription.call(this, vKey, oCondition, oType, oBindingContext, oConditionModel, sConditionModelName);
+						return _getDescription.call(this, vKey, oCondition, oType, oBindingContext);
 					}.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
@@ -515,8 +511,6 @@ sap.ui.define([
 		var vCheckValue;
 		var vCheckParsedValue;
 		var oBindingContext = this.oFormatOptions.bindingContext;
-		var oConditionModel = this.oFormatOptions.conditionModel;
-		var sConditionModelName = this.oFormatOptions.conditionModelName;
 		var aValues;
 
 		if (vValue === "") {
@@ -626,7 +620,7 @@ sap.ui.define([
 		}
 
 		return SyncPromise.resolve().then(function() {
-			return _getItemForValue.call(this, vCheckValue, vCheckParsedValue, oType, oBindingContext, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName);
+			return _getItemForValue.call(this, vCheckValue, vCheckParsedValue, oType, oBindingContext, bCheckKey, bCheckDescription);
 		}.bind(this)).then(function(oResult) {
 			return fnGetResult.call(this, oResult, fnSuccess);
 		}.bind(this)).catch(function(oException) {
@@ -984,7 +978,7 @@ sap.ui.define([
 
 	}
 
-	function _getItemForValue(vValue, vParsedValue, oType, oBindingContext, bCheckKey, bCheckDescription, oConditionModel, sConditionModelName) {
+	function _getItemForValue(vValue, vParsedValue, oType, oBindingContext, bCheckKey, bCheckDescription) {
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		var oDelegate = this.oFormatOptions.delegate;
@@ -999,8 +993,6 @@ sap.ui.define([
 				bindingContext: oBindingContext,
 				checkKey: bCheckKey,
 				checkDescription: bCheckDescription,
-				conditionModel: oConditionModel,
-				conditionModelName: sConditionModelName,
 				exception: ParseException,
 				control: oControl
 		};
@@ -1013,34 +1005,28 @@ sap.ui.define([
 
 	}
 
-	function _getDescription(vKey, oCondition, oType, oBindingContext, oConditionModel, sConditionModelName) {
+	function _getDescription(vKey, oCondition, oType, oBindingContext) {
 
 		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, oType);
+			return oDelegate.getDescription(oPayload, oFieldHelp, vKey, oCondition.inParameters, oCondition.outParameters, oBindingContext, undefined, undefined, oCondition.payload, oControl, oType);
 		} else if (oFieldHelp) {
-			if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-				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);
-			}
+			var oConfig = {
+				value: vKey,
+				parsedValue: vKey,
+				dataType: oType,
+				context: {inParameters: oCondition.inParameters, outParameters: oCondition.outParameters, payload: oCondition.payload},
+				bindingContext: oBindingContext,
+				checkKey: true,
+				checkDescription: false,
+				caseSensitive: true, // case sensitive as used to get description for known key
+				exception: FormatException,
+				control: oControl
+			};
+			return oFieldHelp.getItemForValue(oConfig);
 		}
 
 	}

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -64,8 +64,6 @@ sap.ui.define([
 	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
 	 * @param {object} [oFormatOptions.payload] Payload of the delegate
 	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
-	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
-	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
 	 * @param {boolean} [oFormatOptions.convertWhitespaces] If set, whitespaces will be replaced by special characters to display whitespaces in HTML
 	 * @param {sap.ui.core.Control} [oFormatOptions.control] Instance if the calling control

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

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldInfo</code> aggregation in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldInfoBase
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -34,8 +34,7 @@ sap.ui.define([
 	'sap/m/Panel',
 	'sap/base/Log',
 	'sap/ui/core/InvisibleMessage',
-	'sap/ui/thirdparty/jquery',
-	'sap/ui/mdc/field/ListFieldHelp' // must be loaded before creating of specificMonth operator control in filterOperatorUtil
+	'sap/ui/thirdparty/jquery'
 ], function(
 		Control,
 		ManagedObjectObserver,
@@ -94,7 +93,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -530,7 +529,6 @@ sap.ui.define([
 				setTimeout(function() {
 					var oFormatOptions = merge({}, this.getFormatOptions());
 					delete oFormatOptions.fieldHelpID;
-					delete oFormatOptions.conditionModelName;
 					oFormatOptions.maxConditions = 1;
 					oFormatOptions.display = FieldDisplay.Value;
 					//oFormatOptions.valueType = this._getFieldType.call(this, oOperator.name, 0); //TODO using the _getFieldType for better support of types

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.ConditionsType
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @since 1.96.0
 	 * @private
@@ -69,8 +69,6 @@ sap.ui.define([
 	 * @param {object} [oFormatOptions.delegate] Field delegate to handle model-specific logic
 	 * @param {object} [oFormatOptions.payload] Payload of the delegate
 	 * @param {boolean} [oFormatOptions.preventGetDescription] If set, description is not read by <code>formatValue</code> as it is known that no description exists or might be set later
-	 * @param {sap.ui.mdc.condition.ConditionModel} [oFormatOptions.conditionModel] <code>ConditionModel</code>, if bound to one
-	 * @param {string} [oFormatOptions.conditionModelName] Name of the <code>ConditionModel</code>, if bound to one
 	 * @param {string} [oFormatOptions.defaultOperatorName] Name of the default <code>Operator</code>
 	 * @param {object} [oConstraints] Value constraints
 	 * @alias sap.ui.mdc.field.DynamicDateRangeConditionsType

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

@@ -86,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.FieldBase
@@ -895,7 +895,7 @@ sap.ui.define([
 	 *
 	 * @returns {string} fieldPath of the field
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.FieldHelpBase
+	 * @ui5-restricted sap.ui.mdc.filterbar.FilterBarBase
 	 */
 	FieldBase.prototype.getFieldPath = function() {
 
@@ -1100,13 +1100,15 @@ sap.ui.define([
 			// check only if different type (in Field type might be already taken from binding)
 			if (this._getContentFactory().getDataType()) {
 				var fnCheck = function(sType) {
-					var oTypeClass = this.getTypeUtil().getDataTypeClass(oChanges.current);
-					if (!(this._getContentFactory().getDataType() instanceof oTypeClass)) {
-						// TODO: also compare FormatOptions and Constraints
-						this._initDataType();
-						this.destroyAggregation("_content");
-						this._getContentFactory().updateConditionType();
-					}
+					this._getContentFactory().checkDataTypeChanged(sType).then(function(bChanged) {
+						if (bChanged && !this._bIsBeingDestroyed) {
+							this._initDataType();
+							this.destroyAggregation("_content");
+							this._getContentFactory().updateConditionType();
+						}
+					}.bind(this)).catch(function(oError) {
+						throw oError;
+					});
 				}.bind(this);
 				if (!this.bDelegateInitialized) {
 					// wait until delegate is loaded
@@ -1248,7 +1250,6 @@ sap.ui.define([
 	 *
 	 * @returns {sap.ui.core.Control} Control for value help
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.FieldHelpBase
 	 */
 	 FieldBase.prototype.getControlForSuggestion = function() {
 
@@ -1265,7 +1266,17 @@ sap.ui.define([
 
 	};
 
-	FieldBase.prototype.getFocusElementForValueHelp = function(bTypahead) {
+	/**
+	 * Returns the control the value help should focus (or popover should open on)
+	 *
+	 * In the case that number and unit are shown in different controls, this is the unit control, not the number control.
+	 *
+	 * @param {boolean} bTypeahead Flag that determines whether value help is opened for type-ahead or for complex help
+	 * @returns {sap.ui.core.Control} Control for value help
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.valueHelp.base.Container
+	 */
+	FieldBase.prototype.getFocusElementForValueHelp = function(bTypeahead) {
 		var oSuggestControl = this.getControlForSuggestion();
 		var aIcons = oSuggestControl && oSuggestControl.getMetadata().getAllPrivateAggregations()._endIcon && oSuggestControl.getAggregation("_endIcon", []);
 		var oIcon;
@@ -1277,7 +1288,7 @@ sap.ui.define([
 				}
 			}
 		}
-		return bTypahead || !oIcon ? oSuggestControl : oIcon;
+		return bTypeahead || !oIcon ? oSuggestControl : oIcon;
 	};
 
 	/**
@@ -1286,7 +1297,6 @@ sap.ui.define([
 	 *
 	 * @returns {int} maxConditions used for valueHelp
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.FieldHelpBase
 	 */
 	FieldBase.prototype.getMaxConditionsForHelp = function() {
 
@@ -1527,8 +1537,11 @@ sap.ui.define([
 			this._getContentFactory().setNoFormatting(false); // initialize
 			this.awaitControlDelegate().then(function() {
 				if (!this.bIsDestroyed) {
-					this._oContentFactory.setHideOperator(_isOnlyOneSingleValue.call(this, this._getOperators())); // in single value eq Field hide operator
-					this._oContentFactory.updateConditionType();
+					var bHideOperator = _isOnlyOneSingleValue.call(this, this._getOperators());
+					if (bHideOperator !== this._getContentFactory().getHideOperator()) {
+						this._getContentFactory().setHideOperator(bHideOperator); // in single value eq Field hide operator
+						this._getContentFactory()._setUsedConditionType(this.getContent(), this.getContentEdit(), this.getContentDisplay(), this.getEditMode()); // if external content use it's conditionType
+					}
 				}
 			}.bind(this));
 
@@ -1711,15 +1724,17 @@ sap.ui.define([
 
 		var sEditMode = this.getEditMode();
 		var oContent = this.getContent();
+		var oContentEdit = this.getContentEdit();
+		var oContentDisplay = this.getContentDisplay();
 
-		this._getContentFactory()._setUsedConditionType(oContent, sEditMode); // if external content use it's conditionType
+		this._getContentFactory()._setUsedConditionType(oContent, oContentEdit, oContentDisplay, sEditMode); // if external content use it's conditionType
 		_checkFieldHelpExist.call(this, this.getFieldHelp()); // as FieldHelp might be created after ID is assigned to Field
 		_setAriaAttributes.call(this, false);
 
 
 		if (oContent ||
-			(sEditMode === EditMode.Display && this.getContentDisplay()) ||
-			(sEditMode !== EditMode.Display && this.getContentEdit())) {
+			(sEditMode === EditMode.Display && oContentDisplay) ||
+			(sEditMode !== EditMode.Display && oContentEdit)) {
 			this._destroyInternalContent();
 			var aContent = this._getContent(); // external set content
 			if (aContent.length === 1) {
@@ -2257,24 +2272,19 @@ sap.ui.define([
 							var _handleTypeahead = function () {
 								var oFocusedElement = document.activeElement;
 								if (oFocusedElement && (containsOrEquals(this.getDomRef(), oFocusedElement))) { // only if still connected and focussed
-									var bIsNew = oFieldHelp.isA("sap.ui.mdc.ValueHelp");
 									var bIsFHOpen = oFieldHelp.isOpen();
-									if (!bIsNew && !this._sFilterValue && bIsFHOpen) {
-										oFieldHelp.close(); // close if no filter
-									} else if (bIsNew || this._sFilterValue) {
-										oFieldHelp.setFilterValue(this._sFilterValue);
-										if (this.getMaxConditionsForHelp() === 1 && oFieldHelp.getConditions().length > 0) {
-											// While single-suggestion no item is selected
-											oFieldHelp.setConditions([]);
-										}
-										if (!bIsFHOpen) {
-											/*
-												sap.ui.mdc.ValueHelp can only be "asked" to open a typeahead by a connected control.
-												It will then decide on actual opening after content initialization via ValueHelpDelegate.showTypeahead which can be customized by applications.
-												An already open typeahead content will consult showTypeahead again on any every filtervalue update and eventually close.
-											*/
-											oFieldHelp.open(true);
-										}
+									oFieldHelp.setFilterValue(this._sFilterValue);
+									if (this.getMaxConditionsForHelp() === 1 && oFieldHelp.getConditions().length > 0) {
+										// While single-suggestion no item is selected
+										oFieldHelp.setConditions([]);
+									}
+									if (!bIsFHOpen) {
+										/*
+											sap.ui.mdc.ValueHelp can only be "asked" to open a typeahead by a connected control.
+											It will then decide on actual opening after content initialization via ValueHelpDelegate.showTypeahead which can be customized by applications.
+											An already open typeahead content will consult showTypeahead again on any every filtervalue update and eventually close.
+										*/
+										oFieldHelp.open(true);
 									}
 									_setAriaAttributes.call(this, true);
 									delete this._vLiveChangeValue;
@@ -2282,16 +2292,9 @@ sap.ui.define([
 							}.bind(this);
 
 							if (this._bConnected && this._getContent()[0]) {
-								if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-									oFieldHelp.isTypeaheadSupported().then(function (bTypeahead) {
-										return !!bTypeahead && _handleTypeahead();
-									});
-								} else {
-									var vOpenByTyping = this.hasOwnProperty("_bOpenByTyping") ? this._bOpenByTyping : oFieldHelp.isTypeaheadSupported();
-									if (vOpenByTyping) {
-										_handleTypeahead();
-									}
-								}
+								oFieldHelp.isTypeaheadSupported().then(function (bTypeahead) {
+									return !!bTypeahead && _handleTypeahead();
+								});
 								delete this._vLiveChangeValue;
 							}
 						}.bind(this), 300, { leading: false, trailing: true });
@@ -2450,9 +2453,14 @@ sap.ui.define([
 			oFieldHelp = _getFieldHelp.call(this);
 		}
 
-		if (this._getContentFactory().isMeasure()) {
+		var aHelpConditions;
+		if (this._bParseError && this.getMaxConditionsForHelp() === 1) {
+			// if parsing error and single value case do not see the old (outdated) condition as selected
+			// TODO: handling if error only on unit or number part
+			aHelpConditions = [];
+		} else if (this._getContentFactory().isMeasure()) {
 			// for unit or curreny add only the unit/currency to FieldHelp
-			var aHelpConditions = [];
+			aHelpConditions = [];
 			for (var i = 0; i < aConditions.length; i++) {
 				var oCondition = aConditions[i];
 				if (oCondition.values[0] && oCondition.values[0][1]) {
@@ -2460,11 +2468,12 @@ sap.ui.define([
 					aHelpConditions.push(oHelpCondition);
 				}
 			}
-			oFieldHelp.setConditions(aHelpConditions);
 		} else {
-			oFieldHelp.setConditions(aConditions);
+			aHelpConditions = aConditions;
 		}
 
+		oFieldHelp.setConditions(aHelpConditions);
+
 	}
 
 	function _handleValueHelpRequest(oEvent) {
@@ -2806,11 +2815,7 @@ sap.ui.define([
 			oFieldHelp.detachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
 			oFieldHelp.detachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
 			oFieldHelp.detachEvent("closed", _handleFieldHelpAfterClose, this);
-			if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-				oFieldHelp.detachEvent("opened", _handleFieldHelpOpened, this);
-			} else {
-				oFieldHelp.detachEvent("open", _handleFieldHelpOpened, this); // as old FieldHelp has no opened event use open event. But this is also fires async there
-			}
+			oFieldHelp.detachEvent("opened", _handleFieldHelpOpened, this);
 		this._bConnected = false;
 		}
 
@@ -2820,7 +2825,6 @@ sap.ui.define([
 
 		var oFieldHelp = _getFieldHelp.call(this);
 		if (oFieldHelp) { // as Config or BindingContext might change, update connection on every focus
-			var oConditionModelInfo = _getConditionModelInfo.call(this);
 			var oType;
 			var bIsMeasure = this._getContentFactory().isMeasure();
 
@@ -2841,8 +2845,6 @@ sap.ui.define([
 					delegate: this.getControlDelegate(),
 					delegateName: this.getDelegate() && this.getDelegate().name,
 					payload: this.getPayload(),
-					conditionModel: oConditionModelInfo.model,
-					conditionModelName: oConditionModelInfo.name,
 					defaultOperatorName: this.getDefaultOperator ? this.getDefaultOperator() : null
 			};
 			oFieldHelp.connect(this, oConfig);
@@ -2855,11 +2857,7 @@ sap.ui.define([
 				oFieldHelp.attachEvent("afterClose", _handleFieldHelpAfterClose, this); // TODO: remove
 				oFieldHelp.attachEvent("switchToValueHelp", _handleFieldSwitchToValueHelp, this);
 				oFieldHelp.attachEvent("closed", _handleFieldHelpAfterClose, this);
-				if (oFieldHelp.isA("sap.ui.mdc.ValueHelp")) {
-					oFieldHelp.attachEvent("opened", _handleFieldHelpOpened, this);
-				} else {
-					oFieldHelp.attachEvent("open", _handleFieldHelpOpened, this); // as old FieldHelp has no opened event use open event. But this is also fires async there
-				}
+				oFieldHelp.attachEvent("opened", _handleFieldHelpOpened, this);
 				var aConditions = this.getConditions();
 				_setConditionsOnFieldHelp.call(this, aConditions, oFieldHelp);
 
@@ -2949,7 +2947,6 @@ sap.ui.define([
 	 *
 	 * @returns {object} formatOptions of the field
 	 * @private
-	 * @ui5-restricted sap.ui.mdc.field.FieldHelpBase
 	 */
 	FieldBase.prototype._getFormatOptions = function() {
 
@@ -2957,8 +2954,6 @@ sap.ui.define([
 			this._asyncParsingCall = _asyncParsingCall.bind(this); //as variable to have the same function after each update of formatOptions. Otherwise it would be a change on FormatOption in ValueHelpPanel every time
 		}
 
-		var oConditionModelInfo = _getConditionModelInfo.call(this);
-
 		return {
 			valueType: this._getContentFactory().retrieveDataType(),
 			originalDateType: this._getContentFactory().getDateOriginalType() || this._getContentFactory().getUnitOriginalType(),
@@ -2976,8 +2971,6 @@ sap.ui.define([
 			delegateName: this.getDelegate() && this.getDelegate().name,
 			payload: this.getPayload(),
 			preventGetDescription: this._bPreventGetDescription,
-			conditionModel: oConditionModelInfo.model,
-			conditionModelName: oConditionModelInfo.name,
 			convertWhitespaces: this.getEditMode() === EditMode.Display || this.getMaxConditions() !== 1, // also replace whitespaces in tokens
 			control: this,
 			defaultOperatorName : this.getDefaultOperator ? this.getDefaultOperator() : null,
@@ -3038,8 +3031,6 @@ sap.ui.define([
 			this._asyncParsingCall = _asyncParsingCall.bind(this);
 		}
 
-		var oConditionModelInfo = _getConditionModelInfo.call(this);
-
 		return {
 			valueType: this._getContentFactory().getUnitType(),
 			originalDateType: this._getContentFactory().getDateOriginalType() || this._getContentFactory().getUnitOriginalType(),
@@ -3057,8 +3048,6 @@ sap.ui.define([
 			delegateName: this.getDelegate() && this.getDelegate().name,
 			payload: this.getPayload(),
 			preventGetDescription: this._bPreventGetDescription,
-			conditionModel: oConditionModelInfo.model,
-			conditionModelName : oConditionModelInfo.name,
 			convertWhitespaces: this.getEditMode() === EditMode.Display || this.getEditMode() === EditMode.EditableDisplay,
 			control: this,
 			getConditions: this.getConditions.bind(this), // TODO: better solution to update unit in all conditions
@@ -3203,35 +3192,6 @@ sap.ui.define([
 
 	}
 
-	/*
-	 * In FilterField case the Field help needs to be bound to the same ConditionModel to
-	 * bind the In- and OutParameters in the right way.
-	 * As the FieldHelp might be placed outside the FilterBar in the control tree it might not
-	 * inherit the ConditionModel.
-	 */
-	function _getConditionModelInfo() {
-
-		var oConditionModel;
-		var sName;
-		var oBinding = this.getBinding("conditions");
-
-		if (oBinding) {
-			var oModel = oBinding.getModel();
-			if (oModel && oModel.isA("sap.ui.mdc.condition.ConditionModel")) {
-				oConditionModel = oModel;
-				var oBindingInfo = this.getBindingInfo("conditions");
-				if (oBindingInfo.model) {
-					sName = oBindingInfo.model;
-				} else if (oBindingInfo.parts && oBindingInfo.parts.length === 1) {
-					sName = oBindingInfo.parts[0].model;
-				}
-			}
-		}
-
-		return {name: sName, model: oConditionModel};
-
-	}
-
 	FieldBase.prototype._isPropertyInitial = function(sPropertyName) {
 
 		// as bound propertys are never initial even if there is no existing binding right now check the binding too