@sapui5/sap.rules.ui 1.108.1 → 1.110.1

package/package.json

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

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

@@ -902,7 +902,7 @@ sap.ui.define([
 		},
 
 		_closeAutoSuggestionPopup: function () {
-			if (this._oAutoSuggestionPopUp)
+			if (this._oAutoSuggestionPopUp && this._oAutoSuggestionPopUp.isOpen())
 				this._oAutoSuggestionPopUp.close();
 		},
 
@@ -916,7 +916,7 @@ sap.ui.define([
 				keyCodes = [16, 17, 18, 93, 13, 9, 35, 36, 45, 34, 33, 40, 37, 38, 39, 27, 44, 145, 19, 112, 113, 114, 115, 116, 117, 118,
 					119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135
 				]; //Non printable keys refer https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode
-
+			var isMac = sap.ui.Device.os.name === "mac";
 			this.aKeyTracker = [];
 			if (!this._focusedOut) {
 				that._setCurrentCursorPosition(that._cursorPostion);
@@ -934,9 +934,12 @@ sap.ui.define([
 					that._handleArrowNavigation(event);
 				} else if (event.key === "Control") {
 					that.ctrlPressed = true;
-				} else if (that.ctrlPressed && (event.keyCode === 32 || event.key === " ")) {
+				} else if (isMac && event.key === "Alt") {
+					that.optionPressed = true;
+				} else if ((that.ctrlPressed && (event.keyCode === 32 || event.key === " ")) || (isMac && that.optionPressed && (event.keyCode === 32 || event.key === " ")) ) {
 					that._initializeCursorSpan();
 					that.ctrlPressed = false;
+					that.optionPressed = false;
 					that._bCtrlSpacePressed = true;
 					//For where Clause
 					if (!that.dataObjectInfo) {
@@ -945,6 +948,9 @@ sap.ui.define([
 					if (!that.relString) {
 						that.relString = "";
 					}
+					if (isMac){
+						event.preventDefault();
+					}
 				} else if (event.key === "Shift") {
 					that.bShiftPressed = true;
 				} else if (that.bShiftPressed && keyCodes.indexOf(event.keyCode) === -1) {
@@ -969,6 +975,7 @@ sap.ui.define([
 
 			this._input.on("click", function (event) {
 				that.ctrlPressed = false;
+				that.optionPressed = false;
 				that.forceFireChange = false;
 				that._initializeCursorSpan();
 				var json;
@@ -1022,7 +1029,7 @@ sap.ui.define([
 
 				//After space keyup, this is needed, else it continues
 				// till _handleKeyUpEvent and closes the autosuggestion
-				if (event.key === "Control" || event.keyCode === 35 || event.keyCode === 36 || event.keyCode === 37 || event.keyCode === 39 || event.keyCode === 20 || event.keyCode === 144) {
+				if (event.key === "Control" || (sap.ui.Device.os.name === "mac" && event.key === "Alt") || event.keyCode === 35 || event.keyCode === 36 || event.keyCode === 37 || event.keyCode === 39 || event.keyCode === 20 || event.keyCode === 144) {
 					return;
 				}
 
@@ -2614,6 +2621,8 @@ sap.ui.define([
 					title: this.oBundle.getText("astSuggestionDialogTitle"),
 					initialFocus: that, //To keep focus on input even after popup is opened
 					afterOpen: function () { //Needed to set cursor for text rule
+						// focus should be set on the popover after its opened
+						this.focus();
                         var position;
                         if (that.bEditInBetween) {
                             position = that.filterTextLength;

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

@@ -37,6 +37,9 @@ sap.ui.define([
 		}
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
 		var placeHolderText = oBundle.getText("ctrlSpaceCue");
+		if(sap.ui.Device.os.name == "mac"){
+			placeHolderText = oBundle.getText("optionSpaceCue");
+		}
 		if(placeHolderText.length>50 && oControl.getParent().getId() ===  "popover") {
 			placeHolderText = placeHolderText.substring(0,50) + " ...";
 		}
@@ -72,4 +75,4 @@ sap.ui.define([
 
 	return AstExpressionBasicRenderer;
 
-}, /* bExport= */ true);
+}, /* bExport= */ true);

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

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

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

@@ -58,7 +58,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.108.1
+     * @version 1.110.1
      *
      * @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.108.1
+         * @version 1.110.1
          *
          * @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.108.1
+     * @version 1.110.1
      *
      * @constructor
      * @private

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

@@ -27,7 +27,7 @@ sap.ui.define([
 		 * @extends  sap.rules.ui.ExpressionAdvanced
 		 *
 		 * @author SAP SE
-		 * @version 1.108.1
+		 * @version 1.110.1
 		 *
 		 * @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.108.1
+     * @version 1.110.1
      *
      * @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.108.1
+	 * @version 1.110.1
 	 *
 	 * @constructor
 	 * @public

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

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

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

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

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.108.1
+     * @version 1.110.1
      *
      * @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.108.1
+     * @version 1.110.1
      *
      * @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.108.1
+		 * @version 1.110.1
 		 *
 		 * @constructor
 		 * @private
@@ -95,6 +95,9 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 			 *  Create Odata call for TextRuleBranch or TextRuleDefaultBranch based on type of condition
 			 */
 			_addConditionBlock: function (oEvent, sType) {
+			    if(this._isAddCallInProgress) {
+			        return;
+			    }
 				var that = this;
 				var oDataModel = this._getModel();
 				var oSource = oEvent.getSource();
@@ -143,6 +146,7 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 				mParameters.error = function () {
 					Log.info("Error creating " + sKeytext + "entity");
 				};
+				this._isAddCallInProgress = true;
 				oDataModel.createEntry(sKeytext, mParameters);
 			},
 
@@ -199,11 +203,13 @@ sap.ui.define(["sap/base/Log","sap/ui/thirdparty/jquery",
 							oVerticalLayout.insertContent(oElseIfPanel, nNewIndex);
 							that._adjustElseIfTitle(data.verticalLayout, nNewIndex, true);
 						}
+						that._isAddCallInProgress = false;
 						that._updateBusyState(false);
 						sap.m.MessageToast.show(that.oBundle.getText("branchCreatedSuccess"));
 					},
 					error: function () {
 						Log.info("Error reading TextRuleResultExpressions");
+						that._isAddCallInProgress = false;
 					}
 				});
 

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

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

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

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

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

@@ -331,12 +331,14 @@ sap.ui.define([
             }
             if (this._dateBusinessDataType === "D") {
                 formatter = sap.ui.core.format.DateFormat.getDateInstance({
-                    pattern: "yyyy-MM-dd"
+                    pattern: "yyyy-MM-dd",
+                    UTC:true
                 });
                 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);
             }
@@ -543,43 +545,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 +599,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 +609,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,
@@ -799,12 +793,14 @@ sap.ui.define([
             }
             if (this._dateBusinessDataType === "D") {
                 formatter = sap.ui.core.format.DateFormat.getDateInstance({
-                    pattern: "yyyy-MM-dd"
+                    pattern: "yyyy-MM-dd",
+                    UTC:true
                 });
                 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);
             }