@sapui5/sap.rules.ui 1.120.1 → 1.122.0

package/src/sap/rules/ui/ast/util/SelectFunctionDialog.js

@@ -3,14 +3,33 @@ sap.ui.define([
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
     "sap/rules/ui/ast/constants/Constants",
-    "sap/rules/ui/parser/infrastructure/util/utilsBase"
-
-], function (Control, List, JSONModel, Constants, infraUtils) {
+    "sap/rules/ui/parser/infrastructure/util/utilsBase",
+    "sap/rules/ui/ast/util/utilsBase",
+    "sap/m/Select",
+    "sap/ui/layout/GridData",
+    "sap/ui/core/ListItem",
+    "sap/m/ColumnListItem",
+    "sap/ui/layout/HorizontalLayout",
+    "sap/m/library",
+    "sap/m/Button",
+    "sap/ui/core/IconPool",
+    "sap/m/TextArea",
+    "sap/m/Table",
+    "sap/m/Column",
+    /*"sap/ui/layout/form/GridContainerData",*/
+    "sap/m/Text",
+    "sap/ui/layout/form/SimpleForm",
+    "sap/m/Label",
+    "sap/m/Dialog",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element"
+], function (Control, List, JSONModel, Constants, infraUtils, utilsBase, Select,GridData, ListItem, ColumnListItem, HorizontalLayout, mobileLibrary, Button, IconPool, TextArea, Table,
+Column,/*GridContainerData,*/ Text, SimpleForm, Label, Dialog, coreLib, Element) {
     "use strict";
 
     var instance;
     var SelectFunctionDialog = function () {
-        this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+        this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
         this.functionLabelDisplay = "";
         this.functionLabel = "";
         this._selectFunctionSelected = "";
@@ -61,14 +80,14 @@ sap.ui.define([
     SelectFunctionDialog.prototype._createFunctionSelectionDropDown = function (selectFunction, sAriaValue) {
         var that = this;
         selectFunction = this._filterSelectFunction(selectFunction);
-        var model = new sap.ui.model.json.JSONModel(selectFunction);
+        var model = new JSONModel(selectFunction);
 
-        this.functionSelect = new sap.m.Select({
+        this.functionSelect = new Select({
             width: "200px",
             selectedKey: this._selectFunctionSelected,
             forceSelection: false,
             showSecondaryValues: true,
-            layoutData: new sap.ui.layout.GridData({
+            layoutData: new GridData({
                 span: "L3 M3 S12"
             }),
             ariaLabelledBy: sAriaValue,
@@ -108,7 +127,7 @@ sap.ui.define([
         this.functionSelect.bindItems({
             path: "/selection",
             //sorter : new sap.ui.model.Sorter("lastName"),
-            template: new sap.ui.core.ListItem({
+            template: new ListItem({
                 text: "{name}",
                 key: "{name}",
                 additionalText: "{label}"
@@ -118,9 +137,9 @@ sap.ui.define([
         return this.functionSelect;
     };
 
-    SelectFunctionDialog.prototype._getAttributeAstExpressionBasic = function (sAriaValue) {
+    SelectFunctionDialog.prototype._getAttributeAstExpressionBasic = function (sAriaValue, AstExpressionBasic) {
         var that = this;
-        this.astExpressionBasicForAttribute = new sap.rules.ui.AstExpressionBasic({
+        this.astExpressionBasicForAttribute = new AstExpressionBasic({
             astExpressionLanguage: this._oAstExpressionLanguage,
             enableAggregateFunctionWhereClause: true,
             value: "{attributeSelected}",
@@ -174,15 +193,15 @@ sap.ui.define([
         return false;
     };
 
-    SelectFunctionDialog.prototype._tableColumnsFactory = function (sId, oContext) {
+    SelectFunctionDialog.prototype._tableColumnsFactory = function (AstExpressionBasic) {
         var that = this;
-        var itemTemplate = new sap.m.ColumnListItem({
-            cells: [that._getAttributeAstExpressionBasic("selectAttributeLabelId" + that.selectLabelUUID),
-                new sap.m.Select({
+        var itemTemplate = new ColumnListItem({
+            cells: [that._getAttributeAstExpressionBasic("selectAttributeLabelId" + that.selectLabelUUID, AstExpressionBasic),
+                new Select({
                     enabled: "{/enabledData/enabled}",
                     items: {
                         path: "/sortOrder",
-                        template: new sap.ui.core.ListItem({
+                        template: new ListItem({
                             key: '{name}',
                             text: '{label}'
                         })
@@ -196,11 +215,11 @@ sap.ui.define([
                     width: '200px',
                     tooltip: that.oBundle.getText("sort_attributes_tooltip"),
                 }).addStyleClass("sapAstExpressionDialogField sapAstExpressionSortSelect"),
-                new sap.ui.layout.HorizontalLayout({
+                new HorizontalLayout({
                     content: [
-                        new sap.m.Button({
-                            type: sap.m.ButtonType.Transparent,
-                            icon: sap.ui.core.IconPool.getIconURI("sys-cancel"),
+                        new Button({
+                            type: mobileLibrary.ButtonType.Transparent,
+                            icon: IconPool.getIconURI("sys-cancel"),
                             visible: "{cancelButton}",
                             enabled: "{/enabledData/enabled}",
                             press: function (oEvent) {
@@ -213,9 +232,9 @@ sap.ui.define([
 
                             }.bind(this)
                         }),
-                        new sap.m.Button({
-                            type: sap.m.ButtonType.Transparent,
-                            icon: sap.ui.core.IconPool.getIconURI("add"),
+                        new Button({
+                            type: mobileLibrary.ButtonType.Transparent,
+                            icon: IconPool.getIconURI("add"),
                             visible: "{addButton}",
                             enabled: "{/enabledData/enabled}",
                             press: function (oEvent) {
@@ -288,14 +307,14 @@ sap.ui.define([
         var that = this;
         var autoSuggestion = this._getSuggestionsForTheGivenInput("");
         var aDataObject = autoSuggestion.autoComplete.categories;
-        var model = new sap.ui.model.json.JSONModel(aDataObject);
+        var model = new JSONModel(aDataObject);
 
-        this.vocabularySelect = new sap.m.Select({
+        this.vocabularySelect = new Select({
             width: "200px",
             selectedKey: this.dataObjectIdSelected,
             forceSelection: false,
             ariaLabelledBy: sAriaValue,
-            layoutData: new sap.ui.layout.GridData({
+            layoutData: new GridData({
                 span: "L3 M3 S12"
             }),
             change: function (oEvent) {
@@ -344,7 +363,7 @@ sap.ui.define([
         this.vocabularySelect.bindItems({
             path: "/terms",
             //sorter : new sap.ui.model.Sorter("lastName"),
-            template: new sap.ui.core.ListItem({
+            template: new ListItem({
                 text: "{label}",
                 key: "{id}"
             })
@@ -352,7 +371,7 @@ sap.ui.define([
         // Add Rules to the same path so that the dataobjects list contain rules as well
         var vocabularyRules = autoSuggestion.autoComplete.categories.vocabularyRules;
         for(var entry in vocabularyRules){
-        	var item = new sap.ui.core.ListItem({
+        	var item = new ListItem({
                 text: vocabularyRules[entry].label,
                 key: vocabularyRules[entry].id
             })
@@ -365,7 +384,7 @@ sap.ui.define([
 
     SelectFunctionDialog.prototype._bindAttributes = function () {
         /*if (this.dataObjectId) {*/
-        this.oModel = new sap.ui.model.json.JSONModel();
+        this.oModel = new JSONModel();
         this.oModel.setData({
             sortOrder: this.sortOrder,
             selectionData: this.selectedData,
@@ -384,9 +403,9 @@ sap.ui.define([
             this.conditionsTable.setModel(this.oModel);
         }*/
     };
-    SelectFunctionDialog.prototype._createWhereAstExpressionBasic = function (sAriaValue) {
+    SelectFunctionDialog.prototype._createWhereAstExpressionBasic = function (sAriaValue, AstExpressionBasic) {
         var that = this;
-        this.astExpressionBasicForWhere = new sap.rules.ui.AstExpressionBasic({
+        this.astExpressionBasicForWhere = new AstExpressionBasic({
             astExpressionLanguage: this._oAstExpressionLanguage,
             enableAggregateFunctionWhereClause: true,
             value: this._whereExpressionId,
@@ -409,7 +428,7 @@ sap.ui.define([
         }
     };
     SelectFunctionDialog.prototype._createFunctionLabel = function () {
-        this.functionLabelField = new sap.m.TextArea({
+        this.functionLabelField = new TextArea({
             value: this.functionLabelDisplay,
             enabled: false,
             width: "100%"
@@ -453,31 +472,31 @@ sap.ui.define([
         };
     }
 
-    SelectFunctionDialog.prototype._createTable = function () {
+    SelectFunctionDialog.prototype._createTable = function (AstExpressionBasic) {
         var that = this;
-        this.conditionsTable = new sap.m.Table({
-            backgroundDesign: sap.m.BackgroundDesign.Solid,
-            showSeparators: sap.m.ListSeparators.None,
-            layoutData: new sap.ui.layout.form.GridContainerData({
+        this.conditionsTable = new Table({
+            backgroundDesign: mobileLibrary.BackgroundDesign.Solid,
+            showSeparators: mobileLibrary.ListSeparators.None,
+            /*layoutData: new sap.ui.layout.form.GridContainerData({
                 halfGrid: false
-            }),
+            }),*/
             columns: [
-                new sap.m.Column({
+                new Column({
                     width: "50%"
                 }).setStyleClass("sapAstAttributeColumn"),
 
-                new sap.m.Column({
+                new Column({
                     width: "25%"
                 }).setStyleClass("sapAstSortColumn"),
 
-                new sap.m.Column({
+                new Column({
                     width: "20%"
                 })
             ]
         }).addStyleClass("sapAstAttributeTable");
 
         this._bindAttributes();
-        var itemTemplate = that._tableColumnsFactory();
+        var itemTemplate = that._tableColumnsFactory(AstExpressionBasic);
         this.conditionsTable.bindItems("/selectionData", itemTemplate);
 
         return this.conditionsTable;
@@ -485,11 +504,11 @@ sap.ui.define([
 
     SelectFunctionDialog.prototype._createCountField = function (sAriaValue) {
         var that = this;
-        this._countField = new sap.m.TextArea({
+        this._countField = new TextArea({
             value: that._count,
             enabled: this.enableCountField,
             ariaLabelledBy: sAriaValue,
-            layoutData: new sap.ui.layout.GridData({
+            layoutData: new GridData({
                 span: "L1 M1 S12"
             }),
             change: function (oEvent) {
@@ -532,150 +551,154 @@ sap.ui.define([
         this._clearData();
         //create a uuid and append to the existing id to enable Select within Select as the Id becomes duplicate.
         this.selectLabelUUID = this._createUUId();
-        this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+        this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
         this._oAstExpressionLanguage = AstExpressionLanguage;
-        if (jsonData) {
-            this._selectFunctionSelected = jsonData.function;
-            this._whereExpressionId = jsonData.filter;
-            this.dataObjectId = jsonData.dataObject;
-            this.functionLabel = jsonData.functionLabel;
-            this.dataObjectIdSelected = jsonData.dataObject.replace("/", "");
-            this.attributeJson = jsonData.attributes;
-            if (jsonData.count) {
-                this._count = jsonData.count;
-                this.enableCountField = true;
-            }
-            that.functionLabelDisplay = this._convertFunctionLabelToText(jsonData.dataObject, jsonData.functionLabel);;
-            if (this.dataObjectId) {
-                var dataObjectWithCommonInfo = this._returnDataObjectBasedOnCommonAssociationoReferenceSelection(jsonData.doVocabId, jsonData.attributes);
-                this.attributeJson = this._addTableIdFromAttribute(jsonData.attributes, dataObjectWithCommonInfo, this.dataObjectId);
-                this.dataObjectIdData.dataObjectId = this.dataObjectId;
-                this.enabledData.enabled = true;
-                this.termsProvider = this._oAstExpressionLanguage._astBunldeInstance.TermsProvider.TermsProvider;
-                this.dataObjectLabel = this.termsProvider.getTermNameFromASTNodeReference(this.dataObjectId);
-            }
-            if (!jQuery.isEmptyObject(this.attributeJson)) {
-                this.selectedData = [];
-                for (var key in this.attributeJson) {
-                    var newjson = {
-                        attributeSelected: "",
-                        sortOrder: Constants.NOSORT,
-                        cancelButton: true,
-                        addButton: true,
-                    }
-                    newjson.attributeSelected = key;
-                    newjson.sortOrder = this.attributeJson[key];
-                    this.selectedData.push(newjson);
-                    sequence++;
-                }
-                if (sequence === 1) {
-                    this.selectedData[0].cancelButton = false;
-                }
-            }
-            if (this._selectFunctionSelected === Constants.SELECT) {
-                this.enableCountField = false;
-            }
-
-        }
+        sap.ui.require([
+                "sap/rules/ui/AstExpressionBasic"
+              ], (AstExpressionBasic) => {
+                if (jsonData) {
+                            this._selectFunctionSelected = jsonData.function;
+                            this._whereExpressionId = jsonData.filter;
+                            this.dataObjectId = jsonData.dataObject;
+                            this.functionLabel = jsonData.functionLabel;
+                            this.dataObjectIdSelected = jsonData.dataObject.replace("/", "");
+                            this.attributeJson = jsonData.attributes;
+                            if (jsonData.count) {
+                                this._count = jsonData.count;
+                                this.enableCountField = true;
+                            }
+                            that.functionLabelDisplay = this._convertFunctionLabelToText(jsonData.dataObject, jsonData.functionLabel);;
+                            if (this.dataObjectId) {
+                                var dataObjectWithCommonInfo = this._returnDataObjectBasedOnCommonAssociationoReferenceSelection(jsonData.doVocabId, jsonData.attributes);
+                                this.attributeJson = this._addTableIdFromAttribute(jsonData.attributes, dataObjectWithCommonInfo, this.dataObjectId);
+                                this.dataObjectIdData.dataObjectId = this.dataObjectId;
+                                this.enabledData.enabled = true;
+                                this.termsProvider = this._oAstExpressionLanguage._astBunldeInstance.TermsProvider.TermsProvider;
+                                this.dataObjectLabel = this.termsProvider.getTermNameFromASTNodeReference(this.dataObjectId);
+                            }
+                            if (!jQuery.isEmptyObject(this.attributeJson)) {
+                                this.selectedData = [];
+                                for (var key in this.attributeJson) {
+                                    var newjson = {
+                                        attributeSelected: "",
+                                        sortOrder: Constants.NOSORT,
+                                        cancelButton: true,
+                                        addButton: true,
+                                    }
+                                    newjson.attributeSelected = key;
+                                    newjson.sortOrder = this.attributeJson[key];
+                                    this.selectedData.push(newjson);
+                                    sequence++;
+                                }
+                                if (sequence === 1) {
+                                    this.selectedData[0].cancelButton = false;
+                                }
+                            }
+                            if (this._selectFunctionSelected === Constants.SELECT) {
+                                this.enableCountField = false;
+                            }
 
-        var functionSelect = that._createFunctionSelectionDropDown(data,"selectFunctionSelectionLabelId", + that.selectLabelUUID);
-        var countText = new sap.m.Text({
-            text: "Count",
-            tooltip: "Count",
-            textAlign: "End",
-            layoutData: new sap.ui.layout.GridData({
-                span: "L1 M1 S12"
-            })
-        });
-        var oVocabularyText = new sap.m.Text({
-            text: that.oBundle.getText("vocabulary"),
-            tooltip: that.oBundle.getText("vocabulary"),
-            textAlign: "End",
-            layoutData: new sap.ui.layout.GridData({
-                span: "L2 M2 S12"
-            })
-        });
-        var attributeTable = that._createTable();
-        var oWhereControl = that._createWhereAstExpressionBasic("selectWhereLabelId" + that.selectLabelUUID);
-        var oFunctionLabelControl = that._createFunctionLabel();
-
-        var verticalLayoutForSelectFunction = new sap.ui.layout.form.SimpleForm({
-            layout: sap.ui.layout.form.SimpleFormLayout.ResponsiveGridLayout,
-            editable: true,
-            content: [
-                new sap.m.Label("selectFunctionSelectionLabelId" + that.selectLabelUUID ,{
-                    text: that.oBundle.getText("function"),
-                    tooltip: that.oBundle.getText("function"),
-                    labelFor: functionSelect.getId()
-                }), functionSelect,
-                countText,
-                that._createCountField(countText.getId()),
-                oVocabularyText,
-                that._createDataObjectDropDown(oVocabularyText.getId()),
-
-                new sap.m.Label("selectAttributeLabelId" + that.selectLabelUUID ,{
-                    text: that.oBundle.getText("attributes"),
-                    tooltip: that.oBundle.getText("attributes"),
-                    labelFor: attributeTable.getId()
-                }).addStyleClass("sapAstAttributeLabel"),
-                attributeTable,
-                new sap.m.Label("selectWhereLabelId" + that.selectLabelUUID,{
-                    text: that.oBundle.getText("where"),
-                    tooltip: that.oBundle.getText("where"),
-                    labelFor: oWhereControl.getId()
-                }),
-                oWhereControl,
-                new sap.m.Label({
-                    text: that.oBundle.getText("function_label"),
-                    tooltip: that.oBundle.getText("function_label"),
-                    labelFor: oFunctionLabelControl.getId()
-                }),
-                oFunctionLabelControl
-            ]
-        });
+                        }
 
-        var selectFunctionsDialog = new sap.m.Dialog({
-            title: this.oBundle.getText("selectFunctionTitle"),
-            contentWidth: "800px",
-            showHeader: true,
-            draggable: true,
-            beforeClose: function () {
-					dialogOpenedCallbackReference(false);
-				},
-            content: [verticalLayoutForSelectFunction],
-            buttons: [
-                this.applyButton = new sap.m.Button({
-                    text: this.oBundle.getText("apply"),
-					tooltip: this.oBundle.getText("applyChangesBtnTooltip"),
-                    press: function (event) {
-                        var selectFunctionData = that._createJson()
-                        event.getSource().mProperties = {
-                            value: that.functionLabel,
-                            jsonData: selectFunctionData
-                        };
-                        callBack(event);
-						that._setModal(false);
-                        selectFunctionsDialog.close();
-                        selectFunctionsDialog.destroy();
-                    }
-                }),
-                new sap.m.Button({
-                    text: this.oBundle.getText("cancel"),
-					tooltip: this.oBundle.getText("cancelBtnTooltip"),
-                    press: function (event) {
-						that._setModal(false);
-                        selectFunctionsDialog.close();
-                        selectFunctionsDialog.destroy();
-                    }
-                })
-            ]
-        }).addStyleClass("sapUiSizeCompact");;
-        that._setModal(true);
-        selectFunctionsDialog.open();
+                        var functionSelect = that._createFunctionSelectionDropDown(data,"selectFunctionSelectionLabelId", + that.selectLabelUUID);
+                        var countText = new Text({
+                            text: "Count",
+                            tooltip: "Count",
+                            textAlign: "End",
+                            layoutData: new GridData({
+                                span: "L1 M1 S12"
+                            })
+                        });
+                        var oVocabularyText = new Text({
+                            text: that.oBundle.getText("vocabulary"),
+                            tooltip: that.oBundle.getText("vocabulary"),
+                            textAlign: "End",
+                            layoutData: new GridData({
+                                span: "L2 M2 S12"
+                            })
+                        });
+                        var attributeTable = that._createTable(AstExpressionBasic);
+                        var oWhereControl = that._createWhereAstExpressionBasic("selectWhereLabelId" + that.selectLabelUUID, AstExpressionBasic);
+                        var oFunctionLabelControl = that._createFunctionLabel();
+
+                        var verticalLayoutForSelectFunction = new SimpleForm({
+                            layout: "ResponsiveGridLayout",
+                            editable: true,
+                            content: [
+                                new Label("selectFunctionSelectionLabelId" + that.selectLabelUUID ,{
+                                    text: that.oBundle.getText("function"),
+                                    tooltip: that.oBundle.getText("function"),
+                                    labelFor: functionSelect.getId()
+                                }), functionSelect,
+                                countText,
+                                that._createCountField(countText.getId()),
+                                oVocabularyText,
+                                that._createDataObjectDropDown(oVocabularyText.getId(), AstExpressionBasic),
+
+                                new Label("selectAttributeLabelId" + that.selectLabelUUID ,{
+                                    text: that.oBundle.getText("attributes"),
+                                    tooltip: that.oBundle.getText("attributes"),
+                                    labelFor: attributeTable.getId()
+                                }).addStyleClass("sapAstAttributeLabel"),
+                                attributeTable,
+                                new Label("selectWhereLabelId" + that.selectLabelUUID,{
+                                    text: that.oBundle.getText("where"),
+                                    tooltip: that.oBundle.getText("where"),
+                                    labelFor: oWhereControl.getId()
+                                }),
+                                oWhereControl,
+                                new Label({
+                                    text: that.oBundle.getText("function_label"),
+                                    tooltip: that.oBundle.getText("function_label"),
+                                    labelFor: oFunctionLabelControl.getId()
+                                }),
+                                oFunctionLabelControl
+                            ]
+                        });
+
+                        var selectFunctionsDialog = new Dialog({
+                            title: this.oBundle.getText("selectFunctionTitle"),
+                            contentWidth: "800px",
+                            showHeader: true,
+                            draggable: true,
+                            beforeClose: function () {
+                					dialogOpenedCallbackReference(false);
+                				},
+                            content: [verticalLayoutForSelectFunction],
+                            buttons: [
+                                this.applyButton = new Button({
+                                    text: this.oBundle.getText("apply"),
+                					tooltip: this.oBundle.getText("applyChangesBtnTooltip"),
+                                    press: function (event) {
+                                        var selectFunctionData = that._createJson()
+                                        event.getSource().mProperties = {
+                                            value: that.functionLabel,
+                                            jsonData: selectFunctionData
+                                        };
+                                        callBack(event);
+                						that._setModal(false);
+                                        selectFunctionsDialog.close();
+                                        selectFunctionsDialog.destroy();
+                                    }
+                                }),
+                                new Button({
+                                    text: this.oBundle.getText("cancel"),
+                					tooltip: this.oBundle.getText("cancelBtnTooltip"),
+                                    press: function (event) {
+                						that._setModal(false);
+                                        selectFunctionsDialog.close();
+                                        selectFunctionsDialog.destroy();
+                                    }
+                                })
+                            ]
+                        }).addStyleClass("sapUiSizeCompact");;
+                        that._setModal(true);
+                        selectFunctionsDialog.open();
+              });
     };
 	
 	SelectFunctionDialog.prototype._setModal = function (value) {
-        var pop = sap.ui.getCore().byId("popover");
+        var pop = Element.getElementById("popover");
         if (pop) {
             pop.setModal(value);
         }
@@ -965,7 +988,7 @@ sap.ui.define([
 	};
 	
 	SelectFunctionDialog.prototype._createUUId = function () {
-		this.infraUtils = new sap.rules.ui.parser.infrastructure.util.utilsBase.utilsBaseLib();
+		this.infraUtils = new utilsBase.utilsBaseLib();
 		return this.infraUtils.createUUID()
     };
 

package/src/sap/rules/ui/ast/util/utilsBase.js

@@ -0,0 +1,85 @@
+sap.ui.define([
+	"sap/rules/ui/ast/constants/Constants"
+], function(utilConstantsLib) {
+    "use strict";
+    
+    function utilsBaseLib() {
+		//Constructor to enable usage of public method on the client side.
+		//This mechanism was used in HRF to enable association to corresponding namespace in the client side.
+	}
+	
+	utilsBaseLib.prototype.buildJsonPath = function(prefix, property, propertyIndex){
+		var path = '';
+		
+		//adding prefix
+		if(prefix === null || prefix === undefined){
+			path += utilConstantsLib.JSON_PATH_ROOT;
+		}
+		else{
+			path += prefix;
+		}
+		
+		//adding additional property
+		path += '.' + property;
+		
+		//adding property index in case property is a collection
+		if(propertyIndex !== null && 
+		   propertyIndex !== undefined && 
+		   propertyIndex >= 0){
+			path += '[' + propertyIndex + ']';
+		}
+		
+		return path;
+	};
+	
+	utilsBaseLib.prototype.setJsonValueAccordingPath = function (jsonObj, jsonPath, propToAddName, objToAdd){
+		var pathArray = jsonPath.replace(/\[/g, '.').replace(/\]/g, '').split('.');
+		var i, jsonIndex;
+		var currObj = jsonObj;
+		
+		for(i = 1; i < pathArray.length; i++){ //starting after $
+			jsonIndex = parseInt(pathArray[i], 10);
+			
+			if(jsonIndex >= 0){ //A number
+				currObj = currObj[jsonIndex];
+			}
+			else{ //A property
+				currObj = currObj[pathArray[i]];
+			}
+		}
+		
+		if(currObj){
+			currObj[propToAddName] = objToAdd;
+		}
+	};
+	
+	// Creates 32-char UUID
+	utilsBaseLib.prototype.createUUID = function() {
+		var result, i, j;
+		result = '';
+		for (j = 0; j < 32; j++) {
+			// SECURITY CODE SCAN:
+			// Must use Math.random (), because In XS JavaScript there is no currently
+			// solution for a robust cryptographic PRNG
+			i = Math.floor(Math.random() * 16).toString(16);
+			result = result + i;
+		}
+		return result;
+	};
+	
+
+	utilsBaseLib.prototype.findObjectById = function (objectId, array) {
+		var result = null;
+		for (var i = 0; i < array.length; i++) { 
+		  if (array[i].id === objectId) { 
+		    result = array[i];
+		    break;
+		  } 
+		}
+		return result;
+	};
+	
+	return {
+		utilsBaseLib: utilsBaseLib
+	}; 
+}, true);

package/src/sap/rules/ui/codemirror/addon/hint/show-hint.js

@@ -265,10 +265,14 @@
 		},
 
 		_setModal : function(value){
-			var pop = sap.ui.getCore().byId("popover");
-				if (pop) {
-					pop.setModal(value);
-				}
+			sap.ui.require([
+                 "sap/ui/core/Element"
+                      ], (Element) => {
+        			  var pop = Element.getElementById("popover");
+                      if (pop) {
+                      	pop.setModal(value);
+                      	}
+			});
 		},
 
 		showHints: function(data) {