@sapui5/sap.rules.ui 1.120.1 → 1.122.0

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

@@ -7,6 +7,7 @@
 
 // Provides the sap.rules.ui.ExpressionAdvanced control
 sap.ui.define([
+    "./library",
 	"./ExpressionAdvancedRenderer",
 	"sap/base/Log",
 	"sap/m/Dialog",
@@ -18,23 +19,35 @@ sap.ui.define([
 	"sap/ui/layout/HorizontalLayout",
 	"sap/rules/ui/Utils",
 	"sap/ui/core/Popup",
-	"jquery.sap.global",
+	"sap/ui/thirdparty/jquery",
 	"sap/rules/ui/ExpressionBase",
 	"sap/ui/comp/odata/MetadataAnalyser",
 	"sap/rules/ui/providers/ValueHelpProvider",
 	"sap/ui/core/LocaleData",
 	"sap/rules/ui/Constants",
+	"sap/base/i18n/Formatting",
+    "sap/ui/core/format/DateFormat",
+    "sap/ui/core/library",
+    "sap/ui/model/json/JSONModel",
+    "sap/ui/unified/Calendar",
+    "sap/ui/model/odata/v2/ODataModel",
+    "sap/ui/comp/valuehelpdialog/ValueHelpDialog",
+    "sap/ui/comp/smartfilterbar/SmartFilterBar",
+    "sap/ui/comp/smartfilterbar/ControlConfiguration",
+    "sap/ui/table/Column",
+    "sap/m/Label",
+    "sap/ui/model/Filter",
+    "sap/ui/model/FilterOperator",
+    "sap/ui/core/Lib",
+    "sap/ui/core/BusyIndicator",
+    "sap/ui/core/Element",
+	/*"sap/rules/ui/DecisionTableCellExpressionAdvanced"*/
 	"sap/rules/ui/codemirror/lib/codemirror",
-	"sap/rules/ui/codemirror/addon/hint/show-hint",
-	"sap/rules/ui/codemirror/mode/hdf/hdf",
-	"sap/rules/ui/codemirror/addon/display/placeholder",
-	"sap/rules/ui/codemirror/addon/mh/mark-selection",
-	"sap/rules/ui/codemirror/addon/hint/hdf-hint",
-	"sap/rules/ui/codemirror/addon/closeBrackets/closebrackets",
-	"sap/rules/ui/codemirror/addon/search/search"
-	
-], function(ExpressionAdvancedRenderer, Log, Dialog, Control, Button, TextArea, Text, MessageBox, HorizontalLayout, Utils, Popup, jQ, ExpressionBase, MetadataAnalyser,
-	ValueHelpProvider, LocaleData, Constants) {
+
+], function(Library, ExpressionAdvancedRenderer, Log, Dialog, Control, Button, TextArea, Text, MessageBox, HorizontalLayout, Utils, Popup, jQ, ExpressionBase, MetadataAnalyser,
+	ValueHelpProvider, LocaleData, Constants, Formatting, DateFormat,
+	coreLibrary, JSONModel, Calendar, ODataModel, ValueHelpDialog, SmartFilterBar,
+	ControlConfiguration, Column, Label, Filter, FilterOperator, coreLib, BusyIndicator, Element/*DecisionTableCellExpressionAdvanced*/) {
 	"use strict";
 	/**
 	 * Constructor for a new ExpressionAdvanced.
@@ -68,7 +81,7 @@ sap.ui.define([
 				 */
 				type: {
 					type: "sap.rules.ui.ExpressionType",
-					defaultValue: sap.rules.ui.ExpressionType.All,
+					defaultValue: Library.ExpressionType.All,
 					bindable: "bindable"
 				},
 
@@ -141,16 +154,20 @@ sap.ui.define([
 
 	ExpressionAdvanced.prototype.init = function() {
 		ExpressionBase.prototype.init.apply(this, arguments);
-		var codeMirrorCSS = jQuery.sap.getModulePath("sap.rules.ui.codemirror.lib") + "/codemirror.css";
-		var showHintCSS = jQuery.sap.getModulePath("sap.rules.ui.codemirror.addon.hint") + "/show-hint.css";
-		jQuery.sap.includeStyleSheet(codeMirrorCSS);
-		jQuery.sap.includeStyleSheet(showHintCSS);
+		var codeMirrorCSS = sap.ui.require.toUrl("sap/rules/ui/codemirror/lib") + "/codemirror.css";
+		var showHintCSS = sap.ui.require.toUrl("sap/rules/ui/codemirror/addon/hint") + "/show-hint.css";
+		sap.ui.require([
+                        "sap/ui/dom/includeStylesheet"
+                      ], (includeStyleSheet) => {
+                            includeStyleSheet(codeMirrorCSS);
+                            includeStyleSheet(showHintCSS);
+                      });
 
 		this.pop = new Popup(jQ('<span></span>')[0], false, false, false);
 		this.errorWidgets = [];
 		this.expressionTokens = [];
 		this._liveValue = "";
-		this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 		this.dataModel = this.initControlDataModel();
 
 		// Expression area
@@ -164,12 +181,12 @@ sap.ui.define([
 		this.bFlagForEventListener = true;
 
 		// Date instance which is used to convert the selected date from calendar control to short format
-		var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+		var oLocale = Formatting.getLanguageTag();
 		var oLocaleData = LocaleData.getInstance(oLocale);
 
-		this.oFormatDate = sap.ui.core.format.DateFormat.getInstance({
+		this.oFormatDate = DateFormat.getInstance({
 				pattern: oLocaleData.getDatePattern('short'),
-				calendarType: sap.ui.core.CalendarType.Gregorian
+				calendarType: coreLibrary.CalendarType.Gregorian
 			},
 			oLocale
 		);
@@ -181,7 +198,7 @@ sap.ui.define([
 	};
 
 	ExpressionAdvanced.prototype._processValidationResult = function(result) {
-		if (result.status === sap.rules.ui.ValidationStatus.Error) {
+		if (result.status === Library.ValidationStatus.Error) {
 			var msg = Utils.parseUTFToString(result.errorDetails /* || "unknown message"  */ );
 			msg = msg.replace(/\r\n/g, " ").replace(/\r/g, " ").replace(/\n/g, " ");
 			this.errorCursorPosition = result.cursorPosition;
@@ -204,7 +221,7 @@ sap.ui.define([
 		var expressionValue = this.codeMirror ? this.codeMirror.getValue() : this.getValue();
 		var result = {};
 		var incomingdata = {};
-		var oEL = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var oEL = Element.getElementById(this.getExpressionLanguage());
 		if (oEL) {
 			incomingdata = oEL.validateExpression(
 				sInput || expressionValue,
@@ -235,14 +252,14 @@ sap.ui.define([
 			return;
 		}
 		pop.attachClosed(function() {
-			jQ.sap.byId(thisId).remove();
+			jQuery(document.getElementById(thisId)).remove();
 		});
 		var dock = Popup.Dock;
 		var cssClass = 'sapMInputBaseMessage' + errorState + ' sapMFocus';
 		var T = 'sapMValueStateMessageError sapMText';
-		var r = sap.ui.getCore().getLibraryResourceBundle('sap.m');
+		var r = coreLib.getResourceBundleFor('sap.m');
 
-		if (errorState === sap.ui.core.ValueState.Success) {
+		if (errorState === coreLibrary.ValueState.Success) {
 			cssClass = 'sapUiInvisibleText';
 			errorMessage = '';
 		}
@@ -292,7 +309,7 @@ sap.ui.define([
 	};
 
 	ExpressionAdvanced.prototype.initControlDataModel = function() {
-		var oDataModel = new sap.ui.model.json.JSONModel();
+		var oDataModel = new JSONModel();
 		var data = {};
 		oDataModel.setData(data);
 		return oDataModel;
@@ -431,7 +448,7 @@ sap.ui.define([
 	};
 
 	ExpressionAdvanced.prototype.onAliasLinkPress = function(aliasName) {
-		var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
 		if (expressionLanguage) {
 			expressionLanguage.onAliasLinkPress(aliasName);
 			expressionLanguage.attachEvent("aliasDialogClosed", this.aliasClickCancel, this);
@@ -439,7 +456,7 @@ sap.ui.define([
 	};
 
 	ExpressionAdvanced.prototype.onCreateAliasLinkForText = function(text) {
-		var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
 		if (expressionLanguage) {
 			expressionLanguage.attachEvent("aliasDialogClosed", this.replaceTextWithAlias, this);
 			expressionLanguage.onCreateAliasLinkForText(text);
@@ -456,51 +473,58 @@ sap.ui.define([
 		this.codeMirror.focus();
 		this.codeMirror.execCommand("goLineEnd");
 		this.fireDialog({
-			dialogStatus: sap.rules.ui.ValueListDialogMode.Close
+			dialogStatus: library.ValueListDialogMode.Close
 		});
 	};
 
 	ExpressionAdvanced.prototype.onAfterRendering = function() {
 
-		this.timer = null;
-		// needAutoComplete tells us whether an auto complete action is required.
-		// we need it since we execute the popup opening in a delayed manner. sometimes it should not open (case 2):
-		// case 1. press key -> ... -> delayed open of popup (need to open)
-		// case 2. press key -> ... -> press Enter (to select form list) -> ... -> delayed open of popup (need not open)
-		this.needAutoComplete = false;
-		this.endCompletion = false;
-		this._setCodeMirror();
-		this._setEditorStyle();
-		this._handleMousedown();
-		this._handleChange();
-		this._handleFocusLeave(); //blur
-		this._handleEndCodeCompletion();
-		this._handleKeyPress();
-		this._handleEditableProperty();
-		this._handleOnLoadValidation();
-		this._refreshOnNavigationEnd();
-		this._handleFocus();
-		this._handleValueListSelect();
-		this._handleCalendarChange();
-
-		//bug RULES-4848\5031\5030 after choose value from auto complete - popover will not closed
-		if (this.bFlagForEventListener) {
-			this.bFlagForEventListener = false;
-			this.fnMouseDownListsner = function(oEvent) {
-				this.bFlagForChangeBeforeBlur = oEvent.target.className.indexOf("CodeMirror-hint") > -1;
-			}.bind(this);
-
-			this.fnBlurListsner = function(oEvent) {
-				if (this.bFlagForChangeBeforeBlur) {
-					this.bFlagForChangeBeforeBlur = false;
-					oEvent.stopPropagation();
-					this.codeMirror.focus();
-				}
-			}.bind(this);
-
-			document.addEventListener("mousedown", this.fnMouseDownListsner, true);
-			document.getElementById(this.getId()).addEventListener("blur", this.fnBlurListsner, true);
-		}
+        sap.ui.require([
+              "sap/rules/ui/codemirror/addon/hint/show-hint",
+              "sap/rules/ui/codemirror/mode/hdf/hdf",
+              "sap/rules/ui/codemirror/addon/display/placeholder",
+              "sap/rules/ui/codemirror/addon/mh/mark-selection",
+              "sap/rules/ui/codemirror/addon/hint/hdf-hint",
+              "sap/rules/ui/codemirror/addon/closeBrackets/closebrackets"
+              ], () => {
+                    this.timer = null;
+                            // needAutoComplete tells us whether an auto complete action is required.
+                            // we need it since we execute the popup opening in a delayed manner. sometimes it should not open (case 2):
+                            // case 1. press key -> ... -> delayed open of popup (need to open)
+                            // case 2. press key -> ... -> press Enter (to select form list) -> ... -> delayed open of popup (need not open)
+                            this.needAutoComplete = false;
+                            this.endCompletion = false;
+                            this._setCodeMirror();
+                            this._setEditorStyle();
+                            this._handleMousedown();
+                            this._handleChange();
+                            this._handleFocusLeave(); //blur
+                            this._handleEndCodeCompletion();
+                            this._handleKeyPress();
+                            this._handleEditableProperty();
+                            this._handleOnLoadValidation();
+                            this._refreshOnNavigationEnd();
+                            this._handleFocus();
+                            this._handleValueListSelect();
+                            this._handleCalendarChange();
+                            //bug RULES-4848\5031\5030 after choose value from auto complete - popover will not closed
+                            if (this.bFlagForEventListener) {
+                            	this.bFlagForEventListener = false;
+                            	this.fnMouseDownListsner = function(oEvent) {
+                            		this.bFlagForChangeBeforeBlur = oEvent.target.className.indexOf("CodeMirror-hint") > -1;
+                            	}.bind(this);
+                                	this.fnBlurListsner = function(oEvent) {
+                                	if (this.bFlagForChangeBeforeBlur) {
+                                		this.bFlagForChangeBeforeBlur = false;
+                                			oEvent.stopPropagation();
+                                			this.codeMirror.focus();
+                                		}
+                                	}.bind(this);
+                                    	document.addEventListener("mousedown", this.fnMouseDownListsner, true);
+                                     	document.getElementById(this.getId()).addEventListener("blur", this.fnBlurListsner, true);
+                            }
+
+               });
 
 	};
 
@@ -517,7 +541,7 @@ sap.ui.define([
 		var bAddSpace = false;
 		var that = this;
 
-		var oCalendar = new sap.ui.unified.Calendar({
+		var oCalendar = new Calendar({
 			width: "100%",
 			select: this.handleCalendarSelect.bind(this)
 		});
@@ -554,7 +578,7 @@ sap.ui.define([
 
 	// Utility function to update Modal Property of modal
 	ExpressionAdvanced.prototype._updateModal = function(modalValue) {
-		var pop = sap.ui.getCore().byId("popover");
+		var pop = Element.getElementById("popover");
 		if (pop) {
 			pop.setModal(modalValue);
 		}
@@ -583,7 +607,7 @@ sap.ui.define([
 	ExpressionAdvanced.prototype._raiseError = function(sError) {
 		//handling a scenario when the callback or the model are invalid
 		Log.error(sError);
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		var oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 		this.setValueStateText(oBundle.getText("valueHelpTechnicalError"));
 		this._showPopUp();
 	};
@@ -602,7 +626,7 @@ sap.ui.define([
 					valueHelpInfo = suggestions[sugg].info;
 				}
 			}
-			var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+			var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
             valueHelpInfo.expressionLanguage = expressionLanguage;
 			var callback = expressionLanguage.getValueHelpCallback();
 			this.oTextArea.setValueState("None");
@@ -620,7 +644,7 @@ sap.ui.define([
 					callback.call(this, valueHelpInfo);
 					// create provider
 					var oModel = valueHelpInfo[0].model;
-					if (!(oModel instanceof sap.ui.model.odata.v2.ODataModel)) {
+					if (!(oModel instanceof ODataModel)) {
 						this._raiseError("value help model is not an oData V2 model");
 					} else if (oModel.isMetadataLoadingFailed()) {
 						this._raiseError("model metadata loading has failed in the past");
@@ -642,7 +666,7 @@ sap.ui.define([
 	ExpressionAdvanced.prototype._createValueHelpProvider = function(valueHelpInfo, bReplaceWord) {
 
 		var oModel = valueHelpInfo.model;
-		this.oMetadataAnalyzer = new sap.ui.comp.odata.MetadataAnalyser(oModel);
+		this.oMetadataAnalyzer = new MetadataAnalyser(oModel);
 		var sAnnotationPath = valueHelpInfo.metadata.propertyPath;
 		var oValueListAnnotation = this.oMetadataAnalyzer.getValueListAnnotation(sAnnotationPath);
 		if (!oValueListAnnotation.primaryValueListAnnotation) {
@@ -688,7 +712,7 @@ sap.ui.define([
         var businessDataType = valueHelpInfo.metadata.businessDataType;
         var tokens = this.getExpressionTokens();
         var bAddSpace = false;
-        var pop = sap.ui.getCore().byId("popover");
+        var pop = Element.getElementById("popover");
         if (pop) {
             pop.setModal(true);
         }
@@ -699,7 +723,7 @@ sap.ui.define([
         if (this.oDialog) {
             this.oDialog.destroy();
         }
-        var basePath = sap.ui.getCore().byId(this.getExpressionLanguage()).getModel().sServiceUrl;
+        var basePath = Element.getElementById(this.getExpressionLanguage()).getModel().sServiceUrl;
         this._createDialog(basePath, valueHelpInfo, curPos, businessDataType, bAddSpace, bReplaceWord, bValuehelpLinkPress);
     };
 
@@ -729,8 +753,8 @@ sap.ui.define([
 			attributePath = attributePath = attributePath.replace(":","%3A");
 		}
         this.attributeName = expressionData.oData[attributePath].Name;
-		sap.ui.core.BusyIndicator.show(0);
-        this.oValueHelpDialog = new sap.ui.comp.valuehelpdialog.ValueHelpDialog({
+		BusyIndicator.show(0);
+        this.oValueHelpDialog = new ValueHelpDialog({
             supportMultiselect : false,
             supportRanges : false,
             horizontalScrolling : false,
@@ -762,7 +786,7 @@ sap.ui.define([
                 that.oValueHelpDialog.destroy();
                 that.focus(that.codeMirror);
                 that.oFilterBar.destroy();
-                sap.ui.core.BusyIndicator.hide();
+                BusyIndicator.hide();
             }
         });
     };
@@ -779,7 +803,7 @@ sap.ui.define([
      */
     ExpressionAdvanced.prototype._createSmartFilterBar = function(basePath, valueHelpInfo) {
         var that = this;
-        this.oFilterBar = new sap.ui.comp.smartfilterbar.SmartFilterBar({
+        this.oFilterBar = new SmartFilterBar({
             entitySet : valueHelpInfo.metadata.entitySet,
             enableBasicSearch : true,
             advancedMode : true,
@@ -793,7 +817,7 @@ sap.ui.define([
             },
             controlConfiguration : [ that._createControlConfiguration() ]
         });
-        var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
+        var oModel = new ODataModel(basePath);
         this.oFilterBar.setModel(oModel);
     };
 
@@ -801,7 +825,7 @@ sap.ui.define([
      * Creating the Control Configuration for the smartFilter of the valueHelp Dialog.
      */
     ExpressionAdvanced.prototype._createControlConfiguration = function() {
-        var aControlConfiguration = [ new sap.ui.comp.smartfilterbar.ControlConfiguration({
+        var aControlConfiguration = [ new ControlConfiguration({
             hasValueHelpDialog : true,
             key : "Value",
             label : "Value",
@@ -809,7 +833,7 @@ sap.ui.define([
             width : "100px",
             index : 1
 
-        }), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+        }), new ControlConfiguration({
             hasValueHelpDialog : true,
             key : "Description",
             label : "Description",
@@ -817,7 +841,7 @@ sap.ui.define([
             width : "100px",
             index : 2
 
-        }), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+        }), new ControlConfiguration({
             hasValueHelpDialog : true,
             key : "VocabularyId",
             label : "VocabularyId",
@@ -825,7 +849,7 @@ sap.ui.define([
             visible : false,
             index : 3
 
-        }), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+        }), new ControlConfiguration({
             hasValueHelpDialog : true,
             key : "DataObjectId",
             label : "DataObjectId",
@@ -834,7 +858,7 @@ sap.ui.define([
             groupId : "abc",
             index : 4
 
-        }), new sap.ui.comp.smartfilterbar.ControlConfiguration({
+        }), new ControlConfiguration({
             hasValueHelpDialog : true,
             key : "AttributeId",
             label : "AttributeId",
@@ -843,7 +867,7 @@ sap.ui.define([
             index : 5
 
         }),
-        new sap.ui.comp.smartfilterbar.ControlConfiguration({
+        new ControlConfiguration({
             hasValueHelpDialog : true,
             key : "Version",
             label : "Version",
@@ -884,7 +908,7 @@ sap.ui.define([
             this._addValueHelpColumn(mEntities.valueHelp.properties[i], oTable);
         }
 
-        var oModel = new sap.ui.model.odata.v2.ODataModel(basePath);
+        var oModel = new ODataModel(basePath);
         oTable.setModel(oModel);
         oTable.bindRows(mEntities.valueHelp.collection, null, aFilterParams);
         oTable.getBinding("rows").attachDataReceived(this._handleRowsDataReceived, this);
@@ -904,13 +928,13 @@ sap.ui.define([
 
     // Utility function to create columns for the table.
     ExpressionAdvanced.prototype._addValueHelpColumn = function(oColumName, oTable) {
-        var oColumn = new sap.ui.table.Column().setLabel(new sap.m.Label({
+        var oColumn = new Column().setLabel(new Label({
             text : oColumName
         }));
         if (oColumName === this._propertyValue) {
             oColumn.setSortProperty(oColumName);
         }
-        oTable.addColumn(oColumn.setTemplate(new sap.m.Text().bindProperty("text", oColumName)));
+        oTable.addColumn(oColumn.setTemplate(new Text().bindProperty("text", oColumName)));
     };
 
     /*
@@ -930,9 +954,9 @@ sap.ui.define([
     ExpressionAdvanced.prototype._fetchFilterParams = function(valueHelpInfo) {
         var that = this;
         var aSearchParams = [];
-        var aFilterParams = [ new sap.ui.model.Filter("AttributeId", sap.ui.model.FilterOperator.EQ, valueHelpInfo.metadata.attributeId),
-                new sap.ui.model.Filter("DataObjectId", sap.ui.model.FilterOperator.EQ, valueHelpInfo.metadata.dataObjectId),
-                new sap.ui.model.Filter("VocabularyId", sap.ui.model.FilterOperator.EQ, valueHelpInfo.metadata.vocabularyId) ];
+        var aFilterParams = [ new Filter("AttributeId", FilterOperator.EQ, valueHelpInfo.metadata.attributeId),
+                new Filter("DataObjectId", FilterOperator.EQ, valueHelpInfo.metadata.dataObjectId),
+                new Filter("VocabularyId", FilterOperator.EQ, valueHelpInfo.metadata.vocabularyId) ];
 
         var aFilters = this.oFilterBar.getFilters();
         var searchParam = this.oFilterBar.getParameters();
@@ -941,8 +965,8 @@ sap.ui.define([
             searchParam = this.oFilterBar.getParameters().custom.search;
             aSearchParams = this._getSearchFilters(searchParam);
             aFilters = that._formatFilterParams(aFilters);
-            aFilterParams.push(new sap.ui.model.Filter({
-                filters : [ new sap.ui.model.Filter(aFilters), new sap.ui.model.Filter(aSearchParams) ],
+            aFilterParams.push(new Filter({
+                filters : [ new Filter(aFilters), new Filter(aSearchParams) ],
                 and : true
             }));
         } else if (!jQuery.isEmptyObject(searchParam)) {
@@ -1051,9 +1075,9 @@ sap.ui.define([
     ExpressionAdvanced.prototype._manageParam = function(sPath, operator, value1, value2) {
         var filterParam = [];
         if (value1 && value2) {
-            filterParam = new sap.ui.model.Filter({
-                filters : [ new sap.ui.model.Filter(sPath, sap.ui.model.FilterOperator.GT, value1),
-                        new sap.ui.model.Filter(sPath, sap.ui.model.FilterOperator.LT, value2) ],
+            filterParam = new Filter({
+                filters : [ new Filter(sPath, FilterOperator.GT, value1),
+                        new Filter(sPath, FilterOperator.LT, value2) ],
                 and : true
             });
         }
@@ -1062,21 +1086,21 @@ sap.ui.define([
 
     // Utility function to form the search filter params.
     ExpressionAdvanced.prototype._getSearchFilters = function(searchParam) {
-        return new sap.ui.model.Filter({
-            filters : [ new sap.ui.model.Filter(this._propertyValue, sap.ui.model.FilterOperator.EQ, searchParam),
-                    new sap.ui.model.Filter(this._propertyDescription, sap.ui.model.FilterOperator.EQ, searchParam) ],
+        return new Filter({
+            filters : [ new Filter(this._propertyValue, FilterOperator.EQ, searchParam),
+                    new Filter(this._propertyDescription, FilterOperator.EQ, searchParam) ],
             and : false
         });
     };
 
     ExpressionAdvanced.prototype.setValueStateFilter = function(oEvent) {
         var sId = oEvent.getSource().sId; 
-        this._valueFieldValue = sap.ui.getCore().byId(sId + "-filterItemControlA_-Value");
+        this._valueFieldValue = Element.getElementById(sId + "-filterItemControlA_-Value");
         if (this._valueFieldValue) {
             this._valueFieldValue.setValueState("None");
             this._valueFieldValue.setValueStateText("");
         }
-        this._valueFieldDescription = sap.ui.getCore().byId(sId + "-filterItemControlA_-Description");
+        this._valueFieldDescription = Element.getElementById(sId + "-filterItemControlA_-Description");
         if (this._valueFieldDescription) {
             this._valueFieldDescription.setValueState("None");
             this._valueFieldDescription.setValueStateText("");
@@ -1092,7 +1116,7 @@ sap.ui.define([
 		if (!this.getEditable()) {
 			return;
 		}
-		var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
 		var callback = expressionLanguage.getValueHelpCallback();
 
 		//build valueHelpInfo
@@ -1198,7 +1222,7 @@ sap.ui.define([
 			cursorPos = this.codeMirror.findPosH(cursorPosition, sFormatedValue.length, "char", true);
 			this.codeMirror.setCursor(cursorPos); // set the cursor past the new selection
 		}
-		var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
 		this.getFormattingTokens(oExpressionLanguage);
 		this.ValueHelpRequested = false;
 	};
@@ -1209,7 +1233,7 @@ sap.ui.define([
 		if ("getAttributeInfo" in this && this.getAttributeInfo()) {
 			attributeInfo = this.getAttributeInfo();
 		}
-		var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+		var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
 		var valueListAttribute;
 		if (attributeInfo) {
 			valueListAttribute = expressionLanguage.getValueListAttribute(attributeInfo);
@@ -1217,7 +1241,7 @@ sap.ui.define([
 
 		function autoComplete(cm, commandName, timeout) {
 			var oAdvancedExpressionEditor = cm.options.expressionEditor;
-			if ((oAdvancedExpressionEditor.getEditable() !== false) && sap.ui.getCore().byId(oAdvancedExpressionEditor.getExpressionLanguage())) {
+			if ((oAdvancedExpressionEditor.getEditable() !== false) && Element.getElementById(oAdvancedExpressionEditor.getExpressionLanguage())) {
 				window.clearTimeout(oAdvancedExpressionEditor.timer);
 				oAdvancedExpressionEditor.timer = window.setTimeout(function() {
 					cm.execCommand(commandName);
@@ -1233,7 +1257,7 @@ sap.ui.define([
 				window.clearTimeout(oAdvancedExpressionEditor.timer);
 				oAdvancedExpressionEditor.needAutoComplete = true;
 				oAdvancedExpressionEditor.timer = window.setTimeout(function() {
-					if (oAdvancedExpressionEditor.needAutoComplete && sap.ui.getCore().byId(oAdvancedExpressionEditor.getExpressionLanguage())) {
+					if (oAdvancedExpressionEditor.needAutoComplete && Element.getElementById(oAdvancedExpressionEditor.getExpressionLanguage())) {
 						cm.execCommand("autocomplete");
 					}
 				}, 500);
@@ -1382,7 +1406,7 @@ sap.ui.define([
 		}
 
 		if (this.expressionTokens.length === 0) {
-			var oEL = sap.ui.getCore().byId(this.getExpressionLanguage());
+			var oEL = Element.getElementById(this.getExpressionLanguage());
 			if (oEL) {
 				this.getFormattingTokens(oEL);
 			}
@@ -1597,7 +1621,7 @@ sap.ui.define([
 			jQuery(oAdvancedExpressionEditor.codeMirror.getWrapperElement()).removeClass('sapMInputBaseStateInner sapMInputBaseErrorInner sapMInputBaseContentWrapper sapMInputBaseContentWrapperState sapMInputBaseContentWrapperError');
 			oAdvancedExpressionEditor._liveValue = cm.getValue();
 
-			var oEL = sap.ui.getCore().byId(oAdvancedExpressionEditor.getExpressionLanguage());
+			var oEL = Element.getElementById(oAdvancedExpressionEditor.getExpressionLanguage());
 			if (oEL) {
 				oAdvancedExpressionEditor.getFormattingTokens(oEL);
 			}
@@ -1630,7 +1654,7 @@ sap.ui.define([
 			if (oAdvancedExpressionEditor.codeMirror.options.shouldValidate && !oAdvancedExpressionEditor.bFlagForPreventBlurWhenPopOverOpen) {
 				oAdvancedExpressionEditor.setValue(oAdvancedExpressionEditor.codeMirror.getValue());
 				//if (oAdvancedExpressionEditor.getProperty("automaticValidation")){
-				if (!(oAdvancedExpressionEditor instanceof sap.rules.ui.DecisionTableCellExpressionAdvanced)) {
+				if (!(oAdvancedExpressionEditor /*instanceof sap.rules.ui.DecisionTableCellExpressionAdvanced*/)) {
 					oAdvancedExpressionEditor.validate();
 				}
 				oAdvancedExpressionEditor._closePopUp();

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

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