@openui5/sap.ui.mdc 1.96.5 → 1.99.0

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

@@ -0,0 +1,104 @@
+/*
+ * ! 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([
+], function () {
+	"use strict";
+
+	return {
+		properties: {
+			dataType: {
+				ignore: true
+			},
+
+			dataTypeConstraints: {
+				ignore: true
+			},
+
+			dataTypeFormatOptions: {
+				ignore: true
+			},
+
+			editMode: {
+				ignore: true
+			},
+
+			required: {
+				ignore: true
+			},
+
+			display: {
+				ignore: true
+			},
+
+			textAlign: {
+				ignore: true
+			},
+
+			textDirection: {
+				ignore: true
+			},
+
+			placeholder: {
+				ignore: true
+			},
+
+			valueState: {
+				ignore: true
+			},
+
+			valueStateText: {
+				ignore: true
+			},
+
+			width: {
+				ignore: true
+			},
+
+			multipleLines: {
+				ignore: true
+			},
+
+			maxConditions: {
+				ignore: true
+			},
+
+			conditions: {
+				ignore: true
+			},
+
+			label: {
+				ignore: true
+			},
+
+			delegate: {
+				ignore: true
+			},
+
+			showEmptyIndicator: {
+				ignore: true
+			}
+
+		},
+		aggregations: {
+			content: {
+				ignore: true
+			},
+
+			contentEdit: {
+				ignore: true
+			},
+
+			contentDisplay: {
+				ignore: true
+			},
+
+			fieldInfo: {
+				ignore: true
+			}
+		}
+
+	};
+});

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

@@ -0,0 +1,22 @@
+/*
+ * ! 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([
+], function () {
+	"use strict";
+
+	return {
+		properties: {
+			operators: {
+				ignore: true
+			},
+
+			defaultOperator: {
+				ignore: true
+			}
+		}
+
+	};
+});

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

@@ -0,0 +1,23 @@
+/*
+ * ! 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([
+], function () {
+	"use strict";
+
+	return {
+		properties: {
+			delegate: {
+				ignore: true
+			}
+		},
+		aggregations: {
+			items: {
+				ignore: true
+			}
+		}
+
+	};
+});

package/src/sap/ui/mdc/designtime/filterbar/FilterBarBase.designtime.js

@@ -23,6 +23,9 @@ sap.ui.define([], function() {
 			filterConditions: {
 				ignore: true
 			},
+			propertyInfo: {
+				ignore: true
+			},
 			suspendSelection: {
 				ignore: true
 			}

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

@@ -4,28 +4,68 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/mdc/p13n/Engine"
-], function (Engine) {
+	"sap/ui/mdc/p13n/Engine",
+	"sap/ui/mdc/Table"
+], function (Engine, Table) {
 	"use strict";
 
-	return {
-		name: "{name}",
-		description: "{description}",
-		aggregations: {
-			_content: {
-				ignore: false
-			}
-		},
-		actions: {
-			settings: function () {
-				//RTA expects the settings to be returned as function
-				return {
-					handler: function (oControl, mPropertyBag) {
-						return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getP13nMode());
-					}
-				};
-			}
+	// Returns the designTime metadata for the control. By default all the properties/aggregations which are not part of the allowed list array will be ignored from RTA/DTA
+	function enhanceDesignTimeMetadata(aAllowed, sKey, oDesignTime) {
+		var bAllowed = aAllowed.includes(sKey);
+		var oObject = bAllowed && oDesignTime[sKey] || {};
+		if (!Object.keys(oObject).length) {
+			oObject[sKey] = {
+				ignore: !bAllowed
+			};
 		}
-	};
+		Object.assign(oDesignTime, oObject);
+	}
 
+	// Returns the designTime object for RTA/DTA
+	function getDesignTime() {
+		// initial structure of designTime object
+		var oDesignTime = {
+			name: "{name}",
+			description: "{description}",
+			actions: {
+				settings: function () {
+					//RTA expects the settings to be returned as function
+					return {
+						handler: function (oControl, mPropertyBag) {
+							return Engine.getInstance().getRTASettingsActionHandler(oControl, mPropertyBag, oControl.getP13nMode());
+						}
+					};
+				}
+			},
+			properties: {},
+			aggregations: {}
+		};
+
+		var oTableMetadata = Table.getMetadata(),
+			// array containing all allowed control properties. Update the aAllowedProperties to enable a property for DTA
+			aAllowedProperties = ["width", "height", "headerLevel",
+			"header", "headerVisible", "showRowCount", "threshold",
+			"noDataText", "enableExport", "busyIndicatorDelay","enableColumnResize",
+			"showPasteButton", "multiSelectMode"],
+			// array containing all allowed control aggregations. Update the aAllowedAggregations to enable an aggregation for DTA
+			aAllowedAggregations = [],
+			// array containing all control properties
+			aAllProperties = Object.keys(oTableMetadata.getAllProperties()).concat(Object.keys(oTableMetadata.getAllPrivateProperties())),
+			// array containing all control aggregations
+			aAllAggregations = Object.keys(oTableMetadata.getAllAggregations()).concat(Object.keys(oTableMetadata.getAllPrivateAggregations()));
+
+		// populate the oDesignTime.properties with the control properties (allowed/disallowed). By default all properties are ignored.
+		aAllProperties.forEach(function(sPropertyName) {
+			enhanceDesignTimeMetadata(aAllowedProperties, sPropertyName, oDesignTime.properties);
+		});
+
+		// populate the oDesignTime.aggregations with the control aggregations (allowed/disallowed). By default all aggregations are ignored.
+		aAllAggregations.forEach(function(sAggregationName) {
+			enhanceDesignTimeMetadata(aAllowedAggregations, sAggregationName, oDesignTime.aggregations);
+		});
+
+		return oDesignTime;
+	}
+
+	return getDesignTime();
 });

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.96.5
+	 * @version 1.99.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.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.field.FieldBase, sap.fe

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -56,19 +56,19 @@ sap.ui.define([
 	 * @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 {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
-	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize value
-	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help, to determine key and description // TODO: async request????
+	 * @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????
 	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator //TODO
 	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
-	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] BindingContext of field. Used to get key or description from the value help using in/out parameters. (In table, the value help might be connected to different row)
-	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field. E.g. for date types internally a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
+	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
 	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. // TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
-	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined. Just return it
+	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
 	 * @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 exist or it might be set later
+	 * @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>
@@ -527,8 +527,8 @@ sap.ui.define([
 				oType.validateValue(vCheckParsedValue);
 			}
 		} catch (oException) {
-			if (oException && !(oException instanceof ParseException) && !(oException instanceof ValidateException)) {// FormatException could also occur
-				// unknown error -> just raise it
+			if (oException && !(bCheckDescription && (oException instanceof ParseException || oException instanceof ValidateException))) {
+				// unknown error or no search for description -> just raise it
 				throw oException;
 			}
 			bCheckKey = false; // cannot be a valid key

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

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @since 1.62.0
 	 * @private
@@ -46,19 +46,19 @@ sap.ui.define([
 	 * @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 {string[]} [oFormatOptions.operators] Possible operators to be used in the condition
-	 * @param {sap.ui.mdc.enum.FieldDisplay} [oFormatOptions.display] DisplayFormat used to visualize value
-	 * @param {string} [oFormatOptions.fieldHelpID] ID of the field help, to determine key and description // TODO: async request????
+	 * @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????
 	 * @param {boolean} [oFormatOptions.hideOperator] If set, only the value of the condition is shown, but no operator //TODO
 	 * @param {int} [oFormatOptions.maxConditions] Maximum number of allowed conditions
-	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] BindingContext of field. Used to get key or description from the value help using in/out parameters. (In table, the value help might be connected to different row)
-	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field. E.g. for date types internally a different type is used internally to have different <code>formatOptions</code>
+	 * @param {sap.ui.model.Context} [oFormatOptions.bindingContext] <code>BindingContext</code> of field. Used to get a key or description from the value help using in/out parameters. (In a table, the value help might be connected to a different row)
+	 * @param {sap.ui.model.Type} [oFormatOptions.originalDateType] Type used on field, for example, for date types; a different type is used internally to have different <code>formatOptions</code>
 	 * @param {sap.ui.model.Type} [oFormatOptions.additionalType] additional Type used on other part of a field. (This is the case for unit fields.)
 	 * @param {function} [oFormatOptions.getConditions] Function to get the existing conditions of the field. Only used if <code>isUnit</code> is set. TODO: better solution
 	 * @param {function} [oFormatOptions.asyncParsing] Callback function to tell the <code>Field</code> the parsing is asynchronous.
-	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined. Just return it
+	 * @param {object} [oFormatOptions.navigateCondition] Condition of keyboard navigation. If this is filled, no real parsing is needed as the condition has already been determined and is just returned
 	 * @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 exist or it might be set later
+	 * @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>

package/src/sap/ui/mdc/field/CustomFieldHelp.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>FieldHelp</code> association in <code>FieldBase</code> controls that allows you to add custom content.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -29,10 +29,10 @@ sap.ui.define([
 	'sap/ui/layout/Grid',
 	'sap/ui/layout/GridData',
 	'sap/m/library',
-	'sap/m/ScrollContainer',
 	'sap/m/Button',
 	'sap/m/Panel',
-	'sap/base/Log'
+	'sap/base/Log',
+	'sap/ui/core/InvisibleMessage'
 ], function(
 		Control,
 		ManagedObjectObserver,
@@ -59,10 +59,10 @@ sap.ui.define([
 		Grid,
 		GridData,
 		mLibrary,
-		ScrollContainer,
 		Button,
 		Panel,
-		Log
+		Log,
+		InvisibleMessage
 		) {
 	"use strict";
 
@@ -74,6 +74,7 @@ sap.ui.define([
 
 	var ButtonType = mLibrary.ButtonType;
 	var ValueState = coreLibrary.ValueState;
+	var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
 
 	/**
 	 * Constructor for a new <code>DefineConditionPanel</code>.
@@ -88,7 +89,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.DefineConditionPanel
@@ -194,6 +195,8 @@ sap.ui.define([
 
 			Control.prototype.init.apply(this, arguments);
 
+			this.oInvisibleMessage = InvisibleMessage.getInstance();
+
 			this._oManagedObjectModel = new ManagedObjectModel(this);
 
 			this._oObserver = new ManagedObjectObserver(_observeChanges.bind(this));
@@ -259,6 +262,8 @@ sap.ui.define([
 				this._bFocusLastRemoveBtn = true; // as remove-Button will disappear and focus should set on the last row remove button
 			}
 
+			this.oInvisibleMessage.announce(oMessageBundle.getText("valuehelp.DEFINECONDITIONS_REMOVECONDITION_ANNOUNCE"), InvisibleMessageMode.Polite);
+
 			// try to reset valueState and value of value Fields inside the removed row
 			var oGrid = this.byId("conditions");
 			var aGridContent = oGrid.getContent();
@@ -277,6 +282,7 @@ sap.ui.define([
 
 			aConditions.splice(iIndex, 1);
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+			_checkInvalidInput.call(this, undefined); // check if invalid condition was removed
 
 			this.fireConditionProcessed();
 		},
@@ -301,8 +307,10 @@ sap.ui.define([
 			var sOperator = oOperator.name;
 			var oCondition = Condition.createCondition(sOperator, oOperator.valueDefaults ? oOperator.valueDefaults : [], undefined, undefined, ConditionValidated.NotValidated);
 
-			// mark the condition as initial and not modified by the user
-			oCondition.isInitial = true;
+			if (oOperator.valueTypes[0] && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+				// mark the condition as initial and not modified by the user
+				oCondition.isInitial = true;
+			}
 
 			FilterOperatorUtil.updateConditionValues(oCondition);
 			FilterOperatorUtil.checkConditionsEmpty(oCondition, aOperators);
@@ -313,6 +321,11 @@ sap.ui.define([
 				aConditions.push(oCondition);
 			}
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+
+			if (!oCondition.isInitial) {
+				// static condition added, it is ready to use -> fire event
+				this.fireConditionProcessed();
+			}
 		},
 
 		updateDefineConditions: function() {
@@ -350,6 +363,21 @@ sap.ui.define([
 
 		onSelectChange: function(oEvent) {
 			var oField = oEvent.getSource();
+			var oCondition = oField.getBindingContext("$this").getObject();
+			var aConditions = this.getConditions();
+			var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
+			if (iIndex >= 0) {
+				oCondition = aConditions[iIndex]; // to get right instance
+			}
+
+			if (!oEvent.getParameter("valid")) { // if Operator in error state -> don't update values
+				oCondition.invalid = true;
+				this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+				oField._sOldKey = oField.getValue();
+				_checkInvalidInput.call(this, true); // set imediately, not only if row left
+				return;
+			}
+
 			var sKey = oField.getValue();
 			var sOldKey = oField._sOldKey;
 			var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
@@ -357,16 +385,11 @@ sap.ui.define([
 
 			if (oOperator && oOperatorOld) {
 				var bUpdate = false;
-				var oCondition = oField.getBindingContext("$this").getObject();
-				var aConditions = this.getConditions();
-				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
 
 				if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
 					// type changed -> remove entered value (only if changed by user in Select)
 					// As Static text updated on condition change, don't delete it here.
 					if (iIndex >= 0) {
-						oCondition = aConditions[iIndex]; // to get right instance
-
 						oCondition.values.forEach(function(value, index) {
 							if (value !== null) {
 								if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
@@ -391,8 +414,6 @@ sap.ui.define([
 
 				if (iIndex >= 0 && oOperator.valueDefaults) {
 					// sets the default values for the operator back to default, if the condition is inital or the value is null
-					oCondition = aConditions[iIndex];
-
 					oCondition.values.forEach(function(value, index) {
 						if ((oCondition.isInitial && value !== oOperator.valueDefaults[index]) ||  (value === null)) {
 							// set the default value and mark the condition as initial
@@ -407,7 +428,6 @@ sap.ui.define([
 				if (!oOperator.valueTypes[1] && oOperatorOld.valueTypes[1]) {
 					// switch from BT to EQ -> remove second value even if filled
 					if (iIndex >= 0) {
-						oCondition = aConditions[iIndex]; // to get right instance
 						if (oCondition.values.length > 1 && oCondition.values[1]) {
 							oCondition.values = oCondition.values.slice(0, 1);
 							bUpdate = true;
@@ -415,9 +435,14 @@ sap.ui.define([
 					}
 				}
 
+				if (oCondition.invalid) {
+					delete oCondition.invalid;
+					bUpdate = true;
+				}
 				if (bUpdate) {
 					FilterOperatorUtil.checkConditionsEmpty(oCondition, _getOperators.call(this));
 					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+					_checkInvalidInput.call(this, false); // set imediately, not only if row left
 				}
 			}
 
@@ -674,7 +699,7 @@ sap.ui.define([
 			oControl = new Field(sId, {
 				delegate: _getDelegate.call(this),
 				value: { path: "$this>", type: oNullableType, mode: 'TwoWay', targetType: 'raw' },
-				editMode: {path: "$condition>operator", formatter: _getEditModeFromOperator},
+				editMode: {parts: [{path: "$condition>operator"}, {path: "$condition>invalid"}], formatter: _getEditModeFromOperator},
 				width: "100%"
 			});
 		}
@@ -788,7 +813,7 @@ sap.ui.define([
 			// default operator not valid -> cannot use -> use first include-operator which requires some values
 			for (var i = 0; i < aOperators.length; i++) {
 				oOperator = FilterOperatorUtil.getOperator(aOperators[i]);
-				if (oOperator.exclude || !oOperator.hasRequiredValues()) {
+				if (!oOperator || oOperator.exclude || !oOperator.hasRequiredValues()) {
 					oOperator = undefined;
 				} else {
 					break;
@@ -1000,6 +1025,11 @@ sap.ui.define([
 		oPanel.addContent(oInvisibleOperatorText);
 		oPanel.addContent(oGrid);
 
+		this._oInvisibleAddOperatorButtonText = new InvisibleText({
+			text: oMessageBundle.getText("valuehelp.DEFINECONDITIONS_ADDCONDITION_DESCRIPTION")
+		});
+		oPanel.addContent(this._oInvisibleAddOperatorButtonText);
+
 		var oAddBtn = new Button(this.getId() + "--addBtn", {
 			press: this.addCondition.bind(this),
 			type: ButtonType.Default,
@@ -1011,8 +1041,9 @@ sap.ui.define([
 				visibleS: {path: "$this>/conditions", formatter: _getAddButtonVisible.bind(this)},
 				visibleM: {path: "$this>/conditions", formatter: _getAddButtonVisible.bind(this)},
 				visibleL: {path: "$this>/conditions", formatter: _getAddButtonVisible.bind(this)},
-				visibleXL: {path: "$this>/conditions", formatter: _getAddButtonVisible.bind(this)}})}
-		);
+				visibleXL: {path: "$this>/conditions", formatter: _getAddButtonVisible.bind(this)}}),
+			ariaDescribedBy: this._oInvisibleAddOperatorButtonText
+		});
 
 		oGrid.addContent(oAddBtn);
 
@@ -1210,10 +1241,12 @@ sap.ui.define([
 
 	}
 
-	function _getEditModeFromOperator(sOperator) {
+	function _getEditModeFromOperator(sOperator, bInvalid) {
 
 		if (!sOperator) {
 			return EditMode.Display;
+		} else if (bInvalid) {
+			return EditMode.ReadOnly;
 		}
 
 		var oOperator = FilterOperatorUtil.getOperator(sOperator);
@@ -1231,7 +1264,7 @@ sap.ui.define([
 
 		var oOperator = sOperator && FilterOperatorUtil.getOperator(sOperator);
 
-		if (!oOperator || !oOperator.valueTypes[0]) {
+		if (!oOperator || !oOperator.valueTypes[0] || (oOperator.valueTypes[0] === Operator.ValueType.Static && !oOperator.getStaticText)) {
 			return "XL8 L8 M8 S0";
 		} else {
 			return "";
@@ -1309,6 +1342,10 @@ sap.ui.define([
 		if (oBindingContext) {
 			oOperatorField.setFieldGroupIds([oBindingContext.getPath()]); // use path to have a ID for every condition
 		}
+		if (oOperatorField.getValueState() === ValueState.Error && !oCondition.invalid) {
+			// remove error and show right value
+			oOperatorField.setValue(oOperatorField.getValue());
+		}
 		iIndex++;
 
 		var oRemoveButton = aGridContent[iIndex];
@@ -1323,8 +1360,7 @@ sap.ui.define([
 		var oValue0Field = aGridContent[iIndex];
 		var oValue1Field;
 		if (oValue0Field.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
-			var sEditMode = _getEditModeFromOperator(oCondition.operator);
-			if (oCondition.values.length > 0 || sEditMode === EditMode.Display) { // as static text for display controls is created after update
+			if (oCondition.values.length > 0) {
 				oValueBindingContext = this._oManagedObjectModel.getContext(oBindingContext.getPath() + "values/0/");
 				oValue0Field.setBindingContext(oValueBindingContext, "$this");
 				oValue0Field.setBindingContext(oBindingContext, "$condition");
@@ -1421,9 +1457,9 @@ sap.ui.define([
 		var oField2; // also update second Field if exist
 		var oCondition = oBindingContext.getObject();
 		var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
-		var bInvalid = false;
+		var bInvalid = !!oCondition.invalid;
 
-		if (oOperator.valueTypes.length > 0 && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+		if (!bInvalid && oOperator.valueTypes.length > 0 && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
 			// check only not static operators
 			if (oOperator.valueTypes.length > 1 && oOperator.valueTypes[1]) {
 				// two fields exist
@@ -1467,14 +1503,26 @@ sap.ui.define([
 
 	function _checkInvalidInput(bInvalid) {
 
+		var i = 0;
+
 		if (bInvalid !== true) {
 			// if already known that invalid input exist -> no additional check needed
+			var aConditions = this.getConditions();
+			for (i = 0; i < aConditions.length; i++) {
+				if (aConditions[i].invalid) {
+					bInvalid = true;
+					break;
+				}
+			}
+		}
+
+		if (bInvalid !== true) {
 			var oGrid = this.byId("conditions");
 			var aContent = oGrid.getContent();
 			bInvalid = false;
-			for (var i = 0; i < aContent.length; i++) {
+			for (i = 0; i < aContent.length; i++) {
 				var oControl = aContent[i];
-				if (oControl instanceof Field && oControl.hasOwnProperty("_iValueIndex") && oControl.getValueState() === ValueState.Error) {
+				if (oControl.hasOwnProperty("_iValueIndex") && oControl.getValueState && oControl.getValueState() === ValueState.Error) {
 					bInvalid = true;
 					break;
 				}