@easyquery/ui 7.2.0-rc03 → 7.2.0-rc07

package/dist/browser/eq.view.css

@@ -1,6 +1,6 @@
 /** 
- * EasyQuery.JS Community 7.2.0-rc03 (https://korzh.com/easyquery/javascript)
- * Copyright 2021 Korzh.com. All rights reserved.
+ * EasyQuery.JS Community 7.2.0-rc07 (https://korzh.com/easyquery/javascript)
+ * Copyright 2022 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
  * https://korzh.com/easyquery/javascript#LIC or as a part of 

package/dist/browser/eq.view.min.css

@@ -1,6 +1,6 @@
 /** 
- * EasyQuery.JS Community 7.2.0-rc03 (https://korzh.com/easyquery/javascript)
- * Copyright 2021 Korzh.com. All rights reserved.
+ * EasyQuery.JS Community 7.2.0-rc07 (https://korzh.com/easyquery/javascript)
+ * Copyright 2022 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
  * https://korzh.com/easyquery/javascript#LIC or as a part of 

package/dist/bundles/easyquery.ui.js

@@ -1567,6 +1567,7 @@ var meta_entity_MetaEntityAttr = /** @class */ (function () {
             this.lookupEntity = dto.lent;
             this.dataAttr = dto.dattr;
             this.lookupDataAttr = dto.ldattr;
+            this.defaultValue = dto.defVal;
             this.isNullable = utils_utils.getIfDefined(dto.nul, this.isNullable);
             this.isEditable = utils_utils.getIfDefined(dto.ied, this.isEditable);
             this.showOnView = utils_utils.getIfDefined(dto.ivis || dto.sov, this.showOnView);
@@ -3579,6 +3580,10 @@ var DomSelectElementBuilder = /** @class */ (function (_super) {
         this.element.appendChild(option);
         return this;
     };
+    DomSelectElementBuilder.prototype.value = function (value) {
+        this.element.value = value;
+        return this;
+    };
     return DomSelectElementBuilder;
 }(DomElementBuilder));
 
@@ -11331,7 +11336,6 @@ var column_renderer_cb_ColumnRendererCB = /** @class */ (function () {
             .toDOM();
     };
     ColumnRendererCB.prototype.getDefaultCaption = function () {
-        console.log('Calling getDefaultCaption() BASE');
         return this.getDefaultTitleText(this.baseAttr);
     };
     ColumnRendererCB.prototype.getDefaultTitleText = function (attr) {
@@ -11688,7 +11692,6 @@ var aggrfunc_column_renderer_AggrFuncColumnRendererCB = /** @class */ (function
             .getAttributeByIdSafe(this.column.expr.args[0].value);
     };
     AggrFuncColumnRendererCB.prototype.getDefaultCaption = function () {
-        console.log('Calling getDefaultCaption() AGGR');
         return this.getDefaultTitleText(this.baseAttr) + ' '
             + this.bar.getContext().getModel().getAggrFunctionCaption(this.column.expr.func);
     };
@@ -16436,21 +16439,6 @@ var easy_grid_widget_EasyGridWidget = /** @class */ (function (_super) {
         this.grid.refresh();
     };
     EasyGridWidget.prototype.attachQueryObserver = function () {
-        var _this = this;
-        var query = this.getQuery();
-        this.queryEventCallbackId = query.addChangedCallback(function (event) {
-            //if something has changed, and that change is related to columns
-            var edata = event.data;
-            if (!edata || (edata.part != external_easyqueryCore_["QueryChangePart"].Columns && edata.part != external_easyqueryCore_["QueryChangePart"].All)) {
-                return;
-            }
-            if (event.data.source == _this) {
-                _this.grid.refresh();
-            }
-            else {
-                _this.refresh();
-            }
-        });
     };
     EasyGridWidget.prototype.destroyCore = function () {
         this.detachQueryObserver();
@@ -18196,6 +18184,12 @@ var AggrFunc;
     AggrFunc["Max"] = "MAX";
     AggrFunc["Count"] = "COUNT";
 })(AggrFunc || (AggrFunc = {}));
+var FormFieldType;
+(function (FormFieldType) {
+    FormFieldType[FormFieldType["ColumnField"] = 0] = "ColumnField";
+    FormFieldType[FormFieldType["RowField"] = 1] = "RowField";
+    FormFieldType[FormFieldType["CellData"] = 2] = "CellData";
+})(FormFieldType || (FormFieldType = {}));
 var DFMT_REGEX = /{0:(.*?)}/g;
 var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
     pivot_table_facet_extends(PivotTableFacet, _super);
@@ -18284,9 +18278,10 @@ var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
         }
         return csb;
     };
-    PivotTableFacet.prototype.createColumnsSelectBuilder = function (allowedTypes, colName) {
+    PivotTableFacet.prototype.createColumnsSelectBuilder = function (allowedTypes, colName, formFieldType) {
         var dataTable = this.getContextDataTable();
         var csb = Object(lib_public_api["i" /* domel */])('select');
+        var firstNumericColIndex = null;
         var _loop_2 = function (i) {
             var column = dataTable.columns.get(i);
             var colLabel = column.label;
@@ -18294,6 +18289,9 @@ var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
             var colId = column.id;
             if (allowedTypes && allowedTypes.indexOf(colType) < 0)
                 return "continue";
+            if (firstNumericColIndex === null && public_api["i" /* utils */].isNumericType(colType)) {
+                firstNumericColIndex = i;
+            }
             csb.addChild('option', function (b) {
                 b
                     .attr('value', colId)
@@ -18315,7 +18313,20 @@ var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
                 }
             }
             else {
-                csb.toDOM().value = options[0].value;
+                switch (formFieldType) {
+                    case FormFieldType.ColumnField: {
+                        csb.toDOM().value = options[0].value;
+                        break;
+                    }
+                    case FormFieldType.RowField: {
+                        csb.toDOM().value = options.length > 1 ? options[1].value : options[0].value;
+                        break;
+                    }
+                    case FormFieldType.CellData: {
+                        csb.toDOM().value = firstNumericColIndex === null ? options[0].value : options[firstNumericColIndex].value;
+                        break;
+                    }
+                }
             }
         }
         return csb;
@@ -18360,7 +18371,7 @@ var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
             .addChild('div', function (b) { return b
             .addClass('kfrm-select')
             .attr('name', 'column_field')
-            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.colName)
+            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.colName, FormFieldType.ColumnField)
             .id('pivotTableColFieldSelector')
             .toDOM()); })
             .addChild('button', function (b) { return b
@@ -18382,7 +18393,7 @@ var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
             .addChild('div', function (b) { return b
             .addClass('kfrm-select')
             .attr('name', 'row_field')
-            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.rowName)
+            .addChildElement(_this.createColumnsSelectBuilder(colTypes, settings.rowName, FormFieldType.RowField)
             .id('pivotTableRowFieldSelector')
             .toDOM()); });
         current = getCurrent();
@@ -18402,7 +18413,7 @@ var pivot_table_facet_PivotTableFacet = /** @class */ (function (_super) {
             .addChild('div', function (b) { return b
             .addClass('kfrm-select')
             .attr('name', 'data_column')
-            .addChildElement(_this.createColumnsSelectBuilder(fieldTypes, settings.fieldName)
+            .addChildElement(_this.createColumnsSelectBuilder(fieldTypes, settings.fieldName, FormFieldType.CellData)
             .on('change', function (ev) {
             var colId = ev.target.value;
             _this.validateSelectedField(colId);
@@ -19678,10 +19689,10 @@ var aggr_settings_renderer_AggrSettingsRenderer = /** @class */ (function () {
             b.on('change', _this.countsCheckboxChangeHandler.bind(_this));
         })
             .addChild('span', function (b) { return b
-            .addClass('slider round'); }); })
+            .addClass('slider round'); })
             .addChild('span', function (b) { return b
             .addClass('switch-text')
-            .addText(external_easyqueryCore_["i18n"].getText('AggrSettings', 'GroupCountsLabel')); }); })
+            .addText(external_easyqueryCore_["i18n"].getText('AggrSettings', 'GroupCountsLabel')); }); }); })
             .addChild('div', function (b) { return b
             .addClass(_this.cssPrefix + "-grandtotals")
             .addChild('label', function (b) { return b
@@ -19694,10 +19705,10 @@ var aggr_settings_renderer_AggrSettingsRenderer = /** @class */ (function () {
             b.on('change', _this.grandCheckboxChangeHandler.bind(_this));
         })
             .addChild('span', function (b) { return b
-            .addClass('slider round'); }); })
+            .addClass('slider round'); })
             .addChild('span', function (b) { return b
             .addClass('switch-text')
-            .addText(external_easyqueryCore_["i18n"].getText('AggrSettings', 'GrandTotalsLabel')); }); });
+            .addText(external_easyqueryCore_["i18n"].getText('AggrSettings', 'GrandTotalsLabel')); }); }); });
         var groups = this.slot.querySelectorAll("." + this.cssPrefix + "-group");
         groups.forEach(function (el) {
             Object(lib_public_api["i" /* domel */])(el)
@@ -19985,7 +19996,7 @@ var aggr_settings_dialog_AggrSettingsDialog = /** @class */ (function () {
                 var ds = _this.context.getServices().getDialogService();
                 _this.body = _this.renderBody();
                 var dlg = ds.open({
-                    title: 'Aggregation settings',
+                    title: external_easyqueryCore_["i18n"].getText('AggrSettings', 'AggrDialogTitle'),
                     body: _this.body,
                     onSubmit: function () {
                         if (_this.query.enableAggregation && !_this.renderer.isValid())
@@ -20046,10 +20057,10 @@ var aggr_settings_dialog_AggrSettingsDialog = /** @class */ (function () {
             b.on('change', _this.enableAggrCheckBoxChangeHandler.bind(_this));
         })
             .addChild('span', function (b) { return b
-            .addClass('slider round'); }); })
+            .addClass('slider round'); })
             .addChild('span', function (b) { return b
             .addClass('switch-text')
-            .addText(external_easyqueryCore_["i18n"].getText('AggrSettings', 'EnableAggrLabel')); }); })
+            .addText(external_easyqueryCore_["i18n"].getText('AggrSettings', 'EnableAggrLabel')); }); }); })
             .addChild('div', function (b) { return b
             .id('AggrSettingsComponent'); });
         return b.toDOM();
@@ -20684,6 +20695,10 @@ var view_View = /** @class */ (function () {
     View.prototype.fetchData = function (options) {
         var _this = this;
         options = options || { refresh: true };
+        this.context.clearResult();
+        //don't run fetch if the query is empty
+        if (this.context.getQuery().isEmpty() && !this.resultOptions.fetchEmptyQueries)
+            return;
         this.showResultSpinner();
         this.context.fetchData({
             elasticPaging: options.elasticPaging,
@@ -21693,7 +21708,9 @@ var data_filter_view_extends = (undefined && undefined.__extends) || (function (
 var data_filter_view_DataFilterView = /** @class */ (function (_super) {
     data_filter_view_extends(DataFilterView, _super);
     function DataFilterView() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super.call(this) || this;
+        _this.resultOptions.fetchEmptyQueries = true;
+        return _this;
     }
     DataFilterView.prototype.initOptions = function (options) {
         var _this = this;
@@ -21771,7 +21788,9 @@ var html_data_filter_view_extends = (undefined && undefined.__extends) || (funct
 var html_data_filter_view_HtmlDataFilterView = /** @class */ (function (_super) {
     html_data_filter_view_extends(HtmlDataFilterView, _super);
     function HtmlDataFilterView() {
-        return _super.call(this) || this;
+        var _this = _super.call(this) || this;
+        _this.resultOptions.fetchEmptyQueries = true;
+        return _this;
     }
     /**
     * Creates the widget that represents Grid Widget.
@@ -21841,7 +21860,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
         _this.loadReportButtonClickHandler = _this.loadReportButtonClick.bind(_this);
         _this.saveReportButtonClickHandler = _this.saveReportButtonClick.bind(_this);
         _this.removeReportButtonClickHandler = _this.removeReportButtonClick.bind(_this);
-        _this.updateReportButtonClickHandler = _this.updateReportButtonClick.bind(_this);
+        _this.reloadReportDataButtonClickHandler = _this.reloadReportDataButtonClick.bind(_this);
         browser_utils["a" /* browserUtils */].onMobileModeChanged(function (_) {
             document.location.reload();
         });
@@ -21928,7 +21947,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
         var loadReportButton = "LoadReportButton";
         var saveReportButton = "SaveReportButton";
         var removeReportButton = "RemoveReportButton";
-        var updateReportButton = "UpdateReportButton";
+        var reloadReportDataButton = "ReloadReportDataButton";
         var resultCountSpan = "ResultCount";
         var exportButtons = "ResultExportButtons";
         var exportClass = this.exportClass;
@@ -21940,7 +21959,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
             loadReportButton = options.slots.loadReportButton || loadReportButton;
             saveReportButton = options.slots.saveReportButton || saveReportButton;
             removeReportButton = options.slots.removeReportButton || removeReportButton;
-            updateReportButton = options.slots.updateReportButton || updateReportButton;
+            reloadReportDataButton = options.slots.reloadReportDataButton || reloadReportDataButton;
             exportClass = options.slots.exportClass || exportClass;
         }
         this.exportButtons = this.domRoots.reduce(function (elems, root) {
@@ -21987,10 +22006,14 @@ var report_view_ReportView = /** @class */ (function (_super) {
                 this.removeReportButton.addEventListener('click', this.removeReportButtonClickHandler);
             }
         }
-        if (!this.updateReportButton) {
-            this.updateReportButton = this.resolveElement(updateReportButton);
-            if (this.updateReportButton) {
-                this.updateReportButton.addEventListener('click', this.updateReportButtonClickHandler);
+        if (!this.reloadReportDataButton) {
+            this.reloadReportDataButton = this.resolveElement(reloadReportDataButton);
+            //OBSOLETE: remove the next 3 lines. We just support the old default button ID here
+            if (!this.reloadReportDataButton) {
+                this.reloadReportDataButton = this.resolveElement('UpdateReportButton');
+            }
+            if (this.reloadReportDataButton) {
+                this.reloadReportDataButton.addEventListener('click', this.reloadReportDataButtonClickHandler);
             }
         }
         this.reportListSlot = document.getElementById('ReportList');
@@ -22295,8 +22318,8 @@ var report_view_ReportView = /** @class */ (function (_super) {
             this.removeReportButton.removeEventListener('click', this.removeReportButtonClickHandler);
             this.removeReportButton = null;
         }
-        if (this.updateReportButton) {
-            this.updateReportButton.removeEventListener('click', this.updateReportButtonClickHandler);
+        if (this.reloadReportDataButton) {
+            this.reloadReportDataButton.removeEventListener('click', this.reloadReportDataButtonClickHandler);
             this.removeReportButton = null;
         }
         if (this.reportListSlot) {
@@ -22397,7 +22420,7 @@ var report_view_ReportView = /** @class */ (function (_super) {
     /**
     * The handler of the "Update" button click.
     */
-    ReportView.prototype.updateReportButtonClick = function () {
+    ReportView.prototype.reloadReportDataButtonClick = function () {
         this.fetchData();
     };
     /**
@@ -22744,6 +22767,7 @@ function addEasyQueryUITexts() {
             UnaggrBtn: 'Remove column aggregation',
             GrandTotalsLabel: 'Show grand totals',
             GroupCountsLabel: 'Show record count for groups',
+            AggrDialogTitle: 'Aggregation/grouping',
             EnableAggrLabel: 'Enable aggregation',
             SelectedError: 'Complete the action with selected column(s)',
             NoGroupsOrAggrError: 'Add at least one group or aggregation',