@michalrakus/x-react-web-lib 1.9.0 → 1.11.0

package/lib/components/XInputIntervalBase.js

@@ -0,0 +1,97 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __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 __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XInputIntervalBase = void 0;
+var inputtext_1 = require("primereact/inputtext");
+var react_1 = __importStar(require("react"));
+var XUtilsConversions_1 = require("./XUtilsConversions");
+var XUtils_1 = require("./XUtils");
+// zatial podporuje len hours a minutes - TODO - pridat aj seconds, ale cez nejaky prepinac
+var XInputIntervalBase = function (props) {
+    // true, ak uzivatel typuje hodnotu ale hodnota sa este neda skonvertovat na korektny interval (este nevieme vytvorit IPostgresInterval)
+    // false, ak uz mame v inpute korektnu hodnotu - vtedy zavolame props.onChange a posleme mu IPostgresInterval
+    var _a = __read((0, react_1.useState)(false), 2), inputChanged = _a[0], setInputChanged = _a[1];
+    // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
+    var _b = __read((0, react_1.useState)(undefined), 2), inputValueState = _b[0], setInputValueState = _b[1];
+    var onChange = function (e) {
+        // conversion to IPostgresInterval will be done in onBlur
+        setInputChanged(true);
+        setInputValueState(e.target.value);
+    };
+    var onBlur = function (e) {
+        // optimalizacia - testujeme len ak inputChanged === true
+        if (inputChanged) {
+            // convert e.target.value (e.g. 10:29) into IPostgresInterval (e.g. {hours: 10, minutes: 29})
+            var valueInterval = (0, XUtilsConversions_1.intervalFromUI)(e.target.value);
+            if (valueInterval === undefined) {
+                // user odisiel z inputu a nechal tam nevalidnu hodnotu - zapiseme hodnotu null, nech nemusime kontrolovat field pri validacii
+                valueInterval = null;
+            }
+            props.onChange(valueInterval);
+            setInputChanged(false);
+            setInputValueState(undefined); // pre poriadok
+        }
+    };
+    var getInputValue = function () {
+        var inputValue;
+        if (inputChanged) {
+            inputValue = inputValueState;
+        }
+        else {
+            inputValue = (0, XUtilsConversions_1.intervalAsUI)(props.value);
+        }
+        return inputValue;
+    };
+    // remark - width:'3.5rem' is default, can be overriden by value from props.style, if needed
+    return (react_1.default.createElement(inputtext_1.InputText, __assign({ id: props.id, value: getInputValue(), onChange: onChange, onBlur: onBlur, readOnly: props.readOnly }, XUtils_1.XUtils.createErrorProps(props.error), { style: __assign({ width: '3.5rem' }, props.style) })));
+};
+exports.XInputIntervalBase = XInputIntervalBase;

package/lib/components/XInputIntervalDT.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import { IPostgresInterval } from "./XUtils";
+import { XInputDT, XInputDTProps } from "./XInputDT";
+export interface XInputIntervalDTProps extends XInputDTProps {
+}
+export declare class XInputIntervalDT extends XInputDT<XInputIntervalDTProps> {
+    constructor(props: XInputIntervalDTProps);
+    getValue(): IPostgresInterval | null;
+    onValueChange(value: IPostgresInterval | null): void;
+    render(): JSX.Element;
+}

package/lib/components/XInputIntervalDT.js

@@ -0,0 +1,43 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XInputIntervalDT = void 0;
+var react_1 = __importDefault(require("react"));
+var XInputIntervalBase_1 = require("./XInputIntervalBase");
+var XInputDT_1 = require("./XInputDT");
+var XInputIntervalDT = /** @class */ (function (_super) {
+    __extends(XInputIntervalDT, _super);
+    function XInputIntervalDT(props) {
+        var _this = _super.call(this, props) || this;
+        _this.onValueChange = _this.onValueChange.bind(_this);
+        return _this;
+    }
+    XInputIntervalDT.prototype.getValue = function () {
+        return this.getValueFromRowData();
+    };
+    XInputIntervalDT.prototype.onValueChange = function (value) {
+        this.onValueChangeBase(value, this.props.onChange);
+    };
+    XInputIntervalDT.prototype.render = function () {
+        return (react_1.default.createElement(XInputIntervalBase_1.XInputIntervalBase, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError() }));
+    };
+    return XInputIntervalDT;
+}(XInputDT_1.XInputDT));
+exports.XInputIntervalDT = XInputIntervalDT;

package/lib/components/XLazyDataTable.d.ts

@@ -1,7 +1,7 @@
 import React, { ReactChild } from 'react';
 import { DataTableFilterMeta, DataTableFilterMetaData, DataTableOperatorFilterMetaData } from 'primereact/datatable';
 import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
-import { SearchTableParams } from "./SearchTableParams";
+import { XSearchBrowseParams } from "./XSearchBrowseParams";
 import { XAggregateType, XCustomFilter } from "../serverApi/FindParam";
 import { XOnSaveOrCancelProp } from "./XFormBase";
 export type XBetweenFilterProp = "row" | "column" | undefined;
@@ -15,6 +15,13 @@ export interface XEditModeHandlers {
     onMoveColumnLeft: (field: string) => void;
     onMoveColumnRight: (field: string) => void;
 }
+export interface XBrowseProps {
+    displayed?: boolean;
+    openForm?: (newFormElement: JSX.Element | null) => void;
+}
+export interface XSearchBrowseProps {
+    searchBrowseParams?: XSearchBrowseParams;
+}
 export interface XLazyDataTableProps {
     entity: string;
     dataKey?: string;
@@ -35,7 +42,7 @@ export interface XLazyDataTableProps {
     filters?: DataTableFilterMeta;
     customFilter?: XCustomFilter;
     sortField?: string;
-    searchTableParams?: SearchTableParams;
+    searchBrowseParams?: XSearchBrowseParams;
     width?: string;
     dataLoadedState?: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
     editMode?: boolean;

package/lib/components/XLazyDataTable.js

@@ -198,7 +198,7 @@ var XLazyDataTable = function (props) {
     };
     // premenne platne pre cely component (obdoba member premennych v class-e)
     var dataTableEl = (0, react_1.useRef)(null);
-    var customFilter = props.customFilter;
+    var customFilterItems = XUtils_1.XUtils.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];
@@ -208,13 +208,15 @@ var XLazyDataTable = function (props) {
     if (props.filters) {
         filtersInit = __assign(__assign({}, filtersInit), props.filters); // items from props.filters will replace existing items in filtersInit
     }
-    if (props.searchTableParams !== undefined) {
-        var displayFieldFilter = props.searchTableParams.displayFieldFilter;
+    if (props.searchBrowseParams !== undefined) {
+        var displayFieldFilter = props.searchBrowseParams.displayFieldFilter;
         if (displayFieldFilter !== undefined) {
             filtersInit[displayFieldFilter.field] = createFilterItem(props.filterDisplay, displayFieldFilter.constraint);
         }
-        // ak mame props.searchTableParams.customFilter, pridame ho
-        customFilter = XUtils_1.XUtils.filterAnd(customFilter, props.searchTableParams.customFilter);
+        // ak mame props.searchBrowseParams.customFilterFunction, pridame filter
+        if (props.searchBrowseParams.customFilterFunction) {
+            customFilterItems = XUtils_1.XUtils.filterAnd(customFilterItems, props.searchBrowseParams.customFilterFunction());
+        }
     }
     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)(props.sortField ? [{ field: props.sortField, order: 1 }] : []), 2), multiSortMeta = _g[0], setMultiSortMeta = _g[1];
@@ -255,7 +257,7 @@ var XLazyDataTable = function (props) {
         return __generator(this, function (_a) {
             //console.log("zavolany onPage");
             setFirst(event.first);
-            loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: event.first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+            loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: event.first, rows: rows, filters: filters, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
             return [2 /*return*/];
         });
     }); };
@@ -269,7 +271,7 @@ var XLazyDataTable = function (props) {
         //console.log("zavolany onSort - this.state.multiSortMeta = " + JSON.stringify(multiSortMeta));
         //console.log("zavolany onSort - event.multiSortMeta = " + JSON.stringify(event.multiSortMeta));
         setMultiSortMeta(event.multiSortMeta);
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilterItems: customFilterItems, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
     };
     var onClickFilter = function () {
         //console.log("zavolany onClickFilter");
@@ -281,7 +283,7 @@ var XLazyDataTable = function (props) {
         setFilters(filtersInit);
     };
     var loadData = function () {
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
     };
     var loadDataBase = function (findParam) { return __awaiter(void 0, void 0, void 0, function () {
         var findResult;
@@ -364,11 +366,11 @@ var XLazyDataTable = function (props) {
     var onRowDoubleClick = function (event) {
         //console.log("zavolany onRowDoubleClick");
         //console.log(event.data);
-        if (props.onEdit !== undefined) {
+        if (props.onEdit !== undefined && props.searchBrowseParams === undefined) {
             props.onEdit(event.data);
         }
-        else if (props.searchTableParams !== undefined) {
-            props.searchTableParams.onChoose(event.data);
+        else if (props.searchBrowseParams !== undefined) {
+            props.searchBrowseParams.onChoose(event.data);
         }
     };
     var onClickAddRow = function () {
@@ -449,7 +451,7 @@ var XLazyDataTable = function (props) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems };
+                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems };
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
@@ -461,7 +463,7 @@ var XLazyDataTable = function (props) {
         });
     }); };
     var createExportParams = function () {
-        var queryParam = { filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
+        var queryParam = { filters: filtersAfterFiltering, customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
         return {
             path: "x-lazy-data-table-export",
             queryParam: queryParam,
@@ -472,8 +474,8 @@ var XLazyDataTable = function (props) {
     var onClickChoose = function () {
         //console.log("zavolany onClickChoose");
         if (selectedRow !== null) {
-            if (props.searchTableParams !== undefined) {
-                props.searchTableParams.onChoose(selectedRow);
+            if (props.searchBrowseParams !== undefined) {
+                props.searchBrowseParams.onChoose(selectedRow);
             }
         }
         else {
@@ -569,45 +571,60 @@ var XLazyDataTable = function (props) {
         }
         return betweenFilter;
     };
-    var bodyTemplate = function (columnProps, rowData, xField) {
-        var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueByPath(rowData, columnProps.field);
-        var bodyValue = '';
+    var valueAsUI = function (value, xField) {
+        var valueResult = '';
         if (xField.type === "decimal") {
             // tuto zatial hack, mal by vzdy prist number
             var numberValue = null;
-            if (typeof rowDataValue === 'string') {
-                numberValue = parseFloat(rowDataValue);
+            if (typeof value === 'string') {
+                numberValue = parseFloat(value);
             }
-            else if (typeof rowDataValue === 'number') {
-                numberValue = rowDataValue;
+            else if (typeof value === 'number') {
+                numberValue = value;
             }
-            bodyValue = (0, XUtilsConversions_1.numberAsUI)(numberValue, xField.scale);
+            valueResult = (0, XUtilsConversions_1.numberAsUI)(numberValue, xField.scale);
         }
         else if (xField.type === "date") {
             // tuto zatial hack, mal by prist Date
             var dateValue = null;
-            if (typeof rowDataValue === 'string') {
-                dateValue = new Date(rowDataValue);
+            if (typeof value === 'string') {
+                dateValue = new Date(value);
             }
-            else if (typeof rowDataValue === 'object' && rowDataValue instanceof Date) {
-                dateValue = rowDataValue;
+            else if (typeof value === 'object' && value instanceof Date) {
+                dateValue = value;
             }
-            bodyValue = (0, XUtilsConversions_1.dateAsUI)(dateValue);
+            valueResult = (0, XUtilsConversions_1.dateAsUI)(dateValue);
         }
         else if (xField.type === "datetime") {
             // tuto zatial hack, mal by prist Date
             var dateValue = null;
-            if (typeof rowDataValue === 'string') {
-                dateValue = new Date(rowDataValue);
+            if (typeof value === 'string') {
+                dateValue = new Date(value);
             }
-            else if (typeof rowDataValue === 'object' && rowDataValue instanceof Date) {
-                dateValue = rowDataValue;
+            else if (typeof value === 'object' && value instanceof Date) {
+                dateValue = value;
             }
-            bodyValue = (0, XUtilsConversions_1.datetimeAsUI)(dateValue);
+            valueResult = (0, XUtilsConversions_1.datetimeAsUI)(dateValue);
         }
         else if (xField.type === "boolean") {
             // TODO - efektivnejsie by bolo renderovat len prislusne ikonky
-            bodyValue = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: rowDataValue, disabled: true });
+            valueResult = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: value, disabled: true });
+        }
+        else {
+            // string a ine typy
+            valueResult = value;
+        }
+        return valueResult;
+    };
+    var bodyTemplate = function (columnProps, rowData, xField) {
+        var bodyValue;
+        var rowDataValue = XUtilsCommon_1.XUtilsCommon.getValueOrValueListByPath(rowData, columnProps.field);
+        if (Array.isArray(rowDataValue)) {
+            var elemList = rowDataValue.map(function (value, index) { return react_1.default.createElement("div", { key: index }, valueAsUI(value, xField)); });
+            bodyValue = react_1.default.createElement("div", null, elemList);
+        }
+        else {
+            bodyValue = valueAsUI(rowDataValue, xField);
         }
         return bodyValue;
     };
@@ -633,7 +650,7 @@ var XLazyDataTable = function (props) {
                 // }
                 var viewHeight = void 0;
                 var headerFooterHeight = void 0;
-                if (props.searchTableParams === undefined) {
+                if (props.searchBrowseParams === undefined) {
                     // sme v standardnom formulari
                     viewHeight = '100vh';
                     // experimentalne zistena vyska header/footer
@@ -702,7 +719,7 @@ var XLazyDataTable = function (props) {
     }
     // else - editMode is undefined - browse is not editable
     // export pre search button-y zatial vypneme
-    var exportRows = (props.searchTableParams === undefined);
+    var exportRows = (props.searchBrowseParams === undefined);
     // pre lepsiu citatelnost vytvarame stlpce uz tu
     var columnElemList = react_1.default.Children.map(props.children, function (child) {
         // ak chceme zmenit child element, tak treba bud vytvorit novy alebo vyklonovat
@@ -805,8 +822,7 @@ var XLazyDataTable = function (props) {
         if (childColumn.props.body !== undefined) {
             body = childColumn.props.body;
         }
-        // TODO - mozno by bolo dobre vytvarat body pre kazdy typ fieldu, nech je to vsetko konzistentne
-        else if (xField.type === "decimal" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
+        else {
             body = function (rowData) { return bodyTemplate(childColumn.props, rowData, xField); };
         }
         // *********** width/headerStyle ***********
@@ -859,12 +875,12 @@ var XLazyDataTable = function (props) {
         react_1.default.createElement("div", { className: "flex justify-content-center" },
             react_1.default.createElement(datatable_1.DataTable, { value: value.rowList, dataKey: dataKey, paginator: props.paginator, rows: rows, totalRecords: value.totalRecords, lazy: true, first: first, onPage: onPage, loading: loading, filterDisplay: props.filterDisplay, filters: filters, onFilter: onFilter, sortMode: "multiple", removableSort: true, multiSortMeta: multiSortMeta, onSort: onSort, selectionMode: "single", selection: selectedRow, onSelectionChange: onSelectionChange, onRowDoubleClick: onRowDoubleClick, ref: dataTableEl, className: "p-datatable-sm x-lazy-datatable", resizableColumns: true, columnResizeMode: "expand", tableStyle: tableStyle, paginatorLeft: paginatorLeft, paginatorRight: paginatorRight, scrollable: props.scrollable, scrollHeight: scrollHeight, style: style }, columnElemList)),
         react_1.default.createElement("div", { className: "flex justify-content-center" },
-            props.onAddRow !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "addRow", icon: "pi pi-plus", label: (0, XLocale_1.xLocaleOption)('addRow'), onClick: onClickAddRow }) : null,
-            props.onEdit !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "editRow", icon: "pi pi-pencil", label: (0, XLocale_1.xLocaleOption)('editRow'), onClick: onClickEdit }) : null,
-            props.removeRow !== undefined && props.removeRow !== false ? react_1.default.createElement(XButton_1.XButton, { key: "removeRow", icon: "pi pi-times", label: (0, XLocale_1.xLocaleOption)('removeRow'), onClick: onClickRemoveRow }) : null,
+            props.onAddRow !== undefined && props.searchBrowseParams === undefined ? react_1.default.createElement(XButton_1.XButton, { key: "addRow", icon: "pi pi-plus", label: (0, XLocale_1.xLocaleOption)('addRow'), onClick: onClickAddRow }) : null,
+            props.onEdit !== undefined && props.searchBrowseParams === undefined ? react_1.default.createElement(XButton_1.XButton, { key: "editRow", icon: "pi pi-pencil", label: (0, XLocale_1.xLocaleOption)('editRow'), onClick: onClickEdit }) : null,
+            props.removeRow !== undefined && props.removeRow !== false && props.searchBrowseParams === undefined ? react_1.default.createElement(XButton_1.XButton, { key: "removeRow", icon: "pi pi-times", label: (0, XLocale_1.xLocaleOption)('removeRow'), onClick: onClickRemoveRow }) : null,
             exportRows ? react_1.default.createElement(XButton_1.XButton, { key: "exportRows", icon: "pi pi-file-export", label: (0, XLocale_1.xLocaleOption)('exportRows'), onClick: onClickExport }) : null,
             props.appButtons,
-            props.searchTableParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "choose", label: (0, XLocale_1.xLocaleOption)('chooseRow'), onClick: onClickChoose }) : null,
+            props.searchBrowseParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "choose", label: (0, XLocale_1.xLocaleOption)('chooseRow'), onClick: onClickChoose }) : null,
             exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { key: "exportRowsDialog", dialogOpened: exportRowsDialogOpened, hideDialog: function () { return setExportRowsDialogOpened(false); }, rowCount: exportRowsDialogRowCount, exportParams: createExportParams }) : null)));
 };
 exports.XLazyDataTable = XLazyDataTable;

package/lib/components/{SearchTableParams.d.ts → XSearchBrowseParams.d.ts}

@@ -4,8 +4,8 @@ export interface XFieldFilter {
     field: string;
     constraint: DataTableFilterMetaData;
 }
-export interface SearchTableParams {
+export interface XSearchBrowseParams {
     onChoose: (chosenRow: any) => void;
     displayFieldFilter?: XFieldFilter;
-    customFilter?: XCustomFilter;
+    customFilterFunction?: () => XCustomFilter | undefined;
 }

package/lib/components/XSearchButton.d.ts

@@ -5,8 +5,8 @@ import { XObject } from "./XObject";
 export interface XSearchButtonProps extends XFormComponentProps<XObject> {
     assocField: string;
     displayField: string;
-    searchTable: any;
-    assocForm?: any;
+    searchBrowse: JSX.Element;
+    assocForm?: JSX.Element;
     filter?: XFilterProp;
     size?: number;
     inputStyle?: React.CSSProperties;

package/lib/components/XSearchButton.js

@@ -136,7 +136,7 @@ var XSearchButton = /** @class */ (function (_super) {
                         setValueToModel(null); // prazdny retazec znamena null hodnotu
                         return [3 /*break*/, 3];
                     case 1:
-                        displayFieldFilter = { filter: "[".concat(props.displayField, "] LIKE :xDisplayFieldValue"), values: { "xDisplayFieldValue": "".concat(e.target.value, "%") } };
+                        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))];
                     case 2:
@@ -166,7 +166,7 @@ var XSearchButton = /** @class */ (function (_super) {
             setInputChanged(false);
         };
         var onClickSearch = function (e) {
-            console.log("zavolany onClickSearch");
+            //console.log("zavolany onClickSearch");
             if (!_this.isReadOnly()) {
                 setDialogOpened(true);
                 // POVODNY KOD
@@ -178,13 +178,13 @@ var XSearchButton = /** @class */ (function (_super) {
                     // OTAZKA - ziskavat id priamo z root objektu? potom ho vsak treba do root objektu pridat
                     var id = (assocObject !== null) ? assocObject[xEntityAssoc.idField] : null;
                     // klonovanim elementu pridame atribut id
-                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id }, props.assocForm.children);
+                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id } /*, props.assocForm.children*/);
                     props.form.props.openForm(assocForm);
                 }
             }
         };
         var onChoose = function (chosenRow) {
-            console.log("zavolany onChoose");
+            //console.log("zavolany onChoose");
             // zavrieme search dialog
             // POVODNY KOD
             //overlayPanelEl.current.hide();
@@ -199,14 +199,12 @@ var XSearchButton = /** @class */ (function (_super) {
                 _this.inputTextRef.current.focus();
             }
         };
-        // {React.createElement(props.searchTable, {searchTableParams: {onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}, ...props.searchTableProps}, null)}
-        // <BrandSearchTable searchTableParams={{onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}} qqq="fiha"/>
         // takto cez metodku, mozno sa metodka vola len ked sa otvori dialog a usetrime nieco...
-        var createSearchTableParams = function () {
+        var createSearchBrowseParams = function () {
             return {
                 onChoose: onChoose,
                 displayFieldFilter: (inputChanged ? { field: props.displayField, constraint: { value: inputValueState, matchMode: "startsWith" } } : undefined),
-                customFilter: _this.getFilterBase(_this.props.filter)
+                customFilterFunction: function () { return _this.getFilterBase(_this.props.filter); }
             };
         };
         // vypocitame inputValue
@@ -215,10 +213,8 @@ var XSearchButton = /** @class */ (function (_super) {
             react_1.default.createElement("label", { htmlFor: props.assocField, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
             react_1.default.createElement("div", { className: "x-search-button-base" },
                 react_1.default.createElement(inputtext_1.InputText, __assign({ id: props.assocField, value: inputValue, onChange: onInputValueChange, onBlur: onInputBlur, readOnly: this.isReadOnly(), ref: this.inputTextRef, maxLength: xDisplayField.length, size: size, style: props.inputStyle }, this.getClassNameTooltip())),
-                react_1.default.createElement(button_1.Button, { label: "...", onClick: onClickSearch })),
-            react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchTable, {
-                searchTableParams: createSearchTableParams()
-            }, props.searchTable.children))));
+                react_1.default.createElement(button_1.Button, { icon: "pi pi-search", onClick: onClickSearch })),
+            react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchBrowse, { searchBrowseParams: createSearchBrowseParams() } /*, props.searchBrowse.children*/))));
     };
     return XSearchButton;
 }(XFormComponent_1.XFormComponent));

package/lib/components/XSearchButtonDT.d.ts

@@ -5,8 +5,8 @@ export declare const XSearchButtonDT: (props: {
     entity: string;
     assocField: string;
     displayField: string;
-    searchTable: any;
-    assocForm?: any;
+    searchBrowse: JSX.Element;
+    assocForm?: JSX.Element | undefined;
     rowData: any;
     readOnly?: boolean | undefined;
 }) => JSX.Element;

package/lib/components/XSearchButtonDT.js

@@ -155,7 +155,7 @@ var XSearchButtonDT = function (props) {
                     // OTAZKA - ziskavat id priamo z root objektu? potom ho vsak treba do root objektu pridat
                     var id = (assocObject !== null && assocObject !== undefined) ? assocObject[xEntityAssoc.idField] : null;
                     // klonovanim elementu pridame atribut id
-                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id }, props.assocForm.children);
+                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id } /*, props.assocForm.children*/);
                     props.form.props.openForm(assocForm);
                 }
             }
@@ -175,14 +175,18 @@ var XSearchButtonDT = function (props) {
             inputTextRef.current.focus();
         }
     };
-    // {React.createElement(props.searchTable, {searchTableParams: {onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}, ...props.searchTableProps}, null)}
-    // <BrandSearchTable searchTableParams={{onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}} qqq="fiha"/>
     // vypocitame inputValue
     var inputValue = computeInputValue();
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "x-search-button-base" },
             react_1.default.createElement(inputtext_1.InputText, { id: props.assocField, value: inputValue, onChange: onInputValueChange, onBlur: onInputBlur, readOnly: readOnly, ref: inputTextRef }),
-            react_1.default.createElement(button_1.Button, { label: "...", onClick: onClickSearch })),
-        react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchTable, { searchTableParams: { onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined) } }, props.searchTable.children))));
+            react_1.default.createElement(button_1.Button, { icon: "pi pi-search", onClick: onClickSearch })),
+        react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchBrowse, {
+            searchBrowseParams: {
+                onChoose: onChoose,
+                displayFieldFilter: (inputChanged ? { field: props.displayField, constraint: { value: inputValueState, matchMode: "startsWith" } } : undefined),
+                customFilterFunction: function () { return undefined; } // TODO - dorobit
+            }
+        } /*, props.searchBrowse.children*/))));
 };
 exports.XSearchButtonDT = XSearchButtonDT;

package/lib/components/XUtils.d.ts

@@ -3,13 +3,22 @@ import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType } from "../serv
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
-import { XCustomFilter } from "../serverApi/FindParam";
+import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
     Update = 2,
     Remove = 3
 }
+export interface IPostgresInterval {
+    years?: number;
+    months?: number;
+    days?: number;
+    hours?: number;
+    minutes?: number;
+    seconds?: number;
+    milliseconds?: number;
+}
 export declare class XUtils {
     static dropdownEmptyOptionValue: string;
     static xBackendUrl: string | undefined;
@@ -58,6 +67,24 @@ export declare class XUtils {
     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 markNotNull(label: string): string;
     static showErrorMessage(message: string, e: unknown): void;
@@ -70,5 +97,6 @@ export declare class XUtils {
     static getErrorMessages(xErrorMap: XErrorMap): string;
     static getErrorMessage(xError: XError): string | undefined;
     static normalizeString(value: string): string;
-    static filterAnd(filter1: XCustomFilter | undefined, filter2: XCustomFilter | undefined): XCustomFilter | undefined;
+    static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
+    static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
 }