@easydata/crud 1.3.6-rc03 → 1.4.0-rc02

package/dist/bundles/easydata.crud.js

@@ -842,7 +842,7 @@ var i18n_i18n;
 var utils_utils;
 (function (utils) {
     function getAllDataTypes() {
-        return Object.values(DataType);
+        return Object.values(DataType).filter(function (item) { return typeof item === "number"; });
     }
     utils.getAllDataTypes = getAllDataTypes;
     function getDateDataTypes() {
@@ -850,12 +850,16 @@ var utils_utils;
     }
     utils.getDateDataTypes = getDateDataTypes;
     function getStringDataTypes() {
-        return [DataType.String, DataType.Memo];
+        return [DataType.String, DataType.Memo, DataType.FixedChar];
     }
     utils.getStringDataTypes = getStringDataTypes;
     var _numericTypes = [DataType.Byte, DataType.Word, DataType.Int32,
-        DataType.Int64, DataType.Float, DataType.Currency];
-    var _intTypes = [DataType.Byte, DataType.Word, DataType.Int32, DataType.Int64];
+        DataType.Int64, DataType.Float, DataType.Currency, DataType.Autoinc];
+    function getNumericDataTypes() {
+        return _numericTypes;
+    }
+    utils.getNumericDataTypes = getNumericDataTypes;
+    var _intTypes = [DataType.Byte, DataType.Word, DataType.Int32, DataType.Int64, DataType.Autoinc];
     //-------------- object functions -------------------
     /**
      * Copy the content of all objests passed in `args` parameters into `target`
@@ -920,7 +924,7 @@ var utils_utils;
                                     hashSet.set(sourceVal, target[key]);
                                 }
                                 else {
-                                    if (typeof target[key] == 'undefined') {
+                                    if (typeof target[key] == 'undefined' || target[key] == null) {
                                         target[key] = Object.create(Object.getPrototypeOf(sourceVal));
                                     }
                                     hashSet.set(sourceVal, target[key]);
@@ -1449,7 +1453,7 @@ var http_client_HttpClient = /** @class */ (function () {
         var desc = {
             method: method,
             url: url,
-            headers: __assign({}, this.defaultHeaders, options.headers || {}),
+            headers: __assign(__assign({}, this.defaultHeaders), options.headers || {}),
             queryParams: options.queryParams || {},
             data: data
         };
@@ -1595,6 +1599,12 @@ var MetaEntity = /** @class */ (function () {
         };
         internalProcessEntity(this);
     };
+    MetaEntity.prototype.getFirstPrimaryAttr = function () {
+        return this.getPrimaryAttrs()[0];
+    };
+    MetaEntity.prototype.getPrimaryAttrs = function () {
+        return this.attributes.filter(function (attr) { return attr.isPrimaryKey; });
+    };
     return MetaEntity;
 }());
 
@@ -2213,9 +2223,9 @@ var meta_data_MetaData = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=meta_data.js.map
-// CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/aggr_calculator.js
-var aggr_calculator_assign = (undefined && undefined.__assign) || function () {
-    aggr_calculator_assign = Object.assign || function(t) {
+// CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/aggr_settings.js
+var aggr_settings_assign = (undefined && undefined.__assign) || function () {
+    aggr_settings_assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
             s = arguments[i];
             for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
@@ -2223,7 +2233,7 @@ var aggr_calculator_assign = (undefined && undefined.__assign) || function () {
         }
         return t;
     };
-    return aggr_calculator_assign.apply(this, arguments);
+    return aggr_settings_assign.apply(this, arguments);
 };
 /**
  * Defines aggregations settings for the current context.
@@ -2236,16 +2246,32 @@ var AggregationSettings = /** @class */ (function () {
         this.groups = [];
         this.useGrandTotals = false;
         this.useRecordCount = false;
-        this.caseSensitiveGroups = false;
+        this._caseSensitiveGroups = false;
         this.COUNT_FIELD_NAME = 'GRPRECCNT';
     }
+    Object.defineProperty(AggregationSettings.prototype, "caseSensitiveGroups", {
+        get: function () {
+            return this._caseSensitiveGroups;
+        },
+        set: function (value) {
+            this._caseSensitiveGroups = value;
+            this.updateCompareProc();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    AggregationSettings.prototype.updateCompareProc = function () {
+        this.compareValues = this._caseSensitiveGroups
+            ? this.strictCompare
+            : this.caseInsensitiveCompare;
+    };
     AggregationSettings.prototype.addGroup = function (settings) {
         var cols = settings.columns || this.colStore.getColumnIds(settings.from, settings.to);
         if (!this.colStore.validateColumns(cols))
             throw "Invalid columns: " + cols;
         if (this.hasColumnsInUse(cols))
             throw "Can't add same columns to different groups/aggregates";
-        this.groups.push(aggr_calculator_assign({ columns: cols, aggregates: null }, settings));
+        this.groups.push(aggr_settings_assign({ columns: cols }, settings));
         return this;
     };
     AggregationSettings.prototype.addAggregateColumn = function (colIndexOrId, funcId) {
@@ -2270,7 +2296,7 @@ var AggregationSettings = /** @class */ (function () {
         var cols = [];
         var mappedGrops = this.groups.map(function (grp) {
             cols = cols.concat(grp.columns);
-            return aggr_calculator_assign({}, grp, { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
+            return aggr_settings_assign(aggr_settings_assign({}, grp), { columns: Array.from(cols), aggregates: Array.from(_this.aggregates) });
         });
         return mappedGrops;
     };
@@ -2362,10 +2388,35 @@ var AggregationSettings = /** @class */ (function () {
             }
         }
     };
+    AggregationSettings.prototype.buildGroupKey = function (group, row) {
+        var caseInsensitive = !this.caseSensitiveGroups;
+        var result = {};
+        if (group) {
+            for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
+                var colId = _a[_i];
+                var keyVal = row.getValue(colId);
+                if (caseInsensitive && typeof (keyVal) === 'string') {
+                    keyVal = keyVal.toLowerCase();
+                }
+                result[colId] = keyVal;
+            }
+        }
+        return result;
+    };
+    //returns true if value1 == value2
+    AggregationSettings.prototype.strictCompare = function (value1, value2) {
+        return value1 === value2;
+    };
+    //makes a case insensative comparision of two values and return true if there are equal
+    AggregationSettings.prototype.caseInsensitiveCompare = function (value1, value2) {
+        var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
+        var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
+        return val1 === val2;
+    };
     return AggregationSettings;
 }());
 
-//# sourceMappingURL=aggr_calculator.js.map
+//# sourceMappingURL=aggr_settings.js.map
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/data/data_column.js
 
 
@@ -2392,6 +2443,8 @@ var data_column_DataColumn = /** @class */ (function () {
         this.displayFormat = desc.dfmt;
         this.groupFooterColumnTemplate = desc.gfct;
         this.style = desc.style || {};
+        this.description = desc.description;
+        this.calculatedWidth = 0;
     }
     return DataColumn;
 }());
@@ -2431,9 +2484,10 @@ var data_column_DataColumnList = /** @class */ (function () {
             .map(function (col, index) { return index; });
     };
     DataColumnList.prototype.put = function (index, col) {
-        //!!!!!!!!!check on "out of index"
-        this.items[index] = col;
-        this.updateDateColumnIdx();
+        if (index >= 0 && index < this.count) {
+            this.items[index] = col;
+            this.updateDateColumnIdx();
+        }
     };
     DataColumnList.prototype.move = function (col, newIndex) {
         var oldIndex = this.items.indexOf(col);
@@ -2443,8 +2497,12 @@ var data_column_DataColumnList = /** @class */ (function () {
         }
     };
     DataColumnList.prototype.get = function (index) {
-        //!!!!!!!!!check on "out of index"
-        return this.items[index];
+        if (index >= 0 && index < this.count) {
+            return this.items[index];
+        }
+        else {
+            return null;
+        }
     };
     DataColumnList.prototype.getIndex = function (id) {
         return this.mapper[id];
@@ -2528,16 +2586,23 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
     function EasyDataTable(options) {
         this._chunkSize = 1000;
         this._elasticChunks = false;
-        // object keeps number keys sorted
-        this.chunkMap = {};
+        this.cachedRows = [];
         this.total = 0;
         this.loader = null;
         this.needTotal = true;
+        this.isInMemory = false;
         options = options || {};
         this._chunkSize = options.chunkSize || this._chunkSize;
         this._elasticChunks = options.elasticChunks || this._elasticChunks;
         this.loader = options.loader;
+        if (typeof options.inMemory !== 'undefined') {
+            this.isInMemory = options.inMemory;
+        }
+        if (this.isInMemory) {
+            this.needTotal = false;
+        }
         this._columns = new data_column_DataColumnList();
+        this.onUpdate = options.onUpdate;
         if (options.columns) {
             for (var _i = 0, _a = options.columns; _i < _a.length; _i++) {
                 var colDesc = _a[_i];
@@ -2568,7 +2633,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
             this._chunkSize = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -2581,7 +2646,7 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
             this._elasticChunks = value;
             this.total = 0;
             this.needTotal = !this.elasticChunks;
-            this.chunkMap = {};
+            this.cachedRows = [];
         },
         enumerable: true,
         configurable: true
@@ -2609,22 +2674,12 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
                 endIndex = this.total;
             }
         }
-        var lbChunk = Math.trunc(fromIndex / this._chunkSize);
-        var ubChunk = Math.trunc((endIndex - 1) / this._chunkSize);
-        var allChunksCached = true;
-        for (var i = lbChunk; i <= ubChunk; i++) {
-            if (!this.chunkMap[i]) {
-                allChunksCached = false;
-                break;
-            }
+        if (this.isInMemory && endIndex > this.cachedRows.length) {
+            endIndex = this.cachedRows.length;
         }
+        var allChunksCached = endIndex <= this.cachedRows.length;
         if (allChunksCached) {
-            var resultArr = [];
-            for (var i = lbChunk; i <= ubChunk; i++) {
-                resultArr = resultArr.concat(this.chunkMap[i].rows);
-            }
-            var firstChunkOffset = this.chunkMap[lbChunk].offset;
-            return Promise.resolve(resultArr.slice(fromIndex - firstChunkOffset, endIndex - firstChunkOffset));
+            return Promise.resolve(this.cachedRows.slice(fromIndex, endIndex));
         }
         //if loader is not defined
         if (!this.loader) {
@@ -2635,53 +2690,34 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         if (this.needTotal) {
             this.needTotal = false;
         }
-        var limit = this._chunkSize * (ubChunk - lbChunk + 1);
-        if (this.elasticChunks)
-            limit++;
-        return this.loader.loadChunk({
-            offset: lbChunk * this._chunkSize,
+        var offset = this.cachedRows.length;
+        var limit = endIndex - offset;
+        if (limit < this._chunkSize) {
+            limit = this._chunkSize;
+        }
+        var resultPromise = this.loader.loadChunk({
+            offset: offset,
             limit: limit,
             needTotal: needTotal
         })
             .then(function (result) {
-            var chunks = result.table.getCachedChunks();
             if (needTotal) {
                 _this.total = result.total;
-                if (endIndex > _this.total) {
-                    endIndex = _this.total;
-                }
             }
-            var index = lbChunk;
-            for (var _i = 0, chunks_1 = chunks; _i < chunks_1.length; _i++) {
-                var chunk = chunks_1[_i];
-                _this.chunkMap[index] = {
-                    offset: index * _this._chunkSize,
-                    rows: chunk.rows
-                };
-                index++;
+            Array.prototype.push.apply(_this.cachedRows, result.table.getCachedRows());
+            if (endIndex > _this.cachedRows.length) {
+                endIndex = _this.cachedRows.length;
             }
             if (_this.elasticChunks) {
                 var count_1 = result.table.getCachedCount();
-                if (count_1 > 0) {
-                    var chunk = _this.chunkMap[index - 1];
-                    if (count_1 === limit) {
-                        chunk.rows.splice(chunk.rows.length - 1, 1);
-                        if (chunk.rows.length == 0) {
-                            delete _this.chunkMap[index - 1];
-                        }
-                    }
-                    if (count_1 < limit) {
-                        _this.total = _this.getCachedCount();
-                    }
+                if (count_1 < limit) {
+                    _this.total = _this.cachedRows.length;
                 }
             }
-            var resultArr = [];
-            for (var i = lbChunk; i <= ubChunk; i++) {
-                resultArr = resultArr.concat(_this.chunkMap[i].rows);
-            }
-            var firstChunkOffset = _this.chunkMap[lbChunk].offset;
-            return resultArr.slice(fromIndex - firstChunkOffset, endIndex - firstChunkOffset);
+            _this.fireUpdated();
+            return _this.cachedRows.slice(fromIndex, endIndex);
         });
+        return resultPromise;
     };
     EasyDataTable.prototype.getRow = function (index) {
         return this.getRows({ offset: index, limit: 1 })
@@ -2693,14 +2729,13 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
     EasyDataTable.prototype.setTotal = function (total) {
         this.total = total;
         this.needTotal = false;
-        this.chunkMap = {};
     };
     EasyDataTable.prototype.getCachedCount = function () {
-        return this.getCachedRows().length;
+        return this.cachedRows.length;
     };
     EasyDataTable.prototype.clear = function () {
         this.columns.clear();
-        this.chunkMap = {};
+        this.cachedRows = [];
         this.total = 0;
         this.needTotal = !this._elasticChunks;
     };
@@ -2733,60 +2768,33 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         }
         return null;
     };
-    EasyDataTable.prototype.addRow = function (rowOrValue) {
+    EasyDataTable.prototype.addRow = function (rowOrValues) {
         var newRow;
-        if (Array.isArray(rowOrValue)) {
+        if (Array.isArray(rowOrValues)) {
+            var values = rowOrValues;
             var dateIdx = this._columns.getDateColumnIndexes();
             if (dateIdx.length > 0) {
                 for (var _i = 0, dateIdx_1 = dateIdx; _i < dateIdx_1.length; _i++) {
                     var idx = dateIdx_1[_i];
-                    if (rowOrValue[idx]) {
-                        rowOrValue[idx] = this.mapDate(rowOrValue[idx], this._columns.get(idx).type);
+                    if (values[idx]) {
+                        values[idx] = this.mapDate(values[idx], this._columns.get(idx).type);
                     }
                 }
             }
-            newRow = new DataRow(this._columns, rowOrValue);
+            newRow = new DataRow(this._columns, values);
         }
         else {
-            newRow = this.createRow(rowOrValue);
+            newRow = this.createRow(rowOrValues);
         }
-        var lastChunk = this.getLastChunk();
-        if (!lastChunk || lastChunk.rows.length >= this._chunkSize) {
-            lastChunk = this.createChunk();
-        }
-        lastChunk.rows.push(newRow);
+        this.cachedRows.push(newRow);
         var cachedTotal = this.getCachedCount();
         if (cachedTotal > this.total) {
             this.total = cachedTotal;
         }
         return newRow;
     };
-    EasyDataTable.prototype.createChunk = function (index) {
-        if (typeof index == 'undefined') {
-            index = this.getLastChunkIndex() + 1;
-        }
-        var chunk = { offset: index * this._chunkSize, rows: [] };
-        this.chunkMap[index] = chunk;
-        return chunk;
-    };
-    EasyDataTable.prototype.getLastChunkIndex = function () {
-        var keys = Object.keys(this.chunkMap);
-        return keys.length > 0
-            ? parseInt(keys[keys.length - 1])
-            : -1;
-    };
-    EasyDataTable.prototype.getLastChunk = function () {
-        var index = this.getLastChunkIndex();
-        return index > -1
-            ? this.chunkMap[index]
-            : null;
-    };
     EasyDataTable.prototype.getCachedRows = function () {
-        return this.getCachedChunks()
-            .reduce(function (acc, v) { return acc.concat(v.rows); }, []);
-    };
-    EasyDataTable.prototype.getCachedChunks = function () {
-        return Object.values(this.chunkMap);
+        return this.cachedRows;
     };
     EasyDataTable.prototype.totalIsKnown = function () {
         if (this.elasticChunks) {
@@ -2795,6 +2803,11 @@ var easy_data_table_EasyDataTable = /** @class */ (function () {
         }
         return !this.needTotal;
     };
+    EasyDataTable.prototype.fireUpdated = function () {
+        if (this.onUpdate) {
+            this.onUpdate(this);
+        }
+    };
     return EasyDataTable;
 }());
 
@@ -2946,6 +2959,22 @@ var event_emitter_EventEmitter = /** @class */ (function () {
 }());
 
 //# sourceMappingURL=event_emitter.js.map
+// CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/utils/liquid.js
+var liquid;
+(function (liquid) {
+    function renderLiquidTemplate(template, vars) {
+        var result = template;
+        if (vars) {
+            for (var v in vars) {
+                var liquidVarRegexp = new RegExp('\{\{' + v + '\}\}', 'g');
+                result = result.replace(liquidVarRegexp, vars[v]);
+            }
+        }
+        return result;
+    }
+    liquid.renderLiquidTemplate = renderLiquidTemplate;
+})(liquid || (liquid = {}));
+//# sourceMappingURL=liquid.js.map
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/core/dist/lib/i18n/load_default_locale_settings.js
 
 i18n_i18n.resetLocales();
@@ -2963,7 +2992,6 @@ i18n_i18n.resetLocales();
 
 
 
-//data
 
 
 
@@ -2977,6 +3005,7 @@ i18n_i18n.resetLocales();
 
 
 
+
 if (typeof Object.values !== 'function') {
     Object.values = function (obj) {
         return Object.keys(obj).map(function (key) { return obj[key]; });
@@ -3008,11 +3037,11 @@ var text_data_filter_assign = (undefined && undefined.__assign) || function () {
 };
 
 var text_data_filter_TextDataFilter = /** @class */ (function () {
-    function TextDataFilter(loader, sourceTable, entityId, isLookup) {
+    function TextDataFilter(loader, sourceTable, sourceId, isLookup) {
         if (isLookup === void 0) { isLookup = false; }
         this.loader = loader;
         this.sourceTable = sourceTable;
-        this.entityId = entityId;
+        this.sourceId = sourceId;
         this.isLookup = isLookup;
         this.filterValue = '';
         //turns off client-side search
@@ -3049,7 +3078,7 @@ var text_data_filter_TextDataFilter = /** @class */ (function () {
                 limit: this.sourceTable.chunkSize,
                 needTotal: true,
                 filters: filters_1,
-                entityId: this.entityId,
+                sourceId: this.sourceId,
                 lookup: this.isLookup
             })
                 .then(function (data) {
@@ -3057,7 +3086,7 @@ var text_data_filter_TextDataFilter = /** @class */ (function () {
                     chunkSize: _this.sourceTable.chunkSize,
                     loader: {
                         loadChunk: function (params) { return _this.loader
-                            .loadChunk(text_data_filter_assign({}, params, { filters: filters_1, entityId: _this.entityId, lookup: _this.isLookup })); }
+                            .loadChunk(text_data_filter_assign(text_data_filter_assign({}, params), { filters: filters_1, sourceId: _this.sourceId, lookup: _this.isLookup })); }
                     }
                 });
                 for (var _i = 0, _a = _this.sourceTable.columns.getItems(); _i < _a.length; _i++) {
@@ -3078,26 +3107,26 @@ var text_data_filter_TextDataFilter = /** @class */ (function () {
         return new Promise(function (resolve, reject) {
             var filteredTable = new easy_data_table_EasyDataTable({
                 chunkSize: _this.sourceTable.chunkSize,
+                inMemory: true
             });
             for (var _i = 0, _a = _this.sourceTable.columns.getItems(); _i < _a.length; _i++) {
                 var col = _a[_i];
                 filteredTable.columns.add(col);
             }
             var words = _this.filterValue.split('||').map(function (w) { return w.trim().toLowerCase(); });
+            var suitableColumns = _this.sourceTable.columns.getItems()
+                .filter(function (col) { return utils_utils.isIntType(col.type)
+                || utils_utils.getStringDataTypes().indexOf(col.type) >= 0; });
             var hasEnterance = function (row) {
-                for (var _i = 0, _a = _this.sourceTable.columns.getItems(); _i < _a.length; _i++) {
-                    var col = _a[_i];
-                    if (utils_utils.isIntType(col.type)
-                        || utils_utils.getStringDataTypes().indexOf(col.type) >= 0) {
-                        var value = row.getValue(col.id);
-                        if (value) {
-                            var normalized = value.toString()
-                                .toLowerCase();
-                            for (var _b = 0, words_1 = words; _b < words_1.length; _b++) {
-                                var word = words_1[_b];
-                                if (normalized.indexOf(word) >= 0) {
-                                    return true;
-                                }
+                for (var _i = 0, suitableColumns_1 = suitableColumns; _i < suitableColumns_1.length; _i++) {
+                    var col = suitableColumns_1[_i];
+                    var value = row.getValue(col.id);
+                    if (value) {
+                        var normalized = value.toString().toLowerCase();
+                        for (var _a = 0, words_1 = words; _a < words_1.length; _a++) {
+                            var word = words_1[_a];
+                            if (normalized.indexOf(word) >= 0) {
+                                return true;
                             }
                         }
                     }
@@ -3110,8 +3139,7 @@ var text_data_filter_TextDataFilter = /** @class */ (function () {
                     filteredTable.addRow(row);
                 }
             }
-            if (filteredTable.getCachedCount() == 0)
-                filteredTable.setTotal(0);
+            filteredTable.setTotal(filteredTable.getCachedCount());
             resolve(filteredTable);
         });
     };
@@ -3461,6 +3489,13 @@ var dom_elem_builder_extends = (undefined && undefined.__extends) || (function (
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __spreadArrays = (undefined && undefined.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
 
 var DomElementBuilder = /** @class */ (function () {
     function DomElementBuilder(tag, parent) {
@@ -3531,7 +3566,7 @@ var DomElementBuilder = /** @class */ (function () {
             classNames[_i - 1] = arguments[_i];
         }
         if (className) {
-            var fullList = className.trim().split(" ").concat(classNames);
+            var fullList = __spreadArrays(className.trim().split(" "), classNames);
             for (var i = 0; i < fullList.length; i++)
                 this.element.classList.add(fullList[i]);
         }
@@ -3543,7 +3578,7 @@ var DomElementBuilder = /** @class */ (function () {
             classNames[_i - 1] = arguments[_i];
         }
         if (className) {
-            var fullList = className.trim().split(" ").concat(classNames);
+            var fullList = __spreadArrays(className.trim().split(" "), classNames);
             for (var i = 0; i < fullList.length; i++)
                 this.element.classList.remove(fullList[i]);
         }
@@ -4110,6 +4145,14 @@ var drag_manager_DragManager = /** @class */ (function () {
 //global variable
 var eqDragManager = new drag_manager_DragManager();
 //# sourceMappingURL=drag_manager.js.map
+// CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_options.js
+var AutoResizeColumns;
+(function (AutoResizeColumns) {
+    AutoResizeColumns[AutoResizeColumns["Always"] = 0] = "Always";
+    AutoResizeColumns[AutoResizeColumns["Once"] = 1] = "Once";
+    AutoResizeColumns[AutoResizeColumns["Never"] = 2] = "Never";
+})(AutoResizeColumns || (AutoResizeColumns = {}));
+//# sourceMappingURL=easy_grid_options.js.map
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_cell_renderer.js
 
 
@@ -4261,13 +4304,7 @@ var easy_grid_cell_renderer_GridCellRendererStore = /** @class */ (function () {
 // CONCATENATED MODULE: d:/a/easydata/easydata/easydata.js/packs/ui/dist/lib/grid/easy_grid_columns.js
 
 
-var DEFAULT_WIDTH = 150;
-var DEFAULT_WIDTH_NUMBER = 120;
-var DEFAULT_WIDTH_DATE = 200;
-var DEFAULT_WIDTH_BOOL = 80;
 var DEFAULT_WIDTH_STRING = 250;
-var MIN_WIDTH_STRING = 100;
-var MAX_WIDTH_STRING = 500;
 var ROW_NUM_WIDTH = 60;
 var GridColumnAlign;
 (function (GridColumnAlign) {
@@ -4292,36 +4329,25 @@ var easy_grid_columns_GridColumn = /** @class */ (function () {
     function GridColumn(column, grid, isRowNum) {
         if (isRowNum === void 0) { isRowNum = false; }
         this._label = null;
+        this._description = null;
         //public left: number;
         this.align = GridColumnAlign.NONE;
         this.isVisible = true;
         this.isRowNum = false;
         this.dataColumn = column;
         this.grid = grid;
+        var widthOptions = grid.options.columnWidths || {};
         if (column) {
             if (column.style.alignment) {
                 this.align = MapAlignment(column.style.alignment);
             }
-            var coltype = column.type;
-            var cellType = this.grid.cellRendererStore.getCellType(coltype);
-            switch (cellType) {
-                case CellRendererType.NUMBER:
-                    this.width = DEFAULT_WIDTH_NUMBER;
-                    break;
-                case CellRendererType.DATETIME:
-                    this.width = DEFAULT_WIDTH_DATE;
-                    break;
-                case CellRendererType.BOOL:
-                    this.width = DEFAULT_WIDTH_BOOL;
-                    break;
-                default:
-                    this.width = DEFAULT_WIDTH_STRING;
-            }
+            this.width = (widthOptions && widthOptions[this.type]) ? widthOptions[this.type].default : DEFAULT_WIDTH_STRING;
             this.cellRenderer = this.grid.cellRendererStore.getDefaultRenderer(column.type);
+            this._description = column.description;
         }
         else if (isRowNum) {
             this.isRowNum = true;
-            this.width = ROW_NUM_WIDTH;
+            this.width = (widthOptions && widthOptions.rowNumColumn) ? widthOptions.rowNumColumn.default : ROW_NUM_WIDTH;
             this._label = '';
             this.cellRenderer = this.grid.cellRendererStore.getDefaultRendererByType(CellRendererType.NUMBER);
         }
@@ -4340,6 +4366,14 @@ var easy_grid_columns_GridColumn = /** @class */ (function () {
         configurable: true
     });
     ;
+    Object.defineProperty(GridColumn.prototype, "description", {
+        /** Get column description. */
+        get: function () {
+            return this._description;
+        },
+        enumerable: true,
+        configurable: true
+    });
     Object.defineProperty(GridColumn.prototype, "type", {
         get: function () {
             return this.dataColumn ? this.dataColumn.type : null;
@@ -4359,9 +4393,10 @@ var easy_grid_columns_GridColumnList = /** @class */ (function () {
     GridColumnList.prototype.sync = function (columnList, hasRowNumCol) {
         if (hasRowNumCol === void 0) { hasRowNumCol = true; }
         this.clear();
-        if (hasRowNumCol) {
-            var rowNumCol = new easy_grid_columns_GridColumn(null, this.grid, true);
-            this.add(rowNumCol);
+        var rowNumCol = new easy_grid_columns_GridColumn(null, this.grid, true);
+        this.add(rowNumCol);
+        if (!hasRowNumCol) {
+            rowNumCol.isVisible = false;
         }
         if (columnList) {
             for (var _i = 0, _a = columnList.getItems(); _i < _a.length; _i++) {
@@ -4435,6 +4470,14 @@ var easy_grid_assign = (undefined && undefined.__assign) || function () {
     };
     return easy_grid_assign.apply(this, arguments);
 };
+var easy_grid_spreadArrays = (undefined && undefined.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+
 
 
 
@@ -4467,14 +4510,42 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 pageSize: 30,
                 pageSizeItems: [20, 30, 50, 100, 200]
             },
-            addColumns: false,
+            columnWidths: {
+                autoResize: AutoResizeColumns.Once,
+                stringColumns: {
+                    min: 100,
+                    max: 500,
+                    default: 250
+                },
+                numberColumns: {
+                    min: 60,
+                    default: 120
+                },
+                boolColumns: {
+                    min: 50,
+                    default: 80
+                },
+                dateColumns: {
+                    min: 80,
+                    default: 200
+                },
+                otherColumns: {
+                    min: 100,
+                    max: 500,
+                    default: 250
+                },
+                rowNumColumn: {
+                    min: 40,
+                    default: 60
+                }
+            },
+            showPlusButton: false,
             viewportRowsCount: null,
             showActiveRow: true
         };
         this.rowsOnPagePromise = null;
         this.containerInitialHeight = 0;
         this.firstRender = true;
-        this.compareValues = this.strictCompare;
         this.prevRowTotals = null;
         this.landingIndex = -1;
         this.landingSlot = domel('div')
@@ -4486,7 +4557,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         if (options && options.paging) {
             options.paging = utils_utils.assign(this.defaultDataGridOptions.paging, options.paging);
         }
-        this.options = easy_grid_assign({}, this.defaultDataGridOptions, options);
+        this.options = this.mergeOptions(options);
+        this.processColumnWidthsOptions();
         if (!this.options.slot)
             throw Error('"slot" parameter is required to initialize EasyDataGrid');
         if (!this.options.dataTable)
@@ -4498,6 +4570,42 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         this.setSlot(this.options.slot);
         this.init(this.options);
     }
+    EasyGrid.prototype.mergeOptions = function (options) {
+        var colWidthOptions = utils_utils.assignDeep({}, this.defaultDataGridOptions.columnWidths, options.columnWidths);
+        var pagingOptions = utils_utils.assignDeep({}, this.defaultDataGridOptions.paging, options.paging);
+        var result = utils_utils.assign({}, this.defaultDataGridOptions, options);
+        result.columnWidths = colWidthOptions;
+        result.paging = pagingOptions;
+        return result;
+    };
+    EasyGrid.prototype.processColumnWidthsOptions = function () {
+        var widthOptions = this.options.columnWidths;
+        if (!widthOptions)
+            return;
+        //string columns
+        utils_utils.getStringDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.stringColumns), widthOptions[dataType]);
+        });
+        //numeric columns
+        utils_utils.getNumericDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.numberColumns), widthOptions[dataType]);
+        });
+        //bool columns
+        widthOptions[DataType.Bool] = easy_grid_assign(easy_grid_assign({}, widthOptions.boolColumns), widthOptions[DataType.Bool]);
+        //date columns
+        utils_utils.getDateDataTypes().forEach(function (dataType) {
+            widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.dateColumns), widthOptions[dataType]);
+        });
+        //other columns
+        var knownTypes = easy_grid_spreadArrays(utils_utils.getStringDataTypes(), utils_utils.getNumericDataTypes(), utils_utils.getDateDataTypes(), [
+            DataType.Bool
+        ]);
+        utils_utils.getAllDataTypes().forEach(function (dataType) {
+            if (!(dataType in knownTypes)) {
+                widthOptions[dataType] = easy_grid_assign(easy_grid_assign({}, widthOptions.otherColumns), widthOptions[dataType]);
+            }
+        });
+    };
     EasyGrid.prototype.setSlot = function (slot) {
         if (typeof slot === 'string') {
             if (slot.length) {
@@ -4530,8 +4638,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         if (options.onRowDbClick) {
             this.addEventListener('rowDbClick', options.onRowDbClick);
         }
-        if (options.onAddColumnClick) {
-            this.addEventListener('addColumnClick', options.onAddColumnClick);
+        if (options.onPlusButtonClick) {
+            this.addEventListener('plusButtonClick', options.onPlusButtonClick);
         }
         if (options.onColumnChanged) {
             this.addEventListener('columnChanged', options.onColumnChanged);
@@ -4617,7 +4725,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
     };
     EasyGrid.prototype.render = function () {
         var _this = this;
-        if (!this.hasData() && !this.options.addColumns)
+        if (!this.hasData() && !this.options.showPlusButton)
             return;
         this.containerInitialHeight = this.slot.clientHeight;
         this.rootDiv = document.createElement('div');
@@ -4634,18 +4742,27 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         gridContainer.classList.add(this.cssPrefix + "-container");
         gridContainer.appendChild(this.rootDiv);
         this.slot.appendChild(gridContainer);
+        var needAutoResize = this.options.columnWidths.autoResize !== AutoResizeColumns.Never;
         if (this.rowsOnPagePromise) {
             this.rowsOnPagePromise
                 .then(function () { return _this.updateHeight(); })
                 .then(function () {
                 _this.firstRender = false;
                 _this.rowsOnPagePromise = null;
+                if (needAutoResize) {
+                    _this.resizeColumns();
+                }
             });
         }
         else {
             setTimeout(function () {
-                _this.updateHeight();
-                _this.firstRender = false;
+                _this.updateHeight()
+                    .then(function () {
+                    _this.firstRender = false;
+                    if (needAutoResize) {
+                        _this.resizeColumns();
+                    }
+                });
             }, 100);
         }
     };
@@ -4656,14 +4773,14 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 var firstRow = _this.bodyCellContainerDiv.firstElementChild;
                 var rowHeight = firstRow ? firstRow.offsetHeight : DEFAULT_ROW_HEIGHT;
                 var rowCount = _this.options.viewportRowsCount; // || DEFAULT_ROW_COUNT;
-                var bodyHeight_1 = rowHeight * rowCount;
-                domel(_this.bodyDiv)
-                    .setStyle('height', bodyHeight_1 + "px");
+                var viewportHeight_1 = rowHeight * rowCount;
+                domel(_this.bodyViewportDiv)
+                    .setStyle('height', viewportHeight_1 + "px");
                 setTimeout(function () {
                     var sbHeight = _this.bodyViewportDiv.offsetHeight - _this.bodyViewportDiv.clientHeight;
-                    bodyHeight_1 = bodyHeight_1 + sbHeight;
-                    domel(_this.bodyDiv)
-                        .setStyle('height', bodyHeight_1 + "px");
+                    viewportHeight_1 = viewportHeight_1 + sbHeight;
+                    domel(_this.bodyViewportDiv)
+                        .setStyle('height', viewportHeight_1 + "px");
                     resolve();
                 }, 100);
                 return;
@@ -4682,6 +4799,12 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             }
         });
     };
+    EasyGrid.prototype.getContainerWidth = function () {
+        return this.columns.getItems()
+            .filter(function (col) { return col.isVisible; })
+            .map(function (col) { return col.width; })
+            .reduce(function (sum, current) { return sum + current; });
+    };
     EasyGrid.prototype.renderHeader = function () {
         var _this = this;
         this.headerDiv = domel('div')
@@ -4704,10 +4827,10 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             _this.headerRowDiv.appendChild(hd);
             if (column.isRowNum) {
                 domel(hd)
-                    .addChildElement(_this.renderAddColumnButton());
+                    .addChildElement(_this.renderHeaderButtons());
             }
         });
-        var containerWidth = this.columns.getItems().map(function (column) { return column.width; }).reduce(function (sum, current) { return sum + current; });
+        var containerWidth = this.getContainerWidth();
         domel(this.headerCellContainerDiv)
             .setStyle('width', containerWidth + "px");
     };
@@ -4718,7 +4841,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         var _this = this;
         var colBuilder = domel('div')
             .addClass(this.cssPrefix + "-header-cell")
-            .data('col-idx', "" + (index + 1))
+            .data('col-idx', "" + index)
             .setStyle('width', column.width + "px");
         if (column.dataColumn) {
             colBuilder
@@ -4732,6 +4855,11 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 .addClass(this.cssPrefix + "-header-cell-label")
                 .text(column.label);
         }
+        if (column.description) {
+            domel('div', colDiv)
+                .addClass('question-mark')
+                .title(column.description);
+        }
         if (this.options.allowDragDrop) {
             eqDragManager.registerDraggableItem({
                 element: colDiv,
@@ -4751,14 +4879,6 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         }
         return colDiv;
     };
-    EasyGrid.prototype.strictCompare = function (value1, value2) {
-        return value1 !== value2;
-    };
-    EasyGrid.prototype.caseInsensitiveCompare = function (value1, value2) {
-        var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
-        var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
-        return val1 !== val2;
-    };
     EasyGrid.prototype.renderBody = function () {
         var _this = this;
         this.bodyDiv = domel('div')
@@ -4772,10 +4892,6 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             .addClass(this.cssPrefix + "-cell-container")
             .toDOM();
         var showAggrs = this.canShowAggregates();
-        this.compareValues = this.caseInsensitiveCompare;
-        if (showAggrs && this.options.aggregates.settings.caseSensitiveGroups) {
-            this.compareValues = this.strictCompare;
-        }
         if (this.dataTable) {
             this.showProgress();
             this.rowsOnPagePromise = this.getRowsToRender()
@@ -4785,15 +4901,22 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 //prevent double rendering (bad solution, we have to figure out how to avoid this behavior properly)
                 _this.bodyCellContainerDiv.innerHTML = '';
                 _this.prevRowTotals = null;
+                var rowsToRender = 0;
                 if (rows.length) {
                     var groups_1 = showAggrs
                         ? _this.options.aggregates.settings.getGroups()
                         : [];
+                    rowsToRender = (rows.length < _this.pagination.pageSize)
+                        ? rows.length
+                        : _this.pagination.pageSize;
                     rows.forEach(function (row, index) {
                         if (showAggrs)
                             _this.updateTotalsState(groups_1, row);
-                        var tr = _this.renderRow(row, index);
-                        _this.bodyCellContainerDiv.appendChild(tr);
+                        //we don't actually render the last row
+                        if (index < rowsToRender) {
+                            var tr = _this.renderRow(row, index);
+                            _this.bodyCellContainerDiv.appendChild(tr);
+                        }
                     });
                     var showGrandTotalsOnEachPage = _this.options.aggregates && _this.options.aggregates.showGrandTotalsOnEachPage;
                     if (showAggrs && (_this.isLastPage() || showGrandTotalsOnEachPage)) {
@@ -4801,11 +4924,10 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                         _this.updateTotalsState(groups_1, row, true);
                     }
                 }
-                var containerWidth = _this.columns.getItems()
-                    .map(function (column) { return column.width; }).reduce(function (sum, current) { return sum + current; });
+                var containerWidth = _this.getContainerWidth();
                 domel(_this.bodyCellContainerDiv)
                     .setStyle('width', containerWidth + "px");
-                return rows.length;
+                return rowsToRender;
             })
                 .catch(function (error) { console.error(error); return 0; });
         }
@@ -4813,7 +4935,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             domel(_this.headerViewportDiv)
                 .setStyle('margin-left', "-" + _this.bodyViewportDiv.scrollLeft + "px");
         });
-        this.bodyViewportDiv.addEventListener('keydown', this.onVieportKeydown.bind(this));
+        this.bodyViewportDiv.addEventListener('keydown', this.onViewportKeydown.bind(this));
     };
     EasyGrid.prototype.isLastPage = function () {
         if (this.dataTable.elasticChunks) {
@@ -4839,7 +4961,7 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                 var group = groups[level - 1];
                 for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
                     var col = _a[_i];
-                    if (this.compareValues(this.prevRowTotals.getValue(col), newRow.getValue(col))) {
+                    if (!aggrSettings.compareValues(this.prevRowTotals.getValue(col), newRow.getValue(col))) {
                         changeLevel = level;
                         break;
                     }
@@ -4900,8 +5022,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         });
         var aggrContainer = this.options.aggregates.calculator.getAggrContainer();
         var aggrCols = aggrSettings.getAggregates().map(function (c) { return c.colId; });
-        var key = this.buildGroupKey(group, row);
-        aggrContainer.getAggregates(level, key)
+        var key = aggrSettings.buildGroupKey(group, row);
+        aggrContainer.getAggregateData(level, key)
             .then(function (values) {
             for (var _i = 0, aggrCols_1 = aggrCols; _i < aggrCols_1.length; _i++) {
                 var aggrColId = aggrCols_1[_i];
@@ -4942,34 +5064,20 @@ var easy_grid_EasyGrid = /** @class */ (function () {
                         }
                     }
                     if (groupFooterTemplate) {
-                        var cellDiv_1 = _this.renderCell(column, colIndex, val, rowElement);
+                        var cellDiv_1 = _this.renderCell(column, index, val, rowElement);
                         var innerCell = cellDiv_1.firstChild;
                         val = innerCell.innerHTML;
                         val = _this.applyGroupColumnTemplate(groupFooterTemplate, val, values[aggrSettings.COUNT_FIELD_NAME]);
                     }
                 }
-                var cellDiv = _this.renderCell(column, colIndex, val, rowElement);
+                var cellDiv = _this.renderCell(column, index, val, rowElement);
                 rowElement.appendChild(cellDiv);
             });
         })
             .catch(function (error) { return console.error(error); });
         return rowElement;
     };
-    EasyGrid.prototype.buildGroupKey = function (group, row) {
-        var aggrSettings = this.options.aggregates.settings;
-        var caseInsensitive = aggrSettings && !aggrSettings.caseSensitiveGroups;
-        var result = {};
-        for (var _i = 0, _a = group.columns; _i < _a.length; _i++) {
-            var colId = _a[_i];
-            var keyVal = row.getValue(colId);
-            if (caseInsensitive && typeof (keyVal) === 'string') {
-                keyVal = keyVal.toLowerCase();
-            }
-            result[colId] = keyVal;
-        }
-        return result;
-    };
-    EasyGrid.prototype.onVieportKeydown = function (ev) {
+    EasyGrid.prototype.onViewportKeydown = function (ev) {
         if (this.options.showActiveRow) {
             var rowCount = this.bodyCellContainerDiv.querySelectorAll("." + this.cssPrefix + "-row").length;
             var newValue = void 0;
@@ -5023,13 +5131,17 @@ var easy_grid_EasyGrid = /** @class */ (function () {
             }
         }
     };
+    /** Returns a promise with the list of the rows to render on one page.
+     * The list contains pageSize+1 row to make it possible
+     * to render the totals row (if it appears to be on the edge between pages)
+     */
     EasyGrid.prototype.getRowsToRender = function () {
         if (this.options.paging.enabled === false) {
             return Promise.resolve(this.dataTable.getCachedRows());
         }
         return this.dataTable.getRows({
-            page: this.pagination.page,
-            pageSize: this.pagination.pageSize
+            offset: (this.pagination.page - 1) * this.pagination.pageSize,
+            limit: this.pagination.pageSize + 1
         })
             .catch(function (error) {
             console.error(error);
@@ -5054,23 +5166,26 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         var pageInfoDiv = domel('div')
             .addClass(this.cssPrefix + "-page-info")
             .toDOM();
-        var fistPageRecordNum = count
-            ? (this.pagination.page - 1) * this.pagination.pageSize + 1
-            : 0;
-        var lastPageRecordNum = count
-            ? fistPageRecordNum + count - 1
-            : 0;
-        var totalStr = this.dataTable.getTotal().toString();
-        if (this.dataTable.elasticChunks) {
-            var count_1 = this.dataTable.getCachedCount();
-            var total = this.dataTable.getTotal();
-            if (count_1 !== total)
-                totalStr = '?';
-        }
-        pageInfoDiv.innerHTML = i18n_i18n.getText('GridPageInfo')
-            .replace('{FirstPageRecordNum}', "<span>" + fistPageRecordNum.toString() + "</span>")
-            .replace('{LastPageRecordNum}', "<span>" + lastPageRecordNum.toString() + "</span>")
-            .replace('{Total}', "<span>" + totalStr + "</span>");
+        var rowCount = this.dataTable.getTotal();
+        if (rowCount > 0) {
+            var fistPageRecordNum = count
+                ? (this.pagination.page - 1) * this.pagination.pageSize + 1
+                : 0;
+            var lastPageRecordNum = count
+                ? fistPageRecordNum + count - 1
+                : 0;
+            var totalStr = this.dataTable.getTotal().toString();
+            if (this.dataTable.elasticChunks) {
+                var count_1 = this.dataTable.getCachedCount();
+                var total = this.dataTable.getTotal();
+                if (count_1 !== total)
+                    totalStr = '?';
+            }
+            pageInfoDiv.innerHTML = i18n_i18n.getText('GridPageInfo')
+                .replace('{FirstPageRecordNum}', "<span>" + fistPageRecordNum.toString() + "</span>")
+                .replace('{LastPageRecordNum}', "<span>" + lastPageRecordNum.toString() + "</span>")
+                .replace('{Total}', "<span>" + totalStr + "</span>");
+        }
         return pageInfoDiv;
     };
     EasyGrid.prototype.showProgress = function () {
@@ -5125,13 +5240,13 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         if (this.options.showActiveRow && index == this.activeRowIndex) {
             rowBuilder.addClass(this.cssPrefix + "-row-active");
         }
-        this.columns.getItems().forEach(function (column) {
+        this.columns.getItems().forEach(function (column, index) {
             if (!column.isVisible) {
                 return;
             }
             var colindex = column.isRowNum ? -1 : _this.dataTable.columns.getIndex(column.dataColumn.id);
             var val = column.isRowNum ? indexGlobal + 1 : row.getValue(colindex);
-            rowElement.appendChild(_this.renderCell(column, colindex, val, rowElement));
+            rowElement.appendChild(_this.renderCell(column, index, val, rowElement));
         });
         return rowElement;
     };
@@ -5165,7 +5280,8 @@ var easy_grid_EasyGrid = /** @class */ (function () {
         var _this = this;
         var paginateDiv = document.createElement('div');
         paginateDiv.className = this.cssPrefix + "-pagination-wrapper";
-        if (this.options.paging && this.options.paging.enabled) {
+        var rowCount = this.dataTable.getTotal();
+        if (this.options.paging && this.options.paging.enabled && rowCount > 0) {
             var prefix_1 = this.paginationOptions.useBootstrap ? '' : this.cssPrefix + "-";
             var buttonClickHandler_1 = function (ev) {
                 var element = ev.target;
@@ -5291,18 +5407,18 @@ var easy_grid_EasyGrid = /** @class */ (function () {
     EasyGrid.prototype.removeEventListener = function (eventType, handlerId) {
         this.eventEmitter.unsubscribe(eventType, handlerId);
     };
-    EasyGrid.prototype.renderAddColumnButton = function () {
+    EasyGrid.prototype.renderHeaderButtons = function () {
         var _this = this;
-        if (this.options.addColumns) {
+        if (this.options.showPlusButton) {
             return domel('div')
-                .addClass(this.cssPrefix + "-addrow")
-                .title(this.options.addColumnsTitle || 'Add column')
+                .addClass(this.cssPrefix + "-header-btn-plus")
+                .title(this.options.plusButtonTitle || 'Add')
                 .addChild('a', function (builder) { return builder
                 .attr('href', 'javascript:void(0)')
                 .on('click', function (e) {
                 e.preventDefault();
                 _this.fireEvent({
-                    type: 'addColumnClick',
+                    type: 'plusButtonClick',
                     sourceEvent: e
                 });
             }); })
@@ -5403,6 +5519,97 @@ var easy_grid_EasyGrid = /** @class */ (function () {
     EasyGrid.prototype.focus = function () {
         this.bodyViewportDiv.focus();
     };
+    EasyGrid.prototype.resizeColumns = function () {
+        if (this.options.columnWidths.autoResize === AutoResizeColumns.Never)
+            return;
+        var containerWidth = this.bodyCellContainerDiv.style.width;
+        this.bodyCellContainerDiv.style.visibility = 'hidden';
+        this.bodyCellContainerDiv.style.width = '1px';
+        //this.headerRowDiv.style.visibility = 'hidden';
+        this.headerRowDiv.style.width = '1px';
+        var sumWidth = 0;
+        var columns = this.columns.getItems();
+        var headerCells = this.headerCellContainerDiv.querySelectorAll("." + this.cssPrefix + "-header-cell");
+        var headerIdx = 0;
+        var _loop_1 = function (idx) {
+            var column = columns[idx];
+            if (!column.isVisible)
+                return "continue";
+            var calculatedWidth = this_1.options.columnWidths.autoResize !== AutoResizeColumns.Always && column.dataColumn
+                ? column.dataColumn.calculatedWidth
+                : 0;
+            var cellValues = this_1.bodyCellContainerDiv.querySelectorAll("." + this_1.cssPrefix + "-cell[data-col-idx=\"" + idx + "\"] > ." + this_1.cssPrefix + "-cell-value");
+            var maxWidth = 0;
+            if (calculatedWidth > 0) {
+                sumWidth += calculatedWidth;
+                column.width = calculatedWidth;
+                cellValues.forEach(function (value) {
+                    value.parentElement.style.width = calculatedWidth + "px";
+                });
+                headerCells[headerIdx].style.width = calculatedWidth + "px";
+            }
+            else {
+                if (cellValues.length == 0) {
+                    headerCells[headerIdx].style.width = null;
+                    headerCells[headerIdx].style.whiteSpace = 'nowrap';
+                }
+                maxWidth = headerCells[headerIdx].offsetWidth;
+                if (cellValues.length > 0) {
+                    cellValues.forEach(function (value) {
+                        value.parentElement.style.width = null;
+                        var width = value.parentElement.offsetWidth;
+                        if (width > maxWidth) {
+                            maxWidth = width;
+                        }
+                    });
+                    maxWidth += 3;
+                    var maxOption = column.isRowNum
+                        ? this_1.options.columnWidths.rowNumColumn.max || 500
+                        : this_1.options.columnWidths[column.dataColumn.type].max || 2000;
+                    var minOption = column.isRowNum
+                        ? this_1.options.columnWidths.rowNumColumn.min || 0
+                        : this_1.options.columnWidths[column.dataColumn.type].min || 20;
+                    if (maxWidth > maxOption) {
+                        maxWidth = maxOption;
+                    }
+                    if (maxWidth < minOption) {
+                        maxWidth = minOption;
+                    }
+                    if (utils_utils.isNumericType(column.type)) {
+                        //increase the calculated width in 1.3 times for numeric columns
+                        maxWidth = Math.round(maxWidth * 1.3);
+                    }
+                    sumWidth += maxWidth;
+                    column.width = maxWidth;
+                    cellValues.forEach(function (value) {
+                        value.parentElement.style.width = maxWidth + "px";
+                    });
+                    headerCells[headerIdx].style.width = maxWidth + "px";
+                    if (column.dataColumn) {
+                        column.dataColumn.calculatedWidth = maxWidth;
+                    }
+                }
+                else {
+                    sumWidth += maxWidth;
+                }
+            }
+            headerIdx++;
+        };
+        var this_1 = this;
+        for (var idx = 0; idx < this.columns.count; idx++) {
+            _loop_1(idx);
+        }
+        if (sumWidth > 0) {
+            this.bodyCellContainerDiv.style.width = sumWidth + "px";
+            this.headerCellContainerDiv.style.width = sumWidth + "px";
+        }
+        else {
+            this.bodyCellContainerDiv.style.width = containerWidth;
+            this.headerCellContainerDiv.style.width = containerWidth;
+        }
+        this.bodyCellContainerDiv.style.visibility = null;
+        this.headerRowDiv.removeAttribute('style');
+    };
     return EasyGrid;
 }());
 
@@ -6156,9 +6363,9 @@ var DefaultDialogService = /** @class */ (function () {
             _this.open(options);
         });
     };
-    DefaultDialogService.prototype.open = function (options) {
+    DefaultDialogService.prototype.open = function (options, data) {
         var _this = this;
-        var dialog = new default_dialog_service_DefaultDialog(options);
+        var dialog = new default_dialog_service_DefaultDialog(options, data);
         var onDestroy = options.onDestroy;
         options.onDestroy = function (dlg) {
             _this.untrack(dlg);
@@ -6206,7 +6413,7 @@ var DefaultDialogService = /** @class */ (function () {
 }());
 
 var default_dialog_service_DefaultDialog = /** @class */ (function () {
-    function DefaultDialog(options) {
+    function DefaultDialog(options, data) {
         var _this = this;
         this.options = options;
         this.submitHandler = function (token) {
@@ -6234,6 +6441,7 @@ var default_dialog_service_DefaultDialog = /** @class */ (function () {
             return true;
         };
         this.dialogId = utils_utils.generateId('dlg');
+        this.data = data;
         this.slot =
             domel('div', document.body)
                 .attr('tab-index', '-1')
@@ -6268,7 +6476,8 @@ var default_dialog_service_DefaultDialog = /** @class */ (function () {
                     .addClass(default_dialog_service_cssPrefix + "-body")
                     .toDOM();
                 if (typeof options.body === 'string') {
-                    b.addHtml(options.body);
+                    var html = liquid.renderLiquidTemplate(options.body, data);
+                    b.addHtml(html);
                 }
                 else {
                     b.addChildElement(options.body);
@@ -6328,6 +6537,9 @@ var default_dialog_service_DefaultDialog = /** @class */ (function () {
                 .toDOM(); })
                 .toDOM();
     }
+    DefaultDialog.prototype.getData = function () {
+        return this.data;
+    };
     DefaultDialog.prototype.getRootElement = function () {
         return this.slot;
     };
@@ -6452,7 +6664,7 @@ var default_dialog_service_DefaultDialog = /** @class */ (function () {
 
 var default_dialog_service_DefaultProgressDialog = /** @class */ (function (_super) {
     default_dialog_service_extends(DefaultProgressDialog, _super);
-    function DefaultProgressDialog(options) {
+    function DefaultProgressDialog(options, data) {
         var _this = this;
         var contentElement;
         var progressElement;
@@ -6487,7 +6699,7 @@ var default_dialog_service_DefaultProgressDialog = /** @class */ (function (_sup
             cancelable: false,
             closable: false,
             onDestroy: options.onDestroy
-        }) || this;
+        }, data) || this;
         _this.contentElement = contentElement;
         _this.progressElement = progressElement;
         return _this;
@@ -6528,13 +6740,13 @@ var DefaultDialogSet = /** @class */ (function () {
     DefaultDialogSet.prototype.getCurrent = function () {
         return this.currentDialog;
     };
-    DefaultDialogSet.prototype.openNext = function () {
-        return this.open(this.currentIndex + 1);
+    DefaultDialogSet.prototype.openNext = function (data) {
+        return this.open(this.currentIndex + 1, data);
     };
-    DefaultDialogSet.prototype.openPrev = function () {
-        return this.open(this.currentIndex - 1);
+    DefaultDialogSet.prototype.openPrev = function (data) {
+        return this.open(this.currentIndex - 1, data);
     };
-    DefaultDialogSet.prototype.open = function (page) {
+    DefaultDialogSet.prototype.open = function (page, data) {
         if (page < 0) {
             this.currentIndex = 0;
         }
@@ -6550,7 +6762,8 @@ var DefaultDialogSet = /** @class */ (function () {
             }
             catch (e) { }
         }
-        this.currentDialog = this.dialogService.open(this.options[this.currentIndex]);
+        var dlgOptions = this.options[this.currentIndex];
+        this.currentDialog = this.dialogService.open(dlgOptions, data);
         return this.currentDialog;
     };
     DefaultDialogSet.prototype.close = function () {
@@ -6583,6 +6796,7 @@ addEasyDataUITexts();
 
 
 
+
 //datetimepicker
 
 
@@ -7088,12 +7302,13 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                     var lookupTable = new easy_data_table_EasyDataTable({
                         loader: {
                             loadChunk: function (chunkParams) { return _this.context.getDataLoader()
-                                .loadChunk(entity_form_builder_assign({}, chunkParams, { id: lookupEntity.id })); }
+                                .loadChunk(entity_form_builder_assign(entity_form_builder_assign({}, chunkParams), { id: lookupEntity.id })); }
                         }
                     });
                     _this.context.getDataLoader()
-                        .loadChunk({ offset: 0, limit: 1000, needTotal: true, entityId: lookupEntity.id })
+                        .loadChunk({ offset: 0, limit: 1000, needTotal: true, sourceId: lookupEntity.id })
                         .then(function (data) {
+                        var _a;
                         var _loop_1 = function (col) {
                             var attrs = lookupEntity.attributes.filter(function (attr) {
                                 return attr.id == col.id && (attr.isPrimaryKey || attr.showInLookup);
@@ -7102,13 +7317,13 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                                 lookupTable.columns.add(col);
                             }
                         };
-                        for (var _i = 0, _a = data.table.columns.getItems(); _i < _a.length; _i++) {
-                            var col = _a[_i];
+                        for (var _i = 0, _b = data.table.columns.getItems(); _i < _b.length; _i++) {
+                            var col = _b[_i];
                             _loop_1(col);
                         }
                         lookupTable.setTotal(data.total);
-                        for (var _b = 0, _c = data.table.getCachedRows(); _b < _c.length; _b++) {
-                            var row = _c[_b];
+                        for (var _c = 0, _d = data.table.getCachedRows(); _c < _d.length; _c++) {
+                            var row = _d[_c];
                             lookupTable.addRow(row);
                         }
                         var ds = new DefaultDialogService();
@@ -7147,7 +7362,9 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                                 .join(', ');
                         };
                         if (selectedValue) {
-                            _this.context.getEntity(selectedValue, lookupEntity.id)
+                            var attr_1 = lookupEntity.getFirstPrimaryAttr();
+                            var key = attr_1.id.substring(attr_1.id.lastIndexOf('.') + 1);
+                            _this.context.fetchRecord((_a = {}, _a[key] = selectedValue, _a), lookupEntity.id)
                                 .then(function (data) {
                                 if (data.entity) {
                                     updateSelectedValue(data.entity);
@@ -7195,7 +7412,7 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 }); });
         });
     };
-    EntityEditFormBuilder.prototype.setupDateTimeField = function (parent, attr, readOnly, value) {
+    EntityEditFormBuilder.prototype.setupDateTimeField = function (parent, attr, value, readOnly, hidden) {
         var _this = this;
         var horizClass = isIE
             ? 'kfrm-fields-ie is-horizontal'
@@ -7216,6 +7433,8 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 .addClass(horizClass)
                 .addChild('input', function (b) {
                 inputEl = b.toDOM();
+                b.name(attr.id);
+                b.type(hidden ? 'hidden' : _this.resolveInputType(attr.dataType));
                 if (readOnly) {
                     b.attr('readonly', '');
                 }
@@ -7239,8 +7458,6 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                         }
                     });
                 }
-                b.name(attr.id);
-                b.type(_this.resolveInputType(attr.dataType));
                 b.value((utils_utils.IsDefinedAndNotNull(value)
                     ? utils_utils.dateTimeToStr(value, editFormat)
                     : ''));
@@ -7282,7 +7499,7 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 }).toDOM(); });
         });
     };
-    EntityEditFormBuilder.prototype.setupListField = function (parent, attr, readOnly, values, value) {
+    EntityEditFormBuilder.prototype.setupListField = function (parent, attr, value, values, readOnly) {
         var _this = this;
         domel(parent)
             .addChild('div', function (b) { return b
@@ -7315,12 +7532,14 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
             b.attr('accept', accept);
         });
     };
-    EntityEditFormBuilder.prototype.setupTextField = function (parent, attr, readOnly, value) {
+    EntityEditFormBuilder.prototype.setupTextField = function (parent, attr, value, readOnly, hidden) {
         var _this = this;
         domel(parent)
             .addChild('input', function (b) {
-            if (readOnly)
+            if (readOnly) {
                 b.attr('readonly', '');
+            }
+            b.type(hidden ? 'hidden' : _this.resolveInputType(attr.dataType));
             b.name(attr.id)
                 .type(_this.resolveInputType(attr.dataType));
             if (attr.dataType == DataType.Bool) {
@@ -7335,7 +7554,7 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
             }
         });
     };
-    EntityEditFormBuilder.prototype.setupTextArea = function (parent, attr, readOnly, value) {
+    EntityEditFormBuilder.prototype.setupTextArea = function (parent, attr, value, readOnly) {
         // feature: modify size in value editor ??
         domel(parent)
             .addChild('textarea', function (b) {
@@ -7343,6 +7562,9 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 b.attr('readonly', '');
             b.attr('name', attr.id);
             b.setStyle('height', "120px");
+            b.value(utils_utils.IsDefinedAndNotNull(value)
+                ? value.toString()
+                : '');
         });
     };
     EntityEditFormBuilder.prototype.addFormField = function (parent, attr) {
@@ -7358,19 +7580,28 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
                 .toDOM();
         }
         domel(parent)
-            .addChild('label', function (b) { return b
-            .attr('for', attr.id)
-            .addHtml(attr.caption + " " + (required ? '<sup style="color: red">*</sup>' : '') + ": "); });
+            .addChild('label', function (b) {
+            b.attr('for', attr.id);
+            b.addHtml(attr.caption + " " + (required ? '<sup style="color: red">*</sup>' : '') + ": ");
+            if (attr.description) {
+                b.addChild('div', function (b) { return b
+                    .attr('title', attr.description)
+                    .addClass('question-mark')
+                    .setStyle('vertical-align', 'middle')
+                    .setStyle('display', 'inline-block'); });
+            }
+        });
+        var hidden = attr.isPrimaryKey;
         if (attr.kind === EntityAttrKind.Lookup) {
             this.setupLookupField(parent, attr, readOnly, value);
             return;
         }
         switch (editor.tag) {
             case EditorTag.DateTime:
-                this.setupDateTimeField(parent, attr, readOnly, value);
+                this.setupDateTimeField(parent, attr, value, readOnly, hidden);
                 break;
             case EditorTag.List:
-                this.setupListField(parent, attr, readOnly, editor.values, value);
+                this.setupListField(parent, attr, value, editor.values, readOnly);
                 break;
             case EditorTag.File:
                 this.setupFileField(parent, attr, readOnly, editor.accept);
@@ -7378,10 +7609,10 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
             case EditorTag.Edit:
             default:
                 if (editor.multiline) {
-                    this.setupTextArea(parent, attr, readOnly, value);
+                    this.setupTextArea(parent, attr, value, readOnly);
                 }
                 else {
-                    this.setupTextField(parent, attr, readOnly, value);
+                    this.setupTextField(parent, attr, value, readOnly, hidden);
                 }
                 break;
         }
@@ -7433,13 +7664,15 @@ var entity_form_builder_EntityEditFormBuilder = /** @class */ (function () {
         this.form['setHtmlInt'](formHtml);
         for (var _i = 0, _a = this.context.getActiveEntity().attributes; _i < _a.length; _i++) {
             var attr = _a[_i];
-            if (this.params.isEditForm) {
-                if (!attr.showOnEdit)
-                    continue;
-            }
-            else {
-                if (!attr.showOnCreate)
-                    continue;
+            if (!attr.isPrimaryKey) {
+                if (this.params.isEditForm) {
+                    if (!attr.showOnEdit)
+                        continue;
+                }
+                else {
+                    if (!attr.showOnCreate)
+                        continue;
+                }
             }
             this.addFormField(fb.toDOM(), attr);
         }
@@ -7474,8 +7707,8 @@ var easy_data_server_loader_EasyDataServerLoader = /** @class */ (function () {
     }
     EasyDataServerLoader.prototype.loadChunk = function (params) {
         var _this = this;
-        var url = this.context.resolveEndpoint('GetEntities', { entityId: params.entityId || this.context.getActiveEntity().id });
-        delete params.entityId;
+        var url = this.context.resolveEndpoint('FetchDataset', { sourceId: params.sourceId || this.context.getActiveEntity().id });
+        delete params.sourceId;
         this.context.startProcess();
         var http = this.context.getHttpClient();
         return http.post(url, params)
@@ -7512,6 +7745,17 @@ var easy_data_server_loader_EasyDataServerLoader = /** @class */ (function () {
 
 
 // CONCATENATED MODULE: ./src/main/data_context.ts
+var data_context_assign = (undefined && undefined.__assign) || function () {
+    data_context_assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return data_context_assign.apply(this, arguments);
+};
 
 
 
@@ -7524,9 +7768,8 @@ var data_context_DataContext = /** @class */ (function () {
         this.model = new meta_data_MetaData();
         this.model.id = options.metaDataId || '__default';
         this.dataLoader = new easy_data_server_loader_EasyDataServerLoader(this);
-        this.data = new easy_data_table_EasyDataTable({
-            loader: this.dataLoader
-        });
+        var dataTableOptions = data_context_assign({ loader: this.dataLoader }, options.dataTable);
+        this.data = new easy_data_table_EasyDataTable(dataTableOptions);
         this.setDefaultEndpoints(this.options.endpoint || '/api/easydata');
     }
     DataContext.prototype.getActiveEntity = function () {
@@ -7545,8 +7788,8 @@ var data_context_DataContext = /** @class */ (function () {
     DataContext.prototype.getDataLoader = function () {
         return this.dataLoader;
     };
-    DataContext.prototype.createFilter = function (entityId, data, isLookup) {
-        return new text_data_filter_TextDataFilter(this.dataLoader, data || this.getData(), entityId || this.activeEntity.id, isLookup);
+    DataContext.prototype.createFilter = function (sourceId, data, isLookup) {
+        return new text_data_filter_TextDataFilter(this.dataLoader, data || this.getData(), sourceId || this.activeEntity.id, isLookup);
     };
     DataContext.prototype.loadMetaData = function () {
         var _this = this;
@@ -7570,7 +7813,7 @@ var data_context_DataContext = /** @class */ (function () {
     DataContext.prototype.getHttpClient = function () {
         return this.http;
     };
-    DataContext.prototype.getEntities = function () {
+    DataContext.prototype.fetchDataset = function () {
         var _this = this;
         this.data.clear();
         return this.dataLoader.loadChunk({ offset: 0, limit: this.data.chunkSize, needTotal: true })
@@ -7587,33 +7830,33 @@ var data_context_DataContext = /** @class */ (function () {
             return _this.data;
         });
     };
-    DataContext.prototype.getEntity = function (id, entityId) {
+    DataContext.prototype.fetchRecord = function (keys, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('GetEntity', { id: id,
-            entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('FetchRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.get(url).getPromise()
+        return this.http.get(url, { queryParams: keys })
             .finally(function () { return _this.endProcess(); });
     };
-    DataContext.prototype.createEntity = function (obj, entityId) {
+    DataContext.prototype.createRecord = function (obj, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('CreateEntity', { entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('CreateRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.post(url, obj, { dataType: 'json' }).getPromise().finally(function () { return _this.endProcess(); });
+        return this.http.post(url, obj, { dataType: 'json' })
+            .finally(function () { return _this.endProcess(); });
     };
-    DataContext.prototype.updateEntity = function (id, obj, entityId) {
+    DataContext.prototype.updateRecord = function (obj, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('UpdateEntity', { id: id,
-            entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('UpdateRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.post(url, obj, { dataType: 'json' }).getPromise().finally(function () { return _this.endProcess(); });
+        return this.http.post(url, obj, { dataType: 'json' })
+            .finally(function () { return _this.endProcess(); });
     };
-    DataContext.prototype.deleteEntity = function (id, entityId) {
+    DataContext.prototype.deleteRecord = function (obj, sourceId) {
         var _this = this;
-        var url = this.resolveEndpoint('DeleteEntity', { id: id,
-            entityId: entityId || this.activeEntity.id });
+        var url = this.resolveEndpoint('DeleteRecord', { sourceId: sourceId || this.activeEntity.id });
         this.startProcess();
-        return this.http.post(url, null).getPromise().finally(function () { return _this.endProcess(); });
+        return this.http.post(url, obj, { dataType: 'json' })
+            .finally(function () { return _this.endProcess(); });
     };
     DataContext.prototype.setEndpoint = function (key, value) {
         this.endpoints.set(key, value);
@@ -7638,7 +7881,7 @@ var data_context_DataContext = /** @class */ (function () {
                     if (opt == 'modelId') {
                         optVal = this.model.getId();
                     }
-                    else if (opt == 'entityId') {
+                    else if (opt == 'sourceId') {
                         optVal = this.activeEntity.id;
                     }
                     else {
@@ -7660,11 +7903,11 @@ var data_context_DataContext = /** @class */ (function () {
     };
     DataContext.prototype.setDefaultEndpoints = function (endpointBase) {
         this.setEnpointIfNotExist('GetMetaData', combinePath(endpointBase, 'models/{modelId}'));
-        this.setEnpointIfNotExist('GetEntities', combinePath(endpointBase, 'models/{modelId}/crud/{entityId}/fetch'));
-        this.setEnpointIfNotExist('GetEntity', combinePath(endpointBase, 'models/{modelId}/crud/{entityId}/fetch/{id}'));
-        this.setEnpointIfNotExist('CreateEntity', combinePath(endpointBase, 'models/{modelId}/crud/{entityId}/create'));
-        this.setEnpointIfNotExist('UpdateEntity', combinePath(endpointBase, 'models/{modelId}/crud/{entityId}/update/{id}'));
-        this.setEnpointIfNotExist('DeleteEntity', combinePath(endpointBase, 'models/{modelId}/crud/{entityId}/delete/{id}'));
+        this.setEnpointIfNotExist('FetchDataset', combinePath(endpointBase, 'models/{modelId}/sources/{sourceId}/fetch'));
+        this.setEnpointIfNotExist('FetchRecord', combinePath(endpointBase, 'models/{modelId}/sources/{sourceId}/fetch'));
+        this.setEnpointIfNotExist('CreateRecord', combinePath(endpointBase, 'models/{modelId}/sources/{sourceId}/create'));
+        this.setEnpointIfNotExist('UpdateRecord', combinePath(endpointBase, 'models/{modelId}/sources/{sourceId}/update'));
+        this.setEnpointIfNotExist('DeleteRecord', combinePath(endpointBase, 'models/{modelId}/sources/{sourceId}/delete'));
     };
     return DataContext;
 }());
@@ -7797,7 +8040,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
     };
     EntityDataView.prototype.renderGrid = function () {
         var _this = this;
-        this.context.getEntities()
+        this.context.fetchDataset()
             .then(function (result) {
             var gridSlot = document.createElement('div');
             _this.slot.appendChild(gridSlot);
@@ -7810,10 +8053,10 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                     allowPageSizeChange: true,
                     pageSizeItems: [15, 30, 50, 100, 200]
                 },
-                addColumns: true,
-                addColumnsTitle: i18n_i18n.getText('AddBtnTitle'),
+                showPlusButton: _this.context.getActiveEntity().isEditable,
+                plusButtonTitle: i18n_i18n.getText('AddRecordBtnTitle'),
                 showActiveRow: false,
-                onAddColumnClick: _this.addClickHandler.bind(_this),
+                onPlusButtonClick: _this.addClickHandler.bind(_this),
                 onGetCellRenderer: _this.manageCellRenderer.bind(_this),
                 onRowDbClick: _this.rowDbClickHandler.bind(_this),
                 onSyncGridColumn: _this.syncGridColumnHandler.bind(_this)
@@ -7868,7 +8111,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                 if (!form.validate())
                     return false;
                 form.getData()
-                    .then(function (obj) { return _this.context.createEntity(obj); })
+                    .then(function (obj) { return _this.context.createRecord(obj); })
                     .then(function () {
                     return _this.refreshData();
                 })
@@ -7899,12 +8142,10 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
                 .replace('{entity}', activeEntity.caption),
             body: form.getHtml(),
             onSubmit: function () {
-                var keyAttrs = activeEntity.attributes.filter(function (attr) { return attr.isPrimaryKey; });
-                var keys = keyAttrs.map(function (attr) { return row.getValue(attr.id); });
                 if (!form.validate())
                     return false;
                 form.getData()
-                    .then(function (obj) { return _this.context.updateEntity(keys.join(':'), obj); })
+                    .then(function (obj) { return _this.context.updateRecord(obj); })
                     .then(function () {
                     return _this.refreshData();
                 })
@@ -7925,16 +8166,20 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
             .then(function (row) {
             if (row) {
                 var activeEntity = _this.context.getActiveEntity();
-                var keyAttrs = activeEntity.attributes.filter(function (attr) { return attr.isPrimaryKey; });
-                var keys_1 = keyAttrs.map(function (attr) { return row.getValue(attr.id); });
-                var entityId = keyAttrs.map(function (attr, index) { return attr.id + ":" + keys_1[index]; }).join(';');
+                var keyAttrs = activeEntity.getPrimaryAttrs();
+                var keyVals_1 = keyAttrs.map(function (attr) { return row.getValue(attr.id); });
+                var keys_1 = keyAttrs.reduce(function (val, attr, index) {
+                    var property = attr.id.substring(attr.id.lastIndexOf('.') + 1);
+                    val[property] = keyVals_1[index];
+                    return val;
+                }, {});
                 _this.dlg.openConfirm(i18n_i18n.getText('DeleteDlgCaption')
                     .replace('{entity}', activeEntity.caption), i18n_i18n.getText('DeleteDlgMessage')
-                    .replace('{entityId}', entityId))
+                    .replace('{recordId}', Object.keys(keys_1)
+                    .map(function (key) { return key + ":" + keys_1[key]; }).join(';')))
                     .then(function (result) {
                     if (result) {
-                        //pass entityId in future
-                        _this.context.deleteEntity(keys_1.join(':'))
+                        _this.context.deleteRecord(keys_1)
                             .then(function () {
                             return _this.refreshData();
                         })
@@ -7956,7 +8201,7 @@ var entity_data_view_EntityDataView = /** @class */ (function () {
     };
     EntityDataView.prototype.refreshData = function () {
         var _this = this;
-        return this.context.getEntities()
+        return this.context.fetchDataset()
             .then(function () {
             _this.grid.refresh();
         });
@@ -8042,6 +8287,7 @@ var easy_data_view_dispatcher_EasyDataViewDispatcher = /** @class */ (function (
         parent.insertBefore(progressBarSlot, parent.firstElementChild);
         this.context = new data_context_DataContext({
             endpoint: options.endpoint,
+            dataTable: options.dataTable,
             onProcessStart: function () { return bar.show(); },
             onProcessEnd: function () { return bar.hide(); }
         });
@@ -8136,13 +8382,14 @@ function addEasyDataCRUDTexts() {
         CalendarBtnTitle: 'Open calendar',
         TimerBtnTitle: 'Open timer',
         AddBtnTitle: 'Add',
+        AddRecordBtnTitle: 'Add record',
         EditBtn: 'Edit',
         DeleteBtn: 'Delete',
         SelectLink: '[ select ]',
         AddDlgCaption: 'Create {entity}',
         EditDlgCaption: 'Edit {entity}',
         DeleteDlgCaption: 'Delete {entity}',
-        DeleteDlgMessage: 'Are you shure about removing this entity: [{entityId}]?',
+        DeleteDlgMessage: 'Are you sure you want to remove this record: {{recordId}}?',
         EntityMenuDesc: 'Click on an entity to view/edit its content',
         BackToEntities: 'Back to entities',
         SearchBtn: 'Search',