@sapui5/sap.rules.ui 1.121.0 → 1.122.0

package/src/sap/rules/ui/ast/autoComplete/AutoComplete.js

@@ -8,17 +8,18 @@ sap.ui.define(["sap/rules/ui/ast/autoComplete/dataStructure/Stack",
 		"sap/rules/ui/ast/autoComplete/dataStructure/ComparisionOperatorStack",
 		"sap/rules/ui/ast/autoComplete/dataStructure/FunctionalStack",
 		"sap/rules/ui/ast/autoComplete/node/OperatorNode",
-		"sap/rules/ui/ast/autoComplete/dataStructure/ArrayAndRangeStack"
+		"sap/rules/ui/ast/autoComplete/dataStructure/ArrayAndRangeStack",
+		"sap/ui/core/Lib",
 	],
 	function (Stack, TermsProvider, OperatorProvider, FunctionProvider, astBundleLibrary, Constants, TermNode, ComparisionOperatorStack,
-		FunctionalStack, OperatorNode, ArrayAndRangeStack) {
+		FunctionalStack, OperatorNode, ArrayAndRangeStack, coreLib) {
 		'use strict';
 
 		var astLibInstance = astBundleLibrary.getInstance();
 
 		var AutoComplete = function () {
 			this._autoCompleteStack = new Stack();
-			this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+			this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 		};
 
 		AutoComplete.prototype._getAutoSuggestionSkeleton = function () {

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

@@ -4,14 +4,19 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/DisplayListItem",
+    "sap/m/Panel",
+    "sap/ui/core/Lib",
     "./AutoSuggestionAdvancedFunctionPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionAdvancedFunctionPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionAdvancedFunctionPanelRenderer) {
     "use strict";
 
+	var ListMode = mobileLibrary.ListMode;
+	
     var autoSuggestionAdvancedFunctionPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionAdvancedFunctionPanel", {
             metadata: {
@@ -40,8 +45,8 @@ sap.ui.define([
             },
 
             init: function () {
-				this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-                this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+				this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
+                this.infraUtils = new infraUtils.utilsBaseLib();
                 this.needCreateLayout = true;
                 this.AttributeSegmentSelected = true;
                 this.dataObjectName = "";
@@ -63,11 +68,11 @@ sap.ui.define([
                 var that = this;
                 var vocabularyData = this.getData();
                 // create a Model with this data
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
                 model.setData(vocabularyData);
 
                 // create a list 
-                this.advancedFunctionlist = new sap.m.List({
+                this.advancedFunctionlist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -76,10 +81,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.advancedFunctionlist.bindItems({
                     path: "/",
-                    sorter: new sap.ui.model.Sorter("name"),
+                    sorter: new Sorter("name"),
                     rememberSelections: false,
                     mode: ListMode.SingleSelectMaster,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -94,7 +99,7 @@ sap.ui.define([
                 var that = this;
 
                 // add list to the panel
-                var advancedFunctionslistPanel = new sap.m.Panel({
+                var advancedFunctionslistPanel = new Panel({
                     headerText: this.oBundle.getText("advancedFunctionPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),

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

@@ -4,20 +4,25 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
     "sap/ui/core/LocaleData",
     "sap/rules/ui/Constants",
     "sap/rules/ui/services/AstExpressionLanguage",
     "sap/rules/ui/ast/util/AggregateFunctionDialog",
+    "sap/m/Panel",
+    "sap/m/Link",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
     "./AutoSuggestionAggregateFunctionPanelRenderer"
 
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils,
-    LocaleData, Constants, AstExpressionLanguage, AggregateFunctionDialog, AutoSuggestionAggregateFunctionPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils,
+    LocaleData, Constants, AstExpressionLanguage, AggregateFunctionDialog, Panel, Link, coreLib, Element, AutoSuggestionAggregateFunctionPanelRenderer) {
     "use strict";
 
+	var ListMode = mobileLibrary.ListMode;
     var autoSuggestionAggregateFunctionPanel = Control.extend("sap.rules.ui.ast.autoCompleteContent.AutoSuggestionAggregateFunctionPanel", {
         metadata: {
             library: "sap.rules.ui",
@@ -54,9 +59,9 @@ sap.ui.define([
         },
 
         init: function () {
-			this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+			this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
             this.aggregateFunctionDialog = AggregateFunctionDialog.getInstance();
-            this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+            this.infraUtils = new infraUtils.utilsBaseLib();
             this._oAstExpressionLanguage = new AstExpressionLanguage();
             this.needCreateLayout = true;
 
@@ -72,18 +77,18 @@ sap.ui.define([
         },
 
         onAfterRendering: function () {
-            this._oAstExpressionLanguage = sap.ui.getCore().byId(this.getAstExpressionLanguage());
+            this._oAstExpressionLanguage = Element.getElementById(this.getAstExpressionLanguage());
         },
         initializeVariables: function () {
 
         },
         _createLayout: function () {
             var that = this;
-            var AggregateFunctionsPanel = new sap.m.Panel({
+            var AggregateFunctionsPanel = new Panel({
                 expandable: false,
                 expanded: true,
 				width: "auto",
-                content: [new sap.m.Link({
+                content: [new Link({
                     wrapping: true,
                     text: this.oBundle.getText("aggregateFunctionPanelTitle"),
                     press: function (oEvent) {

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

@@ -4,14 +4,18 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/DisplayListItem",
+    "sap/m/Panel",
+    "sap/ui/core/Lib",
     "./AutoSuggestionArrayOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionArrayOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionArrayOperatorPanelRenderer) {
     "use strict";
 
+	var ListMode = mobileLibrary.ListMode;
     var autoSuggestionArrayOperatorPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionArrayOperatorPanel", {
             metadata: {
@@ -40,8 +44,8 @@ sap.ui.define([
             },
 
             init: function () {
-				this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-                this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+				this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
+                this.infraUtils = new infraUtils.utilsBaseLib();
                 this.needCreateLayout = true;
                 this.AttributeSegmentSelected = true;
                 this.dataObjectName = "";
@@ -63,11 +67,11 @@ sap.ui.define([
                 var that = this;
                 var vocabularyData = this.getData();
                 // create a Model with this data
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
                 model.setData(vocabularyData);
 
                 // create a list 
-                this.arrayOperatorslist = new sap.m.List({
+                this.arrayOperatorslist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -76,10 +80,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.arrayOperatorslist.bindItems({
                     path: "/array",
-                    sorter: new sap.ui.model.Sorter("name"),
+                    sorter: new Sorter("name"),
                     rememberSelections: false,
                     mode: ListMode.SingleSelectMaster,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -94,7 +98,7 @@ sap.ui.define([
                 var that = this;
 
                 // add list to the panel
-                var arrayOperatorslistPanel = new sap.m.Panel({
+                var arrayOperatorslistPanel = new Panel({
                     headerText: this.oBundle.getText("arrayOperatorsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),

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

@@ -4,14 +4,18 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/m/ListMode",
+    "sap/m/library",
     "sap/ui/core/CustomData",
     "sap/ui/model/Sorter",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/DisplayListItem",
+    "sap/m/Panel",
+    "sap/ui/core/Lib",
     "./AutoSuggestionComparisionOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionComparisionOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionComparisionOperatorPanelRenderer) {
     "use strict";
-
+	
+	var ListMode = mobileLibrary.ListMode;
     var autoSuggestionComparisionOperatorPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionComparisionOperatorPanel", {
             metadata: {
@@ -40,8 +44,8 @@ sap.ui.define([
             },
 
             init: function () {
-				this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-                this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+				this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
+                this.infraUtils = new infraUtils.utilsBaseLib();
                 this.needCreateLayout = true;
                 this.AttributeSegmentSelected = true;
                 this.dataObjectName = "";
@@ -63,11 +67,11 @@ sap.ui.define([
                 var that = this;
                 // create a Model with this data
                 var vocabularyData = this.getData();
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
                 model.setData(vocabularyData);
 
                 // create a list 
-                this.comparisionOperatorslist = new sap.m.List({
+                this.comparisionOperatorslist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -76,10 +80,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.comparisionOperatorslist.bindItems({
                     path: "/comparision",
-                    sorter: new sap.ui.model.Sorter("name"),
+                    sorter: new Sorter("name"),
                     rememberSelections: false,
                     mode: ListMode.SingleSelectMaster,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -92,7 +96,7 @@ sap.ui.define([
                 // set the model to the List, so it knows which data to use
                 this.comparisionOperatorslist.setModel(model);
                 // add list to the panel
-                var comparisionOperatorsListPanel = new sap.m.Panel({
+                var comparisionOperatorsListPanel = new Panel({
                     headerText: this.oBundle.getText("comparisonOperatorsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),

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

@@ -9,20 +9,29 @@ sap.ui.define([
 	"sap/m/DateTimePicker",
 	"sap/m/TimePicker",
 	"sap/ui/model/json/JSONModel",
-	"sap/m/ListMode",
+	"sap/m/library",
 	"sap/ui/core/CustomData",
 	"sap/ui/model/Sorter",
 	"sap/ui/core/LocaleData",
 	"sap/rules/ui/Constants",
 	"sap/rules/ui/AstExpressionBasic",
 	"sap/rules/ui/services/AstExpressionLanguage",
+	"sap/base/i18n/Formatting",
+	"sap/ui/core/format/DateFormat",
+	"sap/m/Link",
+    "sap/m/Panel",
+    "sap/m/ToolbarSpacer",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
+    "sap/ui/core/library",
 	"./AutoSuggestionDateAndTimePanelRenderer"
 
-], function (jQuery, library, Control, List, Dialog, Button, DatePicker, DateTimePicker, TimePicker, JSONModel, ListMode, CustomData,
+], function (jQuery, library, Control, List, Dialog, Button, DatePicker, DateTimePicker, TimePicker, JSONModel, mobileLibrary, CustomData,
 	Sorter,
-	LocaleData, Constants, AstExpressionBasic, AstExpressionLanguage, AutoSuggestionDateAndTimePanelRenderer) {
+	LocaleData, Constants, AstExpressionBasic, AstExpressionLanguage, Formatting, DateFormat, Link, Panel, ToolbarSpacer, coreLib, Element, coreLibrary, AutoSuggestionDateAndTimePanelRenderer) {
 	"use strict";
 
+	var ListMode = mobileLibrary.ListMode;
 	var autoSuggestionDateAndTimePanel = Control.extend("sap.rules.ui.ast.autoCompleteContent.AutoSuggestionDateAndTimePanel", {
 		metadata: {
 			library: "sap.rules.ui",
@@ -64,17 +73,17 @@ sap.ui.define([
 
 		init: function () {
 			this.needCreateLayout = true;
-			this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+			this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
 			this.vocabularyInfo = this.getVocabularyInfo();
 			this.autoSuggestionData = this.getData();
 
 			// 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
 			);
@@ -92,7 +101,7 @@ sap.ui.define([
 		//creates calender control
 		_createDateTimeDialog: function () {
 			var that = this;
-			var oLocale = sap.ui.getCore().getConfiguration().getFormatSettings().getFormatLocale();
+			var oLocale = Formatting.getLanguageTag();
 			var oLocaleData = LocaleData.getInstance(oLocale);
 			var dateFormatted = oLocaleData.getDatePattern('medium');
 			var timeFormat = oLocaleData.getTimePattern('medium');
@@ -162,13 +171,13 @@ sap.ui.define([
 			}
 			if (this._dateBusinessDataType === "D") {
 				date = new Date(sValue);
-				formatter = sap.ui.core.format.DateFormat.getDateInstance({
+				formatter = DateFormat.getDateInstance({
 					pattern: "yyyy-MM-dd"
 				});
 				return formatter.format(date);
 			} else if (this._dateBusinessDataType === "U") {
 				date = new Date(sValue);
-				formatter = sap.ui.core.format.DateFormat.getDateTimeInstance({
+				formatter = DateFormat.getDateTimeInstance({
 					pattern: "yyyy-MM-dd'T'HH:mm:ss.sss'Z'"
 				});
 				return formatter.format(date);
@@ -177,7 +186,7 @@ sap.ui.define([
 		},
 
 		_setModal: function (value) {
-			var pop = sap.ui.getCore().byId("popover");
+			var pop = Element.getElementById("popover");
 			if (pop) {
 				pop.setModal(value);
 			}
@@ -219,7 +228,7 @@ sap.ui.define([
 			} else if (this._dateBusinessDataType === "U") {
 				this.textContent = this.oBundle.getText("select_date_time");
 			} 
-			this.content = new sap.m.Link({
+			this.content = new Link({
 				wrapping: true,
 				text: this.textContent,
 				press: function (oEvent) {
@@ -227,7 +236,7 @@ sap.ui.define([
 				}
 			});
 			
-			var dateAndTimePanel = new sap.m.Panel({
+			var dateAndTimePanel = new Panel({
 				expandable: false,
 				expanded: true,
 				content: [this.content],
@@ -238,7 +247,7 @@ sap.ui.define([
 		
 		_createBothDateAndTime: function() {
 			var that = this;
-			this.dateContent = new sap.m.Link({
+			this.dateContent = new Link({
 				wrapping: true,
 				text: this.oBundle.getText("select_date"),
 				press: function (oEvent) {
@@ -247,9 +256,9 @@ sap.ui.define([
 				}
 			});
 			
-			this.toolBarSpacer =	new sap.m.ToolbarSpacer({width: "1em"});
+			this.toolBarSpacer =	new ToolbarSpacer({width: "1em"});
 			
-			this.timeContent = new sap.m.Link({
+			this.timeContent = new Link({
 				wrapping: true,
 				text: this.oBundle.getText("select_date_time"),
 				press: function (oEvent) {
@@ -258,7 +267,7 @@ sap.ui.define([
 				}
 			});
 			
-			var dateAndTimePanel = new sap.m.Panel({
+			var dateAndTimePanel = new Panel({
 				headerText: this.oBundle.getText("dateTimePanelTitle"),
 				expandable: true,
 				expanded: false,