@sapui5/sap.rules.ui 1.121.0 → 1.123.0

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

@@ -2,9 +2,20 @@ sap.ui.define([
     "sap/ui/core/Control",
     "sap/m/List",
     "sap/ui/model/json/JSONModel",
-    "sap/rules/ui/ast/constants/Constants"
-
-], function (Control, List, JSONModel, Constants) {
+    "sap/rules/ui/ast/constants/Constants",
+    "sap/m/Select",
+    "sap/ui/layout/GridData",
+    "sap/ui/core/ListItem",
+    "sap/m/MultiComboBox",
+    "sap/m/TextArea",
+    "sap/m/Text",
+    "sap/ui/layout/form/SimpleForm",
+    "sap/m/Button",
+    "sap/m/Label",
+    "sap/m/Dialog",
+    "sap/ui/core/Lib",
+    "sap/ui/core/Element"
+], function (Control, List, JSONModel, Constants, Select, GridData, ListItem, MultiComboBox, TextArea, Text, SimpleForm, Button, Label, Dialog, coreLib, Element) {
     "use strict";
 
     var instance;
@@ -19,7 +30,7 @@ sap.ui.define([
         this.displayTextVocabulary = "";
         this.jsonDataArray = [];
         this.groupBySelectEnable = true;
-        this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+        this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
     };
 
     AggregateFunctionDialog.prototype._filterAggregateFunction = function (aggregateFunction) {
@@ -39,13 +50,13 @@ sap.ui.define([
     AggregateFunctionDialog.prototype._createFunctionSelectionDropDown = function (aggregateFunction, sAriaValue) {
         var that = this;
         aggregateFunction = this._filterAggregateFunction(aggregateFunction);
-        var model = new sap.ui.model.json.JSONModel(aggregateFunction);
+        var model = new JSONModel(aggregateFunction);
 
-        this.functionSelect = new sap.m.Select({
+        this.functionSelect = new Select({
             selectedKey: this._aggregateFunctionSelected,
             forceSelection: false,
             showSecondaryValues: true,
-            layoutData: new sap.ui.layout.GridData({
+            layoutData: new GridData({
                 span: "L3 M3 S12"
             }),
             ariaLabelledBy: sAriaValue,
@@ -70,7 +81,7 @@ sap.ui.define([
         this.functionSelect.bindItems({
             path: "/aggregate",
             //sorter : new sap.ui.model.Sorter("lastName"),
-            template: new sap.ui.core.ListItem({
+            template: new ListItem({
                 text: "{name}",
                 key: "{name}",
                 additionalText: "{label}"
@@ -111,10 +122,10 @@ sap.ui.define([
         return bIsAttributeFieldEnabled;
     };
     
-    AggregateFunctionDialog.prototype._createVocabularyAstExpression = function (sAriaValue) {
+    AggregateFunctionDialog.prototype._createVocabularyAstExpression = function (sAriaValue, AstExpressionBasic) {
         var that = this;
         var jsonData = [];
-        this.astExpressionBasicForVocabulary = new sap.rules.ui.AstExpressionBasic({
+        this.astExpressionBasicForVocabulary = new AstExpressionBasic({
             value: this._vocabularyExpressionId,
             jsonData: this.jsonDataArray,
             astExpressionLanguage: this._oAstExpressionLanguage,
@@ -272,9 +283,9 @@ sap.ui.define([
         }
     };
 	
-	AggregateFunctionDialog.prototype._createAttributeAstExpressionBasic = function (sAriaValue) {
+	AggregateFunctionDialog.prototype._createAttributeAstExpressionBasic = function (sAriaValue,AstExpressionBasic) {
         var that = this;
-        this.astExpressionBasicForAttributes = new sap.rules.ui.AstExpressionBasic({
+        this.astExpressionBasicForAttributes = new AstExpressionBasic({
             value: this._attributeId,
             astExpressionLanguage: this._oAstExpressionLanguage,
             dataObjectInfo: this._getDataObjectInfoForAttribute(),
@@ -295,13 +306,13 @@ sap.ui.define([
         return this.astExpressionBasicForAttributes;
     };
 
-    AggregateFunctionDialog.prototype._createWhereAstExpressionBasic = function (sAriaValue) {
+    AggregateFunctionDialog.prototype._createWhereAstExpressionBasic = function (sAriaValue, AstExpressionBasic) {
         var that = this;
-        this.oModel = new sap.ui.model.json.JSONModel();
+        this.oModel = new JSONModel();
         this.oModel.setData({
             value: this._whereExpressionId,
         });
-        this.astExpressionBasicForWhere = new sap.rules.ui.AstExpressionBasic({
+        this.astExpressionBasicForWhere = new AstExpressionBasic({
             astExpressionLanguage: this._oAstExpressionLanguage,
             enableAggregateFunctionWhereClause: true,
             value: this._whereExpressionId,
@@ -319,7 +330,7 @@ sap.ui.define([
 
     AggregateFunctionDialog.prototype._createGroupByDropDown = function (sAriaValue) {
         var that = this;
-        this.groupBySelect = new sap.m.MultiComboBox({
+        this.groupBySelect = new MultiComboBox({
             showSecondaryValues: true,
             enabled: that._enableFieldGroupBy(),
             ariaLabelledBy: sAriaValue,
@@ -333,7 +344,7 @@ sap.ui.define([
         }).addStyleClass("sapAstExpressionDialogField");
         this.groupBySelect.bindItems({
             path: "/terms",
-            template: new sap.ui.core.ListItem({
+            template: new ListItem({
                 text: "{label}",
                 key: "{id}"
             })
@@ -354,7 +365,7 @@ sap.ui.define([
                 var autoSuggestion = this._getSuggestionsForTheGivenInput(this.dataObjectId);
             }
             var attributeJson = this._getAttributesForGroupBy(autoSuggestion.autoComplete.categories);
-            var model = new sap.ui.model.json.JSONModel(attributeJson);
+            var model = new JSONModel(attributeJson);
             this.groupBySelect.setModel(model);
         }
         if (this.groupBySelected) {
@@ -378,7 +389,7 @@ sap.ui.define([
     };
 
     AggregateFunctionDialog.prototype._createFunctionLabel = function () {
-        this.functionLabelField = new sap.m.TextArea({
+        this.functionLabelField = new TextArea({
             value: this.functionLabelDisplay,
             enabled: false,
             width: "100%",
@@ -413,147 +424,151 @@ sap.ui.define([
     AggregateFunctionDialog.prototype._createAggregationFunctionDialog = function (data, callBack, AstExpressionLanguage, dialogOpenedCallbackReference, jsonData) {
         var that = this;
         this._clearData();
-        this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+        this.oBundle = coreLib.getResourceBundleFor("sap.rules.ui.i18n");
         this._oAstExpressionLanguage = AstExpressionLanguage;
-        if (jsonData) {
-            this._whereExpressionId = jsonData.filter;
-            this._aggregateFunctionSelected = jsonData.function;
-			this._attributeId = jsonData.attribute;
-            this.functionLabel = jsonData.functionLabel;
-            this.functionLabelDisplay = this._convertFunctionLabelToText(jsonData.dataObject, jsonData.functionLabel);
-            if (jsonData.groupBy) {
-                for (var i = 0; i < jsonData.groupBy.length; i++) {
-                    this.groupBySelected.push(jsonData.groupBy[i].replace("./", ""));
-                }
-            }
-            this._groupBy = jsonData.groupBy;
-            this.dataObjectId = jsonData.dataObject;
-            if (typeof jsonData.vocabulary === "object" || jsonData.vocabulary instanceof Object) {
-                this._vocabularyExpressionId = jsonData.selectExpression;
-                this.jsonDataArray = [jsonData.vocabulary];
-            } else {
-                this._vocabularyExpressionId = jsonData.vocabulary;
-            }
-            this.groupBySelectEnable = (this._aggregateFunctionSelected !== Constants.COUNTDISTINCT && this._aggregateFunctionSelected !== Constants.DISTINCT) ? true : false;
-
-        }
-
-        var oFunctionSelect = that._createFunctionSelectionDropDown(data,"aggregateFunctionSelectLabelId");
-        var oVocabularyText = new sap.m.Text({
-            text: that.oBundle.getText("vocabulary"),
-            tooltip: that.oBundle.getText("vocabulary"),
-            textAlign: "End",
-            width: "90%",
-            layoutData: new sap.ui.layout.GridData({
-                span: "L2 M2 S12"
-            })
-        });
-        var oWhereControl = that._createWhereAstExpressionBasic("aggregateWhereLabelId");
-        var oGroupByControl = that._createGroupByDropDown("aggregateGroupByLabelId");
-        var oAttributeControl = that._createAttributeAstExpressionBasic("aggregateAttributeLabelId");
-        var oFunctionLabelControl = that._createFunctionLabel("aggregateFunctionLabelId");
-
-        var verticalLayoutForAggregateFunction = new sap.ui.layout.form.SimpleForm({
-            layout: sap.ui.layout.form.SimpleFormLayout.ResponsiveGridLayout,
-            editable: true,
-            content: [
-                new sap.m.Label("aggregateFunctionSelectLabelId",{
-                    text: that.oBundle.getText("function"),
-                    tooltip: that.oBundle.getText("function"),
-                    labelFor: oFunctionSelect.getId()
-                }), oFunctionSelect,
-
-                oVocabularyText,
-                that._createVocabularyAstExpression(oVocabularyText.getId()),
-				
-				new sap.m.Label("aggregateAttributeLabelId",{
-                    text: that.oBundle.getText("attribute"),
-                    tooltip: that.oBundle.getText("attribute"),
-                    labelFor: oAttributeControl.getId()
-                }),
-                oAttributeControl,
-
-                new sap.m.Label("aggregateWhereLabelId",{
-                    text: that.oBundle.getText("where"),
-                    tooltip: that.oBundle.getText("where"),
-                    labelFor: oWhereControl.getId()
-                }),
-                oWhereControl,
-                new sap.m.Label("aggregateGroupByLabelId",{
-                    text: that.oBundle.getText("group_by"),
-                    tooltip: that.oBundle.getText("group_by"),
-                    labelFor: oGroupByControl.getId()
-                }),
-                oGroupByControl,
-                new sap.m.Label("aggregateFunctionLabelId",{
-                    text: that.oBundle.getText("function_label"),
-                    tooltip: that.oBundle.getText("function_label"),
-                    labelFor: oFunctionLabelControl.getId()
-                }).addStyleClass("sapAstDialogLabelMargin"),
-                oFunctionLabelControl
-            ]
-        });
+        sap.ui.require([
+                "sap/rules/ui/AstExpressionBasic"
+              ], (AstExpressionBasic) => {
+                    if (jsonData) {
+                                this._whereExpressionId = jsonData.filter;
+                                this._aggregateFunctionSelected = jsonData.function;
+                    			this._attributeId = jsonData.attribute;
+                                this.functionLabel = jsonData.functionLabel;
+                                this.functionLabelDisplay = this._convertFunctionLabelToText(jsonData.dataObject, jsonData.functionLabel);
+                                if (jsonData.groupBy) {
+                                    for (var i = 0; i < jsonData.groupBy.length; i++) {
+                                        this.groupBySelected.push(jsonData.groupBy[i].replace("./", ""));
+                                    }
+                                }
+                                this._groupBy = jsonData.groupBy;
+                                this.dataObjectId = jsonData.dataObject;
+                                if (typeof jsonData.vocabulary === "object" || jsonData.vocabulary instanceof Object) {
+                                    this._vocabularyExpressionId = jsonData.selectExpression;
+                                    this.jsonDataArray = [jsonData.vocabulary];
+                                } else {
+                                    this._vocabularyExpressionId = jsonData.vocabulary;
+                                }
+                                this.groupBySelectEnable = (this._aggregateFunctionSelected !== Constants.COUNTDISTINCT && this._aggregateFunctionSelected !== Constants.DISTINCT) ? true : false;
 
-        var aggregateFunctionsDialog = new sap.m.Dialog({
-            title: this.oBundle.getText("configure_aggr_title"),
-            contentWidth: "800px",
-            showHeader: true,
-            afterOpen: function () {
-                that.astExpressionBasicForWhere.setValue(that._whereExpressionId);
-            },
-            beforeClose: function () {
-                dialogOpenedCallbackReference(false);
-            },
-            content: [verticalLayoutForAggregateFunction],
-            buttons: [
-                this.applyButton = new sap.m.Button({
-                    text: that.oBundle.getText("apply"),
-                    enabled: that._enableField(),
-					tooltip: that.oBundle.getText("applyChangesBtnTooltip"),
-                    press: function (event) {
-                        if (that._isDataObjectStructure() || that._isDataObjectElement()) {
-                            that.astExpressionBasicForVocabulary.setValueState("Error");
-                            that.astExpressionBasicForVocabulary.setValueStateText(that.oBundle.getText("StructureElementNotSupported"));
-                        } else {
-                            that.astExpressionBasicForVocabulary.setValueState("None");
-                            if (that.jsonDataArray && that.jsonDataArray.length > 0) {
-                                var whereExpressionId = that._whereExpressionId;
-								var attributeId = that._attributeId;
-                                var groupBy = that._groupBy;
-                                var aggregateFunctionData = that._createJson(that._aggregateFunctionSelected, that.jsonDataArray[0],
-                                    whereExpressionId, groupBy, that.functionLabel, that.dataObjectId, attributeId);
-                            } else {
-                                var whereExpressionId = that._whereExpressionId;
-								var attributeId = that._attributeId;
-                                var groupBy = that._groupBy
-                                var aggregateFunctionData = that._createJson(that._aggregateFunctionSelected, that._vocabularyExpressionId,
-                                    whereExpressionId, groupBy, that.functionLabel, that.dataObjectId, attributeId);
                             }
 
-                            event.getSource().mProperties = {
-                                value: that.functionLabel,
-                                jsonData: aggregateFunctionData
-                            };
-                            callBack(event);
-                            that._setModal(false);
-                            aggregateFunctionsDialog.close();
-                            aggregateFunctionsDialog.destroy();
-                        }
-                    }
-                }),
-                new sap.m.Button({
-                    text: that.oBundle.getText("cancel"),
-					tooltip: that.oBundle.getText("cancelBtnTooltip"),
-                    press: function (event) {
-                        that._setModal(false);
-                        aggregateFunctionsDialog.close();
-                        aggregateFunctionsDialog.destroy();
-                    }
-                })
-            ]
-        }).addStyleClass("sapUiSizeCompact");
-        this._setModal(true);
-        aggregateFunctionsDialog.open();
+                            var oFunctionSelect = that._createFunctionSelectionDropDown(data,"aggregateFunctionSelectLabelId");
+                            var oVocabularyText = new Text({
+                                text: that.oBundle.getText("vocabulary"),
+                                tooltip: that.oBundle.getText("vocabulary"),
+                                textAlign: "End",
+                                width: "90%",
+                                layoutData: new GridData({
+                                    span: "L2 M2 S12"
+                                })
+                            });
+                            var oWhereControl = that._createWhereAstExpressionBasic("aggregateWhereLabelId", AstExpressionBasic);
+                            var oGroupByControl = that._createGroupByDropDown("aggregateGroupByLabelId");
+                            var oAttributeControl = that._createAttributeAstExpressionBasic("aggregateAttributeLabelId", AstExpressionBasic);
+                            var oFunctionLabelControl = that._createFunctionLabel("aggregateFunctionLabelId");
+
+                            var verticalLayoutForAggregateFunction = new SimpleForm({
+                                layout: "ResponsiveGridLayout",
+                                editable: true,
+                                content: [
+                                    new Label("aggregateFunctionSelectLabelId",{
+                                        text: that.oBundle.getText("function"),
+                                        tooltip: that.oBundle.getText("function"),
+                                        labelFor: oFunctionSelect.getId()
+                                    }), oFunctionSelect,
+
+                                    oVocabularyText,
+                                    that._createVocabularyAstExpression(oVocabularyText.getId(), AstExpressionBasic),
+
+                    				new Label("aggregateAttributeLabelId",{
+                                        text: that.oBundle.getText("attribute"),
+                                        tooltip: that.oBundle.getText("attribute"),
+                                        labelFor: oAttributeControl.getId()
+                                    }),
+                                    oAttributeControl,
+
+                                    new Label("aggregateWhereLabelId",{
+                                        text: that.oBundle.getText("where"),
+                                        tooltip: that.oBundle.getText("where"),
+                                        labelFor: oWhereControl.getId()
+                                    }),
+                                    oWhereControl,
+                                    new Label("aggregateGroupByLabelId",{
+                                        text: that.oBundle.getText("group_by"),
+                                        tooltip: that.oBundle.getText("group_by"),
+                                        labelFor: oGroupByControl.getId()
+                                    }),
+                                    oGroupByControl,
+                                    new Label("aggregateFunctionLabelId",{
+                                        text: that.oBundle.getText("function_label"),
+                                        tooltip: that.oBundle.getText("function_label"),
+                                        labelFor: oFunctionLabelControl.getId()
+                                    }).addStyleClass("sapAstDialogLabelMargin"),
+                                    oFunctionLabelControl
+                                ]
+                            });
+
+                            var aggregateFunctionsDialog = new Dialog({
+                                title: this.oBundle.getText("configure_aggr_title"),
+                                contentWidth: "800px",
+                                showHeader: true,
+                                afterOpen: function () {
+                                    that.astExpressionBasicForWhere.setValue(that._whereExpressionId);
+                                },
+                                beforeClose: function () {
+                                    dialogOpenedCallbackReference(false);
+                                },
+                                content: [verticalLayoutForAggregateFunction],
+                                buttons: [
+                                    this.applyButton = new Button({
+                                        text: that.oBundle.getText("apply"),
+                                        enabled: that._enableField(),
+                    					tooltip: that.oBundle.getText("applyChangesBtnTooltip"),
+                                        press: function (event) {
+                                            if (that._isDataObjectStructure() || that._isDataObjectElement()) {
+                                                that.astExpressionBasicForVocabulary.setValueState("Error");
+                                                that.astExpressionBasicForVocabulary.setValueStateText(that.oBundle.getText("StructureElementNotSupported"));
+                                            } else {
+                                                that.astExpressionBasicForVocabulary.setValueState("None");
+                                                if (that.jsonDataArray && that.jsonDataArray.length > 0) {
+                                                    var whereExpressionId = that._whereExpressionId;
+                    								var attributeId = that._attributeId;
+                                                    var groupBy = that._groupBy;
+                                                    var aggregateFunctionData = that._createJson(that._aggregateFunctionSelected, that.jsonDataArray[0],
+                                                        whereExpressionId, groupBy, that.functionLabel, that.dataObjectId, attributeId);
+                                                } else {
+                                                    var whereExpressionId = that._whereExpressionId;
+                    								var attributeId = that._attributeId;
+                                                    var groupBy = that._groupBy
+                                                    var aggregateFunctionData = that._createJson(that._aggregateFunctionSelected, that._vocabularyExpressionId,
+                                                        whereExpressionId, groupBy, that.functionLabel, that.dataObjectId, attributeId);
+                                                }
+
+                                                event.getSource().mProperties = {
+                                                    value: that.functionLabel,
+                                                    jsonData: aggregateFunctionData
+                                                };
+                                                callBack(event);
+                                                that._setModal(false);
+                                                aggregateFunctionsDialog.close();
+                                                aggregateFunctionsDialog.destroy();
+                                            }
+                                        }
+                                    }),
+                                    new Button({
+                                        text: that.oBundle.getText("cancel"),
+                    					tooltip: that.oBundle.getText("cancelBtnTooltip"),
+                                        press: function (event) {
+                                            that._setModal(false);
+                                            aggregateFunctionsDialog.close();
+                                            aggregateFunctionsDialog.destroy();
+                                        }
+                                    })
+                                ]
+                            }).addStyleClass("sapUiSizeCompact");
+                            this._setModal(true);
+                            aggregateFunctionsDialog.open();
+              });
     };
 
     AggregateFunctionDialog.prototype._returnDataObjectBasedOnType = function (vocabId) {
@@ -637,7 +652,7 @@ sap.ui.define([
     };
     
     AggregateFunctionDialog.prototype._setModal = function (value) {
-        var pop = sap.ui.getCore().byId("popover");
+        var pop = Element.getElementById("popover");
         if (pop) {
             pop.setModal(value);
         }