@sapui5/sap.rules.ui 1.110.1 → 1.112.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.rules.ui",
-  "version": "1.110.1",
+  "version": "1.112.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.110.1</version>
+	<version>1.112.0</version>
 
 	<documentation>UI5 library: sap.rules.ui</documentation>
 

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

@@ -1073,6 +1073,10 @@ sap.ui.define([
 				}
 
 				if (currentText !== lastText) {
+					if(lastText? lastText.trim() == "" : true && currentText.trim() == ""){
+						this.textContent = "";
+						return;
+					}
 					that.bTypingFlow = true;
 					//needed when shift and some key has been keyed up at same time
 					if (((event.keyCode !== 8 && event.keyCode !== 46) && keyCodes.indexOf(event.keyCode) === -1) || (event.key === "Shift" && that
@@ -2799,7 +2803,9 @@ sap.ui.define([
 							Log.error("Error in parsing string to JSON: " + e.message);
 						}
 					}
-					this._uiModel.push(item);
+					if(!(this.getDomRef("input").children && this.getDomRef("input").children.length == 1 && this.getDomRef("input").children[0].outerHTML == "<br>")){
+						this._uiModel.push(item);
+					}
 				}
 				that._uiModeltoString();
 			}

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

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

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

@@ -37,6 +37,46 @@ sap.ui.define(function() {
 	Constants.UP = "UP";
 	Constants.DOWN = "DOWN";
 	Constants.CONDITION = "CONDITION";
+	Constants.OPERATOR_MAPPING = [{valueHelpType:"U",operator:"EQ",exclude:false,supported:true,message:"equal to"},
+		{valueHelpType:"O",operator:"EQ",exclude:false,supported:true,message:"equal to"},
+		{valueHelpType:"U",operator:"Contains",exclude:false,supported:true,message:"contains"},
+		{valueHelpType:"O",operator:"Contains",exclude:false,supported:true,message:"contains"},
+		{valueHelpType:"U",operator:"EQ",exclude:true,supported:true,message:"equal to"},
+		{valueHelpType:"O",operator:"EQ",exclude:true,supported:true,message:"equal to"},
+		{valueHelpType:"U",operator:"Contains",exclude:true,supported:false,message:"does not contain"},
+		{valueHelpType:"O",operator:"Contains",exclude:true,supported:false,message:"does not contain"},
+		{valueHelpType:"U",operator:"BT",exclude:false,supported:true,message:"between"},
+		{valueHelpType:"O",operator:"BT",exclude:false,supported:false,message:"between"},
+		{valueHelpType:"U",operator:"BT",exclude:true,supported:false,message:"not between"},
+		{valueHelpType:"O",operator:"BT",exclude:true,supported:false,message:"not between"},
+		{valueHelpType:"U",operator:"StartsWith",exclude:false,supported:false,message:"starts with"},
+		{valueHelpType:"O",operator:"StartsWith",exclude:false,supported:false,message:"starts with"},
+		{valueHelpType:"U",operator:"StartsWith",exclude:true,supported:false,message:"does not start with"},
+		{valueHelpType:"O",operator:"StartsWith",exclude:true,supported:false,message:"does not start with"},
+		{valueHelpType:"U",operator:"EndsWith",exclude:false,supported:false,message:"ends with"},
+		{valueHelpType:"O",operator:"EndsWith",exclude:false,supported:false,message:"ends with"},
+		{valueHelpType:"U",operator:"EndsWith",exclude:true,supported:false,message:"does not end with"},
+		{valueHelpType:"O",operator:"EndsWith",exclude:true,supported:false,message:"does not end with"},
+		{valueHelpType:"U",operator:"LT",exclude:false,supported:true,message:"less than"},
+		{valueHelpType:"O",operator:"LT",exclude:false,supported:false,message:"less than"},
+		{valueHelpType:"U",operator:"LT",exclude:true,supported:true,message:"not less than"},
+		{valueHelpType:"O",operator:"LT",exclude:true,supported:false,message:"not less than"},
+		{valueHelpType:"U",operator:"LE",exclude:false,supported:true,message:"less than equal to"},
+		{valueHelpType:"O",operator:"LE",exclude:false,supported:false,message:"less than equal to"},
+		{valueHelpType:"U",operator:"LE",exclude:true,supported:true,message:"not less than equal to"},
+		{valueHelpType:"O",operator:"LE",exclude:true,supported:false,message:"not less than equal to"},
+		{valueHelpType:"U",operator:"GT",exclude:false,supported:true,message:"greater than"},
+		{valueHelpType:"O",operator:"GT",exclude:false,supported:false,message:"greater than"},
+		{valueHelpType:"U",operator:"GT",exclude:true,supported:true,message:"not greater than"},
+		{valueHelpType:"O",operator:"GT",exclude:true,supported:false,message:"not greater than"},
+		{valueHelpType:"U",operator:"GE",exclude:false,supported:true,message:"greater than equal to"},
+		{valueHelpType:"O",operator:"GE",exclude:false,supported:false,message:"greater than equal to"},
+		{valueHelpType:"U",operator:"GE",exclude:true,supported:true,message:"not greater than equal to"},
+		{valueHelpType:"O",operator:"GE",exclude:true,supported:false,message:"not greater than equal to"},
+		{valueHelpType:"U",operator:"Empty",exclude:false,supported:false,message:"empty"},
+		{valueHelpType:"O",operator:"Empty",exclude:false,supported:false,message:"empty"},
+		{valueHelpType:"U",operator:"Empty",exclude:true,supported:false,message:"not empty"},
+		{valueHelpType:"O",operator:"Empty",exclude:true,supported:false,message:"not empty"}];
 	return Constants;
 	
 }, true);

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

@@ -58,7 +58,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.112.0
      *
      * @constructor
      * @private

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

@@ -35,7 +35,7 @@ sap.ui.define([
          * @extends  sap.ui.core.Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.112.0
          *
          * @constructor
          * @public

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

@@ -27,7 +27,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.AstExpressionBasic
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.112.0
      *
      * @constructor
      * @private
@@ -128,7 +128,7 @@ sap.ui.define([
 
     };
 
-    DecisionTableCellAstExpressionBasic.prototype._updateModelAstNodes = function (oModel, oColumnData) {
+    DecisionTableCellAstExpressionBasic.prototype._updateModelAstNodes = function (oModel, oColumnData, sGroupId) {
         if (this.oDecisionTableCell) {
             var astNodes = oColumnData.ASTNodes;
             for (var node in astNodes) {
@@ -163,13 +163,13 @@ sap.ui.define([
 
                 var mParameters = {};
                 mParameters.properties = updatedAstNode;
-                mParameters.groupId = "changes";
+                mParameters.groupId = sGroupId;
                 oModel.createEntry("/DecisionTableRowCellASTs", mParameters);
             }
         }
     };
 
-    DecisionTableCellAstExpressionBasic.prototype._removeExistingAstNodes = function (oModel, oColumnData, sPath, astNodes) {
+    DecisionTableCellAstExpressionBasic.prototype._removeExistingAstNodes = function (oModel, oColumnData, sPath, astNodes, sGroupId) {
 		if (this.oDecisionTableCell) {
 			var mParameters = {};
 			mParameters.ColId = oColumnData.ColId;
@@ -199,7 +199,7 @@ sap.ui.define([
 
 			oModel.callFunction("/DeleteDTRowCellASTDraft", {
 				method: "POST",
-				groupId: "changes",
+				groupId: sGroupId,
 				urlParameters: mParameters
 			});
 
@@ -222,22 +222,23 @@ sap.ui.define([
     };
 
     DecisionTableCellAstExpressionBasic.prototype._removeAndUpdateExisitingNodes = function (oModel, oData, sPath, astNodes,sCellContentPath) {
-		oModel.setDeferredGroups(["changes"]);
+	    	var sGroupId = oData.RowId + "," + oData.ColId;
+		oModel.setDeferredGroups([sGroupId]);
 		var oEventBus = sap.ui.getCore().getEventBus();
 		oModel.update(sPath, {
 			"Content": oModel.getProperty(sCellContentPath)
 		}, {
-			groupId: "changes",
+			groupId: sGroupId,
 			success: function (oData) {
                 oEventBus.publish("sap.ui.rules", "astCreated");
             }
 		});
-		this._removeExistingAstNodes(oModel, oData, sPath, astNodes);
+		this._removeExistingAstNodes(oModel, oData, sPath, astNodes, sGroupId);
 		if (this._checkEmptyMarkerNode(astNodes)) {
-			this._updateModelAstNodes(oModel, oData);
+			this._updateModelAstNodes(oModel, oData, sGroupId);
 		}
 		oModel.submitChanges({
-			groupId: "changes"
+			groupId: sGroupId
 		});
 	};
 
@@ -266,9 +267,8 @@ sap.ui.define([
 			var sCellContentPath = this.oDecisionTableCell.getValuePath();
 			var sPath = "/" + sCellContentPath.split("/")[1];
 			oEventBus.publish("sap.ui.rules", "astCreating");
-			if (!oModel.hasPendingChanges()) {
-				this._removeAndUpdateExisitingNodes(oModel, oData, sPath, astNodes,sCellContentPath);
-			}
+			this._removeAndUpdateExisitingNodes(oModel, oData, sPath, astNodes,sCellContentPath);
+			
 		}
 	};
 

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

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * @extends  sap.rules.ui.ExpressionAdvanced
 		 *
 		 * @author SAP SE
-		 * @version 1.110.1
+		 * @version 1.112.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.ExpressionBasic
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.112.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.110.1
+	 * @version 1.112.0
 	 *
 	 * @constructor
 	 * @public
@@ -39,7 +39,7 @@ sap.ui.define([
 			properties : {
 				/**
 				 * The value determines the user input mode for the corresponding rule cells when creating or editing a rule.
-				 * @deprecated This attribute is deprecated since version 1.52.8, use the decisionTableFormat property.
+				 * @deprecated Since 1.52.8, use the decisionTableFormat property.
 				 */
 				cellFormat: {
 					type: "sap.rules.ui.DecisionTableCellFormat",

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

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

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

@@ -38,7 +38,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.112.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.110.1
+    * @version 1.112.0
     *
     * @constructor
     * @private

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

@@ -26,7 +26,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.112.0
      *
      * @constructor
      * @private

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

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

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

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

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

@@ -47,7 +47,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 		 * @extends  Control
 		 *
 		 * @author SAP SE
-		 * @version 1.110.1
+		 * @version 1.112.0
 		 *
 		 * @constructor
 		 * @private
@@ -162,6 +162,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			_addConditionSuccess: function (newCondition, that, data) {
 				var sNumbering;
 				var nNewIndex;
+				var bConditionCreated = false;
 				var sConditionId = newCondition.Id;
 				var oDataModel = that._getModel();
 				var oHeaderKey = {
@@ -190,6 +191,18 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							var oElsePanel = that._createElseFormLayout(oContext, that.oBundle.getText("titleElse"), true);
 							oVerticalLayout.removeContent(data.nIndex);
 							oVerticalLayout.insertContent(oElsePanel, data.nIndex);
+							oElsePanel.addEventDelegate({
+							    onAfterRendering: function(){
+							    	if (data && data.bfirst && !bConditionCreated && oElsePanel.getContent().length > 0 && oElsePanel.getContent()[0].getFormContainers() && 
+							    			oElsePanel.getContent()[0].getFormContainers().length > 0 && oElsePanel.getContent()[0].getFormContainers()[0].getFormElements() &&
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements().length > 0 && oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields() &&
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields().length > 0 && 
+							    			oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input) {
+							    		oElsePanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+										bConditionCreated = true;
+									}
+							    }
+							});
 						} else if (response.Type === that.typeElseIf) {
 							that.getModel("displayModel").getProperty("/textRuleConditions/ElseIf").push(response);
 							if (data.bfirst) {
@@ -202,6 +215,18 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							var oElseIfPanel = that._createFormLayout(oContext, that.oBundle.getText("titleElseIf") + sNumbering, true);
 							oVerticalLayout.insertContent(oElseIfPanel, nNewIndex);
 							that._adjustElseIfTitle(data.verticalLayout, nNewIndex, true);
+							oElseIfPanel.addEventDelegate({
+							    onAfterRendering: function(){
+							    	if (data && data.bfirst && !bConditionCreated && oElseIfPanel.getContent().length > 0 && oElseIfPanel.getContent()[0].getFormContainers() && 
+							    			oElseIfPanel.getContent()[0].getFormContainers().length > 0 && oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements() &&
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements().length > 0 && oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields() &&
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields().length > 0 && 
+							    			oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input) {
+							    		oElseIfPanel.getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+										bConditionCreated = true;
+									}
+							    }
+							});
 						}
 						that._isAddCallInProgress = false;
 						that._updateBusyState(false);
@@ -437,7 +462,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						tooltip: this.oBundle.getText("deleteElseIf"),
 						visible: "{TextRuleModel>/editable}",
 						press: function (oEvent) {
-							that._deleteConditionBlock(oEvent);
+							that.showDeleteConfirmationDialogMessage(oEvent.getSource());
 						}
 					}).setBindingContext(oContext);
 
@@ -472,7 +497,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 					tooltip: this.oBundle.getText("deleteElse"),
 					visible: "{TextRuleModel>/editable}",
 					press: function (oEvent) {
-						that._deleteConditionBlock(oEvent);
+						that.showDeleteConfirmationDialogMessage(oEvent.getSource());
 					}
 				}).setBindingContext(oContext);
 
@@ -511,6 +536,35 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				return oPanel;
 			},
 
+			showDeleteConfirmationDialogMessage: function(oSource) {
+				var that = this;
+				var oDialog = new Dialog({	
+					title: this.oBundle.getText("warning_title"),	
+					type: sap.m.DialogType.Message,	
+					state: sap.ui.core.ValueState.Warning,	
+					content: new Text({	
+						text: this.oBundle.getText("condition_delete_confirmation_message")	
+					}),	
+					afterClose: function() {	
+						oDialog.destroy();	
+					}	
+				});	
+				oDialog.setBeginButton(new Button({	
+					text: this.oBundle.getText("textrule_confirmation_dialog_delete"),
+					press: function() {	
+						that._deleteConditionBlock(oSource)	
+						oDialog.close();
+					}
+				}));	
+				oDialog.setEndButton(new Button({	
+					text: this.oBundle.getText("textrule_confirmation_dialog_cancel"),	
+					press: function() {
+						oDialog.close();
+					}
+				}));	
+				oDialog.open();	
+			},
+
 			/*
 			 * Returns If form container
 			 */
@@ -633,10 +687,9 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			 * Deletes based on Binding path
 			 * Vertical layout content deleted based on its index
 			 */
-			_deleteConditionBlock: function (oEvent) {
+			_deleteConditionBlock: function (oSource) {
 				var that = this;
 				var oDataModel = this._getModel();
-				var oSource = oEvent.getSource();
 				var oPanel = oSource.getParent().getParent();
 				var oVerticalLayout = oPanel.getParent();
 				var nIndex = oVerticalLayout.indexOfContent(oPanel);
@@ -644,6 +697,8 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				var sConditionId = oBindingContext.getProperty("Id");
 				var sType = oBindingContext.getProperty("Type");
 				var sKeyText;
+				var initialConditionCount = oVerticalLayout.getContent().length;
+				var bConditionDeleted = false;
 				if (sType === that.typeElse) {
 					sKeyText = "/TextRuleDefaultBranches";
 				} else if (sType === that.typeElseIf) {
@@ -682,6 +737,23 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 						that._adjustElseIfTitle(oVerticalLayout, nIndex, false);
 					} /* eslint-enable */
 					that._updateBusyState(false);
+					oVerticalLayout.addEventDelegate({
+					    onAfterRendering: function(){
+					    	if(!bConditionDeleted) {
+					    		if (initialConditionCount === 3 && (nIndex === 1 || nIndex === 2)){
+					    			oVerticalLayout.getContent()[nIndex].getContent()[0].focus();
+					    		} else if(nIndex === initialConditionCount-2 && oVerticalLayout.getContent().length > 0 && oVerticalLayout.getContent()[nIndex] && 
+					    				oVerticalLayout.getContent()[nIndex].getContent().length > 0 && oVerticalLayout.getContent()[nIndex].getContent()[0].getMetadata().getName() 
+					    				=== "sap.m.Button") {
+					    			oVerticalLayout.getContent()[initialConditionCount-2].getContent()[0].focus()
+					    		} else if(oVerticalLayout.getContent().length > 0 && oVerticalLayout.getContent()[nIndex] && 
+					    				oVerticalLayout.getContent()[nIndex].getContent().length > 0 && oVerticalLayout.getContent()[nIndex].getContent()[0].getFormContainers().length > 0) {
+					    			oVerticalLayout.getContent()[nIndex].getContent()[0].getFormContainers()[0].getFormElements()[0].getFields()[0]._input.focus();
+					    		}
+					    		bConditionDeleted = true;
+					    	}
+					    }
+					});
 					sap.m.MessageToast.show(that.oBundle.getText("branchDeletedSuccess"));
 				};
 

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

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

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

@@ -45,7 +45,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.110.1
+         * @version 1.112.0
          *
          * @constructor
          * @private

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

@@ -110,14 +110,18 @@ sap.ui.define([
 				hasValueSource = false;
 			}
 			//The invisible text is introduced to identify the input field by screen reader.
-			this._invisibleText = new sap.ui.core.InvisibleText({
+			this._invisibleTextLabel = new sap.ui.core.InvisibleText({
+				text:this.oBundle.getText("fixedValuePanelTitle")
+			})
+			this._invisibleTextDescription = new sap.ui.core.InvisibleText({
 				text:this.oBundle.getText("fixedValueInvisibleText")
 			});
 			this.fixedValueTextArea = new sap.m.Input({
 				showValueHelp: hasValueSource,
 				showSuggestion: true,
 				autocomplete: false,
-				ariaLabelledBy: this._invisibleText.getId(),
+				ariaLabelledBy: this._invisibleTextLabel.getId(),
+				ariaDescribedBy: this._invisibleTextDescription.getId(),
 				valueHelpRequest: function () {
 					that._dialogOpenedCallbackReference(true);
 					that._setModal(true);
@@ -137,7 +141,7 @@ sap.ui.define([
 				headerText: this.oBundle.getText("fixedValuePanelTitle"),
 				expandable: true,
 				expanded: false,
-				content: [this._invisibleText, this.fixedValueTextArea],
+				content: [this._invisibleTextLabel, this._invisibleTextDescription, this.fixedValueTextArea],
 				width: "auto"
 			})
 			
@@ -331,8 +335,7 @@ sap.ui.define([
             }
             if (this._dateBusinessDataType === "D") {
                 formatter = sap.ui.core.format.DateFormat.getDateInstance({
-                    pattern: "yyyy-MM-dd",
-                    UTC:true
+                    pattern: "yyyy-MM-dd"
                 });
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {
@@ -363,7 +366,7 @@ sap.ui.define([
 
 				},
 				filterChange: function (oEvent) {
-					that.setValueStateFilter(oEvent);
+					that.setValueStateFilter(oEvent, valueHelpInfo);
 				},
 				controlConfiguration: [that._createControlConfiguration()]
 			});
@@ -657,18 +660,56 @@ sap.ui.define([
 			});
 		},
 
-		setValueStateFilter: function (oEvent) {
-			var sId = oEvent.getSource().sId;
-			this._valueFieldValue = sap.ui.getCore().byId(sId + "-filterItemControlA_-Value");
-			if (this._valueFieldValue) {
-				this._valueFieldValue.setValueState("None");
-				this._valueFieldValue.setValueStateText("");
+		setValueStateFilter: function (oEvent, valueHelpInfo) {
+			var aFilterFields = oEvent.getSource().getAllFilterItems();
+			var aFilterValues = oEvent.getSource().getFilterData();
+			
+			for (var i=0;i<aFilterFields.length; i++){
+				if(aFilterFields[i].getName() === "Value" && aFilterValues && aFilterValues.Value && aFilterValues.Value.ranges) {
+					var unsupportedOperatorsValueError = this.filterUnSupportedOperator(aFilterValues.Value.ranges, valueHelpInfo);
+					if (unsupportedOperatorsValueError) {
+						aFilterFields[i].getControl().setValueState("Error");
+						aFilterFields[i].getControl().setValueStateText(unsupportedOperatorsValueError);
+					} else {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+					}
+				} else if(aFilterFields[i].getName() === "Description" && aFilterValues && aFilterValues.Description && aFilterValues.Description.ranges) {
+					var unsupportedOperatorsDescriptionError = this.filterUnSupportedOperator(aFilterValues.Description.ranges, valueHelpInfo);
+					if (unsupportedOperatorsDescriptionError) {
+						aFilterFields[i].getControl().setValueState("Error");
+						aFilterFields[i].getControl().setValueStateText(unsupportedOperatorsDescriptionError);
+					} else {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+					}
+				} else if(aFilterFields[i].getName() === "Value") {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+				} else if(aFilterFields[i].getName() === "Description") {
+						aFilterFields[i].getControl().setValueState("None");
+						aFilterFields[i].getControl().setValueStateText("");
+				}
 			}
-			this._valueFieldDescription = sap.ui.getCore().byId(sId + "-filterItemControlA_-Description");
-			if (this._valueFieldDescription) {
-				this._valueFieldDescription.setValueState("None");
-				this._valueFieldDescription.setValueStateText("");
+		},
+		
+		filterUnSupportedOperator: function(aRanges, valueHelpInfo) {
+			var aUnSupportedOperator = [];
+			var sUnSupportedOperatorError = "";
+			for(var i=0;i<aRanges.length;i++) {
+				var currentMapping = Constants.OPERATOR_MAPPING.find(function(oItem){
+					return aRanges[i].operation === oItem.operator && aRanges[i].exclude === oItem.exclude && valueHelpInfo.sourceType === oItem.valueHelpType
+				})
+				if (!currentMapping.supported && aUnSupportedOperator.indexOf("'" + currentMapping.message + "'") === -1) {
+					aUnSupportedOperator.push("'" + currentMapping.message + "'");
+				}
+			}
+			if (aUnSupportedOperator.length > 1) {
+				sUnSupportedOperatorError = aUnSupportedOperator.join(",") + " are not supported";
+			} else if (aUnSupportedOperator.length === 1) {
+				sUnSupportedOperatorError = aUnSupportedOperator.join(",") + " is not supported";
 			}
+			return sUnSupportedOperatorError;
 		},
 
 		_formatText: function (oEvent) {
@@ -793,8 +834,7 @@ sap.ui.define([
             }
             if (this._dateBusinessDataType === "D") {
                 formatter = sap.ui.core.format.DateFormat.getDateInstance({
-                    pattern: "yyyy-MM-dd",
-                    UTC:true
+                    pattern: "yyyy-MM-dd"
                 });
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {

package/src/sap/rules/ui/ast/parser/bundle.js

@@ -10788,7 +10788,7 @@ var ASTUtil = (function () {
 			for (var node in jsonObjects) {
 				var businessDataType = jsonObjects[node].Output ? jsonObjects[node].Output.BusinessDataType : null;
 			    if(businessDataType === "D"){
-					jsonObjects[node].formattedValue = "'" + dateFormat.format(new Date(jsonObjects[node].Value.replace(/\'/g, "")), false) + "'";
+					jsonObjects[node].formattedValue = "'" + dateFormat.format(new Date(jsonObjects[node].Value.replace(/\'/g, "")), true) + "'";
 						}
 			    if(businessDataType === "U"){
 					jsonObjects[node].formattedValue = "'" + timeFormat.format(new Date(jsonObjects[node].Value.replace(/\'/g, "")), false) + "'";

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

@@ -603,3 +603,11 @@ quarter=quarter
 value=Value
 # XFLD: Text for ValueHelp column Description
 description=Description
+# XBUT: Yes Button text for Delete confirmation.
+textrule_confirmation_dialog_delete=Delete
+# XBUT: NO button text for Delete confirmation close.
+textrule_confirmation_dialog_cancel=Cancel
+# XFLD: Text for time and Duration Dialog
+condition_delete_confirmation_message=Delete this condition?
+# XFLD: Dialog title
+warning_title=Delete

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

@@ -295,3 +295,7 @@ week=\u0623\u0633\u0628\u0648\u0639
 quarter=\u0631\u0628\u0639 \u0633\u0646\u0629
 value=\u0627\u0644\u0642\u064A\u0645\u0629
 description=\u0627\u0644\u0648\u0635\u0641
+textrule_confirmation_dialog_delete=\u062D\u0630\u0641
+textrule_confirmation_dialog_cancel=\u0625\u0644\u063A\u0627\u0621
+condition_delete_confirmation_message=\u0647\u0644 \u062A\u0631\u064A\u062F \u062D\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0634\u0631\u0637\u061F
+warning_title=\u062D\u0630\u0641

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

@@ -295,3 +295,7 @@ week=\u0441\u0435\u0434\u043C\u0438\u0446\u0430
 quarter=\u0442\u0440\u0438\u043C\u0435\u0441\u0435\u0447\u0438\u0435
 value=\u0421\u0442\u043E\u0439\u043D\u043E\u0441\u0442
 description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
+textrule_confirmation_dialog_delete=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435
+textrule_confirmation_dialog_cancel=\u041E\u0442\u043A\u0430\u0437
+condition_delete_confirmation_message=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u043E\u0432\u0430 \u0443\u0441\u043B\u043E\u0432\u0438\u0435?
+warning_title=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435

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

@@ -295,3 +295,7 @@ week=setmana
 quarter=trimestre
 value=Valor
 description=Descripci\u00F3
+textrule_confirmation_dialog_delete=Suprimir
+textrule_confirmation_dialog_cancel=Cancel\u00B7lar
+condition_delete_confirmation_message=Voleu suprimir aquesta condici\u00F3?
+warning_title=Suprimir