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

package/lib/components/XAutoCompleteBase.js

@@ -335,8 +335,8 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                             maxRows: this.props.lazyLoadMaxRows + 1,
                             fullTextSearch: { fields: this.getFields(), value: event.query.trim(), splitValue: this.props.splitQueryValue, matchMode: "contains" },
                             entity: this.props.suggestionsQuery.entity,
-                            filterItems: XUtils_1.XUtils.createCustomFilterItems(filter),
-                            multiSortMeta: XUtils_1.XUtils.createMultiSortMeta(this.getSortField()),
+                            filterItems: XUtilsCommon_1.XUtilsCommon.createCustomFilterItems(filter),
+                            multiSortMeta: XUtilsCommon_1.XUtilsCommon.createMultiSortMeta(this.getSortField()),
                             fields: this.props.suggestionsQuery.fields
                         };
                         return [4 /*yield*/, XUtils_1.XUtils.fetchOne('x-lazy-auto-complete-suggestions', suggestionsRequest)];
@@ -346,7 +346,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                         // ak sme nesortovali v DB (co je draha operacia) tak zosortujeme teraz
                         // (itemTemplateString sa vola duplicitne ale pre tych cca 20 zaznamov je to ok)
                         if (this.props.suggestionsQuery.sortField === undefined) {
-                            filteredSuggestions = XUtils_1.XUtils.arraySort(filteredSuggestions, this.itemTemplateString);
+                            filteredSuggestions = XUtilsCommon_1.XUtilsCommon.arraySort(filteredSuggestions, this.itemTemplateString);
                         }
                         // ak mame o 1 zaznam viac ako je lazyLoadMaxRows, zmenime posledny zaznam na ...
                         // TODO - lepsie by bolo posledny zaznam vyhodit a popisok ... zobrazit do footer-a (odpadnu problemy z pripadnou selekciou pseudozaznamu ...)
@@ -727,17 +727,13 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         // Dialog pre konkretny form:
         // <DobrovolnikForm id={this.formDialogObjectId} object={this.formDialogInitValuesForInsert} onSaveOrCancel={this.formDialogOnSaveOrCancel}/>
         // formgroup-inline lepi SplitButton na autocomplete a zarovna jeho vysku
-        return (react_1.default.createElement("div", { className: "x-auto-complete-base", style: { width: this.props.width, maxWidth: this.props.maxWidth } },
-            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ key: "autoComplete", value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true })),
-            buttons,
-            this.props.valueForm != undefined ?
-                react_1.default.createElement(dialog_1.Dialog, { key: "dialogForm", className: "x-dialog-without-header", visible: this.state.formDialogOpened, onHide: this.formDialogOnHide }, react_1.default.cloneElement(this.props.valueForm, {
+        return (react_1.default.createElement.apply(react_1.default, __spreadArray(__spreadArray(["div", { className: "x-auto-complete-base", style: { width: this.props.width, maxWidth: this.props.maxWidth } }, react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName, showEmptyMessage: true }))], __read(buttons), false), [this.props.valueForm != undefined ?
+                react_1.default.createElement(dialog_1.Dialog, { key: "dialog-form", className: "x-dialog-without-header", visible: this.state.formDialogOpened, onHide: this.formDialogOnHide }, react_1.default.cloneElement(this.props.valueForm, {
                     id: this.formDialogObjectId, initValues: this.formDialogInitValuesForInsert, onSaveOrCancel: this.formDialogOnSaveOrCancel
                 } /*, this.props.valueForm.children*/))
-                : undefined,
-            this.props.searchBrowse != undefined && !readOnly ?
-                react_1.default.createElement(dialog_1.Dialog, { key: "dialogBrowse", className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
-                : undefined));
+                : undefined, this.props.searchBrowse != undefined && !readOnly ?
+                react_1.default.createElement(dialog_1.Dialog, { key: "dialog-browse", className: "x-dialog-without-header", visible: this.state.searchDialogOpened, onHide: this.searchDialogOnHide }, react_1.default.cloneElement(this.props.searchBrowse, { searchBrowseParams: this.createSearchBrowseParams() } /*, props.searchBrowse.children*/))
+                : undefined], false)));
     };
     XAutoCompleteBase.valueMoreSuggestions = "...";
     XAutoCompleteBase.defaultProps = {

package/lib/components/XEditBrowse.js

@@ -110,6 +110,7 @@ var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtils_1 = require("./XUtils");
 var XLazyDataTable_1 = require("./XLazyDataTable/XLazyDataTable");
 var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
+var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 // TODO - pouzit extends XEditBrowseBase, ako je tomu pri CarForm?
 var XEditBrowse = /** @class */ (function (_super) {
     __extends(XEditBrowse, _super);
@@ -281,7 +282,7 @@ var XEditBrowse = /** @class */ (function (_super) {
         var index = this.getIndexForColumn(field);
         if (index !== undefined) {
             var xBrowseMeta = this.state.xBrowseMeta;
-            XUtils_1.XUtils.arrayMoveElement(xBrowseMeta.columnMetaList, index, offset);
+            XUtilsCommon_1.XUtilsCommon.arrayMoveElement(xBrowseMeta.columnMetaList, index, offset);
             // TODO - tu mozno treba setnut funkciu - koli moznej asynchronicite
             this.setState({ xBrowseMeta: xBrowseMeta });
         }

package/lib/components/XFormBase.js

@@ -169,7 +169,7 @@ var XFormBase = /** @class */ (function (_super) {
                                 assocToSort = _b.value;
                                 assocRowList = object[assocToSort.assoc];
                                 if (assocRowList) {
-                                    object[assocToSort.assoc] = XUtils_1.XUtils.arraySort(assocRowList, assocToSort.sortField);
+                                    object[assocToSort.assoc] = XUtilsCommon_1.XUtilsCommon.arraySort(assocRowList, assocToSort.sortField);
                                 }
                             }
                         }

package/lib/components/XFormDataTable2.d.ts

@@ -26,7 +26,7 @@ export interface XFormDataTableProps {
     rows?: number;
     filterDisplay: "menu" | "row" | "none";
     sortable: boolean;
-    sortField?: string;
+    sortField: string;
     scrollable: boolean;
     scrollWidth?: string;
     scrollHeight?: string;
@@ -48,6 +48,7 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
     static defaultProps: {
         filterDisplay: string;
         sortable: boolean;
+        sortField: string;
         scrollable: boolean;
         scrollWidth: string;
         scrollHeight: string;
@@ -116,6 +117,7 @@ export interface XFormAutoCompleteColumnProps extends XFormColumnBaseProps {
     searchBrowse?: JSX.Element;
     assocForm?: JSX.Element;
     filter?: XTableFieldFilterProp;
+    fields?: string[];
     suggestions?: any[];
 }
 export interface XFormSearchButtonColumnProps extends XFormColumnBaseProps {

package/lib/components/XFormDataTable2.js

@@ -404,7 +404,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
+            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, fields: columnPropsAutoComplete.fields, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;
@@ -527,7 +527,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     };
     XFormDataTable2.prototype.render = function () {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b;
         var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.getEntity());
         var paginator = this.props.paginator !== undefined ? this.props.paginator : false;
         var rows = undefined;
@@ -540,8 +540,14 @@ var XFormDataTable2 = /** @class */ (function (_super) {
             }
         }
         var filterDisplay = this.props.filterDisplay !== "none" ? this.props.filterDisplay : undefined;
-        // default sortovanie - ak mame insert tak nesortujeme (drzime poradie v akom user zaznam vytvoril), ak mame update tak podla id zosortujeme (nech je to zobrazene vzdy rovnako)
-        var sortField = (_a = this.props.sortField) !== null && _a !== void 0 ? _a : (this.props.form.isAddRow() ? undefined : xEntity.idField);
+        var sortField = this.props.sortField;
+        if (sortField === "idFieldOnUpdate") {
+            // default sortovanie - ak mame insert tak nesortujeme (drzime poradie v akom user zaznam vytvoril), ak mame update tak podla id zosortujeme (nech je to zobrazene vzdy rovnako)
+            sortField = (this.props.form.isAddRow() ? undefined : xEntity.idField);
+        }
+        else if (sortField === "none") {
+            sortField = undefined;
+        }
         var label = this.props.label !== undefined ? this.props.label : this.props.assocField;
         var readOnly = this.isReadOnly();
         // v bloku function (child) nejde pouzit priamo this, thisLocal uz ide pouzit
@@ -679,8 +685,8 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         var removeRowLabel = undefined;
         if (this.props.showAddRemoveButtons) {
             // calling xLocaleOption does not work in standard default values initialisation place (public static defaultProps)
-            addRowLabel = (_b = this.props.addRowLabel) !== null && _b !== void 0 ? _b : (0, XLocale_1.xLocaleOption)('addRow');
-            removeRowLabel = (_c = this.props.removeRowLabel) !== null && _c !== void 0 ? _c : (0, XLocale_1.xLocaleOption)('removeRow');
+            addRowLabel = (_a = this.props.addRowLabel) !== null && _a !== void 0 ? _a : (0, XLocale_1.xLocaleOption)('addRow');
+            removeRowLabel = (_b = this.props.removeRowLabel) !== null && _b !== void 0 ? _b : (0, XLocale_1.xLocaleOption)('removeRow');
         }
         return (react_1.default.createElement("div", null,
             react_1.default.createElement("div", { className: "flex justify-content-center" },
@@ -696,6 +702,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
     XFormDataTable2.defaultProps = {
         filterDisplay: "none",
         sortable: false,
+        sortField: "idFieldOnUpdate",
         scrollable: true,
         scrollWidth: '100%',
         scrollHeight: '200vh',

package/lib/components/XLazyDataTable/XLazyDataTable.d.ts

@@ -3,7 +3,7 @@ import { DataTableFilterMeta, DataTableFilterMetaData, DataTableOperatorFilterMe
 import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
 import { XViewStatusOrBoolean } from "../XUtils";
 import { XSearchBrowseParams } from "../XSearchBrowseParams";
-import { XAggregateType, XCustomFilter } from "../../serverApi/FindParam";
+import { XAggregateFunction, XCustomFilter } from "../../serverApi/FindParam";
 import { XOnSaveOrCancelProp } from "../XFormBase";
 import { IconType } from "primereact/utils";
 import { ButtonProps } from "primereact/button";
@@ -110,7 +110,7 @@ export interface XLazyColumnProps {
     betweenFilter?: XBetweenFilterProp | "noBetween";
     width?: string;
     contentType?: XContentType;
-    aggregateType?: XAggregateType;
+    aggregateType?: XAggregateFunction;
     columnViewStatus: XViewStatusOrBoolean;
     filterElement?: XFilterElementProp;
     body?: React.ReactNode | ((data: any, options: ColumnBodyOptions) => React.ReactNode);

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -144,7 +144,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 });
                 }
             }
         }
@@ -217,7 +217,7 @@ 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];
@@ -234,7 +234,7 @@ 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)
@@ -242,7 +242,7 @@ var XLazyDataTable = function (props) {
     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 _k = __read((0, react_1.useState)(XUtilsCommon_1.XUtilsCommon.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];
@@ -380,7 +380,7 @@ 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!

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;

package/lib/serverApi/FindParam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XAggregateType = exports.ResultType = void 0;
+exports.XAggregateFunction = exports.ResultType = void 0;
 // TODO - replaced with DataTableFilterMetaData
 // export interface FilterValue {
 //     value : string;
@@ -22,10 +22,10 @@ var ResultType;
     ResultType[ResultType["RowCountAndPagedRows"] = 2] = "RowCountAndPagedRows";
     ResultType[ResultType["AllRows"] = 3] = "AllRows";
 })(ResultType = exports.ResultType || (exports.ResultType = {}));
-var XAggregateType;
-(function (XAggregateType) {
-    XAggregateType["Min"] = "MIN";
-    XAggregateType["Max"] = "MAX";
-    XAggregateType["Sum"] = "SUM";
-    XAggregateType["Avg"] = "AVG";
-})(XAggregateType = exports.XAggregateType || (exports.XAggregateType = {}));
+var XAggregateFunction;
+(function (XAggregateFunction) {
+    XAggregateFunction["Min"] = "MIN";
+    XAggregateFunction["Max"] = "MAX";
+    XAggregateFunction["Sum"] = "SUM";
+    XAggregateFunction["Avg"] = "AVG";
+})(XAggregateFunction = exports.XAggregateFunction || (exports.XAggregateFunction = {}));

package/lib/serverApi/XUtilsCommon.d.ts

@@ -1,4 +1,6 @@
 import { XEntity, XField } from "./XEntityMetadata";
+import { XCustomFilter, XCustomFilterItem } from "./FindParam";
+import { DataTableSortMeta } from "primereact/datatable";
 export declare class XUtilsCommon {
     static newLine: string;
     static getValueByPath(object: any, path: string): any;
@@ -15,6 +17,33 @@ export declare class XUtilsCommon {
     static displayValueAsUI(prefix: string | null, value: any, xField: XField | undefined): string;
     static objectAsJSON(value: any): string;
     static arrayCreateMap<ID, T>(array: T[], idField: string): Map<ID, T>;
+    static arrayMoveElement(array: any[], position: number, offset: number): void;
+    static arraySort(array: any[], fieldOrValueFunction: string | ((item: any) => any)): 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 createCustomFilter(filter: string | undefined | null): XCustomFilterItem | undefined;
+    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 createPathFieldExp(pathFieldOrPathFieldExp: string): string;
+    static isPathField(pathFieldOrPathFieldExp: string): boolean;
     static getDayName(date: Date | null | undefined): string | undefined;
     static dateAddDays(date: Date | null, days: number): Date | null;
     static dateAddMonths(date: Date | null, months: number): Date | null;

package/lib/serverApi/XUtilsCommon.js

@@ -292,6 +292,171 @@ var XUtilsCommon = /** @class */ (function () {
         }
         return idRowMap;
     };
+    XUtilsCommon.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);
+        }
+    };
+    XUtilsCommon.arraySort = function (array, fieldOrValueFunction) {
+        var valueFunction;
+        if (typeof fieldOrValueFunction === 'string') {
+            valueFunction = function (item) { return item[fieldOrValueFunction]; };
+        }
+        else {
+            valueFunction = fieldOrValueFunction;
+        }
+        return array.sort(function (suggestion1, suggestion2) {
+            var value1 = valueFunction(suggestion1);
+            var value2 = valueFunction(suggestion2);
+            if (value1 > value2) {
+                return 1;
+            }
+            else if (value1 < value2) {
+                return -1;
+            }
+            else {
+                return 0;
+            }
+        });
+    };
+    /**
+     * 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
+     */
+    XUtilsCommon.arrayIncludes = function (array, item, idField) {
+        return item && array.some(function (arrayItem) { return arrayItem && arrayItem[idField] === item[idField]; });
+    };
+    /**
+     * returns intersection of 2 row lists
+     * remark: null/undefined items in both array1 and array2 are ignored
+     *
+     * @param array1
+     * @param array2
+     * @param idField
+     */
+    XUtilsCommon.arrayIntersect = function (array1, array2, idField) {
+        var e_5, _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_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (array2_1_1 && !array2_1_1.done && (_a = array2_1.return)) _a.call(array2_1);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        return array1.filter(function (item) { return item && array2IdSet.has(item[idField]); });
+    };
+    // ************* XCustomFilter/XCustomFilterItem/DataTableSortMeta **************
+    // pomocna metodka - aby sme nemuseli v kode vypisovat {where: <filter>, params: {}}
+    XUtilsCommon.createCustomFilter = function (filter) {
+        var customFilterItem = undefined;
+        if (filter) {
+            customFilterItem = { where: filter, params: {} };
+        }
+        return customFilterItem;
+    };
+    // pomocna metodka - konvertuje XCustomFilter -> XCustomFilterItem[]
+    XUtilsCommon.createCustomFilterItems = function (customFilter) {
+        var customFilterItems = undefined;
+        if (customFilter) {
+            if (Array.isArray(customFilter)) {
+                customFilterItems = customFilter;
+            }
+            else {
+                customFilterItems = [customFilter];
+            }
+        }
+        return customFilterItems;
+    };
+    // pomocna metodka - konvertuje sortField -> DataTableSortMeta[]
+    XUtilsCommon.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
+    XUtilsCommon.filterAnd = function () {
+        var e_6, _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 = XUtilsCommon.createCustomFilterItems(filter);
+                    if (customFilterItems) {
+                        customFilterItemsResult.push.apply(customFilterItemsResult, __spreadArray([], __read(customFilterItems), false));
+                    }
+                }
+            }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            finally {
+                try {
+                    if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
+                }
+                finally { if (e_6) throw e_6.error; }
+            }
+        }
+        return customFilterItemsResult;
+    };
+    // pomocna metodka
+    // ak je idList prazdny, vytvori podmienku id IN (0) a nevrati ziadne zaznamy
+    XUtilsCommon.filterIdIn = function (idField, idList) {
+        return { where: "[".concat(idField, "] IN (:...idList)"), params: { "idList": idList.length > 0 ? idList : [0] } };
+    };
+    // helper
+    XUtilsCommon.createPathFieldExp = function (pathFieldOrPathFieldExp) {
+        // if fieldOrPathFieldExp is only pathField (e.g. attrX or assocA.attrB) then make path field expression (enclose field into [])
+        if (XUtilsCommon.isPathField(pathFieldOrPathFieldExp)) {
+            pathFieldOrPathFieldExp = "[".concat(pathFieldOrPathFieldExp, "]");
+        }
+        return pathFieldOrPathFieldExp;
+    };
+    // helper
+    XUtilsCommon.isPathField = function (pathFieldOrPathFieldExp) {
+        return /^[a-zA-Z0-9_.]+$/.test(pathFieldOrPathFieldExp);
+    };
     XUtilsCommon.getDayName = function (date) {
         var days = ['nedeľa', 'pondelok', 'utorok', 'streda', 'štvrtok', 'piatok', 'sobota'];
         return date ? days[date.getDay()] : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",