@sapui5/sap.rules.ui 1.109.0 → 1.111.0

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

@@ -336,7 +336,8 @@ sap.ui.define([
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {
                 formatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
-                    pattern: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
+                    pattern: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+                    UTC:true
                 });
                 sDateFormatted = formatter.format(date);
             }
@@ -361,7 +362,7 @@ sap.ui.define([
 
 				},
 				filterChange: function (oEvent) {
-					that.setValueStateFilter(oEvent);
+					that.setValueStateFilter(oEvent, valueHelpInfo);
 				},
 				controlConfiguration: [that._createControlConfiguration()]
 			});
@@ -543,43 +544,39 @@ sap.ui.define([
 		_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, valuehelpSourceType);
+				aFilters = that._formatSingleFilter(aFilters);
 			} 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, valuehelpSourceType);
-				aFilters = that._formatMultiFilter(aFilters, 1, true, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 0, true);
+				aFilters = that._formatMultiFilter(aFilters, 1, true);
 
 			} 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, valuehelpSourceType);
-				aFilters = that._formatMultiFilter(aFilters, 1, false, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 0, true);
+				aFilters = that._formatMultiFilter(aFilters, 1, false);
 
 			} 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, valuehelpSourceType);
-				aFilters = that._formatMultiFilter(aFilters, 1, true, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 0, false);
+				aFilters = that._formatMultiFilter(aFilters, 1, true);
 
 			} 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, valuehelpSourceType);
-				aFilters = that._formatMultiFilter(aFilters, 1, false, valuehelpSourceType);
+				aFilters = that._formatMultiFilter(aFilters, 0, false);
+				aFilters = that._formatMultiFilter(aFilters, 1, false);
 
 			}
 
 			return aFilters;
 		},
 
-		_formatSingleFilter: function (aFilters, valuehelpSourceType) {
+		_formatSingleFilter: function (aFilters) {
 			var that = this;
 			var _valueField = null;
 
 			for (var iterator = 0; iterator < aFilters[0].aFilters.length; iterator++) {
-				if (aFilters[0].aFilters[iterator].sOperator === "Contains" && valuehelpSourceType === "U") {
-					aFilters[0].aFilters[iterator].sOperator = "EQ";
-				} else if (aFilters[0].aFilters[iterator].sOperator === "Contains") {
+				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,
@@ -601,7 +598,7 @@ sap.ui.define([
 
 		},
 
-		_formatMultiFilter: function (aFilters, index, bMultifilter, valuehelpSourceType) {
+		_formatMultiFilter: function (aFilters, index, bMultifilter) {
 			var that = this;
 			var _valueField = null;
 			var aComputeFilterParma = [];
@@ -611,12 +608,8 @@ sap.ui.define([
 				aComputeFilterParma = aFilters[0].aFilters[index].aFilters;
 			}
 			for (var iterator = 0; iterator < aComputeFilterParma.length; iterator++) {
-				if (aComputeFilterParma[iterator].sOperator === "Contains" && valuehelpSourceType === "U") {
-					aComputeFilterParma[iterator].sOperator = "EQ";
-				} else if (aComputeFilterParma[iterator].sOperator === "Contains") {
+				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,
@@ -663,18 +656,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("");
+				}
+			}
+		},
+		
+		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 + "'");
+				}
 			}
-			this._valueFieldDescription = sap.ui.getCore().byId(sId + "-filterItemControlA_-Description");
-			if (this._valueFieldDescription) {
-				this._valueFieldDescription.setValueState("None");
-				this._valueFieldDescription.setValueStateText("");
+			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) {
@@ -804,7 +835,8 @@ sap.ui.define([
                 sDateFormatted = formatter.format(date);
             } else if (this._dateBusinessDataType === "U") {
                 formatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
-                    pattern: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
+                    pattern: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+                    UTC:true
                 });
                 sDateFormatted = formatter.format(date);
             }