@sapui5/sap.rules.ui 1.121.0 → 1.123.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.121.0
+     * @version 1.123.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",
@@ -23,10 +22,16 @@ sap.ui.define([
     "sap/rules/ui/providers/ValueHelpProvider",
 	"sap/rules/ui/providers/ValueHelpDialogProvider",
     "sap/ui/core/LocaleData",
-	"sap/rules/ui/Constants"
-], function(Control, CoreItem, ValueState, Select, Input, Button, SelectDialog, StandardListItem, Text, DatePicker,
+	"sap/rules/ui/Constants",
+	"sap/m/Popover",
+	"sap/base/i18n/Formatting",
+	"sap/ui/model/type/String",
+	"sap/m/MessageBox",
+	"sap/ui/core/format/DateFormat",
+	"sap/ui/core/library",
+], 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) {
+    TimePicker, ValueHelpProvider, ValueHelpDialogProvider, LocaleData, Constants, Popover, Formatting, String, MessageBox, DateFormat, coreLibrary) {
     "use strict";
 
     return Control.extend("sap.rules.ui.InstructionRenderer", {
@@ -73,7 +78,7 @@ sap.ui.define([
                 "|" +
                 "^[^" + ILLEGAL_CHARS + "]*$";
 
-            this.lineBreakIndexes = { // auxiliary rendering data to support 
+            this.lineBreakIndexes = { // auxiliary rendering data to support
                 start: {}, // lines breaking in indent mode
                 end: {}
             };
@@ -185,7 +190,7 @@ sap.ui.define([
         },
 
         /**
-         * @returns {string} a concatenated string of space separated tokens 
+         * @returns {string} a concatenated string of space separated tokens
          * **/
         getExpression: function() {
             var expression = [];
@@ -197,7 +202,7 @@ sap.ui.define([
                 expression.push(token);
             }
             var tokenExpression = instructions[instructions.length - 1].token;
-            
+
             if (!tokenExpression && tokenExpression !== 0) {
                 expression.pop(instructions.length - 1);
             }
@@ -364,12 +369,12 @@ sap.ui.define([
                     bAddSpace: false
                 });
                 var oPopover = this.getParent().getParent();
-                if (oPopover instanceof sap.m.Popover) {
+                if (oPopover instanceof Popover) {
                     this.valueHelpCtrl.oValueHelpDialogProvider._popover = oPopover;
                 }
             }
-            
-            
+
+
             this.valueHelpCtrl.addStyleClass(this.TOKENS_GAP_CLASS);
 
             return {
@@ -393,7 +398,7 @@ sap.ui.define([
                 change: function(event) {
 
                 },
-                enabled: (oParent.bReadOnly && oParent instanceof sap.rules.ui.DecisionTableCellExpressionBasic) ? false : true
+                enabled: (oParent.bReadOnly && oParent.isA("sap.rules.ui.DecisionTableCellExpressionBasics")) ? false : true
             });
             ctrl.addStyleClass(this.TOKENS_GAP_CLASS);
 
@@ -499,10 +504,10 @@ sap.ui.define([
             var valueRange = this._createValueRange(instruction);
             this._removeTextSingleQuote(localPath);
             //bug 5312
-            var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(); 
+            var oLocale = Formatting.getLanguageTag();
 			var oLocaleData = LocaleData.getInstance(oLocale);
 			var timeFormat = oLocaleData.getTimePattern('medium');
-            
+
             var ctrl = new TimePicker({
                 width: "auto",
                 type: "Time",
@@ -529,7 +534,7 @@ sap.ui.define([
             var valueRange = this._createValueRange(instruction);
             this._removeTextSingleQuote(localPath);
             //bug 5312
-            var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale(); 
+            var oLocale = Formatting.getLanguageTag();
 			var oLocaleData = LocaleData.getInstance(oLocale);
             var dateFormatted = oLocaleData.getDatePattern('short');
 			var timeFormat = oLocaleData.getTimePattern('medium');
@@ -560,7 +565,7 @@ sap.ui.define([
             var ctrl = new Input({
                 value: {
                     path: fullPath + this.TEXT,
-                    type: new sap.ui.model.type.String(
+                    type: new String(
                             null, {
                                 search: this.VALIDATION_REGEX
                             }) // prevent illegal characters
@@ -586,7 +591,7 @@ sap.ui.define([
         },
 
         _createBooleanSelectionControl: function(instruction, nextCreateFunction, localPath, fullPath) {
-            var ctrl = new sap.m.Select({
+            var ctrl = new Select({
                 selectedKey: "{" + fullPath + this.TOKEN + "}",
                 width: "auto",
                 items: [{
@@ -791,9 +796,8 @@ sap.ui.define([
         },
 
         _showErrorMessage: function(message) {
-            sap.ui.require("sap.m.MessageBox");
-            sap.m.MessageBox.alert(message, {
-                icon: sap.m.MessageBox.Icon.ERROR //,
+            MessageBox.alert(message, {
+                icon: "ERROR" //,
 
                 //title: this.oBundle.getText("ERROR")
             });
@@ -812,7 +816,7 @@ sap.ui.define([
                 addEndQuote = false;
             var newValue = "";
 	    var businessDataType = "";
-			
+
 	    if (model) {
                 newValue = model.getProperty(localPath + this.TEXT);
                 if (model.oData && model.oData.instructions) {
@@ -820,17 +824,17 @@ sap.ui.define([
                     for (var instruction in instructions) {
                         businessDataType = instructions[instruction].businessDataType;
                     }
- 
+
                 }
             }
-			
+
 			// 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
             );

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.121.0
+     * @version 1.123.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.121.0
+     * @version 1.123.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"
                 },
@@ -265,6 +265,9 @@ sap.ui.define([
                 editable: {
                     path: "ruleBuilderInternalModel>/editable"
                 },
+                /**
+                    * @deprecated Since 1.52.8, use the attribute RuleFormat instead.
+                */
                 cellFormat: {
                     path: "ruleBuilderInternalModel>/decisionTableConfiguration/cellFormat"
                 },
@@ -290,13 +293,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 +314,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}"
                     })
@@ -388,6 +391,9 @@ sap.ui.define([
             this._setDecisionTableConfigurationProperty("enableSettings", oDecisionTableConfiguration.getEnableSettings());
             this._setDecisionTableConfigurationProperty("enableSettingResult", oDecisionTableConfiguration.getEnableSettingResult());
             this._setDecisionTableConfigurationProperty("hitPolicies", oDecisionTableConfiguration.getHitPolicies());
+            /**
+                * @deprecated Since 1.52.8, use the attribute RuleFormat instead.
+            */
             this._setDecisionTableConfigurationProperty("cellFormat", oDecisionTableConfiguration.getCellFormat());
             this._setDecisionTableConfigurationProperty("decisionTableFormat", oDecisionTableConfiguration.getDecisionTableFormat());
             this._setDecisionTableConfigurationProperty("visibleRowCount", oDecisionTableConfiguration.getVisibleRowCount());