@openui5/sap.ui.mdc 1.113.0 → 1.115.0

package/src/sap/ui/mdc/{field → valuehelp/base}/DefineConditionPanel.js

@@ -10,21 +10,23 @@ sap.ui.define([
 	'sap/base/util/deepEqual',
 	'sap/ui/mdc/condition/Condition',
 	'sap/ui/mdc/condition/FilterOperatorUtil',
-	'sap/ui/mdc/condition/Operator',
-	'sap/ui/mdc/field/ConditionType',
-	'sap/ui/mdc/enum/EditMode',
-	'sap/ui/mdc/enum/FieldDisplay',
-	'sap/ui/mdc/enum/BaseType',
-	'sap/ui/mdc/enum/ConditionValidated',
+	'sap/ui/mdc/field/ConditionsType',
+	'sap/ui/mdc/field/splitValue',
+	'sap/ui/mdc/enums/FieldEditMode',
+	'sap/ui/mdc/enums/FieldDisplay',
+	'sap/ui/mdc/enums/BaseType',
+	'sap/ui/mdc/enums/ConditionValidated',
+	'sap/ui/mdc/enums/OperatorValueType',
 	'sap/ui/mdc/Field',
 	'sap/ui/mdc/ValueHelp',
 	'sap/ui/mdc/valuehelp/Popover',
 	'sap/ui/mdc/valuehelp/content/FixedList',
-	'sap/ui/mdc/field/ListFieldHelpItem',
+	'sap/ui/mdc/valuehelp/content/FixedListItem',
 	'sap/ui/model/base/ManagedObjectModel',
 	'sap/ui/model/json/JSONModel',
 	'sap/ui/model/resource/ResourceModel',
 	'sap/ui/model/type/String',
+	'sap/ui/model/ParseException',
 	'sap/ui/core/library',
 	'sap/ui/core/InvisibleText',
 	'sap/ui/layout/Grid',
@@ -32,7 +34,12 @@ sap.ui.define([
 	'sap/m/library',
 	'sap/m/Button',
 	'sap/m/Panel',
-	'sap/base/Log',
+	'sap/m/OverflowToolbar',
+	'sap/m/OverflowToolbarLayoutData',
+	'sap/m/ToolbarSpacer',
+	'sap/m/Text',
+	'sap/m/Title',
+	'sap/ui/core/IconPool',
 	'sap/ui/core/InvisibleMessage',
 	'sap/ui/thirdparty/jquery'
 ], function(
@@ -42,21 +49,23 @@ sap.ui.define([
 		deepEqual,
 		Condition,
 		FilterOperatorUtil,
-		Operator,
-		ConditionType,
-		EditMode,
+		ConditionsType,
+		splitValue,
+		FieldEditMode,
 		FieldDisplay,
 		BaseType,
 		ConditionValidated,
+		OperatorValueType,
 		Field,
 		ValueHelp,
 		Popover,
 		FixedList,
-		ListFieldHelpItem,
+		FixedListItem,
 		ManagedObjectModel,
 		JSONModel,
 		ResourceModel,
 		StringType,
+		ParseException,
 		coreLibrary,
 		InvisibleText,
 		Grid,
@@ -64,7 +73,12 @@ sap.ui.define([
 		mLibrary,
 		Button,
 		Panel,
-		Log,
+		OverflowToolbar,
+		OverflowToolbarLayoutData,
+		ToolbarSpacer,
+		Text,
+		Title,
+		IconPool,
 		InvisibleMessage,
 		jQuery
 		) {
@@ -72,13 +86,19 @@ sap.ui.define([
 
 	// translation utils
 	var oMessageBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+	var oMessageBundleM = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 	sap.ui.getCore().attachLocalizationChanged(function() {
 		oMessageBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+		oMessageBundleM = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 	});
 
 	var ButtonType = mLibrary.ButtonType;
 	var ValueState = coreLibrary.ValueState;
 	var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
+	var TextAlign = coreLibrary.TextAlign;
+	var BackgroundDesign = mLibrary.BackgroundDesign;
+	var ToolbarDesign = mLibrary.ToolbarDesign;
+	var OverflowToolbarPriority = mLibrary.OverflowToolbarPriority;
 
 	/**
 	 * Constructor for a new <code>DefineConditionPanel</code>.
@@ -93,17 +113,17 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
-	 * @alias sap.ui.mdc.field.DefineConditionPanel
+	 * @alias sap.ui.mdc.valuehelp.base.DefineConditionPanel
 	 * @since 1.58.0
 	 * @abstract
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.content.Conditions
 	 */
-	var DefineConditionPanel = Control.extend("sap.ui.mdc.field.DefineConditionPanel", {
+	var DefineConditionPanel = Control.extend("sap.ui.mdc.valuehelp.base.DefineConditionPanel", {
 		metadata: {
 			library: "sap.ui.mdc",
 			properties: {
@@ -120,13 +140,13 @@ sap.ui.define([
 					byValue: true
 				},
 
-				// TODO: better way to pass MaxConditions, Operators, ...
 				/**
-				 * The <code>formatOptions</code> for the {@link sap.ui.mdc.field.ConditionType ConditionType} used to format tokens.
+				 * Internal configuration
 				 *
-				 * @since 1.62.0
+				 * <b>Note:</b> This property must not be set from outside, it used to forward the configuration of the <code>ValueHelp</code>
+				 * @since 1.115.0
 				 */
-				formatOptions: {
+				config: {
 					type: "object",
 					defaultValue: {}
 				},
@@ -152,6 +172,18 @@ sap.ui.define([
 				inputOK: {
 					type: "boolean",
 					defaultValue: true
+				},
+
+				/**
+				 * Indicates if pagination is active
+				 *
+				 * @since 1.113.0
+				 * @private
+				 */
+				_pagination: {
+					type: "boolean",
+					defaultValue: false,
+					visibility: "hidden"
 				}
 
 			},
@@ -174,10 +206,26 @@ sap.ui.define([
 				 * <b>Note:</b> The fields are single-value input, and the display is always set to <code>FieldDisplay.Value</code>. Only a <code>ValueHelp</code> with a <code>TypeAhead</code> and single-selection <code>MTable</code> can be used.
 
 				 * <b>Note:</b> For <code>Boolean</code>, <code>Date</code>, or <code>Time</code>, no <code>FieldHelp</code> should be added, but a default <code>ValueHelp</code> used instead.
+				 * @deprecated as of 1.114.0, replaced by {@link #setValueHelp valueHelp} association
+				 *
 				 */
 				fieldHelp: {
 					type: "sap.ui.mdc.ValueHelp",
 					multiple: false
+				},
+
+				/**
+				 * Optional <code>ValueHelp</code>.
+				 *
+				 * This is an association that allows the usage of one <code>ValueHelp</code> instance for the value fields for the <code>DefineConditionPanel</code>.
+				 *
+				 * <b>Note:</b> The fields are single-value input, and the display is always set to <code>FieldDisplay.Value</code>. Only a <code>ValueHelp</code> with a <code>TypeAhead</code> and single-selection <code>MTable</code> can be used.
+				 *
+				 * <b>Note:</b> For <code>Boolean</code>, <code>Date</code>, or <code>Time</code>, no <code>ValueHelp</code> should be added, but a default <code>ValueHelp</code> used instead.
+				 */
+				valueHelp: {
+					type: "sap.ui.mdc.ValueHelp",
+					multiple: false
 				}
 			},
 			events: {
@@ -212,9 +260,18 @@ sap.ui.define([
 			this._oObserver = new ManagedObjectObserver(_observeChanges.bind(this));
 
 			this._oObserver.observe(this, {
-				properties: ["conditions", "formatOptions"]
+				properties: ["conditions", "config"]
 			});
 
+			this._iStartIndex = 0;
+			this._iShownConditions = 10;
+			this._iShownAdditionalConditions = 0; // to not switch page by addings conditions, new conditions are shown on the current page even if there are more than the limit
+			this._sOperatorHelpId = this.getId() + "--rowSelect-help";
+
+			this._oContentEventDelegate = {
+				onpaste: this.onPaste
+			};
+
 			_createInnerControls.call(this);
 			this.setModel(this._oManagedObjectModel, "$this");
 			this.setModel(this._oManagedObjectModel, "$condition"); // TODO: better solution to have 2 bindingContexts on one control
@@ -277,17 +334,19 @@ sap.ui.define([
 			// try to reset valueState and value of value Fields inside the removed row
 			var oGrid = this.byId("conditions");
 			var aGridContent = oGrid.getContent();
-			var iRow = 0;
-			for (var i = 0; i < aGridContent.length && iRow <= iIndex; i++) {
+			var iRow = -1;
+			for (var i = 0; i < aGridContent.length; i++) {
 				var oField = aGridContent[i];
-				if (iRow === iIndex && oField instanceof Field && oField.hasOwnProperty("_iValueIndex")) {
-					if (oField._isInvalidInput()) { // TODO: better was to find out parsing error
+				if (oField instanceof Field && oField.getValueHelp() === this._sOperatorHelpId) {
+					// Operator field starts new row
+					iRow++;
+				}
+
+				if (oField instanceof Field && oField.hasOwnProperty("_iValueIndex") && oField.getBindingContext("$this").getPath().startsWith(sPath)) {
+					if (oField.isInvalidInput()) { // TODO: better way to find out parsing error
 						oField.setValue(null); // to remove invalid value from parsing
 					}
 				}
-				if (oField instanceof Button && oField.getId().endsWith("-removeBtnLarge")) {
-					iRow++;
-				}
 			}
 
 			if (aConditions.length === 1 && iIndex === 0) {
@@ -296,6 +355,11 @@ sap.ui.define([
 				aConditions = this.getConditions();
 			}
 
+			if (iRow === 0 && this._iStartIndex > 0) {
+				// there was only one row on page -> after removing it, go to previous page
+				this._iStartIndex = this._iStartIndex - this._iShownConditions;
+			}
+
 			aConditions.splice(iIndex, 1);
 			this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
 			_checkInvalidInput.call(this, undefined); // check if invalid condition was removed
@@ -305,13 +369,35 @@ sap.ui.define([
 
 		addCondition: function(oEvent) {
 			var aConditions = this.getConditions();
-			var oFormatOptions = this.getFormatOptions();
-			var iMaxConditions = oFormatOptions.maxConditions;
+			var oConfig = this.getConfig();
+			var iMaxConditions = oConfig.maxConditions;
+
+			var oGrid = this.byId("conditions");
+			var aGridContent = oGrid.getContent();
+			var iRows = 0;
+			var iIndex = -1;
+			for (var i = 0; i < aGridContent.length; i++) {
+				var oField = aGridContent[i];
+				if (oField instanceof Field && oField.getValueHelp() === this._sOperatorHelpId) {
+					// Operator field starts new row
+					iRows++;
+					var oBindingContext = oField.getBindingContext("$this");
+					var sPath = oBindingContext.getPath();
+					var aMatch = sPath.match(/^.*\/(\d+)\/$/);
+					if (aMatch) {
+						iIndex = parseInt(aMatch[1]);
+					}
+				}
+			}
 
 			if (iMaxConditions === -1 || aConditions.length < iMaxConditions) {
 				// create a new dummy condition for a new condition on the UI - must be removed later if not used or filled correct
-				this.addDummyCondition(aConditions.length + 1);
+				this.addDummyCondition(iIndex + 1);
 				this._bFocusLastCondition = true; // as add-Button will disappear and focus should stay in DefineConditionPanel
+
+				if (iRows >= this._iShownConditions) {
+					this._iShownAdditionalConditions++;
+				}
 			}
 
 			this.oInvisibleMessage.announce(oMessageBundle.getText("valuehelp.DEFINECONDITIONS_ADDCONDITION_ANNOUNCE"), InvisibleMessageMode.Polite);
@@ -323,7 +409,7 @@ sap.ui.define([
 			var sOperator = oOperator.name;
 			var oCondition = Condition.createCondition(sOperator, oOperator.valueDefaults ? oOperator.valueDefaults : [], undefined, undefined, ConditionValidated.NotValidated);
 
-			if (oOperator.valueTypes[0] && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+			if (oOperator.valueTypes[0] && oOperator.valueTypes[0] !== OperatorValueType.Static) {
 				// mark the condition as initial and not modified by the user
 				oCondition.isInitial = true;
 			}
@@ -346,16 +432,16 @@ sap.ui.define([
 		},
 
 		updateDefineConditions: function() {
-			var aConditions = this.getConditions().filter(function(oCondition) {
-				var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
-				return oCondition.validated !== ConditionValidated.Validated || oOperator.exclude;
-			});
+			var aConditions = _getDefineConditions.call(this);
 
 			_addStaticText.call(this, aConditions, true, false);
 
 			if (aConditions.length === 0) {
 				this.addDummyCondition();
 			}
+			if (aConditions.length < this._iStartIndex) {
+				this._iStartIndex = 0;
+			}
 		},
 
 		// called when the user has change the value of the condition field
@@ -413,9 +499,11 @@ sap.ui.define([
 				var sOldKey = oField._sOldKey;
 				var oOperator = FilterOperatorUtil.getOperator(sKey); // operator must exist as List is created from valid operators
 				var oOperatorOld = sOldKey && FilterOperatorUtil.getOperator(sOldKey);
-				var oCondition = oField.getBindingContext("$this").getObject();
+				var oBindingContext = oField.getBindingContext("$this");
+				var oCondition = oBindingContext.getObject();
+				var sConditionPath = oBindingContext.getPath(); // Path to condition of the active control
+				var iIndex = parseInt(sConditionPath.split("/")[2]); // index of current condition
 				var aConditions = this.getConditions();
-				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
 				if (iIndex >= 0) {
 					oCondition = aConditions[iIndex]; // to get right instance
 				}
@@ -423,14 +511,14 @@ sap.ui.define([
 				if (oOperator && oOperatorOld) {
 					var bUpdate = false;
 
-					if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== Operator.ValueType.Static ) {
+					if (!deepEqual(oOperator.valueTypes[0], oOperatorOld.valueTypes[0]) && oOperator.valueTypes[0] !== OperatorValueType.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.values.forEach(function(value, index) {
 								if (value !== null) {
-									if ((oOperator.valueTypes[index] === Operator.ValueType.Self && oOperatorOld.valueTypes[index] === Operator.ValueType.SelfNoParse) ||
-											(oOperator.valueTypes[index] === Operator.ValueType.SelfNoParse && oOperatorOld.valueTypes[index] === Operator.ValueType.Self)) {
+									if ((oOperator.valueTypes[index] === OperatorValueType.Self && oOperatorOld.valueTypes[index] === OperatorValueType.SelfNoParse) ||
+											(oOperator.valueTypes[index] === OperatorValueType.SelfNoParse && oOperatorOld.valueTypes[index] === OperatorValueType.Self)) {
 										// as for Decimal values the type might change we need to format and parse again
 										var oType = _getFieldType.call(this, oOperator.name, index);
 										var oTypeOld = _getFieldType.call(this, oOperatorOld.name, index);
@@ -484,9 +572,11 @@ sap.ui.define([
 
 				delete oField._sOldKey;
 			}.bind(this)).catch(function (oException) { // if Operator in error state -> don't update values
-				var oCondition = oField.getBindingContext("$this").getObject();
+				var oBindingContext = oField.getBindingContext("$this");
+				var oCondition = oBindingContext.getObject();
+				var sConditionPath = oBindingContext.getPath(); // Path to condition of the active control
+				var iIndex = parseInt(sConditionPath.split("/")[2]); // index of current condition
 				var aConditions = this.getConditions();
-				var iIndex = FilterOperatorUtil.indexOfCondition(oCondition, aConditions);
 				if (iIndex >= 0) {
 					oCondition = aConditions[iIndex]; // to get right instance
 				}
@@ -499,82 +589,50 @@ sap.ui.define([
 		},
 
 		onPaste: function(oEvent) {
-			var sOriginalText;
-			var oSource = oEvent.srcControl;
-			var oFormatOptions = this.getFormatOptions();
-			var iMaxConditions = oFormatOptions.hasOwnProperty("maxConditions") ? oFormatOptions.maxConditions : -1;
-			var sConditionPath = oSource.getBindingContext("$condition").getPath(); // Path to condition of the active control
-			var iIndex = parseInt(sConditionPath.split("/")[2]); // index of current condition - to remove before adding new ones
-
-			// for the purpose to copy from column in excel and paste in MultiInput/MultiComboBox
-			if (window.clipboardData) {
-				//IE
-				sOriginalText = window.clipboardData.getData("Text");
-			} else {
-				// Chrome, Firefox, Safari
-				sOriginalText = oEvent.originalEvent.clipboardData.getData('text/plain');
-			}
-			var aSeparatedText = sOriginalText.split(/\r\n|\r|\n/g);
-
-			if (aSeparatedText && aSeparatedText.length > 1) {
-				setTimeout(function() {
-					var oFormatOptions = merge({}, this.getFormatOptions());
-					delete oFormatOptions.fieldHelpID;
-					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
-					var oConditionType = new ConditionType(oFormatOptions);
-
-					var iLength = aSeparatedText.length;
-					var aConditions = this.getConditions();
-					for (var i = 0; i < iLength; i++) {
-						if (aSeparatedText[i]) {
-							var sValue = aSeparatedText[i].trim();
-
-							var aValues = sValue.split(/\t/g); // if two values exist, use it as Between and create a "a...z" value
-							if (aValues.length == 2 && aValues[0] && aValues[1]) {
-								var oOperator = FilterOperatorUtil.getOperator("BT");
-
-								sValue = oOperator.tokenFormat;
-								for (var j = 0; j < 2; j++) {
-									sValue = sValue.replace(new RegExp("\\{" + j + "\\}", "g"), aValues[j]);
-								}
-
-							}
-
-							try {
-								var oCondition = oConditionType.parseValue(sValue, "string");
-								oConditionType.validateValue(oCondition);
-
-								if (aConditions.length > iIndex) {
-									// overwrite existing condition
-									aConditions.splice(iIndex, 1, oCondition);
-								} else {
-									// add new condition
-									aConditions.push(oCondition);
-								}
-								iIndex++;
-
-							} catch (error) {
-								Log.error("Paste handling", "the pasted value '" + sValue + "' could not be handled! " + error.message);
-							}
-						}
-					}
-
-					if (iMaxConditions >= 0 && aConditions.length > iMaxConditions) {
-						aConditions.splice(iMaxConditions, aConditions.length - iMaxConditions);
-					}
+			// for the purpose to copy from column in Excel and paste as new conditions
+			var sOriginalText = oEvent.originalEvent.clipboardData.getData('text/plain');
+			var aSeparatedText = splitValue(sOriginalText, true); // check without BT support as if TAB is inside the Paste logic needs to be used anyhow
+
+			if (aSeparatedText.length > 1) { // if no linebreak just process normal paste-logic
+				var oSource = oEvent.srcControl;
+				var sConditionPath = oSource.getBindingContext("$condition").getPath(); // Path to condition of the active control
+				var iIndex = parseInt(sConditionPath.split("/")[2]); // index of current condition - to remove before adding new ones
+				var aConditions = this.getConditions();
+				var oFormatOptions = merge({}, this.getConfig());
+				oFormatOptions.display = FieldDisplay.Value;
+				oFormatOptions.getConditions = function() {return aConditions;}; // as condition where inserted will be removed
+				oFormatOptions.defaultOperatorName = aConditions[iIndex].operator; // use current operator as default
+				oFormatOptions.valueType = oFormatOptions.dataType;
+				delete oFormatOptions.dataType;
+				var oConditionsType = new ConditionsType(oFormatOptions);
 
-					if (oSource.setDOMValue) {
-						oSource.setDOMValue(""); // otherwise binding update will be ignored
-					}
+				try {
+					aConditions.splice(iIndex, 1); // remove old condition that is overwitten by pasting
+					var aNewConditions = oConditionsType._parseValueToIndex(sOriginalText, "string", iIndex);
+					oConditionsType.validateValue(aConditions);
 
-					FilterOperatorUtil.checkConditionsEmpty(aConditions);
-					this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+					FilterOperatorUtil.checkConditionsEmpty(aNewConditions);
+					this.setProperty("conditions", aNewConditions, true); // do not invalidate whole DefineConditionPanel
 
 					this.fireConditionProcessed();
+				} catch (error) {
+					var oException = new ParseException(oMessageBundle.getText("field.PASTE_ERROR"));
+					var mErrorParameters = {
+						element: oSource,
+						property: "value", // TODO: right property for custom content
+						type: oConditionsType,
+						newValue: sOriginalText,
+						oldValue: "", // TODO
+						exception: oException,
+						message: oException.message
+					};
+					oSource.fireParseError(mErrorParameters, false, true); // mParameters, bAllowPreventDefault, bEnableEventBubbling
+				}
 
-				}.bind(this), 0);
+				oConditionsType.destroy();
+
+				oEvent.stopImmediatePropagation(true); // to prevent controls own logic
+				oEvent.preventDefault(); // to prevent pasting string into INPUT
 			}
 		},
 
@@ -585,12 +643,17 @@ sap.ui.define([
 			for (var i = 0; i < aGridContent.length; i++) {
 				var oField = aGridContent[i];
 				if (oField instanceof Field && oField.hasOwnProperty("_iValueIndex")) {
-					if (oField._isInvalidInput()) { // TODO: better was to find out parsing error
+					if (oField.isInvalidInput()) { // TODO: better was to find out parsing error
 						oField.setValue(); // to remove invalid value from parsing
 					}
 				}
 			}
 			this.setProperty("inputOK", true, true); // do not invalidate whole DefineConditionPanel
+			if (this._iStartIndex > 0 || this._iShownAdditionalConditions > 0) {
+				this._iStartIndex = 0;
+				this._iShownAdditionalConditions = 0;
+				_renderConditions.call(this); // to have right paging on reopening
+			}
 		},
 
 		/**
@@ -605,8 +668,14 @@ sap.ui.define([
 			var oGrid = this.getAggregation("_content").getContent()[1];
 			var oCtrl = oGrid.getContent()[0]; // 0=Operator Field, 2=first Value Field which might not exist
 			return oCtrl;
-		}
+		},
+
+		// TODO: remove this function and replace by getValueHelp onde FieldHelp association is completetly removed.
+		_getValueHelp: function() {
+
+			return this.getValueHelp() || (this.getFieldHelp && this.getFieldHelp()); // as getFieldHelp not exist in legacy-free UI5
 
+		}
 	});
 
 	function _observeChanges(oChanges) {
@@ -616,7 +685,7 @@ sap.ui.define([
 			_operatorChanged.call(this, oChanges.object, oChanges.current, oChanges.old);
 		}
 
-		if (oChanges.name === "formatOptions") {
+		if (oChanges.name === "config") {
 			// type or maxConditions might changed -> resume ListBinding
 			var aConditions = this.getConditions();
 			var oOperators = oChanges.current && oChanges.current.operators;
@@ -628,7 +697,7 @@ sap.ui.define([
 				_updateOperatorModel.call(this);
 			}
 
-			var oType = oChanges.current && oChanges.current.valueType;
+			var oType = oChanges.current && oChanges.current.dataType;
 			var oTypeOld = oChanges.old && oChanges.old.valueType;
 			var sType = oType && oType.getMetadata().getName();
 			var sTypeOld = oTypeOld && oTypeOld.getMetadata().getName();
@@ -674,8 +743,8 @@ sap.ui.define([
 
 	function _operatorSupportsValueHelp(sKey) {
 		return true;
-		// var aFieldHelpSupportedOperators = ["EQ", "NE"]; // only for this operators we use the FieldHelp on the value fields
-		// return aFieldHelpSupportedOperators.length === 0 || aFieldHelpSupportedOperators.indexOf(sKey) >= 0;
+		// var aValueHelpSupportedOperators = ["EQ", "NE"]; // only for this operators we use the ValueHelp on the value fields
+		// return aValueHelpSupportedOperators.length === 0 || aValueHelpSupportedOperators.indexOf(sKey) >= 0;
 	}
 
 	function _operatorChanged(oField, sKey, sOldKey) {
@@ -696,14 +765,14 @@ sap.ui.define([
 			// find fields and initialize error state
 			oValue0Field = oGrid.getContent()[iIndex + 2];
 			if (oValue0Field && oValue0Field.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
-				if (oValue0Field instanceof Field && !oValue0Field._isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
+				if (oValue0Field instanceof Field && !oValue0Field.isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
 					// if Field is in parsing error state, don't remove error
 					oValue0Field.setValueState(ValueState.None);
 					oValue0Field.setValueStateText();
 				}
 				oValue1Field = oGrid.getContent()[iIndex + 3]; // second field only exists if first field exist
 				if (oValue1Field && oValue1Field.hasOwnProperty("_iValueIndex") && oValue1Field._iValueIndex === 1) {
-					if (oValue1Field instanceof Field && !oValue1Field._isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
+					if (oValue1Field instanceof Field && !oValue1Field.isInvalidInput()) { // TODO: better was to find out parsing error // TODO: handle custom controls
 						// if Field is in parsing error state, don't remove error
 						oValue1Field.setValueState(ValueState.None);
 						oValue1Field.setValueStateText();
@@ -716,14 +785,14 @@ sap.ui.define([
 			}
 
 			if (_operatorSupportsValueHelp(sKey)) {
-				// enable the fieldHelp for the used value fields
-				var sFiedHelp = this.getFieldHelp();
-				oValue0Field && oValue0Field.setFieldHelp && oValue0Field.setFieldHelp(sFiedHelp);
-				oValue1Field && oValue1Field.setFieldHelp && oValue1Field.setFieldHelp(sFiedHelp);
+				// enable the ValueHelp for the used value fields
+				var sValueHelp = this._getValueHelp();
+				oValue0Field && oValue0Field.setValueHelp && oValue0Field.setValueHelp(sValueHelp);
+				oValue1Field && oValue1Field.setValueHelp && oValue1Field.setValueHelp(sValueHelp);
 			} else {
-				// remove the fieldHelp for the used value fields
-				oValue0Field && oValue0Field.setFieldHelp && oValue0Field.setFieldHelp();
-				oValue1Field && oValue1Field.setFieldHelp && oValue1Field.setFieldHelp();
+				// remove the ValueHelp for the used value fields
+				oValue0Field && oValue0Field.setValueHelp && oValue0Field.setValueHelp();
+				oValue1Field && oValue1Field.setValueHelp && oValue1Field.setValueHelp();
 			}
 
 			if (oOperator.createControl || oOperatorOld.createControl) {
@@ -796,7 +865,7 @@ sap.ui.define([
 				editMode: {parts: [{path: "$condition>operator"}, {path: "$condition>invalid"}], formatter: _getEditModeFromOperator},
 				multipleLines: false,
 				width: "100%",
-				fieldHelp: _operatorSupportsValueHelp(oCondition.operator) ? this.getFieldHelp() : null
+				valueHelp: _operatorSupportsValueHelp(oCondition.operator) ? this._getValueHelp() : null
 				//display: should always be FieldDisplay.Value
 			});
 		}
@@ -813,8 +882,8 @@ sap.ui.define([
 		if (oControl.attachChange) { // custom control might not have a change event
 			oControl.attachChange(this.onChange.bind(this));
 		}
-		oControl.onpaste = this.onPaste.bind(this);
-		oControl.setLayoutData(new GridData({span: {parts: [{path: "$condition>"}, {path: "$this>/formatOptions"}], formatter: _getSpanForValue.bind(this)}}));
+		oControl.addDelegate(this._oContentEventDelegate, true, this);
+		oControl.setLayoutData(new GridData({span: {parts: [{path: "$condition>"}, {path: "$this>/config"}], formatter: _getSpanForValue.bind(this)}}));
 		oControl.setBindingContext(oValueBindingContext, "$this");
 		oControl.setBindingContext(oBindingContext, "$condition");
 		// add fieldGroup to validate Condition only after both Fields are entered.
@@ -829,13 +898,13 @@ sap.ui.define([
 		var oDataType = _getType.call(this);
 		var oOperator = FilterOperatorUtil.getOperator(sOperator);
 
-		if (oOperator.valueTypes[iIndex] && [Operator.ValueType.Self, Operator.ValueType.Static].indexOf(oOperator.valueTypes[iIndex]) === -1) {
+		if (oOperator.valueTypes[iIndex] && [OperatorValueType.Self, OperatorValueType.Static].indexOf(oOperator.valueTypes[iIndex]) === -1) {
 			oDataType = oOperator._createLocalType(oOperator.valueTypes[iIndex], oDataType);
 		}
 
 		var bStaticText = false;
 
-		if (oOperator.valueTypes[iIndex] === Operator.ValueType.Static) {
+		if (oOperator.valueTypes[iIndex] === OperatorValueType.Static) {
 			bStaticText = true;
 			oDataType = _getDefaultType.call(this);
 		}
@@ -897,7 +966,7 @@ sap.ui.define([
 	function _getDefaultOperator() {
 		var aOperators = _getOperators.call(this);
 		var oOperator;
-		var sOperatorName = this.getFormatOptions().defaultOperatorName;
+		var sOperatorName = this.getConfig().defaultOperatorName;
 		if (sOperatorName) {
 			oOperator = FilterOperatorUtil.getOperator(sOperatorName);
 		} else {
@@ -927,8 +996,8 @@ sap.ui.define([
 
 	function _getOperators() {
 
-		var oFormatOptions = this.getFormatOptions();
-		var aOperators = oFormatOptions && oFormatOptions.operators;
+		var oConfig = this.getConfig();
+		var aOperators = oConfig && oConfig.operators;
 
 		if (!aOperators || aOperators.length === 0) {
 			// TODO: better default
@@ -968,14 +1037,14 @@ sap.ui.define([
 
 		var bHasMultipleGroups = _hasMultipleOperatorGroups.call(this);
 
-		var sFixedListId = this.getId() + "--rowSelect-help-pop-fl";
+		var sFixedListId = this._sOperatorHelpId + "-pop-fl";
 		var oFixedList = sap.ui.getCore().byId(sFixedListId);
 
 		var oTemplate;
 		if (bHasMultipleGroups) {
-			oTemplate = new ListFieldHelpItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}", groupKey: "{om>groupId}", groupText: "{om>groupText}"});
+			oTemplate = new FixedListItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}", groupKey: "{om>groupId}", groupText: "{om>groupText}"});
 		} else {
-			oTemplate = new ListFieldHelpItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}"});
+			oTemplate = new FixedListItem({key: "{om>key}", text: "{om>text}", additionalText: "{om>additionalText}"});
 		}
 		oFixedList.bindAggregation("items", { path: 'om>/', templateShareable: false, template: oTemplate});
 		oFixedList.setGroupable(bHasMultipleGroups);
@@ -1015,8 +1084,8 @@ sap.ui.define([
 
 	function _getType() {
 
-		var oFormatOptions = this.getFormatOptions();
-		var oType = oFormatOptions && oFormatOptions.valueType;
+		var oConfig = this.getConfig();
+		var oType = oConfig && oConfig.dataType;
 		if (!oType) {
 			oType = _getDefaultType.call(this);
 		}
@@ -1039,9 +1108,9 @@ sap.ui.define([
 		var sType = oType.getMetadata().getName();
 		var oFormatOptions = oType.getFormatOptions();
 		var oConstraints = oType.getConstraints();
-		var oDelegate = this.getFormatOptions().delegate;
-		var oPayload = this.getFormatOptions().payload;
-		var sBaseType = oDelegate ? oDelegate.getTypeUtil(oPayload).getBaseType(sType, oFormatOptions, oConstraints) : BaseType.String; // if not configured use string
+		var oDelegate = this.getConfig().delegate;
+		var oField = this.getConfig().control;
+		var sBaseType = oDelegate ? oDelegate.getTypeMap(oField).getBaseType(sType, oFormatOptions, oConstraints) : BaseType.String; // if not configured use string
 
 		if (sBaseType === BaseType.Unit) {
 			sBaseType = BaseType.Numeric;
@@ -1053,9 +1122,9 @@ sap.ui.define([
 
 	function _getDelegate() {
 
-		var oFormatOptions = this.getFormatOptions();
-		var sName = oFormatOptions.delegateName || "sap/ui/mdc/field/FieldBaseDelegate";
-		var oPayload = oFormatOptions.payload;
+		var oConfig = this.getConfig();
+		var sName = oConfig.delegateName || "sap/ui/mdc/field/FieldBaseDelegate";
+		var oPayload = oConfig.payload;
 
 		return {name: sName, payload: oPayload};
 
@@ -1070,7 +1139,7 @@ sap.ui.define([
 		for (i = 0; i < aConditions.length; i++) {
 			var oCondition = aConditions[i];
 			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
-			if (oOperator && oOperator.valueTypes[0] === Operator.ValueType.Static && (oCondition.values.length === 0 || bTypeChange)) {
+			if (oOperator && oOperator.valueTypes[0] === OperatorValueType.Static && (oCondition.values.length === 0 || bTypeChange)) {
 				// if type changed the text needs to be new formatted (setting of type and conditions might be async.)
 				if (oOperator.getStaticText) {
 					var sText = oOperator.getStaticText(oDataType, _getBaseType.call(this, oDataType));
@@ -1092,17 +1161,67 @@ sap.ui.define([
 
 	function _createInnerControls() {
 		var oInvisibleOperatorText = new InvisibleText(this.getId() + "--ivtOperator", {text: "{$i18n>valuehelp.DEFINECONDITIONS_OPERATORLABEL}"});
+		var oTitle = new Title(this.getId() + "-title", {text: {path: "$this>/label"}});
+		var oButtonPrev = new Button(this.getId() + "--prev", {
+			icon: IconPool.getIconURI("navigation-left-arrow"),
+			tooltip: oMessageBundleM.getText("PAGINGBUTTON_PREVIOUS"),
+			visible: {path: "$this>/_pagination"},
+			layoutData: new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.NeverOverflow
+			}),
+			press: _handlePrevious.bind(this)
+		});
+		var oButtonNext = new Button(this.getId() + "--next", {
+			icon: IconPool.getIconURI("navigation-right-arrow"),
+			tooltip: oMessageBundleM.getText("PAGINGBUTTON_NEXT"),
+			visible: {path: "$this>/_pagination"},
+			layoutData: new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.NeverOverflow
+			}),
+			press: _handleNext.bind(this)
+		});
+		var oButtonRemoveAll = new Button(this.getId() + "--removeAll", {
+			text: oMessageBundleM.getText("CONDITIONPANEL_REMOVE_ALL"),
+			visible: {path: "$this>/_pagination"},
+			layoutData: new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.Low
+			}),
+			press: _handleRemoveAll.bind(this)
+		});
+		var oButtonInsert = new Button(this.getId() + "--insert", {
+			icon: IconPool.getIconURI("add"),
+			visible: {path: "$this>/_pagination"},
+			layoutData: new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.Low
+			}),
+			press: _handleInsert.bind(this)
+		});
+		var oPageCount = new Text(this.getId() + "--pageCount", {
+			text: _getPageText.call(this),
+			wrapping: false,
+			textAlign: TextAlign.Center,
+			visible: {path: "$this>/_pagination"},
+			layoutData: new OverflowToolbarLayoutData({
+				priority: OverflowToolbarPriority.NeverOverflow
+			})
+		});
+		var oToolbar = new OverflowToolbar(this.getId() + "--toolbar", {
+			width: "100%",
+			design: ToolbarDesign.Transparent,
+			content: [oTitle, new ToolbarSpacer(), oButtonPrev, oPageCount, oButtonNext, oButtonRemoveAll, oButtonInsert]
+		});
 
-		var oPanel = new Panel({headerText: "{$this>/label}",
+		var oPanel = new Panel(this.getId() + "--panel", {
+			headerToolbar: oToolbar,
 			expanded: true,
 			height: "100%",
-			backgroundDesign: "Transparent"}
+			backgroundDesign: BackgroundDesign.Transparent}
 		).addStyleClass("sapMdcDefineconditionPanel");
 
 		oPanel.addDependent(
-			new ValueHelp(this.getId() + "--rowSelect-help", {
-				typeahead: new Popover(this.getId() + "--rowSelect-help-pop", {
-									content: [new FixedList(this.getId() + "--rowSelect-help-pop-fl", {
+			new ValueHelp(this._sOperatorHelpId, {
+				typeahead: new Popover(this._sOperatorHelpId + "-pop", {
+									content: [new FixedList(this._sOperatorHelpId + "-pop-fl", {
 													filterList: false,
 													useFirstMatch: true
 												})]
@@ -1135,10 +1254,10 @@ sap.ui.define([
 				span: "XL2 L3 M3 S3",
 				indent: "XL9 L8 M8 S7",
 				linebreak: true,
-				visibleS: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getAddButtonVisible.bind(this)},
-				visibleM: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getAddButtonVisible.bind(this)},
-				visibleL: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getAddButtonVisible.bind(this)},
-				visibleXL: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getAddButtonVisible.bind(this)}}),
+				visibleS: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getAddButtonVisible.bind(this)},
+				visibleM: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getAddButtonVisible.bind(this)},
+				visibleL: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getAddButtonVisible.bind(this)},
+				visibleXL: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getAddButtonVisible.bind(this)}}),
 			ariaDescribedBy: this._oInvisibleAddOperatorButtonText
 		});
 
@@ -1150,17 +1269,17 @@ sap.ui.define([
 
 	}
 
-	function _getAddButtonVisible(aConditions, oFormatOptions) {
+	function _getAddButtonVisible(aConditions, oConfig) {
 
-		var iMaxConditions = oFormatOptions.hasOwnProperty("maxConditions") ? oFormatOptions.maxConditions : -1;
+		var iMaxConditions = oConfig.hasOwnProperty("maxConditions") ? oConfig.maxConditions : -1;
 
 		return iMaxConditions === -1 || aConditions.length < iMaxConditions;
 
 	}
 
-	function _getRemoveButtonVisible(aConditions, oFormatOptions) {
+	function _getRemoveButtonVisible(aConditions, oConfig) {
 
-		var iMaxConditions = oFormatOptions.hasOwnProperty("maxConditions") ? oFormatOptions.maxConditions : -1;
+		var iMaxConditions = oConfig.hasOwnProperty("maxConditions") ? oConfig.maxConditions : -1;
 
 		// only on case of maxCondition==1 the Remove icons should be invisible
 		return iMaxConditions !== 1;
@@ -1171,36 +1290,46 @@ sap.ui.define([
 
 		var aConditions = this.getConditions();
 		var oGrid = this.byId("conditions");
+		var oButtonPrev = this.byId("prev");
+		var oButtonNext = this.byId("next");
+		var oPageCount = this.byId("pageCount");
 		var aGridContent;
 		var iRow = -1;
 		var iIndex = 0;
+		var iDefineConditions = -1;
+		var iShownConditions = this._iShownConditions + this._iShownAdditionalConditions;
 
-		for (var i = 0; i < aConditions.length; i++) {
+		for (var i = 0; i < aConditions.length && iRow < iShownConditions; i++) {
 			var oCondition = aConditions[i];
 			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
 			if (oCondition.validated !== ConditionValidated.Validated || oOperator.exclude) {
 				// show only validated conditions
-				var oBindingContext = this._oManagedObjectModel.getContext("/conditions/" + i + "/");
-				iRow++;
-
-				if (!this.oOperatorModel) {
-					// init operatorModel if first row is created (needed to check operator)
-					this.oOperatorModel = new JSONModel();
-					this.setModel(this.oOperatorModel, "om");
-					_updateOperatorModel.call(this);
-				}
+				iDefineConditions++;
+				if (iDefineConditions >= this._iStartIndex) {
+					// show only conditions on this page
+					iRow++;
+					if (iRow < iShownConditions) {
+						var oBindingContext = this._oManagedObjectModel.getContext("/conditions/" + i + "/");
+
+						if (!this.oOperatorModel) {
+							// init operatorModel if first row is created (needed to check operator)
+							this.oOperatorModel = new JSONModel();
+							this.setModel(this.oOperatorModel, "om");
+							_updateOperatorModel.call(this);
+						}
 
-				aGridContent = oGrid.getContent(); // to have current content
-				if (aGridContent[iIndex] && aGridContent[iIndex].isA("sap.ui.mdc.Field")) {
-					// row already exists -> update it
-					iIndex = _updateRow.call(this, oCondition, oGrid, iIndex, oBindingContext, iRow);
-				} else {
-					// reate new row
-					iIndex = _createRow.call(this, oCondition, oGrid, iIndex, oBindingContext, iRow);
+						aGridContent = oGrid.getContent(); // to have current content
+						if (aGridContent[iIndex] && aGridContent[iIndex].isA("sap.ui.mdc.Field")) {
+							// row already exists -> update it
+							iIndex = _updateRow.call(this, oCondition, oGrid, iIndex, oBindingContext, iRow);
+						} else {
+							// reate new row
+							iIndex = _createRow.call(this, oCondition, oGrid, iIndex, oBindingContext, iRow);
+						}
+					}
 				}
 			}
 		}
-
 		// remove unused rows
 		aGridContent = oGrid.getContent();
 		while (aGridContent[iIndex] && aGridContent[iIndex] !== this.byId("addBtn")) {
@@ -1222,6 +1351,10 @@ sap.ui.define([
 			this._bFocusLastRemoveBtn = false;
 		}
 
+		oPageCount.setText(_getPageText.call(this));
+		oButtonPrev.setEnabled(this._iStartIndex > 0);
+		oButtonNext.setEnabled(iRow >= iShownConditions); // there is at least one more row than conditions are shown
+		this.setProperty("_pagination", iDefineConditions >= iShownConditions);
 	}
 
 	function _getGridIndexOfLastRowWithVisibleElement(aIdEndsWith) {
@@ -1283,13 +1416,13 @@ sap.ui.define([
 			value: {path: "$this>operator", type: this._oOperatorFieldType},
 			width: "100%",
 			display: FieldDisplay.Description,
-			editMode: EditMode.Editable,
+			editMode: FieldEditMode.Editable,
 			multipleLines: false,
-			fieldHelp: this.getId() + "--rowSelect-help",
+			valueHelp: this._sOperatorHelpId,
 			change: this.onSelectChange.bind(this),
 			ariaLabelledBy: this.getId() + "--ivtOperator"
 		})
-		.setLayoutData(new GridData({span: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getSpanForOperator.bind(this)}, linebreak: true}))
+		.setLayoutData(new GridData({span: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getSpanForOperator.bind(this)}, linebreak: true}))
 		.setBindingContext(oBindingContext, "$this");
 		if (oBindingContext) {
 			// validate only complete condition
@@ -1312,7 +1445,7 @@ sap.ui.define([
 		})
 		.setLayoutData(new GridData({span: "XL1 L1 M1 S2",
 			indent: {path: "$this>operator", formatter: _getIndentForOperator},
-			visibleS: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getRemoveButtonVisible.bind(this)},
+			visibleS: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getRemoveButtonVisible.bind(this)},
 			visibleM: false,
 			visibleL: false,
 			visibleXL: false
@@ -1345,9 +1478,9 @@ sap.ui.define([
 		.setLayoutData(new GridData({span: "XL1 L1 M1 S1",
 			indent: {path: "$this>operator", formatter: _getIndentForOperator},
 			visibleS: false,
-			visibleM: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getRemoveButtonVisible.bind(this)},
-			visibleL: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getRemoveButtonVisible.bind(this)},
-			visibleXL: {parts: [{path: "$this>/conditions"}, {path: "$this>/formatOptions"}], formatter: _getRemoveButtonVisible.bind(this)}
+			visibleM: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getRemoveButtonVisible.bind(this)},
+			visibleL: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getRemoveButtonVisible.bind(this)},
+			visibleXL: {parts: [{path: "$this>/conditions"}, {path: "$this>/config"}], formatter: _getRemoveButtonVisible.bind(this)}
 		}))
 		.setBindingContext(oBindingContext, "$this"); // to find condition on remove
 
@@ -1363,17 +1496,17 @@ sap.ui.define([
 		if (!sOperator) {
 			return this.getEditMode(); // do not change edit mode to prevent update if temporary no operator
 		} else if (bInvalid) {
-			return EditMode.ReadOnly;
+			return FieldEditMode.ReadOnly;
 		}
 
 		var oOperator = FilterOperatorUtil.getOperator(sOperator);
 		var bStaticText = false;
 
-		if (oOperator && oOperator.valueTypes[0] === Operator.ValueType.Static) {
+		if (oOperator && oOperator.valueTypes[0] === OperatorValueType.Static) {
 			bStaticText = true;
 		}
 
-		return bStaticText ? EditMode.Display : EditMode.Editable;
+		return bStaticText ? FieldEditMode.Display : FieldEditMode.Editable;
 
 	}
 
@@ -1381,7 +1514,7 @@ sap.ui.define([
 
 		var oOperator = sOperator && FilterOperatorUtil.getOperator(sOperator);
 
-		if (!oOperator || !oOperator.valueTypes[0] || (oOperator.valueTypes[0] === Operator.ValueType.Static && !oOperator.getStaticText)) {
+		if (!oOperator || !oOperator.valueTypes[0] || (oOperator.valueTypes[0] === OperatorValueType.Static && !oOperator.getStaticText)) {
 			return "XL8 L8 M8 S0";
 		} else {
 			return "";
@@ -1389,8 +1522,8 @@ sap.ui.define([
 
 	}
 
-	function _getSpanForOperator(aConditions, oFormatOptions) {
-		var iMaxConditions = oFormatOptions.hasOwnProperty("maxConditions") ? oFormatOptions.maxConditions : -1;
+	function _getSpanForOperator(aConditions, oConfig) {
+		var iMaxConditions = oConfig.hasOwnProperty("maxConditions") ? oConfig.maxConditions : -1;
 		var sSpan = "XL3 L3 M3 ";
 
 		if (iMaxConditions === 1) {
@@ -1401,8 +1534,8 @@ sap.ui.define([
 		return sSpan;
 	}
 
-	function _getSpanForValue(oCondition, oFormatOptions) {
-		var iMaxConditions = oFormatOptions.hasOwnProperty("maxConditions") ? oFormatOptions.maxConditions : -1;
+	function _getSpanForValue(oCondition, oConfig) {
+		var iMaxConditions = oConfig.hasOwnProperty("maxConditions") ? oConfig.maxConditions : -1;
 
 		var oOperator = oCondition && FilterOperatorUtil.getOperator(oCondition.operator);
 		var sSpan = "";
@@ -1579,7 +1712,7 @@ sap.ui.define([
 		var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
 		var bInvalid = !!oCondition.invalid;
 
-		if (!bInvalid && oOperator.valueTypes.length > 0 && oOperator.valueTypes[0] !== Operator.ValueType.Static) {
+		if (!bInvalid && oOperator.valueTypes.length > 0 && oOperator.valueTypes[0] !== OperatorValueType.Static) {
 			// check only not static operators
 			if (oOperator.valueTypes.length > 1 && oOperator.valueTypes[1]) {
 				// two fields exist
@@ -1590,7 +1723,7 @@ sap.ui.define([
 				}
 			}
 
-			if (oField.getMetadata().getAllProperties().valueState && !oField._isInvalidInput() && (!oField2 || !oField2._isInvalidInput())) { // TODO: better was to find out parsing error
+			if (oField.getMetadata().getAllProperties().valueState && !oField.isInvalidInput() && (!oField2 || !oField2.isInvalidInput())) { // TODO: better was to find out parsing error
 				// if Field is in parsing error state, user entry is not transfered to condition, so validating makes no sense.
 				var oType = oField.getBinding("value").getType(); // use nullable data type from Field - don't create new type for each check
 				try {
@@ -1653,6 +1786,102 @@ sap.ui.define([
 
 	}
 
+	function _getDefineConditions() {
+
+		return this.getConditions().filter(function(oCondition) {
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
+			return oCondition.validated !== ConditionValidated.Validated || oOperator.exclude;
+		});
+
+	}
+
+	function _handleNext(oEvent) {
+
+		this._iStartIndex = this._iStartIndex + this._iShownConditions;
+		this._iShownAdditionalConditions = 0;
+		_renderConditions.call(this);
+
+	}
+
+	function _handlePrevious(oEvent) {
+
+		this._iStartIndex = this._iStartIndex - this._iShownConditions;
+		if (this._iStartIndex < 0) {
+			this._iStartIndex = 0;
+		}
+		this._iShownAdditionalConditions = 0;
+		_renderConditions.call(this);
+
+	}
+
+	function _handleRemoveAll(oEvent) {
+
+		var aConditions = this.getConditions().filter(function(oCondition) {
+			var oOperator = FilterOperatorUtil.getOperator(oCondition.operator);
+			return oCondition.validated === ConditionValidated.Validated && !oOperator.exclude;
+		});
+		this.addDummyCondition(aConditions.length + 1);
+
+		this._iStartIndex = 0;
+		this._iShownAdditionalConditions = 0;
+		this.setProperty("conditions", aConditions, true); // do not invalidate whole DefineConditionPanel
+		this.oInvisibleMessage.announce(oMessageBundle.getText("valuehelp.DEFINECONDITIONS_REMOVECONDITION_ANNOUNCE"), InvisibleMessageMode.Polite);
+		this.fireConditionProcessed();
+
+	}
+
+	function _handleInsert(oEvent) {
+
+		var aConditions = this.getConditions();
+		var oFormatOptions = this.getFormatOptions();
+		var iMaxConditions = oFormatOptions.maxConditions;
+
+		// get Index of first row (as validated conditions might exist and are hidden)
+		var oGrid = this.byId("conditions");
+		var aGridContent = oGrid.getContent();
+		var iRows = 0;
+		var iIndex = -1;
+		for (var i = 0; i < aGridContent.length; i++) {
+			var oField = aGridContent[i];
+			if (oField instanceof Field && oField.getValueHelp() === this._sOperatorHelpId) {
+				// Operator field starts new row
+				iRows++;
+				if (iRows === 1) {
+					// determine index for condition in first row
+					var oBindingContext = oField.getBindingContext("$this");
+					var sPath = oBindingContext.getPath();
+					var aMatch = sPath.match(/^.*\/(\d+)\/$/);
+					if (aMatch) {
+						iIndex = parseInt(aMatch[1]);
+					}
+				}
+			}
+		}
+
+		if (iMaxConditions === -1 || aConditions.length < iMaxConditions) {
+			// create a new dummy condition for a new condition on the UI - must be removed later if not used or filled correct
+			this.addDummyCondition(iIndex);
+
+			if (iRows >= this._iShownConditions) {
+				this._iShownAdditionalConditions++;
+			}
+		}
+
+		this.oInvisibleMessage.announce(oMessageBundle.getText("valuehelp.DEFINECONDITIONS_ADDCONDITION_ANNOUNCE"), InvisibleMessageMode.Polite);
+
+	}
+
+	function _getPageText() {
+
+		var aConditions = _getDefineConditions.call(this); // show only validated conditions
+		var iPages = Math.ceil((aConditions.length - this._iShownAdditionalConditions) / this._iShownConditions);
+		var iPage = Math.floor(this._iStartIndex / this._iShownConditions) + 1;
+		var sText = oMessageBundle.getText("valuehelp.PAGE_COUNT", [iPage, iPages]);
+
+		return sText;
+
+	}
+
 	return DefineConditionPanel;
 
 });