@michalrakus/x-react-web-lib 1.28.0 → 1.30.0

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -131,6 +131,7 @@ var XMultilineSwitch_1 = require("./XMultilineSwitch");
 var XMultilineRenderer_1 = require("./XMultilineRenderer");
 var XHtmlRenderer_1 = require("./XHtmlRenderer");
 var XOcfDropdown_1 = require("./XOcfDropdown");
+var XFieldSetBase_1 = require("../XFieldSet/XFieldSetBase");
 var XLazyDataTable = function (props) {
     var _a;
     // must be here, is used in createInitFilters()
@@ -144,7 +145,7 @@ var XLazyDataTable = function (props) {
                 var column = columns_1_1.value;
                 var xLazyColumn = column; // nevedel som to krajsie...
                 if (xLazyColumn.props.aggregateType) {
-                    aggregateItems.push({ field: xLazyColumn.props.field, aggregateType: xLazyColumn.props.aggregateType });
+                    aggregateItems.push({ field: xLazyColumn.props.field, aggregateFunction: xLazyColumn.props.aggregateType });
                 }
             }
         }
@@ -184,7 +185,7 @@ var XLazyDataTable = function (props) {
     };
     var getFilterMatchMode = function (xField) {
         var filterMatchMode;
-        if (xField.type === "string") {
+        if (xField.type === "string" || xField.type === "jsonb") {
             filterMatchMode = api_1.FilterMatchMode.CONTAINS;
         }
         // zatial vsetky ostatne EQUALS
@@ -217,12 +218,16 @@ var XLazyDataTable = function (props) {
     };
     // premenne platne pre cely component (obdoba member premennych v class-e)
     var dataTableEl = (0, react_1.useRef)(null);
-    var customFilterItems = XUtils_1.XUtils.createCustomFilterItems(props.customFilter);
+    var customFilterItems = XUtilsCommon_1.XUtilsCommon.createCustomFilterItems(props.customFilter);
     var aggregateItems = createAggregateItems();
-    var _b = __read((0, react_1.useState)({ rowList: [], totalRecords: 0, aggregateValues: [] }), 2), value = _b[0], setValue = _b[1];
-    var _c = __read((0, react_1.useState)(false), 2), loading = _c[0], setLoading = _c[1];
-    var _d = __read((0, react_1.useState)(0), 2), first = _d[0], setFirst = _d[1];
-    var _e = __read((0, react_1.useState)(props.paginator ? props.rows : undefined), 2), rows = _e[0], setRows = _e[1];
+    // ak mame fieldSet stlpce (stlpce ktore maju zadany fieldSetId a zobrazuju hodnoty podla fieldSet-u),
+    // tak sem nacitame mapy umoznujuce ziskanie labelov zakliknutych field-ov
+    // poznamka: uz by sa zislo mat vytvorene objekty (instancie) pre stlpce a do nich zapisovat pripadny XFieldSetMap, filter (teraz je vo "filters")
+    var _b = __read((0, react_1.useState)({}), 2), xFieldSetMaps = _b[0], setXFieldSetMaps = _b[1];
+    var _c = __read((0, react_1.useState)({ rowList: [], totalRecords: 0, aggregateValues: [] }), 2), value = _c[0], setValue = _c[1];
+    var _d = __read((0, react_1.useState)(false), 2), loading = _d[0], setLoading = _d[1];
+    var _e = __read((0, react_1.useState)(0), 2), first = _e[0], setFirst = _e[1];
+    var _f = __read((0, react_1.useState)(props.paginator ? props.rows : undefined), 2), rows = _f[0], setRows = _f[1];
     var filtersInit = createInitFilters();
     if (props.filters) {
         filtersInit = __assign(__assign({}, filtersInit), props.filters); // items from props.filters will replace existing items in filtersInit
@@ -234,22 +239,22 @@ var XLazyDataTable = function (props) {
         }
         // ak mame props.searchBrowseParams.customFilterFunction, pridame filter
         if (props.searchBrowseParams.customFilter) {
-            customFilterItems = XUtils_1.XUtils.filterAnd(customFilterItems, XUtils_1.XUtils.evalFilter(props.searchBrowseParams.customFilter));
+            customFilterItems = XUtilsCommon_1.XUtilsCommon.filterAnd(customFilterItems, XUtils_1.XUtils.evalFilter(props.searchBrowseParams.customFilter));
         }
     }
-    var _f = __read((0, react_1.useState)(filtersInit), 2), filters = _f[0], setFilters = _f[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
+    var _g = __read((0, react_1.useState)(filtersInit), 2), filters = _g[0], setFilters = _g[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
     var initFtsInputValue = props.fullTextSearch ? createInitFtsInputValue() : undefined;
-    var _g = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValue = _g[0], setFtsInputValue = _g[1];
-    var _h = __read((0, react_1.useState)(undefined), 2), optionalCustomFilter = _h[0], setOptionalCustomFilter = _h[1];
-    var _j = __read((0, react_1.useState)(props.multilineSwitchInitValue), 2), multilineSwitchValue = _j[0], setMultilineSwitchValue = _j[1];
-    var _k = __read((0, react_1.useState)(XUtils_1.XUtils.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _k[0], setMultiSortMeta = _k[1];
-    var _l = __read((0, react_1.useState)(null), 2), selectedRow = _l[0], setSelectedRow = _l[1];
-    var _m = __read((_a = props.dataLoadedState) !== null && _a !== void 0 ? _a : (0, react_1.useState)(false), 2), dataLoaded = _m[0], setDataLoaded = _m[1]; // priznak kde si zapiseme, ci uz sme nacitali data
-    var _o = __read((0, react_1.useState)({ dialogOpened: false }), 2), exportRowsDialogState = _o[0], setExportRowsDialogState = _o[1];
+    var _h = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValue = _h[0], setFtsInputValue = _h[1];
+    var _j = __read((0, react_1.useState)(undefined), 2), optionalCustomFilter = _j[0], setOptionalCustomFilter = _j[1];
+    var _k = __read((0, react_1.useState)(props.multilineSwitchInitValue), 2), multilineSwitchValue = _k[0], setMultilineSwitchValue = _k[1];
+    var _l = __read((0, react_1.useState)(XUtilsCommon_1.XUtilsCommon.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _l[0], setMultiSortMeta = _l[1];
+    var _m = __read((0, react_1.useState)(null), 2), selectedRow = _m[0], setSelectedRow = _m[1];
+    var _o = __read((_a = props.dataLoadedState) !== null && _a !== void 0 ? _a : (0, react_1.useState)(false), 2), dataLoaded = _o[0], setDataLoaded = _o[1]; // priznak kde si zapiseme, ci uz sme nacitali data
+    var _p = __read((0, react_1.useState)({ dialogOpened: false }), 2), exportRowsDialogState = _p[0], setExportRowsDialogState = _p[1];
     //const [exportRowsDialogRowCount, setExportRowsDialogRowCount] = useState<number>(); // param pre dialog
-    var _p = __read((0, react_1.useState)(filtersInit), 2), filtersAfterFiltering = _p[0], setFiltersAfterFiltering = _p[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
-    var _q = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValueAfterFiltering = _q[0], setFtsInputValueAfterFiltering = _q[1]; // tak isto ako filtersAfterFiltering
-    var _r = __read((0, react_1.useState)(undefined), 2), optionalCustomFilterAfterFiltering = _r[0], setOptionalCustomFilterAfterFiltering = _r[1]; // tak isto ako filtersAfterFiltering
+    var _q = __read((0, react_1.useState)(filtersInit), 2), filtersAfterFiltering = _q[0], setFiltersAfterFiltering = _q[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
+    var _r = __read((0, react_1.useState)(initFtsInputValue), 2), ftsInputValueAfterFiltering = _r[0], setFtsInputValueAfterFiltering = _r[1]; // tak isto ako filtersAfterFiltering
+    var _s = __read((0, react_1.useState)(undefined), 2), optionalCustomFilterAfterFiltering = _s[0], setOptionalCustomFilterAfterFiltering = _s[1]; // tak isto ako filtersAfterFiltering
     // parameter [] zabezpeci ze sa metoda zavola len po prvom renderingu (a nie po kazdej zmene stavu (zavolani setNieco()))
     (0, react_1.useEffect)(function () {
         // jednoduchy sposob - nepouzivame parameter props.displayed a priznak dataLoaded
@@ -318,9 +323,22 @@ var XLazyDataTable = function (props) {
             setOptionalCustomFilter(undefined);
         }
     };
-    var loadData = function () {
-        loadDataBase(createFindParam());
-    };
+    var loadData = function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: 
+                // pre poriadok zaserializujeme obidve operacie (aj ked teoreticky by to malo fungovat aj bez serializovania)
+                return [4 /*yield*/, loadXFieldSetMaps()];
+                case 1:
+                    // pre poriadok zaserializujeme obidve operacie (aj ked teoreticky by to malo fungovat aj bez serializovania)
+                    _a.sent();
+                    return [4 /*yield*/, loadDataBase(createFindParam())];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     var createFindParam = function () {
         return {
             resultType: FindParam_1.ResultType.RowCountAndPagedRows,
@@ -335,6 +353,42 @@ var XLazyDataTable = function (props) {
             aggregateItems: aggregateItems
         };
     };
+    var loadXFieldSetMaps = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var fieldSetIds, xFieldSetMetaList, xFieldSetMapsLocal, xFieldSetMetaList_1, xFieldSetMetaList_1_1, xFieldSetMeta;
+        var e_3, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    fieldSetIds = getFieldSetIds();
+                    if (!(fieldSetIds.length > 0)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, XUtils_1.XUtils.fetchRows('XFieldSetMeta', { where: "[fieldSetId] IN (:...fieldSetIdList)", params: { fieldSetIdList: fieldSetIds } })];
+                case 1:
+                    xFieldSetMetaList = _b.sent();
+                    // check
+                    if (xFieldSetMetaList.length !== fieldSetIds.length) {
+                        throw "One or more of fieldSetIds \"".concat(fieldSetIds.join(", "), "\" was not found in DB in the table for Entity XFieldSetMeta");
+                    }
+                    xFieldSetMapsLocal = {};
+                    try {
+                        for (xFieldSetMetaList_1 = __values(xFieldSetMetaList), xFieldSetMetaList_1_1 = xFieldSetMetaList_1.next(); !xFieldSetMetaList_1_1.done; xFieldSetMetaList_1_1 = xFieldSetMetaList_1.next()) {
+                            xFieldSetMeta = xFieldSetMetaList_1_1.value;
+                            xFieldSetMapsLocal[xFieldSetMeta.fieldSetId] = XFieldSetBase_1.XFieldSetBase.createXFieldXFieldMetaMap(xFieldSetMeta);
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (xFieldSetMetaList_1_1 && !xFieldSetMetaList_1_1.done && (_a = xFieldSetMetaList_1.return)) _a.call(xFieldSetMetaList_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                    // save created structures
+                    setXFieldSetMaps(xFieldSetMapsLocal);
+                    _b.label = 2;
+                case 2: return [2 /*return*/];
+            }
+        });
+    }); };
     var loadDataBase = function (findParam) { return __awaiter(void 0, void 0, void 0, function () {
         var findResult;
         return __generator(this, function (_a) {
@@ -380,12 +434,12 @@ var XLazyDataTable = function (props) {
         return xFullTextSearch;
     };
     var createXCustomFilterItems = function (customFilterItems, optionalCustomFilter) {
-        return XUtils_1.XUtils.filterAnd(customFilterItems, optionalCustomFilter === null || optionalCustomFilter === void 0 ? void 0 : optionalCustomFilter.filter);
+        return XUtilsCommon_1.XUtilsCommon.filterAnd(customFilterItems, optionalCustomFilter === null || optionalCustomFilter === void 0 ? void 0 : optionalCustomFilter.filter);
     };
     var getFields = function (addPropsFields) {
         // krasne zobrazi cely objekt!
         //console.log(dataTableEl.current);
-        var e_3, _a;
+        var e_4, _a;
         var fields = [];
         var columns = dataTableEl.current.props.children;
         try {
@@ -394,12 +448,12 @@ var XLazyDataTable = function (props) {
                 fields.push(column.props.field);
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (columns_3_1 && !columns_3_1.done && (_a = columns_3.return)) _a.call(columns_3);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         if (addPropsFields) {
             if (props.fields) {
@@ -411,7 +465,7 @@ var XLazyDataTable = function (props) {
     var getHeaders = function () {
         // krasne zobrazi cely objekt!
         //console.log(dataTableEl.current);
-        var e_4, _a;
+        var e_5, _a;
         var headers = [];
         var columns = dataTableEl.current.props.children;
         try {
@@ -421,17 +475,17 @@ var XLazyDataTable = function (props) {
                 headers.push(column.props.header);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (columns_4_1 && !columns_4_1.done && (_a = columns_4.return)) _a.call(columns_4);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         return headers;
     };
     var getWidths = function () {
-        var e_5, _a;
+        var e_6, _a;
         var _b;
         // vrati sirky stlpcov napr. ['7.75rem', '20rem', '8.5rem', '8.5rem', '6rem']
         // nevracia aktualne sirky stlpcov (po manualnom rozsireni) ale tie ktore boli nastavene/vypocitane v kode
@@ -443,15 +497,37 @@ var XLazyDataTable = function (props) {
                 widths.push((_b = column.props.headerStyle) === null || _b === void 0 ? void 0 : _b.width);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (columns_5_1 && !columns_5_1.done && (_a = columns_5.return)) _a.call(columns_5);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return widths;
     };
+    var getFieldSetIds = function () {
+        var e_7, _a;
+        var fieldSetIds = [];
+        // warning note: props.children are used to get props of XLazyColumn whereas dataTableEl.current.props.children are used to get props of Primereact DataTable
+        var columns = props.children;
+        try {
+            for (var columns_6 = __values(columns), columns_6_1 = columns_6.next(); !columns_6_1.done; columns_6_1 = columns_6.next()) {
+                var column = columns_6_1.value;
+                if (column.props.fieldSetId) {
+                    fieldSetIds.push(column.props.fieldSetId);
+                }
+            }
+        }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        finally {
+            try {
+                if (columns_6_1 && !columns_6_1.done && (_a = columns_6.return)) _a.call(columns_6);
+            }
+            finally { if (e_7) throw e_7.error; }
+        }
+        return fieldSetIds;
+    };
     var hasContentTypeHtml = function () {
         var columns = props.children;
         return columns.some(function (column) { return column.props.contentType === "html"; });
@@ -489,7 +565,7 @@ var XLazyDataTable = function (props) {
         }
     };
     var onClickRemoveRow = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var reread, e_6, e_7;
+        var reread, e_8, e_9;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -504,8 +580,8 @@ var XLazyDataTable = function (props) {
                     reread = _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    e_6 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_6);
+                    e_8 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_8);
                     return [3 /*break*/, 4];
                 case 4:
                     if (reread) {
@@ -527,8 +603,8 @@ var XLazyDataTable = function (props) {
                     _a.sent();
                     return [3 /*break*/, 9];
                 case 8:
-                    e_7 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_7);
+                    e_9 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_9);
                     return [3 /*break*/, 9];
                 case 9:
                     loadData();
@@ -702,12 +778,17 @@ var XLazyDataTable = function (props) {
         }
         return betweenFilter;
     };
-    var valueAsUI = function (value, xField, contentType) {
+    var valueAsUI = function (value, xField, contentType, fieldSetId) {
         var valueResult;
         if (xField.type === "boolean") {
             // TODO - efektivnejsie by bolo renderovat len prislusne ikonky
             valueResult = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: value, disabled: true });
         }
+        else if (xField.type === "jsonb" && fieldSetId) {
+            // zatial sem dame; este by sme mohli dat hlbsie do convertValue/convertValueBase (aby fungovalo aj pre excel) ale tam je problem ze nemame k dispozicii "xFieldSetMaps"
+            // poznamka: krajsie by bolo brat fieldSetId z xField ale to by sme museli vytvorit decorator na backend-e...
+            valueResult = XFieldSetBase_1.XFieldSetBase.xFieldSetValuesAsUI(value, xFieldSetMaps[fieldSetId]);
+        }
         else {
             if (contentType === "html") {
                 // value should be always string (xField.type === "string")
@@ -732,11 +813,11 @@ var XLazyDataTable = function (props) {
         var bodyValue;
         var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueOrValueListByPath(rowData, columnProps.field);
         if (Array.isArray(rowDataValue)) {
-            var elemList = rowDataValue.map(function (value) { return valueAsUI(value, xField, columnProps.contentType); });
+            var elemList = rowDataValue.map(function (value) { return valueAsUI(value, xField, columnProps.contentType, columnProps.fieldSetId); });
             bodyValue = react_1.default.createElement(XMultilineRenderer_1.XMultilineRenderer, { valueList: elemList, renderType: multilineSwitchValue, fewLinesCount: props.multilineSwitchFewLinesCount });
         }
         else {
-            bodyValue = valueAsUI(rowDataValue, xField, columnProps.contentType);
+            bodyValue = valueAsUI(rowDataValue, xField, columnProps.contentType, columnProps.fieldSetId);
         }
         return bodyValue;
     };

package/lib/components/XSearchButton.js

@@ -73,6 +73,7 @@ var XUtils_1 = require("./XUtils");
 var dialog_1 = require("primereact/dialog");
 var XFormComponent_1 = require("./XFormComponent");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
+var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var XSearchButton = /** @class */ (function (_super) {
     __extends(XSearchButton, _super);
     function XSearchButton(props) {
@@ -138,7 +139,7 @@ var XSearchButton = /** @class */ (function (_super) {
                     case 1:
                         displayFieldFilter = { where: "[".concat(props.displayField, "] LIKE :xDisplayFieldValue"), params: { "xDisplayFieldValue": "".concat(e.target.value, "%") } };
                         customFilter = this.getFilterBase(this.props.filter);
-                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, XUtils_1.XUtils.filterAnd(displayFieldFilter, customFilter))];
+                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, XUtilsCommon_1.XUtilsCommon.filterAnd(displayFieldFilter, customFilter))];
                     case 2:
                         rows = _a.sent();
                         if (rows.length === 0) {

package/lib/components/XUtils.d.ts

@@ -3,7 +3,7 @@ import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType, XMultilineExpo
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
-import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
+import { XCustomFilter } from "../serverApi/FindParam";
 import { DataTableSortMeta } from "primereact/datatable";
 import { XObject } from "./XObject";
 import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
@@ -86,26 +86,6 @@ export declare class XUtils {
      */
     static getEnvVarValue(envVarEnum: XEnvVar): string;
     static removeRow(entity: string, row: any): Promise<void>;
-    static arrayMoveElement(array: any[], position: number, offset: number): void;
-    static arraySort(array: any[], fieldOrStringFunction: string | ((item: any) => string)): any[];
-    /**
-     * returns true, if param item is member of the array
-     * remark: null/undefined items in array are ignored, item = null/undefined is ignored
-     *
-     * @param array
-     * @param item
-     * @param idField
-     */
-    static arrayIncludes<T>(array: T[], item: T, idField: string): boolean;
-    /**
-     * returns intersection of 2 row lists
-     * remark: null/undefined items in both array1 and array2 are ignored
-     *
-     * @param array1
-     * @param array2
-     * @param idField
-     */
-    static arrayIntersect<T>(array1: T[], array2: T[], idField: string): T[];
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;
     static isReadOnlyTableField(path: string | undefined, readOnly: XTableFieldReadOnlyProp | undefined, object: XObject | null, tableRow: any): boolean;
     static markNotNull(label: string): string;
@@ -119,10 +99,6 @@ export declare class XUtils {
     static getErrorMessages(xErrorMap: XErrorMap): string;
     static getErrorMessage(xError: XError): string | undefined;
     static normalizeString(value: string): string;
-    static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
-    static createMultiSortMeta(sortField: string | DataTableSortMeta[] | undefined): DataTableSortMeta[] | undefined;
-    static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
-    static filterIdIn(idField: string, idList: number[]): XCustomFilter;
     static evalFilter(filter: XFilterOrFunction | undefined): XCustomFilter | undefined;
     static isTableRowInserted(tableRow: any): boolean;
     static xViewStatus(xViewStatusOrBoolean: XViewStatusOrBoolean): XViewStatus;

package/lib/components/XUtils.js

@@ -73,15 +73,6 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XUtils = exports.XViewStatus = exports.OperationType = void 0;
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
@@ -276,7 +267,7 @@ var XUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: XUtils.createMultiSortMeta(sortField), fields: fields };
+                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtilsCommon_1.XUtilsCommon.createCustomFilterItems(customFilter), multiSortMeta: XUtilsCommon_1.XUtilsCommon.createMultiSortMeta(sortField), fields: fields };
                         return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
                     case 1:
                         rowList = (_a.sent()).rowList;
@@ -292,7 +283,7 @@ var XUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter) };
+                        findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, entity: entity, customFilterItems: XUtilsCommon_1.XUtilsCommon.createCustomFilterItems(customFilter) };
                         return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
                     case 1:
                         totalRecords = (_a.sent()).totalRecords;
@@ -526,85 +517,6 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
-    // TODO - prehodit do XUtilsCommon
-    XUtils.arrayMoveElement = function (array, position, offset) {
-        var element = array[position];
-        array.splice(position, 1);
-        var positionNew = position + offset;
-        if (positionNew > array.length) {
-            positionNew = positionNew - array.length - 1; // element goes to the begin
-        }
-        else if (positionNew < 0) {
-            positionNew = array.length + positionNew + 1; // element goes to the end
-        }
-        if (positionNew >= 0 && positionNew <= array.length) {
-            array.splice(positionNew, 0, element);
-        }
-    };
-    // TODO - prehodit do XUtilsCommon
-    XUtils.arraySort = function (array, fieldOrStringFunction) {
-        var stringFunction;
-        if (typeof fieldOrStringFunction === 'string') {
-            stringFunction = function (item) { return item[fieldOrStringFunction]; };
-        }
-        else {
-            stringFunction = fieldOrStringFunction;
-        }
-        return array.sort(function (suggestion1, suggestion2) {
-            var value1 = stringFunction(suggestion1);
-            var value2 = stringFunction(suggestion2);
-            if (value1 > value2) {
-                return 1;
-            }
-            else if (value1 < value2) {
-                return -1;
-            }
-            else {
-                return 0;
-            }
-        });
-    };
-    // TODO - prehodit do XUtilsCommon
-    /**
-     * returns true, if param item is member of the array
-     * remark: null/undefined items in array are ignored, item = null/undefined is ignored
-     *
-     * @param array
-     * @param item
-     * @param idField
-     */
-    XUtils.arrayIncludes = function (array, item, idField) {
-        return item && array.some(function (arrayItem) { return arrayItem && arrayItem[idField] === item[idField]; });
-    };
-    // TODO - prehodit do XUtilsCommon
-    /**
-     * returns intersection of 2 row lists
-     * remark: null/undefined items in both array1 and array2 are ignored
-     *
-     * @param array1
-     * @param array2
-     * @param idField
-     */
-    XUtils.arrayIntersect = function (array1, array2, idField) {
-        var e_6, _a;
-        var array2IdSet = new Set();
-        try {
-            for (var array2_1 = __values(array2), array2_1_1 = array2_1.next(); !array2_1_1.done; array2_1_1 = array2_1.next()) {
-                var item = array2_1_1.value;
-                if (item) {
-                    array2IdSet.add(item[idField]);
-                }
-            }
-        }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-        finally {
-            try {
-                if (array2_1_1 && !array2_1_1.done && (_a = array2_1.return)) _a.call(array2_1);
-            }
-            finally { if (e_6) throw e_6.error; }
-        }
-        return array1.filter(function (item) { return item && array2IdSet.has(item[idField]); });
-    };
     // helper
     XUtils.isReadOnly = function (path, readOnlyInit) {
         // ak mame path dlzky 2 a viac, field je vzdy readOnly
@@ -696,7 +608,7 @@ var XUtils = /** @class */ (function () {
     // pomocna metodka
     // ak nie su v xErrorMap ziadne chyby, vrati ""
     XUtils.getErrorMessages = function (xErrorMap) {
-        var e_7, _a;
+        var e_6, _a;
         var _b;
         var msg = "";
         try {
@@ -710,12 +622,12 @@ var XUtils = /** @class */ (function () {
                 }
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return msg;
     };
@@ -749,75 +661,6 @@ var XUtils = /** @class */ (function () {
         }
         return value;
     };
-    // pomocna metodka - konvertuje XCustomFilter -> XCustomFilterItem[]
-    XUtils.createCustomFilterItems = function (customFilter) {
-        var customFilterItems = undefined;
-        if (customFilter) {
-            if (Array.isArray(customFilter)) {
-                customFilterItems = customFilter;
-            }
-            else {
-                customFilterItems = [customFilter];
-            }
-        }
-        return customFilterItems;
-    };
-    // pomocna metodka - konvertuje sortField -> DataTableSortMeta[]
-    XUtils.createMultiSortMeta = function (sortField) {
-        var multiSortMeta = undefined;
-        if (sortField) {
-            if (Array.isArray(sortField)) {
-                multiSortMeta = sortField;
-            }
-            else {
-                // default order is asc, supported is also value in form "<column name> desc"
-                var order = 1;
-                var fieldAndOrder = sortField.split(' ');
-                if (fieldAndOrder.length === 2) {
-                    sortField = fieldAndOrder[0];
-                    if (fieldAndOrder[1].toLowerCase() === "desc") {
-                        order = -1;
-                    }
-                }
-                multiSortMeta = [{ field: sortField, order: order }];
-            }
-        }
-        return multiSortMeta;
-    };
-    // pomocna metodka
-    XUtils.filterAnd = function () {
-        var e_8, _a;
-        var filters = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            filters[_i] = arguments[_i];
-        }
-        var customFilterItemsResult = undefined;
-        if (filters.length > 0) {
-            customFilterItemsResult = [];
-            try {
-                for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
-                    var filter = filters_1_1.value;
-                    var customFilterItems = XUtils.createCustomFilterItems(filter);
-                    if (customFilterItems) {
-                        customFilterItemsResult.push.apply(customFilterItemsResult, __spreadArray([], __read(customFilterItems), false));
-                    }
-                }
-            }
-            catch (e_8_1) { e_8 = { error: e_8_1 }; }
-            finally {
-                try {
-                    if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
-                }
-                finally { if (e_8) throw e_8.error; }
-            }
-        }
-        return customFilterItemsResult;
-    };
-    // pomocna metodka
-    // ak je idList prazdny, vytvori podmienku id IN (0) a nevrati ziadne zaznamy
-    XUtils.filterIdIn = function (idField, idList) {
-        return { where: "[".concat(idField, "] IN (:...idList)"), params: { "idList": idList.length > 0 ? idList : [0] } };
-    };
     // pomocna metodka
     XUtils.evalFilter = function (filter) {
         var customFilter = undefined;

package/lib/components/locale/x-en.json

@@ -12,6 +12,7 @@
         "removeRowConfirm": "Are you sure to remove the selected row?",
         "removeRowFailed": "Remove row failed.",
         "newRow": "new row",
+        "ok": "Ok",
         "save": "Save",
         "cancel": "Cancel",
         "expRowCount": "Row count",
@@ -27,8 +28,12 @@
         "fieldSetSaveEditConfirm": "Are you sure to save the form?",
         "fieldSetCancelEditConfirm": "Are you sure to cancel editing? All changes will be lost.",
         "fieldSetRemoveFieldConfirm": "Are you sure to remove the field?",
+        "runStatisticMissingDateField": "Warning:\nThe following statistic fields have date field not filled in:\n\"{fieldsWithoutDate}\".\nNo condition for date will be applied for these statistic fields.",
         "upload": "Upload",
         "yes": "yes",
-        "no": "no"
+        "no": "no",
+        "dateFrom": "Date from",
+        "dateTo": "Date to",
+        "year": "Year"
     }
 }

package/lib/serverApi/FindParam.d.ts

@@ -19,15 +19,15 @@ export interface XFullTextSearch {
     splitValue: boolean;
     matchMode: 'startsWith' | 'contains' | 'endsWith' | 'equals';
 }
-export declare enum XAggregateType {
+export declare enum XAggregateFunction {
     Min = "MIN",
     Max = "MAX",
     Sum = "SUM",
     Avg = "AVG"
 }
-export interface XAggregateItem {
+export interface XSimpleAggregateItem {
     field: string;
-    aggregateType: XAggregateType;
+    aggregateFunction: XAggregateFunction;
 }
 export interface FindParam {
     resultType: ResultType;
@@ -39,7 +39,7 @@ export interface FindParam {
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields?: string[];
-    aggregateItems?: XAggregateItem[];
+    aggregateItems?: XSimpleAggregateItem[];
 }
 export interface XLazyAutoCompleteSuggestionsRequest {
     maxRows: number;