@sapui5/sap.rules.ui 1.101.0 → 1.104.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.rules.ui",
-  "version": "1.101.0",
+  "version": "1.104.0",
   "description": "SAPUI5 Library sap.rules.ui",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/rules/ui/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2016 SAP SE. All rights reserved
 	</copyright>
-	<version>1.101.0</version>
+	<version>1.104.0</version>
 
 	<documentation>UI5 library: sap.rules.ui</documentation>
 

package/src/sap/rules/ui/AstExpressionBasicRenderer.js

@@ -34,6 +34,9 @@ sap.ui.define([
 		}
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
 		var placeHolderText = oBundle.getText("ctrlSpaceCue");
+		if(placeHolderText.length>50 && oControl.getParent().getId() ===  "popover") {
+			placeHolderText = placeHolderText.substring(0,50) + " ...";
+		}
 
 		var sEditable = "contenteditable=\"true\"";
 		var sPlaceHolder = "data-placeholder=\"" + placeHolderText + "\"";

package/src/sap/rules/ui/BindingSpy.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends  ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.104.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/rules/ui/DecisionTable.js

@@ -57,7 +57,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.101.0
+     * @version 1.104.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableCell.js

@@ -34,7 +34,7 @@ sap.ui.define([
          * @extends  sap.ui.core.Control
          *
          * @author SAP SE
-         * @version 1.101.0
+         * @version 1.104.0
          *
          * @constructor
          * @public

package/src/sap/rules/ui/DecisionTableCellAstExpressionBasic.js

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.AstExpressionBasic
      *
      * @author SAP SE
-     * @version 1.101.0
+     * @version 1.104.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableCellExpressionAdvanced.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 * @extends  sap.rules.ui.ExpressionAdvanced
 		 *
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.104.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/rules/ui/DecisionTableCellExpressionBasic.js

@@ -25,7 +25,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.ExpressionBasic
      *
      * @author SAP SE
-     * @version 1.101.0
+     * @version 1.104.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/DecisionTableConfiguration.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.104.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/rules/ui/DecisionTableSettings.js

@@ -43,7 +43,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.101.0
+         * @version 1.104.0
          *
          * @constructor
          * @private
@@ -984,7 +984,22 @@ sap.ui.define([
             }).setBindingContext(oContext);
             this._setExpressionRelevantOperators(displayExpression.relString, oContext.getProperty("Condition/Id"), oContext.getProperty(
                 "Condition/ValueOnly"), astExpressionBasic);
-            astExpressionBasic.addStyleClass("sapRULDecisionTableSettingsAstExpression");
+            if(document.getElementById("content")&& document.getElementById("content").classList &&
+            		document.getElementById("content").classList.length>0 && 
+            		isCompactClassPresent(document.getElementById("content").classList)){
+            	astExpressionBasic.addStyleClass("sapRULDecisionTableSettingsAstExpressionCompactSize");
+            } else {
+            	astExpressionBasic.addStyleClass("sapRULDecisionTableSettingsAstExpressionCozySize");
+            }
+            function isCompactClassPresent(List){
+            	for(var i=0;i< List.length;i++) {
+            		if (List[i] === "sapUiSizeCompact") {
+            			return true;
+            		}
+            	}
+            	return false;
+            };
+            //astExpressionBasic.addStyleClass("sapRULDecisionTableSettingsAstExpression");
             return astExpressionBasic;
         };
 
@@ -1882,10 +1897,6 @@ sap.ui.define([
             var type = oContext.getProperty("Type");
             var fixedOperator = oContext.getProperty("Condition/FixedOperator");
             var sOperator = this.getAstExpressionLanguage() ? this.astUtil._getCapitalOperatorName(fixedOperator) : fixedOperator;
-            var styleClass ="";
-            if (this.getAstExpressionLanguage()) {
-                styleClass = "sapRULDecisionTableSettingsTableContent";
-            }
             
             return new sap.m.ColumnListItem({
 				visible: type === sap.rules.ui.DecisionTableColumn.Condition,
@@ -1903,7 +1914,7 @@ sap.ui.define([
 							model.setProperty(oContext.getPath() + "/Label", labelValue);
 							this._changeColumnStatusToUpdate(oContext);
 						}.bind(this)
-					}).addStyleClass(styleClass),
+					}),
 					
                     // gets the vocab col
                     new sap.m.Select({
@@ -1928,7 +1939,7 @@ sap.ui.define([
                             //Mark column as "Updated"
                             this._changeColumnStatusToUpdate(oContext);
                         }.bind(this)
-                    }).addStyleClass(styleClass),
+                    }),
 
                     // text or guided selection- this will not be supported
                     /*new sap.m.Select({
@@ -1971,7 +1982,7 @@ sap.ui.define([
                                     //Remove coulmn from JSON model
                                     this._removeColumnFromJsonModel(sequence, status);
                                 }.bind(this)
-                            }).setTooltip(this.oBundle.getText("removeColumn")).addStyleClass(styleClass),
+                            }).setTooltip(this.oBundle.getText("removeColumn")),
                             new sap.m.Button({
                                 type: sap.m.ButtonType.Transparent,
                                 icon: sap.ui.core.IconPool.getIconURI("add"),
@@ -1979,11 +1990,11 @@ sap.ui.define([
                                     //Add coulmn from JSON model
                                     this._addColumnToJsonModel(sequence);
                                 }.bind(this)
-                            }).setTooltip(this.oBundle.getText("addColumn")).addStyleClass(styleClass)
+                            }).setTooltip(this.oBundle.getText("addColumn"))
                         ]
                     })
                 ]
-            });
+            }).addStyleClass("sapRULDecisionTableSettingsConditionRow");
         };
 		
         sap.rules.ui.DecisionTableSettings.prototype._updateDecisionTableHeader = function () {

package/src/sap/rules/ui/DecisionTableSettingsOld.js

@@ -37,7 +37,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.101.0
+         * @version 1.104.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/ExpressionBase.js

@@ -22,7 +22,7 @@ sap.ui.define([
     * @extends sap.ui.core.Control
     *
     * @author SAP SE
-    * @version 1.101.0
+    * @version 1.104.0
     *
     * @constructor
     * @private

package/src/sap/rules/ui/ExpressionBasic.js

@@ -25,7 +25,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.101.0
+     * @version 1.104.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/RuleBase.js

@@ -24,7 +24,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.101.0
+     * @version 1.104.0
      *
      * @constructor
      * @private

package/src/sap/rules/ui/RuleBuilder.js

@@ -33,7 +33,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.101.0
+     * @version 1.104.0
      *
      * @constructor
      * @public

package/src/sap/rules/ui/TextRule.js

@@ -46,7 +46,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		 * @extends  Control
 		 *
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.104.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/rules/ui/TextRuleConfiguration.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.101.0
+	 * @version 1.104.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/rules/ui/TextRuleSettings.js

@@ -44,7 +44,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.101.0
+         * @version 1.104.0
          *
          * @constructor
          * @private

package/src/sap/rules/ui/ast/autoComplete/dataStructure/ArrayAndRangeStack.js

@@ -1,8 +1,7 @@
 sap.ui.define(["sap/rules/ui/ast/constants/Constants",
-		"sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
-		"sap/rules/ui/ast/autoComplete/dataStructure/Stack"
+		"sap/rules/ui/ast/autoComplete/dataStructure/BaseStack"
 	],
-	function (Constants, BaseStack, Stack) {
+	function (Constants, BaseStack) {
 		"use strict";
 
 		var ArrayAndRangeStack = function () {
@@ -12,6 +11,10 @@ sap.ui.define(["sap/rules/ui/ast/constants/Constants",
 
 		ArrayAndRangeStack.prototype = new BaseStack();
 		ArrayAndRangeStack.prototype.constructor = BaseStack;
+		
+		ArrayAndRangeStack.prototype.init = function (oStack) {
+			this.oStack = oStack;
+		};
 
 		ArrayAndRangeStack.prototype.push = function (oToken) {
 			var type = oToken.getTokenType();
@@ -32,7 +35,7 @@ sap.ui.define(["sap/rules/ui/ast/constants/Constants",
 
 			case Constants.COMMA:
 			case Constants.RANGE_DOTS:
-				var node = new sap.rules.ui.ast.autoComplete.dataStructure.Stack(this.getTermPrefixId());
+				var node = new this.oStack(this.getTermPrefixId());
 				node.setPrevious(this._top);
 				this._top = node;
 				this._size += 1;
@@ -54,7 +57,7 @@ sap.ui.define(["sap/rules/ui/ast/constants/Constants",
 		ArrayAndRangeStack.prototype._handleLeftParenthesis = function (oToken) {
 			if (this.getHasOpenParenthesis() === false) {
 				this.setHasOpenParenthesis(true);
-				var node = new sap.rules.ui.ast.autoComplete.dataStructure.Stack(this.getTermPrefixId());
+				var node = new this.oStack(this.getTermPrefixId());
 				node.setPrevious(this._top);
 				this._top = node;
 				this._size += 1;

package/src/sap/rules/ui/ast/autoComplete/dataStructure/ComparisionOperatorStack.js

@@ -1,25 +1,27 @@
 sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
 		"sap/rules/ui/ast/constants/Constants",
 		"sap/rules/ui/ast/autoComplete/node/TermNode",
-		"sap/rules/ui/ast/autoComplete/dataStructure/Stack",
 		"sap/rules/ui/ast/provider/OperatorProvider"
 	],
-	function (BaseStack, Constants, TermNode, Stack, OperatorProvider) {
+	function (BaseStack, Constants, TermNode, OperatorProvider) {
 		"use strict";
 
 		var ComparisionOperatorStack = function () {
 			BaseStack.apply(this, arguments);
 			this._name = "";
 			this._sLeftOperandBusinessDataType = null;
-			var node = new sap.rules.ui.ast.autoComplete.dataStructure.Stack(this.getTermPrefixId());
-			node.setContextComparision(true);
-			node.setPrevious(this);
-			this._top = node;
 			this._size += 1;
 		};
 
 		ComparisionOperatorStack.prototype = new BaseStack();
 		ComparisionOperatorStack.prototype.constructor = BaseStack;
+		
+		ComparisionOperatorStack.prototype.init = function (oStack) {
+			var node = new oStack(this.getTermPrefixId());
+			node.setContextComparision(true);
+			node.setPrevious(this);
+			this._top = node;
+		};
 
 		ComparisionOperatorStack.prototype.push = function (oToken) {
 			var type = oToken.getTokenType();

package/src/sap/rules/ui/ast/autoComplete/dataStructure/FunctionalStack.js

@@ -1,9 +1,8 @@
 sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
 		"sap/rules/ui/ast/constants/Constants",
-		"sap/rules/ui/ast/autoComplete/node/TermNode",
-		"sap/rules/ui/ast/autoComplete/dataStructure/Stack"
+		"sap/rules/ui/ast/autoComplete/node/TermNode"
 	],
-	function (BaseStack, Constants, TermNode, Stack) {
+	function (BaseStack, Constants, TermNode) {
 		"use strict";
 
 		var FunctionalStack = function () {
@@ -14,6 +13,10 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
 
 		FunctionalStack.prototype = new BaseStack();
 		FunctionalStack.prototype.constructor = BaseStack;
+		
+		FunctionalStack.prototype.init = function (oStack) {
+			this.oStack = oStack;
+		};
 
 		FunctionalStack.prototype.push = function (oToken) {
 			var type = oToken.getTokenType();
@@ -265,7 +268,7 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
 		FunctionalStack.prototype.handleLeftParenthesisToken = function (oToken) {
 			if (this.getHasOpenParenthesis() === false && this.getSize() == 0) {
 				this.setHasOpenParenthesis(true);
-				this._top = new sap.rules.ui.ast.autoComplete.dataStructure.Stack(this.getTermPrefixId());
+				this._top = new this.oStack(this.getTermPrefixId());
 				// TODO : read from mandatory parameter and set the expected 
 				// dataObjectType and BusinessDataType
 				var aArgsMetadata = this.getFunction().getArgumentsMetadata();
@@ -307,7 +310,7 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/BaseStack",
 					errorMessage: "More number of arguments is been added"
 				};
 			}
-			var node = new sap.rules.ui.ast.autoComplete.dataStructure.Stack(this.getTermPrefixId());
+			var node = new this.oStack(this.getTermPrefixId());
 			if (this.getFunction().getCategory() == Constants.AGGREGATE || this.getFunction().getCategory() == Constants.SELECTION) {
 				if (this.getSize() <= aArgsMetadata.length) {
 					// TODO: hack for now to make attribute with prefix id

package/src/sap/rules/ui/ast/autoComplete/dataStructure/Stack.js

@@ -76,6 +76,7 @@ function (TermNode, Constants, BaseStack, FunctionProvider, OperatorProvider, Fu
 			var sOperatorName = oToken.getText();
 			var oOperator = OperatorProvider.getInstance().getOperatorByName(sOperatorName.toUpperCase());
 			node = new ArrayAndRangeStack(this.getTermPrefixId());
+			node.init(Stack);
 			node.setOperator(oOperator);
 			node.setPrevious(this._top);
 			this._top = node;
@@ -89,6 +90,7 @@ function (TermNode, Constants, BaseStack, FunctionProvider, OperatorProvider, Fu
 			var sFunctionName = oToken.getText();
 			var oFunction = FunctionProvider.getInstance().getFunctionByName(sFunctionName.toUpperCase());
 			node = new FunctionalStack(this.getTermPrefixId());
+			node.init(Stack);
 			node.setFunction(oFunction);
 			node.setPrevious(this._top);
 			this._top = node;
@@ -118,14 +120,16 @@ function (TermNode, Constants, BaseStack, FunctionProvider, OperatorProvider, Fu
 		var oTopNode = this._getNodeRecursively(this._top);
 
 		if (oTopNode && "getBusinessDataType" in oTopNode && oTopNode.getBusinessDataType()) {
-			if ((sOperatorName === '=' || sOperatorName === '!=') && (oTopNode.getBusinessDataType() === Constants.BOOLEANBUSINESSDATATYPE)) {
+			//TODO:To enable the value help in Autosuggestion. Recheck for extra autosuggestion content
+			/*if ((sOperatorName === '=' || sOperatorName === '!=') && (oTopNode.getBusinessDataType() === Constants.BOOLEANBUSINESSDATATYPE)) {
 				this.empty();
 				return {
 					bTokenPushed: true
 				};
-			}
+			}*/
 			var node;
 			node = new ComparisionOperatorStack(this.getTermPrefixId());
+			node.init(Stack);
 			node.setName(sOperatorName);
 			node.setLeftOperandBusinessDataType(oTopNode.getBusinessDataType());
 			node.setPrevious(this._top);

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionFixedValuePanel.js

@@ -375,7 +375,7 @@ sap.ui.define([
 			var aControlConfiguration = [new sap.ui.comp.smartfilterbar.ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "Value",
-					label: "Value",
+					label: this.oBundle.getText("value"),
 					visibleInAdvancedArea: true,
 					width: "100px",
 					index: 1
@@ -383,7 +383,7 @@ sap.ui.define([
 				}), new sap.ui.comp.smartfilterbar.ControlConfiguration({
 					hasValueHelpDialog: true,
 					key: "Description",
-					label: "Description",
+					label: this.oBundle.getText("description"),
 					visibleInAdvancedArea: true,
 					width: "100px",
 					index: 2
@@ -453,7 +453,12 @@ sap.ui.define([
 			oTable.setThreshold(10);
 
 			for (var i = 0; i < mEntities.valueHelp.properties.length; i++) {
-				this._addValueHelpColumn(mEntities.valueHelp.properties[i], oTable);
+				if (mEntities.valueHelp.properties[i] === "Value") {
+					sColumnName = this.oBundle.getText("value");
+				} else if(mEntities.valueHelp.properties[i] === "Description") {
+					sColumnName = this.oBundle.getText("description");
+				}
+				this._addValueHelpColumn(mEntities.valueHelp.properties[i], oTable, sColumnName);
 			}
 
 			var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
@@ -475,12 +480,12 @@ sap.ui.define([
 		},
 
 		// Utility function to create columns for the table.
-		_addValueHelpColumn: function (oColumName, oTable) {
+		_addValueHelpColumn: function (oColumName, oTable, sColumnName) {
 			var oColumn = new sap.ui.table.Column().setLabel(new sap.m.Label({
-				text: oColumName
+				text: sColumnName
 			}));
 			if (oColumName === this._propertyValue) {
-				oColumn.setSortProperty(oColumName);
+				oColumn.setSortProperty(sColumnName);
 			}
 			oTable.addColumn(oColumn.setTemplate(new sap.m.Text().bindProperty("text", oColumName)));
 		},
@@ -512,7 +517,7 @@ sap.ui.define([
 			if (!jQuery.isEmptyObject(searchParam) && aFilters && aFilters.length > 0) {
 				searchParam = this.oFilterBar.getParameters().custom.search;
 				aSearchParams = this._getSearchFilters(searchParam);
-				aFilters = that._formatFilterParams(aFilters);
+				aFilters = that._formatFilterParams(aFilters, valueHelpInfo.sourceType);
 				aFilterParams.push(new sap.ui.model.Filter({
 					filters: [new sap.ui.model.Filter(aFilters), new sap.ui.model.Filter(aSearchParams)],
 					and: true
@@ -524,7 +529,7 @@ sap.ui.define([
 				aFilterParams.push(aSearchParams);
 			} else if (aFilters && aFilters.length > 0) {
 				//When only filters is selected.
-				aFilters = that._formatFilterParams(aFilters);
+				aFilters = that._formatFilterParams(aFilters, valueHelpInfo.sourceType);
 				aFilterParams.push(aFilters[0]);
 			}
 			return aFilterParams;
@@ -533,42 +538,46 @@ sap.ui.define([
 		/*
 		 * format the filterParams to support Contains and Between.
 		 */
-		_formatFilterParams: function (aFilters) {
+		_formatFilterParams: function (aFilters, valuehelpSourceType) {
 			var that = this;
 			if (aFilters[0] && aFilters.length === 1 && aFilters[0].aFilters[0] && aFilters[0].aFilters[0].sOperator) {
-				aFilters = that._formatSingleFilter(aFilters);
+				aFilters = that._formatSingleFilter(aFilters, valuehelpSourceType);
 			} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[0].aFilters[0] && aFilters[0].aFilters[0].aFilters[0].aFilters &&
 				aFilters[0].aFilters[1].aFilters[0].aFilters) {
-				aFilters = that._formatMultiFilter(aFilters, 0, true);
-				aFilters = that._formatMultiFilter(aFilters, 1, true);
+				aFilters = that._formatMultiFilter(aFilters, 0, true, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 1, true, valuehelpSourceType);
 
 			} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[1] && aFilters[0].aFilters[0].aFilters[0] && aFilters[0].aFilters[
 					0].aFilters[0].aFilters && aFilters[0].aFilters[1].aFilters) {
-				aFilters = that._formatMultiFilter(aFilters, 0, true);
-				aFilters = that._formatMultiFilter(aFilters, 1, false);
+				aFilters = that._formatMultiFilter(aFilters, 0, true, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 1, false, valuehelpSourceType);
 
 			} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[1] && aFilters[0].aFilters[1].aFilters[0] && aFilters[0].aFilters[
 					0].aFilters && aFilters[0].aFilters[1].aFilters[0].aFilters) {
-				aFilters = that._formatMultiFilter(aFilters, 0, false);
-				aFilters = that._formatMultiFilter(aFilters, 1, true);
+				aFilters = that._formatMultiFilter(aFilters, 0, false, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 1, true, valuehelpSourceType);
 
 			} else if (aFilters[0] && aFilters[0].aFilters[0] && aFilters[0].aFilters[1] && aFilters[0].aFilters[0].aFilters && aFilters[0].aFilters[
 					1].aFilters) {
-				aFilters = that._formatMultiFilter(aFilters, 0, false);
-				aFilters = that._formatMultiFilter(aFilters, 1, false);
+				aFilters = that._formatMultiFilter(aFilters, 0, false, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 1, false, valuehelpSourceType);
 
 			}
 
 			return aFilters;
 		},
 
-		_formatSingleFilter: function (aFilters) {
+		_formatSingleFilter: function (aFilters, valuehelpSourceType) {
 			var that = this;
 			var _valueField = null;
 
 			for (var iterator = 0; iterator < aFilters[0].aFilters.length; iterator++) {
-				if (aFilters[0].aFilters[iterator].sOperator === "Contains") {
+				if (aFilters[0].aFilters[iterator].sOperator === "Contains" && valuehelpSourceType === "U") {
 					aFilters[0].aFilters[iterator].sOperator = "EQ";
+				} else if (aFilters[0].aFilters[iterator].sOperator === "Contains") {
+					_valueField = (aFilters[0].aFilters[iterator].sPath === this._propertyValue) ? this._valueFieldValue : this._valueFieldDescription;
+					_valueField.setValueState("Error");
+					_valueField.setValueStateText(aFilters[0].aFilters[iterator].sOperator + " operator not supported");
 				} else if (aFilters[0].aFilters[iterator].sOperator === "BT") {
 
 					var convertedFilterParam = that._manageParam(aFilters[0].aFilters[iterator].sPath, aFilters[0].aFilters[iterator].sOperator,
@@ -590,7 +599,7 @@ sap.ui.define([
 
 		},
 
-		_formatMultiFilter: function (aFilters, index, bMultifilter) {
+		_formatMultiFilter: function (aFilters, index, bMultifilter, valuehelpSourceType) {
 			var that = this;
 			var _valueField = null;
 			var aComputeFilterParma = [];
@@ -600,8 +609,12 @@ sap.ui.define([
 				aComputeFilterParma = aFilters[0].aFilters[index].aFilters;
 			}
 			for (var iterator = 0; iterator < aComputeFilterParma.length; iterator++) {
-				if (aComputeFilterParma[iterator].sOperator === "Contains") {
+				if (aComputeFilterParma[iterator].sOperator === "Contains" && valuehelpSourceType === "U") {
 					aComputeFilterParma[iterator].sOperator = "EQ";
+				} else if (aComputeFilterParma[iterator].sOperator === "Contains") {
+					_valueField = (aComputeFilterParma[iterator].sPath === this._propertyValue) ? this._valueFieldValue : this._valueFieldDescription;
+					_valueField.setValueState("Error");
+					_valueField.setValueStateText(aComputeFilterParma[iterator].sOperator + " operator not supported");
 				} else if (aComputeFilterParma[iterator].sOperator === "BT") {
 
 					var convertedFilterParam = that._manageParam(aComputeFilterParma[iterator].sPath, aComputeFilterParma[iterator].sOperator,

package/src/sap/rules/ui/i18n/messagebundle.properties

@@ -597,3 +597,7 @@ year=year
 week=week
 #XLABEL quarter label
 quarter=quarter
+# XFLD: Text for ValueHelp column Value
+value=Value
+# XFLD: Text for ValueHelp column Description
+description=Description

package/src/sap/rules/ui/library.js

@@ -19,13 +19,13 @@ sap.ui.define([
 	 * UI5 library: sap.rules.ui.
 	 *
 	 * @namespace
-	 * @name sap.rules.ui
+	 * @alias sap.rules.ui
 	 * @public
 	 */
 
 	// library dependencies
 	// delegate further initialization of this library to the Core
-	sap.ui.getCore().initLibrary({
+	var rulesUI = sap.ui.getCore().initLibrary({
 		name: "sap.rules.ui",
 		dependencies: ["sap.ui.core","sap.ui.comp"],
 		types: [
@@ -64,7 +64,7 @@ sap.ui.define([
 			"sap.rules.ui.services.AstExpressionLanguage"
 		],
 		noLibraryCSS: false,
-		version: "1.101.0"
+		version: "1.104.0"
 	});
 
 	// sap.rules.ui library contants
@@ -78,7 +78,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @private 
 	 */
-	sap.rules.ui.DecisionTableColumn = {
+	rulesUI.DecisionTableColumn = {
 		/**
 		 * Condition column
 		 * @public
@@ -97,7 +97,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @private 
 	 */
-	sap.rules.ui.ChangeId = {
+	rulesUI.ChangeId = {
 		/**
 		 * oDataModel groupId for New Rule
 		 * @public
@@ -130,7 +130,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @public 
 	 */
-	sap.rules.ui.RuleType = {
+	rulesUI.RuleType = {
 		/**
 		 * Specifies that the rule is formulated as a table that allows complex rules to be visualized according to an if-then-else logic.
 		 * @public
@@ -154,7 +154,7 @@ sap.ui.define([
 	 * @public
 	 * @deprecated This attribute is deprecated since version 1.52.8, use the property decisionTableFormat.
 	 */
-	sap.rules.ui.DecisionTableCellFormat = {
+	rulesUI.DecisionTableCellFormat = {
 		/**
 		 * Specifies that both rule formats are available in the decision table; allowing the rule creator to choose whether to formulate the decision table cells in either the basic or advanced format.
 		 * @public
@@ -178,7 +178,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @private
 	 */
-	sap.rules.ui.RuleFormat = {
+	rulesUI.RuleFormat = {
 		/**
 		 * Specifies that both rule formats are available; allowing the rule creator to choose whether to formulate the rule's expression in either the basic or advanced format.
 		 * @private
@@ -205,7 +205,7 @@ sap.ui.define([
      * @enum {string}
      * @public
      */
-    sap.rules.ui.DecisionTableFormat = {
+	rulesUI.DecisionTableFormat = {
         /**
          * Specifies that the rendering of a cell is based on cellFormat and each cell can have a different format during rendering 
          * @public
@@ -227,7 +227,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @public 
 	 */
-	sap.rules.ui.RuleHitPolicy = {
+	rulesUI.RuleHitPolicy = {
 		/**
 		 * Specifies that only the first condition that matches the input (the first matching row by order in the decision table) is returned as an output.
 		 * @public
@@ -240,11 +240,11 @@ sap.ui.define([
 		AllMatch: "AM"
 	};
 
-	sap.rules.ui.ValidationStatus = {
+	rulesUI.ValidationStatus = {
 		Success: "Success",
 		Error: "Error"
 	};
-	sap.rules.ui.ExpressionTokenType = {
+	rulesUI.ExpressionTokenType = {
 		alias: "alias",
 		parameter: "parameter",
 		reservedWord: "reservedword",
@@ -254,7 +254,7 @@ sap.ui.define([
 		valueList: "valueList",
 		unknown: "unknown"
 	};
-	sap.rules.ui.ExpressionCategory = {
+	rulesUI.ExpressionCategory = {
 		fixed: "fixed",
 		dynamic: "dynamic",
 		value: "value",
@@ -280,7 +280,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @private
 	 */
-	sap.rules.ui.SuggestionsPart = {
+	rulesUI.SuggestionsPart = {
 		all: "all",
 		leftPart: "leftPart",
 		compPart: "compPart",
@@ -293,7 +293,7 @@ sap.ui.define([
 	 * @enum {string}
 	 * @public
 	 */
-	sap.rules.ui.ExpressionType = {
+	rulesUI.ExpressionType = {
 		/**
 		* Specifies that the expression can be of any of the supported business data types.
 		* @public
@@ -346,11 +346,11 @@ sap.ui.define([
 		BooleanEnhanced:"BooleanEnhanced"
 	};
 
-	sap.rules.ui.BackendParserRequest = {
+	rulesUI.BackendParserRequest = {
 		Validate: "validate",
 		Suggests: "autocomplete",
 		GetMetadata: "tokens"
 	};
 
-	return sap.rules.ui;
-});
+	return rulesUI;
+});

package/src/sap/rules/ui/services/AstExpressionLanguage.js

@@ -322,7 +322,15 @@ sap.ui.define(['jquery.sap.global',
 						"N": "B"
 					},
 					"B": {
-						"B": "B"
+						"B": "B",
+						"S": "B",
+						"N": "B",
+						"D": "B",
+						"T": "B",
+						"U": "B",
+						"Q": "B",
+						"A": "B",
+						"G": "B"
 					},
 					"D": {
 						"D": "B",

package/src/sap/rules/ui/themes/base/AstExpression.less

@@ -34,7 +34,7 @@
     box-sizing: border-box;
     background-color: @sapUiFieldBackground;
     width: 100%;
-    min-width: 13rem;
+    min-width: 20rem;
     display: block;
     color: @_sap_rules_ui_AstExpression_Color;
 }
@@ -205,7 +205,6 @@
 
 .sapAstAutoCompleteSuggestionContentRenderer .sapMDLILabel {
     font-size: 12px;
-    height: 28px;
 }
 
 .sapAstAutoCompleteSuggestionContentRenderer .sapUiSizeCompact .sapMDLI {
@@ -229,7 +228,7 @@
     padding-left: 1.1rem;
 }
 
-div:empty:before {
+div:empty:after {
   content:attr(data-placeholder);
   color:@sapUiFieldPlaceholderTextColor;
   font-size : 0.75rem !important;

package/src/sap/rules/ui/themes/base/DecisionTableSettings.less

@@ -49,16 +49,19 @@
 	    padding-right: 0.25rem;
 }
 
-.sapRULDecisionTableSettingsTableContent{
-	margin-top:0px !important;
-	margin-bottom:7px !important;
-	height:1.6rem !important;
+.sapRULDecisionTableSettingsConditionRow {
+	
+}
+.sapRULDecisionTableSettingsConditionRow .sapAstExpressionPreSpaceMargin {
+	margin: 0.1875rem 0 !important;
 }
 
-.sapRULDecisionTableSettingsAstExpression {
+.sapRULDecisionTableSettingsAstExpressionCompactSize {
   min-height: 1.6rem !important;
   line-height:1.5rem !important;
 }
 
-
-
+.sapRULDecisionTableSettingsAstExpressionCozySize {
+  min-height: 1.6rem !important;
+  line-height:2.125rem !important;
+}

package/src/sap/rules/ui/type/ExpressionAbs.js

@@ -18,7 +18,7 @@ sap.ui.define(["jquery.sap.global"], function(jQuery) {
 		 * @extends  sap.ui.model.CompositeType
 		 *
 		 * @author SAP SE
-		 * @version 1.101.0
+		 * @version 1.104.0
 		 *
 		 * @constructor
 		 * @private