@easyquery/ui 7.2.0-rc03 → 7.2.0-rc07

package/dist/browser/eq.community.js

@@ -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 
@@ -90,7 +90,7 @@ window["easyquery"] =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 107);
+/******/ 	return __webpack_require__(__webpack_require__.s = 108);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -294,6 +294,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["a" /* utils */].getIfDefined(dto.nul, this.isNullable);
             this.isEditable = utils["a" /* utils */].getIfDefined(dto.ied, this.isEditable);
             this.showOnView = utils["a" /* utils */].getIfDefined(dto.ivis || dto.sov, this.showOnView);
@@ -1348,7 +1349,7 @@ __webpack_require__.d(__webpack_exports__, "DialogFooterAlignment", function() {
 __webpack_require__.d(__webpack_exports__, "dialogs", function() { return /* binding */ dialogs; });
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid.js
-var easy_grid = __webpack_require__(103);
+var easy_grid = __webpack_require__(104);
 
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
 var easy_grid_options = __webpack_require__(34);
@@ -2101,6 +2102,7 @@ __webpack_require__.d(__webpack_exports__, "Operand", function() { return /* ree
 __webpack_require__.d(__webpack_exports__, "EqValueEditor", function() { return /* reexport */ value_editor["a" /* EqValueEditor */]; });
 __webpack_require__.d(__webpack_exports__, "EqAction", function() { return /* reexport */ EqAction; });
 __webpack_require__.d(__webpack_exports__, "EqModelLoader", function() { return /* reexport */ model_loader["a" /* EqModelLoader */]; });
+__webpack_require__.d(__webpack_exports__, "InMemoryModelStorage", function() { return /* reexport */ model_storage["a" /* InMemoryModelStorage */]; });
 __webpack_require__.d(__webpack_exports__, "BrowserQueryStorage", function() { return /* reexport */ query_storage["a" /* BrowserQueryStorage */]; });
 __webpack_require__.d(__webpack_exports__, "EqContext", function() { return /* reexport */ context_EqContext; });
 __webpack_require__.d(__webpack_exports__, "Widget", function() { return /* reexport */ widget_Widget; });
@@ -2409,6 +2411,7 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         this.httpClient = new public_api["HttpClient"]();
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = function (_) { return new data_model["a" /* DataModel */](); };
+        this.modelStorageResolver = null;
         this.queryResolver = function (context) { return new query_query["b" /* Query */](context.getModel()); };
         this.modelLoaderResolver = function (context) { return new EqServerModelLoader(context); };
         this.queryStorageResolver = function (context) { return new query_storage["a" /* BrowserQueryStorage */](context); };
@@ -2419,6 +2422,7 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         this.aggrCalculatoResolver = function (context) { return new eq_aggr_container["a" /* DefaultAggregatesCalculator */](context); };
     }
     EqServiceProvider.prototype.reset = function () {
+        this.modelStorage = null;
         this.modelLoader = null;
         this.queryStorage = null;
         this.querySynchronizer = null;
@@ -2447,6 +2451,15 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         }
         return this.modelLoader;
     };
+    EqServiceProvider.prototype.getModelStorage = function () {
+        if (!this.modelStorage) {
+            if (!this.modelStorageResolver) {
+                throw 'ModelStorageResolver is not defined';
+            }
+            this.modelStorage = this.modelStorageResolver(this.context);
+        }
+        return this.modelStorage;
+    };
     EqServiceProvider.prototype.getQueryStorage = function () {
         if (!this.queryStorage) {
             if (!this.queryStorageResolver) {
@@ -2510,6 +2523,9 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
     EqServiceProvider.prototype.registerModelLoaderResolver = function (resolver) {
         this.modelLoaderResolver = resolver;
     };
+    EqServiceProvider.prototype.registerModelStorageResolver = function (resolver) {
+        this.modelStorageResolver = resolver;
+    };
     EqServiceProvider.prototype.registerQueryStorageResolver = function (resolver) {
         this.queryStorageResolver = resolver;
     };
@@ -2608,6 +2624,9 @@ var EqAction;
     EqAction["UploadQueryFile"] = "UploadQueryFile";
 })(EqAction || (EqAction = {}));
 //# sourceMappingURL=eq_actions.js.map
+// EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/main/model_storage.js
+var model_storage = __webpack_require__(103);
+
 // EXTERNAL MODULE: c:/azuredevops-agents/korzhdev/_work/1/s/packs/core/dist/lib/query/query_events.js
 var query_events = __webpack_require__(14);
 
@@ -2912,10 +2931,14 @@ var context_EqContext = /** @class */ (function () {
         }
         if (options.endpoint) {
             this.baseEndpoint = options.endpoint;
-            console.warn('The `endpoint` option is deprecated and will be ignored.\n'
+            console.warn('The `endpoint` option is deprecated.\n'
                 + 'Please use `context.useEndpoint(endpointURL)` function instead.');
         }
         this.setDefaultEndpoints(this.baseEndpoint);
+        if (options.modelStorageResolver) {
+            var eqServices = this.getServices();
+            eqServices.registerModelStorageResolver(options.modelStorageResolver);
+        }
         this.loadQueryOnStart = false;
         if (options.loadQueryOnStart) {
             this.loadQueryOnStart = options.loadQueryOnStart;
@@ -4261,6 +4284,7 @@ addEasyQueryCoreTexts();
 
 
 
+
 
 
 //for backward compatibility
@@ -4706,6 +4730,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));
 
@@ -8207,7 +8235,7 @@ var condition_group_renderer = __webpack_require__(76);
 var input_expression_renderer = __webpack_require__(78);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/attribute_expression_renderer.js
-var attribute_expression_renderer = __webpack_require__(51);
+var attribute_expression_renderer = __webpack_require__(52);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/addrow_renderer.js
 var addrow_renderer = __webpack_require__(79);
@@ -9596,8 +9624,6 @@ var Query = /** @class */ (function () {
         }
         this.setDefaultName();
         this.description = "";
-        this.modelId = "";
-        this.modelName = "";
         this.model = (model) ? model : new _dm_data_model__WEBPACK_IMPORTED_MODULE_2__[/* DataModel */ "a"]();
         if (data) {
             this.loadFromData(data);
@@ -9611,10 +9637,14 @@ var Query = /** @class */ (function () {
             this.parentQuery = options.parent;
         }
         this.addChangedCallback(function (ev) {
-            if (ev.data && ev.data.part === _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Columns
-                && ev.data.action !== _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangeAction */ "a"].Modify
+            if (ev.data
+                && ((ev.data.part & _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Columns) > 0)
                 && !ev.data.aggregation) {
-                _this.aggrSettings.clear();
+                if (_this._enableAggregation && _this.updateAggregationSettings()) {
+                    _this.fireChangedEvent({
+                        part: _query_events__WEBPACK_IMPORTED_MODULE_10__[/* QueryChangePart */ "b"].Aggregation
+                    });
+                }
             }
         });
     }
@@ -9635,19 +9665,6 @@ var Query = /** @class */ (function () {
                 this.processQueryForAggregation();
                 var aggrCols = this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == _types_expr_tag__WEBPACK_IMPORTED_MODULE_8__[/* ExprTag */ "a"].AggregateFunction; });
-                // // query contains aggregate columns
-                // if (aggrCols.length) {
-                //     for (const col of aggrCols) {
-                //         const attr = this.model.getAttributeById(col.expr.args[0].value);
-                //         this.changeColumnType(col, ExprTag.EntityAttribute, {
-                //             caption: this.model.getAttributeText(attr, `{attr}`)
-                //         });
-                //     }
-                //     this.fireChangedEvent({
-                //         part: QueryChangePart.Columns,
-                //         wasModified: true
-                //     });
-                // }    
             }
             if (!this._enableAggregation) {
                 this.aggrSettings.clear();
@@ -9656,6 +9673,40 @@ var Query = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
+    Query.prototype.updateAggregationSettings = function () {
+        var hasChanged = false;
+        var aggrSettings = this.getAggregationSettings();
+        for (var i = aggrSettings.groups.length - 1; i >= 0; i--) {
+            var group = aggrSettings.groups[i];
+            var _loop_1 = function (j) {
+                var colId = group.columns[j];
+                if (!this_1.columns.find(function (col) { return col.id === colId; })) {
+                    group.columns.splice(j, 1);
+                    hasChanged = true;
+                }
+            };
+            var this_1 = this;
+            for (var j = group.columns.length - 1; j >= 0; j--) {
+                _loop_1(j);
+            }
+            if (group.columns.length == 0) {
+                aggrSettings.groups.slice(i, 1);
+            }
+        }
+        var aggregates = aggrSettings.getAggregates();
+        var _loop_2 = function (i) {
+            var aggr = aggregates[i];
+            if (!this_2.columns.find(function (col) { return col.id === aggr.colId; })) {
+                aggregates.splice(i, 1);
+                hasChanged = true;
+            }
+        };
+        var this_2 = this;
+        for (var i = aggregates.length - 1; i >= 0; i--) {
+            _loop_2(i);
+        }
+        return hasChanged;
+    };
     Query.prototype.createSubQuery = function () {
         return new Query(this.model);
     };
@@ -11862,6 +11913,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,
@@ -15314,21 +15369,6 @@ var 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 != _easyquery_core__WEBPACK_IMPORTED_MODULE_0__["QueryChangePart"].Columns && edata.part != _easyquery_core__WEBPACK_IMPORTED_MODULE_0__["QueryChangePart"].All)) {
-                return;
-            }
-            if (event.data.source == _this) {
-                _this.grid.refresh();
-            }
-            else {
-                _this.refresh();
-            }
-        });
     };
     EasyGridWidget.prototype.destroyCore = function () {
         this.detachQueryObserver();
@@ -16584,263 +16624,6 @@ var Condition = /** @class */ (function () {
 
 /***/ }),
 /* 51 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AttributeExpressionRenderer; });
-/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
-/* harmony import */ var _list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
-/* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
-/* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
-var __extends = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-
-
-
-
-
-
-var AttributeExpressionRenderer = /** @class */ (function (_super) {
-    __extends(AttributeExpressionRenderer, _super);
-    function AttributeExpressionRenderer(panel, expression, entitiesMenu, slot) {
-        var _this = _super.call(this, panel, expression, null, slot) || this;
-        _this.menu = entitiesMenu;
-        return _this;
-    }
-    AttributeExpressionRenderer.prototype.renderEditor = function () {
-        //create menu
-    };
-    AttributeExpressionRenderer.prototype.getLabelText = function () {
-        var model = this.panel.getContext().getModel();
-        var attrId = this.expression.value;
-        var attrObj = attrId ? model.getAttributeByIdSafe(attrId) : null;
-        var attrFormat = this.panel.options.attrElementFormat;
-        return attrObj ? model.getAttributeText(attrObj, attrFormat) : this.getEmptyText();
-    };
-    AttributeExpressionRenderer.prototype.setValue = function (value, silent) {
-        if (silent === void 0) { silent = false; }
-        silent = silent && value !== this.expression.value;
-        var result = _super.prototype.setValue.call(this, value, true);
-        if (!silent) {
-            this.expression.getParent().fireChangedEvent(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].EntityAttr | _easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].Operator);
-        }
-        return result;
-    };
-    AttributeExpressionRenderer.prototype.isEditable = function () {
-        return !this.isReadOnly()
-            && ((this.panel.options.editableParts & _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute) === _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute);
-    };
-    AttributeExpressionRenderer.prototype.getEmptyText = function () {
-        return this.panel.options.emptyTextAttribute || _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('MsgEmptyAttrValue');
-    };
-    AttributeExpressionRenderer.prototype.getClassesToAdd = function () {
-        return this.cssPrefix + "-condelement " + this.cssPrefix + "-attrelement";
-    };
-    AttributeExpressionRenderer.prototype.adjustWidth = function () {
-        if (_utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__[/* browserUtils */ "a"].isMobileMode()) {
-            return;
-        }
-        var elWidth = this.element.clientWidth;
-        var parWidth = this.element.parentElement.clientWidth;
-        if (elWidth > parWidth / 2) {
-            Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_2__["domel"])(this.element)
-                .addClass(this.cssPrefix + "-attrelement-wide");
-        }
-    };
-    return AttributeExpressionRenderer;
-}(_list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__[/* ListExpressionRenderer */ "b"]));
-
-//# sourceMappingURL=attribute_expression_renderer.js.map
-
-/***/ }),
-/* 52 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GoogleChartWidget; });
-/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
-/* harmony import */ var _chart_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
-/* harmony import */ var _chart_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
-var __extends = (undefined && undefined.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-
-
-
-var GoogleChartWidget = /** @class */ (function (_super) {
-    __extends(GoogleChartWidget, _super);
-    /**
-     * The default constructor.
-     * @param slot The html element.
-     * @param provider The provider.
-     */
-    function GoogleChartWidget(slot) {
-        var _this = _super.call(this, slot) || this;
-        _this.hasChartTypes = [
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie,
-            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut
-        ];
-        _this.options.legend = {
-            show: true,
-            position: 'right'
-        };
-        return _this;
-    }
-    GoogleChartWidget.prototype.getWidgetType = function () {
-        return 'chartGoogle';
-    };
-    GoogleChartWidget.prototype.canDraw = function () {
-        return GoogleChartWidget.hasGoogleCharts();
-    };
-    GoogleChartWidget.hasGoogleCharts = function () {
-        return typeof google !== 'undefined' && typeof google.charts !== 'undefined';
-    };
-    GoogleChartWidget.prototype.initChart = function () {
-        if (GoogleChartWidget.hasGoogleCharts() && this.labelColumn >= 0
-            && this.dataColumns && this.dataColumns.length > 0) {
-            this.googleDataView =
-                new google.visualization.DataView(this.convertToGoogleFormat());
-            this.updateChartColumns();
-        }
-    };
-    GoogleChartWidget.prototype.convertToGoogleType = function (type) {
-        switch (type) {
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
-                return "date";
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
-                return "datetime";
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
-                return "timeofday";
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Byte:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Word:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int32:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int64:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Currency:
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Float:
-                return "number";
-            default:
-                return "string";
-        }
-    };
-    GoogleChartWidget.prototype.convertToGoogleValue = function (value, type) {
-        switch (type) {
-            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool:
-                return value.toString();
-            default:
-                return value;
-        }
-    };
-    GoogleChartWidget.prototype.convertToGoogleFormat = function () {
-        var googleTable = new google.visualization.DataTable();
-        var columns = this.dataTable.columns;
-        for (var i = 0; i < columns.count; i++) {
-            var column = columns.get(i);
-            googleTable.addColumn(this.convertToGoogleType(column.type), column.label, column.id);
-        }
-        var rows = this.dataTable.getCachedRows();
-        googleTable.addRows(rows.length);
-        for (var i = 0; i < rows.length; i++) {
-            var row = rows[i];
-            for (var j = 0; j < columns.count; j++) {
-                googleTable.setCell(i, j, this.convertToGoogleValue(row.getValue(j), columns.get(j).type));
-            }
-        }
-        return googleTable;
-    };
-    GoogleChartWidget.prototype.drawCore = function () {
-        if (this.googleDataView != null) {
-            this.options.legend = this.options.legend || {};
-            var chartOptions = {
-                width: "100%",
-                height: "100%",
-                chartArea: { width: this.getChartAreaWidth }
-            };
-            if (this.chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut) {
-                chartOptions.pieHole = 0.4;
-            }
-            if (!this.options.legend.show) {
-                chartOptions.legend = 'none';
-            }
-            else {
-                chartOptions.legend = { position: this.options.legend.position };
-            }
-            var chart = this.createChart(this.chartDiv);
-            chart.draw(this.googleDataView, chartOptions);
-        }
-    };
-    GoogleChartWidget.prototype.getChartAreaWidth = function (chartType) {
-        if (chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie) {
-            return "100%";
-        }
-        else {
-            return "50%";
-        }
-    };
-    GoogleChartWidget.prototype.updateChartColumns = function () {
-        if (this.googleDataView) {
-            this.googleDataView.setColumns([].concat(this.labelColumn).concat(this.dataColumns));
-        }
-    };
-    GoogleChartWidget.prototype.createChart = function (slot) {
-        switch (this.chartType) {
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column:
-                return new google.visualization.ColumnChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram:
-                return new google.visualization.Histogram(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar:
-                return new google.visualization.BarChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo:
-                return new google.visualization.ComboChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area:
-                return new google.visualization.AreaChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line:
-                return new google.visualization.LineChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine:
-                return new google.visualization.SteppedAreaChart(slot);
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie:
-            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut:
-                return new google.visualization.PieChart(slot);
-            default:
-                return new google.visualization.PieChart(slot);
-        }
-    };
-    return GoogleChartWidget;
-}(_chart_widget__WEBPACK_IMPORTED_MODULE_1__[/* ChartWidget */ "a"]));
-
-//# sourceMappingURL=chart_widget_google.js.map
-
-/***/ }),
-/* 53 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -18019,6 +17802,263 @@ return Promise$1;
 
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(97), __webpack_require__(98)))
 
+/***/ }),
+/* 52 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AttributeExpressionRenderer; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var _easyquery_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
+/* harmony import */ var _easydata_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(1);
+/* harmony import */ var _list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25);
+/* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(3);
+/* harmony import */ var _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(10);
+var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+
+
+
+
+var AttributeExpressionRenderer = /** @class */ (function (_super) {
+    __extends(AttributeExpressionRenderer, _super);
+    function AttributeExpressionRenderer(panel, expression, entitiesMenu, slot) {
+        var _this = _super.call(this, panel, expression, null, slot) || this;
+        _this.menu = entitiesMenu;
+        return _this;
+    }
+    AttributeExpressionRenderer.prototype.renderEditor = function () {
+        //create menu
+    };
+    AttributeExpressionRenderer.prototype.getLabelText = function () {
+        var model = this.panel.getContext().getModel();
+        var attrId = this.expression.value;
+        var attrObj = attrId ? model.getAttributeByIdSafe(attrId) : null;
+        var attrFormat = this.panel.options.attrElementFormat;
+        return attrObj ? model.getAttributeText(attrObj, attrFormat) : this.getEmptyText();
+    };
+    AttributeExpressionRenderer.prototype.setValue = function (value, silent) {
+        if (silent === void 0) { silent = false; }
+        silent = silent && value !== this.expression.value;
+        var result = _super.prototype.setValue.call(this, value, true);
+        if (!silent) {
+            this.expression.getParent().fireChangedEvent(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].EntityAttr | _easyquery_core__WEBPACK_IMPORTED_MODULE_1__["ConditionPart"].Operator);
+        }
+        return result;
+    };
+    AttributeExpressionRenderer.prototype.isEditable = function () {
+        return !this.isReadOnly()
+            && ((this.panel.options.editableParts & _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute) === _types_qp_editable_part__WEBPACK_IMPORTED_MODULE_5__[/* QPEditablePart */ "a"].Attribute);
+    };
+    AttributeExpressionRenderer.prototype.getEmptyText = function () {
+        return this.panel.options.emptyTextAttribute || _easydata_core__WEBPACK_IMPORTED_MODULE_0__["i18n"].getText('MsgEmptyAttrValue');
+    };
+    AttributeExpressionRenderer.prototype.getClassesToAdd = function () {
+        return this.cssPrefix + "-condelement " + this.cssPrefix + "-attrelement";
+    };
+    AttributeExpressionRenderer.prototype.adjustWidth = function () {
+        if (_utils_browser_utils__WEBPACK_IMPORTED_MODULE_4__[/* browserUtils */ "a"].isMobileMode()) {
+            return;
+        }
+        var elWidth = this.element.clientWidth;
+        var parWidth = this.element.parentElement.clientWidth;
+        if (elWidth > parWidth / 2) {
+            Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_2__["domel"])(this.element)
+                .addClass(this.cssPrefix + "-attrelement-wide");
+        }
+    };
+    return AttributeExpressionRenderer;
+}(_list_expression_renderer__WEBPACK_IMPORTED_MODULE_3__[/* ListExpressionRenderer */ "b"]));
+
+//# sourceMappingURL=attribute_expression_renderer.js.map
+
+/***/ }),
+/* 53 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GoogleChartWidget; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var _chart_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(47);
+/* harmony import */ var _chart_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5);
+var __extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+
+var GoogleChartWidget = /** @class */ (function (_super) {
+    __extends(GoogleChartWidget, _super);
+    /**
+     * The default constructor.
+     * @param slot The html element.
+     * @param provider The provider.
+     */
+    function GoogleChartWidget(slot) {
+        var _this = _super.call(this, slot) || this;
+        _this.hasChartTypes = [
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie,
+            _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut
+        ];
+        _this.options.legend = {
+            show: true,
+            position: 'right'
+        };
+        return _this;
+    }
+    GoogleChartWidget.prototype.getWidgetType = function () {
+        return 'chartGoogle';
+    };
+    GoogleChartWidget.prototype.canDraw = function () {
+        return GoogleChartWidget.hasGoogleCharts();
+    };
+    GoogleChartWidget.hasGoogleCharts = function () {
+        return typeof google !== 'undefined' && typeof google.charts !== 'undefined';
+    };
+    GoogleChartWidget.prototype.initChart = function () {
+        if (GoogleChartWidget.hasGoogleCharts() && this.labelColumn >= 0
+            && this.dataColumns && this.dataColumns.length > 0) {
+            this.googleDataView =
+                new google.visualization.DataView(this.convertToGoogleFormat());
+            this.updateChartColumns();
+        }
+    };
+    GoogleChartWidget.prototype.convertToGoogleType = function (type) {
+        switch (type) {
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Date:
+                return "date";
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].DateTime:
+                return "datetime";
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Time:
+                return "timeofday";
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Byte:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Word:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int32:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Int64:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Currency:
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Float:
+                return "number";
+            default:
+                return "string";
+        }
+    };
+    GoogleChartWidget.prototype.convertToGoogleValue = function (value, type) {
+        switch (type) {
+            case _easydata_core__WEBPACK_IMPORTED_MODULE_0__["DataType"].Bool:
+                return value.toString();
+            default:
+                return value;
+        }
+    };
+    GoogleChartWidget.prototype.convertToGoogleFormat = function () {
+        var googleTable = new google.visualization.DataTable();
+        var columns = this.dataTable.columns;
+        for (var i = 0; i < columns.count; i++) {
+            var column = columns.get(i);
+            googleTable.addColumn(this.convertToGoogleType(column.type), column.label, column.id);
+        }
+        var rows = this.dataTable.getCachedRows();
+        googleTable.addRows(rows.length);
+        for (var i = 0; i < rows.length; i++) {
+            var row = rows[i];
+            for (var j = 0; j < columns.count; j++) {
+                googleTable.setCell(i, j, this.convertToGoogleValue(row.getValue(j), columns.get(j).type));
+            }
+        }
+        return googleTable;
+    };
+    GoogleChartWidget.prototype.drawCore = function () {
+        if (this.googleDataView != null) {
+            this.options.legend = this.options.legend || {};
+            var chartOptions = {
+                width: "100%",
+                height: "100%",
+                chartArea: { width: this.getChartAreaWidth }
+            };
+            if (this.chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut) {
+                chartOptions.pieHole = 0.4;
+            }
+            if (!this.options.legend.show) {
+                chartOptions.legend = 'none';
+            }
+            else {
+                chartOptions.legend = { position: this.options.legend.position };
+            }
+            var chart = this.createChart(this.chartDiv);
+            chart.draw(this.googleDataView, chartOptions);
+        }
+    };
+    GoogleChartWidget.prototype.getChartAreaWidth = function (chartType) {
+        if (chartType == _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie) {
+            return "100%";
+        }
+        else {
+            return "50%";
+        }
+    };
+    GoogleChartWidget.prototype.updateChartColumns = function () {
+        if (this.googleDataView) {
+            this.googleDataView.setColumns([].concat(this.labelColumn).concat(this.dataColumns));
+        }
+    };
+    GoogleChartWidget.prototype.createChart = function (slot) {
+        switch (this.chartType) {
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Column:
+                return new google.visualization.ColumnChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Histogram:
+                return new google.visualization.Histogram(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Bar:
+                return new google.visualization.BarChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Combo:
+                return new google.visualization.ComboChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Area:
+                return new google.visualization.AreaChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Line:
+                return new google.visualization.LineChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].SteppedLine:
+                return new google.visualization.SteppedAreaChart(slot);
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Pie:
+            case _chart_type__WEBPACK_IMPORTED_MODULE_2__[/* ChartType */ "a"].Doughnut:
+                return new google.visualization.PieChart(slot);
+            default:
+                return new google.visualization.PieChart(slot);
+        }
+    };
+    return GoogleChartWidget;
+}(_chart_widget__WEBPACK_IMPORTED_MODULE_1__[/* ChartWidget */ "a"]));
+
+//# sourceMappingURL=chart_widget_google.js.map
+
 /***/ }),
 /* 54 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -19197,7 +19237,7 @@ return Promise$1;
 
 //# sourceMappingURL=es6-promise.map
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(118), __webpack_require__(119)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(119), __webpack_require__(120)))
 
 /***/ }),
 /* 55 */
@@ -19747,7 +19787,7 @@ var BrowserQueryStorage = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=query_storage.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
 /* 62 */
@@ -19788,7 +19828,7 @@ var EqModelLoader = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=model_loader.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
 /* 63 */
@@ -19906,7 +19946,7 @@ var DefaultAggregatesCalculator = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eq_aggr_container.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
 /* 64 */
@@ -19965,7 +20005,7 @@ var EasyQueryDataLoader = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=eq_data_loader.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(53)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
 
 /***/ }),
 /* 65 */
@@ -21307,7 +21347,7 @@ var DefaultDialogSet = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=default_dialog_service.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(104)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(105)))
 
 /***/ }),
 /* 69 */
@@ -23160,7 +23200,6 @@ var AggrFuncColumnRendererCB = /** @class */ (function (_super) {
             .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);
     };
@@ -23510,7 +23549,6 @@ var ColumnRendererCB = /** @class */ (function () {
             .toDOM();
     };
     ColumnRendererCB.prototype.getDefaultCaption = function () {
-        console.log('Calling getDefaultCaption() BASE');
         return this.getDefaultTitleText(this.baseAttr);
     };
     ColumnRendererCB.prototype.getDefaultTitleText = function (attr) {
@@ -25353,7 +25391,7 @@ var ProcessWidget = /** @class */ (function (_super) {
 /* harmony import */ var _types_facet_type__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(13);
 /* harmony import */ var _result_facet__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(31);
 /* harmony import */ var _widgets_charts_chart_widget_chartjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(46);
-/* harmony import */ var _widgets_charts_chart_widget_google__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(52);
+/* harmony import */ var _widgets_charts_chart_widget_google__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53);
 /* harmony import */ var _utils_browser_utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3);
 var __extends = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -25627,6 +25665,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 PivotTableFacet = /** @class */ (function (_super) {
     __extends(PivotTableFacet, _super);
@@ -25715,9 +25759,10 @@ var 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(_easydata_ui__WEBPACK_IMPORTED_MODULE_0__["domel"])('select');
+        var firstNumericColIndex = null;
         var _loop_2 = function (i) {
             var column = dataTable.columns.get(i);
             var colLabel = column.label;
@@ -25725,6 +25770,9 @@ var PivotTableFacet = /** @class */ (function (_super) {
             var colId = column.id;
             if (allowedTypes && allowedTypes.indexOf(colType) < 0)
                 return "continue";
+            if (firstNumericColIndex === null && _easydata_core__WEBPACK_IMPORTED_MODULE_1__["utils"].isNumericType(colType)) {
+                firstNumericColIndex = i;
+            }
             csb.addChild('option', function (b) {
                 b
                     .attr('value', colId)
@@ -25746,7 +25794,20 @@ var 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;
@@ -25791,7 +25852,7 @@ var 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
@@ -25813,7 +25874,7 @@ var 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();
@@ -25833,7 +25894,7 @@ var 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);
@@ -26600,7 +26661,7 @@ var AggrSettingsDialog = /** @class */ (function () {
                 var ds = _this.context.getServices().getDialogService();
                 _this.body = _this.renderBody();
                 var dlg = ds.open({
-                    title: 'Aggregation settings',
+                    title: _easyquery_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('AggrSettings', 'AggrDialogTitle'),
                     body: _this.body,
                     onSubmit: function () {
                         if (_this.query.enableAggregation && !_this.renderer.isValid())
@@ -26661,10 +26722,10 @@ var 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(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('AggrSettings', 'EnableAggrLabel')); }); })
+            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_1__["i18n"].getText('AggrSettings', 'EnableAggrLabel')); }); }); })
             .addChild('div', function (b) { return b
             .id('AggrSettingsComponent'); });
         return b.toDOM();
@@ -26843,10 +26904,10 @@ var 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(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GroupCountsLabel')); }); })
+            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GroupCountsLabel')); }); }); })
             .addChild('div', function (b) { return b
             .addClass(_this.cssPrefix + "-grandtotals")
             .addChild('label', function (b) { return b
@@ -26859,10 +26920,10 @@ var 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(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GrandTotalsLabel')); }); });
+            .addText(_easyquery_core__WEBPACK_IMPORTED_MODULE_3__["i18n"].getText('AggrSettings', 'GrandTotalsLabel')); }); }); });
         var groups = this.slot.querySelectorAll("." + this.cssPrefix + "-group");
         groups.forEach(function (el) {
             Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_1__["domel"])(el)
@@ -28754,7 +28815,7 @@ module.exports = g;
 /* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return HttpResponseError; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return HttpClient; });
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11);
-/* harmony import */ var _http_action_result__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(106);
+/* harmony import */ var _http_action_result__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(107);
 /* harmony import */ var _http_method__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36);
 /* harmony import */ var _http_request__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(55);
 var __extends = (undefined && undefined.__extends) || (function () {
@@ -30513,6 +30574,33 @@ var GoogleDataConverter = /** @class */ (function () {
 /* 103 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return InMemoryModelStorage; });
+/* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+
+var InMemoryModelStorage = /** @class */ (function () {
+    function InMemoryModelStorage(models) {
+        this.models = [];
+        if (models) {
+            _easydata_core__WEBPACK_IMPORTED_MODULE_0__["utils"].assign(this.models, [], models);
+        }
+    }
+    InMemoryModelStorage.prototype.getModels = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            resolve(_this.models);
+        });
+    };
+    return InMemoryModelStorage;
+}());
+
+//# sourceMappingURL=model_storage.js.map
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(51)))
+
+/***/ }),
+/* 104 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
 "use strict";
 /* WEBPACK VAR INJECTION */(function(Promise) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EasyGrid; });
 /* harmony import */ var _easydata_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
@@ -31680,10 +31768,10 @@ var EasyGrid = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=easy_grid.js.map
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(104)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(105)))
 
 /***/ }),
-/* 104 */
+/* 105 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(process, global) {/*!
@@ -32863,7 +32951,7 @@ return Promise$1;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(97), __webpack_require__(98)))
 
 /***/ }),
-/* 105 */
+/* 106 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -33592,7 +33680,7 @@ var AdvancedSearchView = /** @class */ (function (_super) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(54)))
 
 /***/ }),
-/* 106 */
+/* 107 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -33623,33 +33711,27 @@ var HttpActionResult = /** @class */ (function () {
 //# sourceMappingURL=http_action_result.js.map
 
 /***/ }),
-/* 107 */
+/* 108 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(108);
-module.exports = __webpack_require__(123);
+__webpack_require__(109);
+module.exports = __webpack_require__(124);
 
 
 /***/ }),
-/* 108 */
+/* 109 */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(109);
 __webpack_require__(110);
 __webpack_require__(111);
-
 __webpack_require__(112);
+
 __webpack_require__(113);
 __webpack_require__(114);
 __webpack_require__(115);
 __webpack_require__(116);
-__webpack_require__(117);
-
-/***/ }),
-/* 109 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
+__webpack_require__(117);
+__webpack_require__(118);
 
 /***/ }),
 /* 110 */
@@ -33701,6 +33783,12 @@ __webpack_require__(117);
 
 /***/ }),
 /* 118 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+/* 119 */
 /***/ (function(module, exports) {
 
 // shim for using process in browser
@@ -33890,7 +33978,7 @@ process.umask = function() { return 0; };
 
 
 /***/ }),
-/* 119 */
+/* 120 */
 /***/ (function(module, exports) {
 
 var g;
@@ -33916,10 +34004,10 @@ module.exports = g;
 
 
 /***/ }),
-/* 120 */,
 /* 121 */,
 /* 122 */,
-/* 123 */
+/* 123 */,
+/* 124 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -34465,7 +34553,7 @@ var chart_type = __webpack_require__(5);
 var chart_widget = __webpack_require__(47);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_widget_google.js
-var chart_widget_google = __webpack_require__(52);
+var chart_widget_google = __webpack_require__(53);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/charts/chart_widget_chartjs.js
 var chart_widget_chartjs = __webpack_require__(46);
@@ -34513,7 +34601,7 @@ var condition_renderer = __webpack_require__(35);
 var condition_group_renderer = __webpack_require__(76);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/attribute_expression_renderer.js
-var attribute_expression_renderer = __webpack_require__(51);
+var attribute_expression_renderer = __webpack_require__(52);
 
 // EXTERNAL MODULE: ./dist/lib/widgets/renderers/querypanel/expression_renderer.js
 var expression_renderer = __webpack_require__(23);
@@ -34549,7 +34637,7 @@ var pivot_table_facet = __webpack_require__(88);
 var view = __webpack_require__(32);
 
 // EXTERNAL MODULE: ./dist/lib/views/adv_search_view.js
-var adv_search_view = __webpack_require__(105);
+var adv_search_view = __webpack_require__(106);
 
 // CONCATENATED MODULE: ./dist/lib/views/data_filter_view.js
 var data_filter_view_extends = (undefined && undefined.__extends) || (function () {
@@ -34573,7 +34661,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;
@@ -34651,7 +34741,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.
@@ -34724,7 +34816,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();
         });
@@ -34811,7 +34903,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;
@@ -34823,7 +34915,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) {
@@ -34870,10 +34962,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');
@@ -35178,8 +35274,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) {
@@ -35280,7 +35376,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();
     };
     /**
@@ -35645,6 +35741,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',