@sapui5/sap.rules.ui 1.121.0 → 1.122.0

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionMiscellaneousOperatorPanel.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",
     "./AutoSuggestionMiscellaneousOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionMiscellaneousOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionMiscellaneousOperatorPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var AutoSuggestionMiscellaneousOperatorPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionMiscellaneousOperatorPanel", {
             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.miscellaneousOperatorslist = new sap.m.List({
+                this.miscellaneousOperatorslist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -76,10 +80,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.miscellaneousOperatorslist.bindItems({
                     path: "/miscellaneous",
-                    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 miscellaneousOperatorslistPanel = new sap.m.Panel({
+                var miscellaneousOperatorslistPanel = new Panel({
                     headerText: this.oBundle.getText("miscOperatorsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionOperationsPanel.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",
     "./AutoSuggestionOperationsPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionOperationsPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionOperationsPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionOperationsPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionOperationsPanel", {
             metadata: {
@@ -36,8 +40,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 = "";
@@ -59,11 +63,11 @@ sap.ui.define([
                 var that = this;
                 var operationsData = this.getData();
                 // create a Model with this data
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
                 model.setData(operationsData);
 
                 // create a list 
-                this.Operationslist = new sap.m.List({
+                this.Operationslist = new List({
                     growing: true,
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
@@ -72,10 +76,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.Operationslist.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",
@@ -90,7 +94,7 @@ sap.ui.define([
                 var that = this;
 
                 // add list to the panel
-                var OperationslistPanel = new sap.m.Panel({
+                var OperationslistPanel = new Panel({
                     headerText: this.oBundle.getText("OperationsPanelTitle"),
                     expandable: true,
                     expanded: true,

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionRangeOperatorPanel.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",
     "./AutoSuggestionRangeOperatorPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionRangeOperatorPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, coreLib, AutoSuggestionRangeOperatorPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionRangeOperatorPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionRangeOperatorPanel", {
             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: "/range",
-                    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 rangeOperatorslistPanel = new sap.m.Panel({
+                var rangeOperatorslistPanel = new Panel({
                     headerText: this.oBundle.getText("rangeOperatorsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),

package/src/sap/rules/ui/ast/autoCompleteContent/AutoSuggestionSelectFunctionPanel.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/SelectFunctionDialog",
+    "sap/m/Panel",
+    "sap/m/Link",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
     "./AutoSuggestionSelectFunctionPanelRenderer"
 
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils,
-    LocaleData, Constants, AstExpressionLanguage, SelectFunctionDialog, AutoSuggestionSelectFunctionPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils,
+    LocaleData, Constants, AstExpressionLanguage, SelectFunctionDialog, Panel, Link, coreLib, Element, AutoSuggestionSelectFunctionPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionSelectFunctionPanel = Control.extend("sap.rules.ui.ast.autoCompleteContent.AutoSuggestionSelectFunctionPanel", {
         metadata: {
             library: "sap.rules.ui",
@@ -54,7 +59,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.selectFunctionDialog = SelectFunctionDialog.getInstance();
             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 selectFunctionsPanel = new sap.m.Panel({
+            var selectFunctionsPanel = new Panel({
                 expandable: false,
                 expanded: true,
 				width: "auto",
-                content: [new sap.m.Link({
+                content: [new Link({
                     wrapping: true,
                     text: this.oBundle.getText("selectFunctionPanelTitle"),
                     press: function (oEvent) {
@@ -97,7 +102,7 @@ sap.ui.define([
         },
 		
 		_setModal: function (value) {
-            var pop = sap.ui.getCore().byId("popover");
+            var pop = Element.getElementById("popover");
             if (pop) {
                 pop.setModal(value);
             }

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

@@ -4,14 +4,26 @@ 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/m/Link",
+    "sap/m/Dialog",
+    "sap/ui/layout/VerticalLayout",
+    "sap/m/Button",
+    "sap/ui/model/Filter",
+    "sap/ui/model/FilterOperator",
+    "sap/m/SearchField",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element",
     "./AutoSuggestionTimeAndDurationFunctionPanelRenderer"
-], function (jQuery, library, Control, List, JSONModel, ListMode, CustomData, Sorter, infraUtils, AutoSuggestionTimeAndDurationFunctionPanelRenderer) {
+], function (jQuery, library, Control, List, JSONModel, mobileLibrary, CustomData, Sorter, infraUtils, DisplayListItem, Panel, Link, Dialog, VerticalLayout, Button, Filter, FilterOperator, SearchField, coreLib, Element, AutoSuggestionTimeAndDurationFunctionPanelRenderer) {
     "use strict";
 
+    var ListMode = mobileLibrary.ListMode;
     var autoSuggestionTimeAndDurationFunctionPanel = Control.extend(
         "sap.rules.ui.ast.autoCompleteContent.AutoSuggestionTimeAndDurationFunctionPanel", {
             metadata: {
@@ -44,8 +56,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 = "";
@@ -68,10 +80,10 @@ sap.ui.define([
                 var that = this;
                 this.vocabularyData = this.getData();
                 // create a Model with this data
-                var model = new sap.ui.model.json.JSONModel();
+                var model = new JSONModel();
 
                 // create a list 
-                this.timeAndDurationFunctionlist = new sap.m.List({
+                this.timeAndDurationFunctionlist = new List({
                     growingScrollToLoad: true,
                     enableBusyIndicator: true,
                 });
@@ -87,10 +99,10 @@ sap.ui.define([
                 // bind the List items to the data collection
                 this.timeAndDurationFunctionlist.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",
@@ -106,7 +118,7 @@ sap.ui.define([
                 var that = this;
 
                 // add list to the panel
-                var timeAndDurationFunctionslistPanel = new sap.m.Panel({
+                var timeAndDurationFunctionslistPanel = new Panel({
                     headerText: this.oBundle.getText("timeAndDurationFunctionsPanelTitle"),
                     expandable: true,
                     expanded: this.getExpand(),
@@ -124,7 +136,7 @@ sap.ui.define([
             getMoreTimeAndDurationLink: function () {
                 var that = this;
                 var suggestionsData = this.getData();
-                var moreTimeAndDurationLink = new sap.m.Link({
+                var moreTimeAndDurationLink = new Link({
                     text: this.oBundle.getText("more_link"),
                     tooltip: this.oBundle.getText("more_link_tooltip"),
                     enabled: true,
@@ -141,7 +153,7 @@ sap.ui.define([
             },
 
             _setModal: function (value) {
-                var pop = sap.ui.getCore().byId("popover");
+                var pop = Element.getElementById("popover");
                 if (pop) {
                     pop.setModal(value);
                 }
@@ -153,11 +165,11 @@ sap.ui.define([
                 var searchField = this.getSearchField(searchFieldText);
                 this.detailedTimeAndDurationList = this.initializeTimeAndDurationList(this.vocabularyData);
                 this.bindFilteredTermsToList(this.detailedTimeAndDurationList, "", false);
-                var verticalLayoutForTimeAndDurationFunction = new sap.ui.layout.VerticalLayout({
+                var verticalLayoutForTimeAndDurationFunction = new VerticalLayout({
                     content: [searchField, that.detailedTimeAndDurationList]
                 }).addStyleClass("sapAstVocabularyPanel");
 
-                this.timeAndDurationDialog = new sap.m.Dialog({
+                this.timeAndDurationDialog = new Dialog({
                     title: this.oBundle.getText("selectTimeAndDurationTitle"),
                     contentWidth: "500px",
                     contentHeight: "500px",
@@ -167,7 +179,7 @@ sap.ui.define([
                         that._dialogOpenedCallbackReference(false);
                     },
                     buttons: [
-                        new sap.m.Button({
+                        new Button({
                             text: this.oBundle.getText("cancelBtn"),
                             tooltip: this.oBundle.getText("cancelBtn"),
                             press: function (event) {
@@ -182,17 +194,17 @@ sap.ui.define([
             },
 
             bindFilteredTermsToList: function (oList, searchText, requireSearch) {
-                var model = new sap.ui.model.json.JSONModel(this.vocabularyData);
+                var model = new JSONModel(this.vocabularyData);
 
                 var that = this;
                 var datapath = "/";
                 if (!oList) {
-                    oList = new sap.m.List({});
+                    oList = new List({});
                 }
                 oList.setModel(model);
                 oList.bindItems({
                     path: datapath,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -210,22 +222,22 @@ sap.ui.define([
                 if (requireSearch) {
                     var filterArray = [];
                     var filterProperty = "name";
-                    filterArray.push(new sap.ui.model.Filter(filterProperty, sap.ui.model.FilterOperator.Contains, searchText));
+                    filterArray.push(new Filter(filterProperty, FilterOperator.Contains, searchText));
                     oList.getBinding("items").filter(filterArray);
                     oList.getModel().refresh(true);
                 }
             },
 
             initializeTimeAndDurationList: function (vocabularyData) {
-                var model = new sap.ui.model.json.JSONModel(vocabularyData);
+                var model = new JSONModel(vocabularyData);
                 var datapath = "/";
-                var timeAndDurationlist = new sap.m.List({
+                var timeAndDurationlist = new List({
                     headerText: this.oBundle.getText("timeAndDuration")
                 });
                 timeAndDurationlist.setModel(model);
                 timeAndDurationlist.bindItems({
                     path: datapath,
-                    template: new sap.m.DisplayListItem({
+                    template: new DisplayListItem({
                         label: "{name}",
                         value: "{label}",
                         type: "Active",
@@ -237,7 +249,7 @@ sap.ui.define([
 
             getSearchField: function (placeHolderText) {
                 var that = this;
-                this.searchField = new sap.m.SearchField({
+                this.searchField = new SearchField({
                     showSearchButton: false,
                     width: "462px",
                     placeholder: placeHolderText, //searchType,