@sapui5/sap.rules.ui 1.120.1 → 1.122.0

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

@@ -6,13 +6,18 @@
  */
 
 sap.ui.define([
-    "jquery.sap.global",
+    "sap/ui/thirdparty/jquery",
     "./library",
     "sap/ui/core/Control",
     "sap/rules/ui/InstructionRenderer",
     "sap/rules/ui/ExpressionBase",
+    "sap/base/i18n/Formatting",
+    "sap/ui/core/format/DateFormat",
+    "sap/ui/core/format/NumberFormat",
+    "sap/ui/comp/odata/MetadataAnalyser",
+    "sap/ui/core/Element",
     "./ExpressionBasicRenderer"
-], function(jQuery, library, Control, InstructionRenderer, ExpressionBase, ExpressionBasicRenderer) {
+], function(jQuery, library, Control, InstructionRenderer, ExpressionBase, Formatting, DateFormat, NumberFormat, MetadataAnalyser, Element, ExpressionBasicRenderer) {
     "use strict";
 
     /**
@@ -26,7 +31,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.120.1
+     * @version 1.122.0
      *
      * @constructor
      * @private
@@ -76,8 +81,8 @@ sap.ui.define([
             }
             this._removeFurtherInstructions(iOriginalIndex);
             updatedExpression = oInstructionsRenderer.getExpression();
-            var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
-            var suggestionsPart = sap.rules.ui.SuggestionsPart;
+            var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
+            var suggestionsPart = library.SuggestionsPart;
             var suggestions;
             var updatedInstruction;
 
@@ -177,9 +182,9 @@ sap.ui.define([
                     }
                     
                     //bug 5339 - remove separators from number
-                    if (suggestion.BDT === sap.rules.ui.ExpressionType.Number) {
-                        var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(); 
-                        var oFloatFormat = sap.ui.core.format.NumberFormat.getFloatInstance(oLocale);
+                    if (suggestion.BDT === library.ExpressionType.Number) {
+                        var oLocale = Formatting.getLanguageTag();
+                        var oFloatFormat = NumberFormat.getFloatInstance(oLocale);
                         var fnFormatFloat = function (number) {
                             number = oFloatFormat.parse(number);
                             if (isNaN(number)) {
@@ -209,7 +214,7 @@ sap.ui.define([
                 if (suggestion.valueListObject) {
 					var model = [suggestion.valueListObject];
 					instruction.valueListObject = suggestion.valueListObject;
-					var expressionLanguage = sap.ui.getCore().byId(this.getExpressionLanguage());
+					var expressionLanguage = Element.getElementById(this.getExpressionLanguage());
 					instruction.expressionLanguage = expressionLanguage;
 					if (model && model instanceof Array && !model[0].metadata.HasValueSource) {
 						instruction.valueListObject = model[0];
@@ -219,7 +224,7 @@ sap.ui.define([
 								var callback = expressionLanguage.getValueHelpCallback();
 								callback.call(this, model);
 								var tempModel = instruction.valueListObject.model;
-								var oMetadataAnalyzer = new sap.ui.comp.odata.MetadataAnalyser(tempModel);
+								var oMetadataAnalyzer = new MetadataAnalyser(tempModel);
 								var sAnnotationPath = instruction.valueListObject.metadata.propertyPath;
 								var oValueListAnnotation = oMetadataAnalyzer.getValueListAnnotation(sAnnotationPath);
 								instructions.forEach(function(instruction) {
@@ -249,7 +254,7 @@ sap.ui.define([
         },
         _reload: function() {
             this.shouldReload = false;
-            var suggestions = sap.ui.getCore().byId(this.getExpressionLanguage())._getBasicSuggestions(this.getValue());
+            var suggestions = Element.getElementById(this.getExpressionLanguage())._getBasicSuggestions(this.getValue());
             if (this._checkForValueHelpSuggestions(suggestions)) {
                 return;
             }
@@ -298,7 +303,7 @@ sap.ui.define([
             
             
 
-            jQuery.sap.byId(this.getId()).on("change", null, function(event) {
+            this.$().on("change", null, function(event) {
 
                 this.focus();
 

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

@@ -1,7 +1,6 @@
 sap.ui.define([
     "sap/ui/core/Control",
     "sap/ui/core/Item",
-    "sap/ui/core/ValueState",
     "sap/m/Select",
     "sap/m/Input",
     "sap/m/Button",
@@ -24,7 +23,7 @@ sap.ui.define([
 	"sap/rules/ui/providers/ValueHelpDialogProvider",
     "sap/ui/core/LocaleData",
 	"sap/rules/ui/Constants"
-], function(Control, CoreItem, ValueState, Select, Input, Button, SelectDialog, StandardListItem, Text, DatePicker,
+], function(Control, CoreItem, Select, Input, Button, SelectDialog, StandardListItem, Text, DatePicker,
     TypeFloat, TypeDate, TypeTime, TypeDateTime, HTML, JSONModel, Filter, FilterOperator, Utils, DateTimePicker,
     TimePicker, ValueHelpProvider, ValueHelpDialogProvider, LocaleData, Constants) {
     "use strict";

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

@@ -7,10 +7,9 @@
 
 // Provides control sap.rules.ui.
 sap.ui.define([
-    "jquery.sap.global", 
     "./library", 
     "sap/ui/core/Control"
-], function(jQuery, library, Control) {
+], function(library, Control) {
     "use strict";
 
     /**
@@ -24,7 +23,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.120.1
+     * @version 1.122.0
      *
      * @constructor
      * @private

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

@@ -7,7 +7,6 @@
 
 // Provides control sap.rules.ui.
 sap.ui.define([
-    "jquery.sap.global",
     "./library",
     "sap/ui/core/Control",
     "sap/m/Select",
@@ -15,12 +14,13 @@ sap.ui.define([
     "sap/rules/ui/DecisionTable",
     "sap/rules/ui/DecisionTableConfiguration",
     "sap/rules/ui/TextRuleConfiguration",
-    "sap/rules/ui/RuleType",
-    "sap/rules/ui/RuleFormat",
     "sap/rules/ui/TextRule",
+    "sap/ui/core/Lib",
+    "sap/ui/model/json/JSONModel",
+    "sap/m/ComboBox",
+    "sap/ui/model/Context",
     "./RuleBuilderRenderer"
-], function(jQuery, library, Control, Select, Item, DecisionTable, DecisionTableConfiguration, TextRuleConfiguration, RuleType,
-    RuleFormat, TextRule, RuleBuilderRenderer) {
+], function(library, Control, Select, Item, DecisionTable, DecisionTableConfiguration, TextRuleConfiguration, TextRule, coreLib, JSONModel, ComboBox, Context, RuleBuilderRenderer) {
     "use strict";
 
     /**
@@ -34,7 +34,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      * @author SAP SE
-     * @version 1.120.1
+     * @version 1.122.0
      *
      * @constructor
      * @public
@@ -53,7 +53,7 @@ sap.ui.define([
                  */
                 types: {
                     type: "sap.rules.ui.RuleType[]",
-                    defaultValue: [sap.rules.ui.RuleType.DecisionTable, sap.rules.ui.RuleType.TextRule]
+                    defaultValue: [library.RuleType.DecisionTable, library.RuleType.TextRule]
                 },
                 /**
                  * Name of the rule's ODataModel (optional).
@@ -158,7 +158,7 @@ sap.ui.define([
         },
 
         init: function() {
-            this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+            this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
             this.needCreateDisplayedControl = true;
 
             this.needRebind = true;
@@ -183,7 +183,7 @@ sap.ui.define([
                 decisionTableConfiguration: {},
                 textRuleConfiguration: {}
             };
-            var oModel = new sap.ui.model.json.JSONModel();
+            var oModel = new JSONModel();
             oModel.setData(data);
             return oModel;
         },
@@ -200,7 +200,7 @@ sap.ui.define([
             var bindingContextPath = this.getBindingContextPath();
             var model = this._getModel();
 
-            var oContext = new sap.ui.model.Context(model, bindingContextPath);
+            var oContext = new Context(model, bindingContextPath);
             this.setBindingContext(oContext);
         },
 
@@ -212,11 +212,11 @@ sap.ui.define([
             // get DT configuration object, or create it if it doesn't exists
             var oTextRuleConfiguration = this.getTextRuleConfiguration();
             if (!oTextRuleConfiguration) {
-                oTextRuleConfiguration = new sap.rules.ui.TextRuleConfiguration();
+                oTextRuleConfiguration = new TextRuleConfiguration();
                 this.setTextRuleConfiguration(oTextRuleConfiguration);
             };
 
-            var oTextRule = new sap.rules.ui.TextRule({
+            var oTextRule = new TextRule({
                 bindingContextPath: {
                     path: "ruleBuilderInternalModel>/bindingContextPath"
                 },
@@ -248,14 +248,14 @@ sap.ui.define([
             // get DT configuration object, or create it if it doesn't exists
             var oDecisionTableConfiguration = this.getDecisionTableConfiguration();
             if (!oDecisionTableConfiguration) {
-                oDecisionTableConfiguration = new sap.rules.ui.DecisionTableConfiguration();
+                oDecisionTableConfiguration = new DecisionTableConfiguration();
                 this.setDecisionTableConfiguration(oDecisionTableConfiguration);
             };
 
-            sap.rules.ui.DecisionTable.prototype.VISIBLEROWCOUNT = this.getDecisionTableConfiguration().getVisibleRowCount();
-			sap.rules.ui.DecisionTable.prototype.THRESHOLD = this.getDecisionTableConfiguration().getThreshold();
+            DecisionTable.prototype.VISIBLEROWCOUNT = this.getDecisionTableConfiguration().getVisibleRowCount();
+			DecisionTable.prototype.THRESHOLD = this.getDecisionTableConfiguration().getThreshold();
             // create DT
-            var oDT = new sap.rules.ui.DecisionTable({
+            var oDT = new DecisionTable({
                 bindingContextPath: {
                     path: "ruleBuilderInternalModel>/bindingContextPath"
                 },
@@ -290,13 +290,13 @@ sap.ui.define([
         _createDisplayedControl: function(sDisplayedControlType) {
             var oDisplayedControl;
             switch (sDisplayedControlType) {
-                case sap.rules.ui.RuleType.DecisionTable:
+                case library.RuleType.DecisionTable:
                     oDisplayedControl = this._createDecisionTable();
                     break;
-                case "sap.rules.ui.RuleType.Ruleset":
+                case "library.RuleType.Ruleset":
                     oDisplayedControl = this._createRuleset();
                     break;
-                case sap.rules.ui.RuleType.TextRule:
+                case library.RuleType.TextRule:
                     oDisplayedControl = this._createTextRule();
                     break;
                 default:
@@ -311,18 +311,18 @@ sap.ui.define([
 
             this.oBundle.getText('decisionTable');
 
-            var oRuleTypesModel = new sap.ui.model.json.JSONModel({
+            var oRuleTypesModel = new JSONModel({
                 items: [{
-                    key: sap.rules.ui.RuleType.DecisionTable,
+                    key: library.RuleType.DecisionTable,
                     text: this.oBundle.getText('decisionTable')
                 }]
             });
 
-            var oRuleTypeSelector = new sap.m.ComboBox({
+            var oRuleTypeSelector = new ComboBox({
                 width: "25%",
                 items: {
                     path: 'ruleTypes>/items',
-                    template: new sap.ui.core.Item({
+                    template: new Item({
                         text: "{ruleTypes>text}",
                         key: "{ruleTypes>key}"
                     })