@sapui5/sap.rules.ui 1.121.0 → 1.122.0

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

@@ -7,7 +7,7 @@
 
 // Provides control sap.rules.ui.DecisionTableCell.
 sap.ui.define([
-        "jquery.sap.global",
+        "sap/ui/thirdparty/jquery",
         "./library",
         "sap/rules/ui/DecisionTableCellExpressionAdvanced",
         "sap/rules/ui/type/DecisionTableCell",
@@ -18,10 +18,25 @@ sap.ui.define([
         "sap/rules/ui/services/AstExpressionLanguage",
         "sap/rules/ui/ast/util/AstUtil",
         "sap/ui/core/LocaleData",
+        "sap/rules/ui/ExpressionAdvanced",
+        "sap/rules/ui/AstExpressionBasic",
+        "sap/ui/core/Control",
+        "sap/m/Input",
+        "sap/ui/model/Context",
+        "sap/ui/core/library",
+        "sap/base/i18n/Formatting",
+        "sap/ui/core/format/DateFormat",
+        "sap/ui/core/EventBus",
+        "sap/ui/core/Lib",
+        "sap/ui/core/Element",
+        "sap/ui/core/Fragment",
+        "sap/rules/ui/DecisionTableCellAstExpressionBasic",
         "./DecisionTableCellRenderer"
     ],
     function (jQuery, library, DecisionTableCellExpressionAdvanced, DecisionTableCellFormatter, DecisionTableCellExpressionBasic, Popover,
-        Constants, ConstantUtils, AstExpressionLanguage, AstUtil, LocaleData, DecisionTableCellRenderer) {
+        Constants, ConstantUtils, AstExpressionLanguage, AstUtil, LocaleData, ExpressionAdvanced,
+        AstExpressionBasic, Control, Input, Context, coreLibrary, Formatting,
+        DateFormat, EventBus, coreLib, Element, Fragment, DecisionTableCellAstExpressionBasic, DecisionTableCellRenderer) {
         "use strict";
 
         /**
@@ -35,14 +50,14 @@ sap.ui.define([
          * @extends  sap.ui.core.Control
          *
          * @author SAP SE
-         * @version 1.121.0
+         * @version 1.122.0
          *
          * @constructor
          * @public
          * @alias sap.rules.ui.DecisionTableCellExpressionAdvanced
          * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
          */
-        var DecisionTableCell = sap.ui.core.Control.extend("sap.rules.ui.DecisionTableCell", {
+        var DecisionTableCell = Control.extend("sap.rules.ui.DecisionTableCell", {
             metadata: {
                 library: "sap.rules.ui",
                 properties: {
@@ -151,7 +166,7 @@ sap.ui.define([
                      */
                     decisionTableFormat: {
                         type: "sap.rules.ui.DecisionTableFormat",
-                        defaultValue: sap.rules.ui.DecisionTableFormat.CellFormat
+                        defaultValue: library.DecisionTableFormat.CellFormat
                     },
                     /**
                      * Contains the key properties of cell : RowId,ColId,RuleId, Version needed for binding context
@@ -222,7 +237,7 @@ sap.ui.define([
 
         DecisionTableCell.prototype._addNodeObject = function (astNode) {
             var oNodeArray = [];
-            var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             var oAstUtil = oAstExpressionLanguage._astBunldeInstance.ASTUtil;
 
             var updatedAstNode = [];
@@ -346,7 +361,7 @@ sap.ui.define([
             if (oDisplayedControl) {
                 oDisplayedControl.destroy();
             }
-            oDisplayedControl = new sap.m.Input({
+            oDisplayedControl = new Input({
             	ariaLabelledBy:this.getAriaLabelledBy(),
                 editable: false,
                 
@@ -375,7 +390,7 @@ sap.ui.define([
             var valuePath = this.getValuePath();
             var expression;
             var sPath = "/" + valuePath.split("/")[1];
-            var oCellContext = new sap.ui.model.Context(this.getModel(), sPath);
+            var oCellContext = new Context(this.getModel(), sPath);
             if (this.getExpressionLanguage()) {
                 valuePath = this.getDisplayModelName() + ">" + valuePath;
             }
@@ -434,9 +449,9 @@ sap.ui.define([
                 oDisplayedControl.bindProperty("valueState", {
                     path: valueStatePath,
                     formatter: function (sValue) {
-                        var valueState = sap.ui.core.ValueState.None;
-                        if (sValue === sap.ui.core.ValueState.Error) {
-                            valueState = sap.ui.core.ValueState.Error;
+                        var valueState = coreLibrary.ValueState.None;
+                        if (sValue === coreLibrary.ValueState.Error) {
+                            valueState = coreLibrary.ValueState.Error;
                         }
                         return valueState;
                     }.bind(this)
@@ -447,14 +462,14 @@ sap.ui.define([
         };
 
         DecisionTableCell.prototype._getLocaleData = function () {
-            var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+            var oLocale = Formatting.getLanguageTag();
             return LocaleData.getInstance(oLocale);
         };
 
         DecisionTableCell.prototype._getDateFormatter = function () {
             var oLocaleData = this._getLocaleData();
             var datePattern = oLocaleData.getDatePattern('medium');
-            var dateFormatter = sap.ui.core.format.DateFormat.getDateInstance({
+            var dateFormatter = DateFormat.getDateInstance({
                 pattern: datePattern
             });
             return dateFormatter;
@@ -464,7 +479,7 @@ sap.ui.define([
             var oLocaleData = this._getLocaleData();
             var datePattern = oLocaleData.getDatePattern('medium');
             var timePattern = oLocaleData.getTimePattern('medium');
-            var dateTimeFormatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+            var dateTimeFormatter = DateFormat.getDateTimeInstance({
                 pattern: datePattern + " " + timePattern
             });
             return dateTimeFormatter;
@@ -472,7 +487,7 @@ sap.ui.define([
 
         DecisionTableCell.prototype._getExpressionFromAstNodes = function (oContext, bInputField) {
             var that = this;
-            var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
             var termsProvider = oAstExpressionLanguage._astBunldeInstance.TermsProvider.TermsProvider;
             var displayExpression = "";
             var displayTermExpression = "";
@@ -582,17 +597,17 @@ sap.ui.define([
 
         DecisionTableCell.prototype.init = function () {
             this.astUtil = new AstUtil();
-	         this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+	         this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
         };
 
         DecisionTableCell.prototype.onAfterRendering = function () {
 			this.bColumnResized = false;
-			var oEventBus = sap.ui.getCore().getEventBus();
+			var oEventBus =  EventBus.getInstance();
 			oEventBus.unsubscribe("sap.ui.rules","_onColumnResized",this._setColumnResized,this);
 		};
 
         DecisionTableCell.prototype.onBeforeRendering = function () {
-            var oEventBus = sap.ui.getCore().getEventBus();
+            var oEventBus =  EventBus.getInstance();
 			oEventBus.subscribeOnce("sap.ui.rules","_onColumnResized",this._setColumnResized,this);
 			if (!this.bColumnResized) {
         		this._setDisplayedControl();
@@ -603,7 +618,7 @@ sap.ui.define([
             this.bColumnResized = true;
         };
 
-        DecisionTableCell.prototype.onFocusIn = function () {
+        DecisionTableCell.prototype.onFocusIn = async function () {
             var fnAfterPopOverOpen = function (oEvent) {
                 var oDecisionTableCellExpression = oEvent.getSource().getAggregation('content')[1];
                 oDecisionTableCellExpression.setVisible(true);
@@ -619,12 +634,12 @@ sap.ui.define([
             var fnAfterPopOverClose = function (oEvent) {
                 if (this._oPopover) {
                     var oDecisionTableCellExpression = this._oPopover.getAggregation('content')[1];
-                    if (oDecisionTableCellExpression instanceof sap.rules.ui.ExpressionAdvanced) { //after choose hint popover close, we fix it with focus in DecisionTableCellExpressionAdvanced so we need to copy the value from the code mirror to the expression advanced value
+                    if (oDecisionTableCellExpression instanceof ExpressionAdvanced) { //after choose hint popover close, we fix it with focus in DecisionTableCellExpressionAdvanced so we need to copy the value from the code mirror to the expression advanced value
                         if (oDecisionTableCellExpression.codeMirror) {
                             var sExpression = oDecisionTableCellExpression.codeMirror.getValue();
                             oDecisionTableCellExpression.setValue(sExpression);
                         }
-                    } else if (oDecisionTableCellExpression instanceof sap.rules.ui.AstExpressionBasic) {
+                    } else if (oDecisionTableCellExpression instanceof AstExpressionBasic) {
                         //While making changes in one cell and focusing into another cell, _fireChange is not called from
                         //AstExpressionBasic._handlePopupFocusOut
                         oDecisionTableCellExpression._fireChange(oDecisionTableCellExpression._input.text())
@@ -643,29 +658,44 @@ sap.ui.define([
                 var sValueRuleFormat = this.getModel().getProperty(this.getRuleFormatPath());
                 var sdecisionTableFormat = this.getDecisionTableFormat();
                 //destroy if the popover is not destroyed during close of popover.
-                if (sap.ui.getCore().byId("popover")) {
-                    sap.ui.getCore().byId("popover").destroy();
+                if (Element.getElementById("popover")) {
+                    Element.getElementById("popover").destroy();
                 }
                 // when the decisionTableFormat is set to type sap.rules.ui.DecisionTableFormat.RuleFormat then we Render the cells based on the
                 // Rule Format
                 if (this.getAstExpressionLanguage()) {
-                    this._oPopover = sap.ui.xmlfragment("sap.rules.ui.fragments.DecisionTableCellAstExpressionBasic", this);
-		    this._oPopover.setTooltip(this.oBundle.getText("ctrlSpaceCue"));
+                    this._oPopover = await Fragment.load({
+											name: 'sap.rules.ui.fragments.DecisionTableCellAstExpressionBasic',
+                                            controller: this
+                                           })
+					this._oPopover.setTooltip(this.oBundle.getText("ctrlSpaceCue"));
                     var oDecisionTableCellExpression = this._oPopover.getAggregation('content')[1];
                     oDecisionTableCellExpression.setAstExpressionLanguage(this.getAstExpressionLanguage());
-                    oDecisionTableCellExpression.attachChange(sap.rules.ui.DecisionTableCellAstExpressionBasic.prototype._changeValue);
+                    oDecisionTableCellExpression.attachChange(DecisionTableCellAstExpressionBasic.prototype._changeValue);
                 } else {
-                    if (sdecisionTableFormat === sap.rules.ui.DecisionTableFormat.RuleFormat) {
-                        if (sValueRuleFormat.toUpperCase() === sap.rules.ui.RuleFormat.Advanced) {
-                            this._oPopover = sap.ui.xmlfragment("sap.rules.ui.fragments.DecisionTableCellExpressionAdvanced", this);
+                    if (sdecisionTableFormat === library.DecisionTableFormat.RuleFormat) {
+                        if (sValueRuleFormat.toUpperCase() === library.RuleFormat.Advanced) {
+                            this._oPopover = await Fragment.load({
+													name: 'sap.rules.ui.fragments.DecisionTableCellExpressionAdvanced',
+                                                    controller: this
+                                                    })
                         } else {
-                            this._oPopover = sap.ui.xmlfragment("sap.rules.ui.fragments.DecisionTableCellExpressionBasic", this);
+                            this._oPopover = await Fragment.load({
+                                                    name: 'sap.rules.ui.fragments.DecisionTableCellExpressionBasic',
+                                                    controller: this
+                                                    })
                         }
                     } else if (bValueOnly) { // When the decisionTableFormat is set to the default value or pf type
                         // sap.rules.ui.DecisionTableFormat.RuleFormat then we render the cells based on ValueOnly
-                        this._oPopover = sap.ui.xmlfragment("sap.rules.ui.fragments.DecisionTableCellExpressionBasic", this);
+                        this._oPopover = await Fragment.load({
+                                                     name: 'sap.rules.ui.fragments.DecisionTableCellExpressionBasic',
+                                                     controller: this
+                                                     })
                     } else {
-                        this._oPopover = sap.ui.xmlfragment("sap.rules.ui.fragments.DecisionTableCellExpressionAdvanced", this);
+                        this._oPopover = await Fragment.load({
+                                                     name: 'sap.rules.ui.fragments.DecisionTableCellAstExpressionBasic',
+                                                     controller: this
+                                                     })
                     }
                     var oDecisionTableCellExpression = this._oPopover.getAggregation('content')[1];
                     oDecisionTableCellExpression.setExpressionLanguage(this.getExpressionLanguage());
@@ -676,7 +706,7 @@ sap.ui.define([
                 this._oPopover.attachAfterClose(fnAfterPopOverClose);
                 this.addDependent(this._oPopover);
 
-                var num = jQuery.sap.byId(this.getId()).closest('td').width() * 0.93;
+                var num = jQuery(document.getElementById(this.getId())).closest('td').width() * 0.93;
                 var sWidth = num + "px";
                 var oScrollContainer = this._oPopover.getAggregation('content')[0];
                 oScrollContainer.setWidth(sWidth);

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

@@ -7,13 +7,17 @@
 
 // Provides control sap.rules.ui.AstExpressionBasic.
 sap.ui.define([
-    "jquery.sap.global",
+    "sap/ui/thirdparty/jquery",
     "./library",
     "sap/rules/ui/Utils",
     "sap/rules/ui/AstExpressionBasic",
     "sap/rules/ui/Constants",
+    "sap/ui/core/library",
+    "sap/ui/core/EventBus",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
     "./DecisionTableCellAstExpressionBasicRenderer"
-], function (jQuery, library, Utils, AstExpressionBasic, Constants, DecisionTableCellAstExpressionBasicRenderer) {
+], function (jQuery, library, Utils, AstExpressionBasic, Constants, coreLibrary, EventBus, coreLib, Element, DecisionTableCellAstExpressionBasicRenderer) {
     "use strict";
 
     /**
@@ -27,7 +31,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.AstExpressionBasic
      *
      * @author SAP SE
-     * @version 1.121.0
+     * @version 1.122.0
      *
      * @constructor
      * @private
@@ -57,7 +61,7 @@ sap.ui.define([
                 },
                 type: {
                     type: "sap.rules.ui.ExpressionType",
-                    defaultValue: sap.rules.ui.ExpressionType.BooleanEnhanced,
+                    defaultValue: library.ExpressionType.BooleanEnhanced,
                     bindable: "bindable"
                 }
             }
@@ -77,18 +81,18 @@ sap.ui.define([
     };
 
     DecisionTableCellAstExpressionBasic.prototype.init = function () {
-        sap.rules.ui.AstExpressionBasic.prototype.init.apply(this, arguments);
+        AstExpressionBasic.prototype.init.apply(this, arguments);
         this.bFlagForChangeBeforeBlur = false;
-		this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
     };
 
     DecisionTableCellAstExpressionBasic.prototype.onAfterRendering = function () {
         var that = this;
-        this._oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
-        sap.rules.ui.AstExpressionBasic.prototype.onAfterRendering.apply(this, arguments);
+        this._oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
+        AstExpressionBasic.prototype.onAfterRendering.apply(this, arguments);
         this.oDecisionTableCell = (this.getParent() && this.getParent().getParent()) ? this.getParent().getParent() : null;
         this._handleValidation();
-        if (jQuery.sap.byId(this.getId()).closest('td').next().width()) {
+        if (jQuery(document.getElementById(this.getId())).closest('td').next().width()) {
             this._showPopUp();
         }
         if (this.oDecisionTableCell) {
@@ -97,7 +101,7 @@ sap.ui.define([
             var dtModel = this.oDecisionTableCell.getModel("dtModel");
             var oDisplayedControl = this.oDecisionTableCell.getAggregation("_displayedControl");
             if (oDisplayedControl) {
-                dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+                dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
             }
         }
     };
@@ -224,7 +228,7 @@ sap.ui.define([
     DecisionTableCellAstExpressionBasic.prototype._removeAndUpdateExisitingNodes = function (oModel, oData, sPath, astNodes,sCellContentPath) {
 	    	var sGroupId = oData.RowId + "," + oData.ColId;
 		oModel.setDeferredGroups([sGroupId]);
-		var oEventBus = sap.ui.getCore().getEventBus();
+		var oEventBus = EventBus.getInstance();
 		oModel.update(sPath, {
 			"Content": oModel.getProperty(sCellContentPath)
 		}, {
@@ -246,14 +250,14 @@ sap.ui.define([
 		var oData = {};
 		if (this.oDecisionTableCell) {
 			var oSource = oEvent.getSource();
-			var oEventBus = sap.ui.getCore().getEventBus();
+			var oEventBus = EventBus.getInstance();
 			var sValue = oEvent.getParameter("newValue");
 			oSource.setValue(sValue);
 			var dtInput = this.oDecisionTableCell.getAggregation("_displayedControl");
 			dtInput.setValue(oEvent.getParameter("displayText"));
 			dtInput.JSON = this.getJsonData();
 			dtInput.relString = this.relString;
-			var oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+			var oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
 			var oModel = this.getBindingContext().getModel();
 			oData = this.oDecisionTableCell.getKeyProperties();
 			var astNodes = oEvent.getParameter("astNodes");

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

@@ -7,13 +7,14 @@
 
 // Provides control sap.rules.ui.ExpressionAdvanced.
 sap.ui.define([
-	"jquery.sap.global",
+	"sap/ui/thirdparty/jquery",
 	"./library",
 	"sap/rules/ui/Utils",
 	"sap/rules/ui/ExpressionAdvanced",
 	"sap/rules/ui/Constants",
+	"sap/ui/core/library",
 	"./DecisionTableCellExpressionAdvancedRenderer"
-],	function(jQuery, library, Utils, ExpressionAdvanced, Constants, DecisionTableCellExpressionAdvancedRenderer) {
+],	function(jQuery, library, Utils, ExpressionAdvanced, Constants, coreLibrary, DecisionTableCellExpressionAdvancedRenderer) {
 		"use strict";
 
 		/**
@@ -27,7 +28,7 @@ sap.ui.define([
 		 * @extends  sap.rules.ui.ExpressionAdvanced
 		 *
 		 * @author SAP SE
-		 * @version 1.121.0
+		 * @version 1.122.0
 		 *
 		 * @constructor
 		 * @private
@@ -57,7 +58,7 @@ sap.ui.define([
 					},
 					type: {
 						type: "sap.rules.ui.ExpressionType",
-						defaultValue: sap.rules.ui.ExpressionType.BooleanEnhanced,
+						defaultValue: library.ExpressionType.BooleanEnhanced,
 						bindable: "bindable"
 					}
 				}
@@ -69,7 +70,7 @@ sap.ui.define([
 			var expressionValue = this.codeMirror ? this.codeMirror.getValue() : this.getValue();
 			if (expressionValue) {
 				var sValue = this.getHeaderValue() + " " + this.getFixedOperator() + " " + expressionValue;
-				sap.rules.ui.ExpressionAdvanced.prototype.validateExpression.apply(this, [sValue]);
+				ExpressionAdvanced.prototype.validateExpression.apply(this, [sValue]);
 			} else {
 				this.setValueStateText("");
 			}
@@ -77,31 +78,38 @@ sap.ui.define([
 		};
     
         DecisionTableCellExpressionAdvanced.prototype.init = function() {
-			sap.rules.ui.ExpressionAdvanced.prototype.init.apply(this, arguments);
+			ExpressionAdvanced.prototype.init.apply(this, arguments);
             this.bFlagForChangeBeforeBlur = false;  
 		};
 
 		DecisionTableCellExpressionAdvanced.prototype.onAfterRendering = function() {
-			sap.rules.ui.ExpressionAdvanced.prototype.onAfterRendering.apply(this, arguments);
-			this.codeMirror.options.fixedOperator = this.getFixedOperator();
-			this.codeMirror.options.headerValue = this.getHeaderValue();
-			this.codeMirror.options.filterOutStructuredCond = true;      //Structured conditions should not appear in decision table. (e.g "any of the following...")
-			this.oDecisionTableCell = (this.getParent() && this.getParent().getParent()) ?  this.getParent().getParent() : null;
-			this._handleValidation();
-            if (jQuery.sap.byId(this.getId()).closest('td').next().width()) {
-				this._showPopUp();
-			}
-			if (this.oDecisionTableCell) {
-				var valueStatePath = this.oDecisionTableCell.getValueStatePath();
-				var dtModel = this.oDecisionTableCell.getModel("dtModel");
-				var oDisplayedControl = this.oDecisionTableCell.getAggregation("_displayedControl");
-				if (oDisplayedControl) {
-					dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
-				}
-			}
-				this.createEventListeners();
-			
-			;
+		    ExpressionAdvanced.prototype.onAfterRendering.apply(this, arguments);
+			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.codeMirror.options.fixedOperator = this.getFixedOperator();
+            			this.codeMirror.options.headerValue = this.getHeaderValue();
+            			this.codeMirror.options.filterOutStructuredCond = true; //Structured conditions should not appear in decision table. (e.g "any of the following...")
+            			this.oDecisionTableCell = (this.getParent() && this.getParent().getParent()) ? this.getParent().getParent() : null;
+            			this._handleValidation();
+            			if (jQuery(document.getElementById(this.getId())).closest('td').next().width()) {
+            				this._showPopUp();
+            			}
+            			if (this.oDecisionTableCell) {
+            				var valueStatePath = this.oDecisionTableCell.getValueStatePath();
+            				var dtModel = this.oDecisionTableCell.getModel("dtModel");
+            				var oDisplayedControl = this.oDecisionTableCell.getAggregation("_displayedControl");
+            				if (oDisplayedControl) {
+            					dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
+            				}
+            			}
+            			this.createEventListeners();
+            		});
 		}
 		
 		DecisionTableCellExpressionAdvanced.prototype._handleValidation = function() {
@@ -113,31 +121,31 @@ sap.ui.define([
 		};
 		
 		DecisionTableCellExpressionAdvanced.prototype._processValidationResult = function(result){
-		sap.rules.ui.ExpressionAdvanced.prototype._processValidationResult.apply(this, arguments);
+		ExpressionAdvanced.prototype._processValidationResult.apply(this, arguments);
 		if (this.oDecisionTableCell) {
 			var valueStateTextPath = this.oDecisionTableCell.getValueStateTextPath();
 			var valueStatePath = this.oDecisionTableCell.getValueStatePath();
 			var dtModel = this.oDecisionTableCell.getModel("dtModel");
 			var oDisplayedControl = this.oDecisionTableCell.getAggregation("_displayedControl");
-			if (oDisplayedControl && result.status === sap.rules.ui.ValidationStatus.Error ) {
+			if (oDisplayedControl && result.status === library.ValidationStatus.Error ) {
 				var errorDetails = this.getValueStateText();
 				dtModel.setProperty(valueStateTextPath.slice(8), errorDetails);
 				if (!this.oDecisionTableCell._oPopover || !this.oDecisionTableCell._oPopover.isOpen()) {
-					dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.Error);
+					dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.Error);
 				} else {
-					dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+					dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
 				}
 				this.setProperty("valueStateText", errorDetails);
 			} else if (oDisplayedControl) {
 				dtModel.setProperty(valueStateTextPath.slice(8), "null");
-				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+				dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
 				this.setProperty("valueStateText", "");
 			}
 		}
 	};
     
         DecisionTableCellExpressionAdvanced.prototype.exit = function() {
-            sap.rules.ui.ExpressionAdvanced.prototype.exit.apply(this, arguments);
+            ExpressionAdvanced.prototype.exit.apply(this, arguments);
             this._handleValidation();
             this._closePopUp();
             this.pop = null;

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

@@ -7,12 +7,14 @@
 
 // Provides control sap.rules.ui.ExpressionBasic.
 sap.ui.define([
-    "jquery.sap.global",
+    "sap/ui/thirdparty/jquery",
     "./library",
     "sap/rules/ui/ExpressionBasic",
     "sap/rules/ui/InstructionRenderer",
+    "sap/ui/core/library",
+    "sap/ui/core/Element",
     "./DecisionTableCellExpressionBasicRenderer"
-], function(jQuery, library, ExpressionBasic, InstructionRenderer, DecisionTableCellExpressionBasicRenderer) {
+], function(jQuery, library, ExpressionBasic, InstructionRenderer, coreLibrary, Element, DecisionTableCellExpressionBasicRenderer) {
     "use strict";
 
     /**
@@ -26,7 +28,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.ExpressionBasic
      *
      * @author SAP SE
-     * @version 1.121.0
+     * @version 1.122.0
      *
      * @constructor
      * @private
@@ -64,7 +66,7 @@ sap.ui.define([
                 },
                 type: {
                     type: "sap.rules.ui.ExpressionType",
-                    defaultValue: sap.rules.ui.ExpressionType.BooleanEnhanced,
+                    defaultValue: library.ExpressionType.BooleanEnhanced,
                     bindable: "bindable"
                 }
             }
@@ -94,11 +96,11 @@ sap.ui.define([
             this.sCellValue = this.getValue();
             this.sValueFromSettings = (this.sHeaderValue + " " + this.FixedOperatorValue);
             this.sValue = (this.sValueFromSettings + this.sCellValue).trim();
-            var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+            var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
             var suggestions;
             if (!this.sHeaderValue && !this.FixedOperatorValue) {
                 this.setProperty("value", this.sValue);
-                sap.rules.ui.ExpressionBasic.prototype._reload.apply(this, arguments);
+                ExpressionBasic.prototype._reload.apply(this, arguments);
                 return;
             } else {
                 //need only right part
@@ -150,7 +152,7 @@ sap.ui.define([
             }
         },
         _onChangeByIndex: function(instructionIndex, sPrefix) {
-            sap.rules.ui.ExpressionBasic.prototype._onChangeByIndex.apply(this, [this.offSet + instructionIndex, this.sHeaderValue + this.FixedOperatorValue, instructionIndex]);
+           ExpressionBasic.prototype._onChangeByIndex.apply(this, [this.offSet + instructionIndex, this.sHeaderValue + this.FixedOperatorValue, instructionIndex]);
         },
         
         renderer: DecisionTableCellExpressionBasicRenderer
@@ -169,24 +171,24 @@ sap.ui.define([
     };
 
     DecisionTableCellExpressionBasic.prototype.onAfterRendering = function() {
-        sap.rules.ui.ExpressionBasic.prototype.onAfterRendering.apply(this, arguments);
+        ExpressionBasic.prototype.onAfterRendering.apply(this, arguments);
         this._calculateOffSet();
         this.oDecisionTableCell = (this.getParent() && this.getParent().getParent()) ? this.getParent().getParent() : null;
         if (this.oDecisionTableCell) {
         	var valueStatePath = this.oDecisionTableCell.getValueStatePath();
     		var dtModel = this.oDecisionTableCell.getModel("dtModel");
     		this.setProperty("valueStateText", "");
-    		dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+    		dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
     		this.createEventListeners();
         }
     };
 
     DecisionTableCellExpressionBasic.prototype.onBeforeRendering = function() {
-        sap.rules.ui.ExpressionBasic.prototype.onBeforeRendering.apply(this, arguments);
+        ExpressionBasic.prototype.onBeforeRendering.apply(this, arguments);
     };
 
     DecisionTableCellExpressionBasic.prototype._getSubExpression = function(expression) {
-        var oExpressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+        var oExpressionLanguage = Element.getElementById(this.getExpressionLanguage());
         return oExpressionLanguage._getSubExpressions(null, "dummy " + expression);
     };
 
@@ -201,7 +203,7 @@ sap.ui.define([
         } else {
             expressionValue = sHeaderValue + " " + FixedOperatorValue + " " + sCellValue;
         }
-        var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+        var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
         if (expressionValue) {
             var oResult = expressionLanguage.validateExpression(expressionValue);
             if (oResult.deferredResult) {
@@ -210,19 +212,19 @@ sap.ui.define([
 						var valueStateTextPath = this.oDecisionTableCell.getValueStateTextPath();
 						var valueStatePath = this.oDecisionTableCell.getValueStatePath();
 						var dtModel = this.oDecisionTableCell.getModel("dtModel");
-						if (oResult.status === sap.rules.ui.ValidationStatus.Error) {
+						if (oResult.status === library.ValidationStatus.Error) {
 							errorDetails = oResult.errorDetails.replace(/\r\n/g, " ").replace(/\r/g, " ").replace(/\n/g, " ");
 							dtModel.setProperty(valueStateTextPath.slice(8), errorDetails);
 							if (!this.oDecisionTableCell._oPopover || !this.oDecisionTableCell._oPopover.isOpen()) {
-								dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.Error);
+								dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.Error);
 							} else {
-								dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+								dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
 							}
 							this.setProperty("valueStateText", errorDetails);
                         } else {
 							this.setProperty("valueStateText", "");
 							dtModel.setProperty(valueStateTextPath.slice(8), "null");
-							dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+							dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
                         }
                     }
                 }.bind(this));
@@ -231,15 +233,15 @@ sap.ui.define([
             	var valueStateTextPath = this.oDecisionTableCell.getValueStateTextPath();
     			var valueStatePath = this.oDecisionTableCell.getValueStatePath();
     			var dtModel = this.oDecisionTableCell.getModel("dtModel");
-                if (oResult.status === sap.rules.ui.ValidationStatus.Error) {
+                if (oResult.status === library.ValidationStatus.Error) {
     				errorDetails = oResult.errorDetails.replace(/\r\n/g, " ").replace(/\r/g, " ").replace(/\n/g, " ");
     				this.setProperty("valueStateText", errorDetails);
     				dtModel.setProperty(valueStateTextPath.slice(8), errorDetails);
-    				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.Error);
+    				dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.Error);
     			} else {
                     this.setProperty("valueStateText", "");
     				dtModel.setProperty(valueStateTextPath.slice(8), "null");
-    				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+    				dtModel.setProperty(valueStatePath.slice(8), coreLibrary.ValueState.None);
                 }
             }
         }