@michalrakus/x-react-web-lib 1.20.0 → 1.22.0

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

@@ -15,6 +15,10 @@ export interface XAppButtonForRow {
     label: string;
     onClick: (selectedRow: any) => void;
 }
+export interface XOptionalCustomFilter {
+    label: string;
+    filter: XCustomFilter;
+}
 export interface XEditModeHandlers {
     onStart: () => void;
     onSave: () => void;
@@ -34,6 +38,7 @@ export interface XSearchBrowseProps {
 }
 export interface XLazyDataTableProps {
     entity: string;
+    label?: string;
     dataKey?: string;
     paginator: boolean;
     rows: number;
@@ -52,6 +57,7 @@ export interface XLazyDataTableProps {
     appButtons?: any;
     filters?: DataTableFilterMeta;
     customFilter?: XCustomFilter;
+    optionalCustomFilters?: XOptionalCustomFilter[];
     sortField?: string | DataTableSortMeta[];
     fullTextSearch: boolean | string[];
     fields?: string[];
@@ -62,6 +68,7 @@ export interface XLazyDataTableProps {
     width?: string;
     rowClassName?: (data: any) => object | string | undefined;
     dataLoadedState?: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
+    exportFieldsToDuplicateValues?: string[];
     editMode?: boolean;
     editModeHandlers?: XEditModeHandlers;
     displayed?: boolean;

package/lib/components/XLazyDataTable/XLazyDataTable.js

@@ -130,6 +130,7 @@ var editor_1 = require("primereact/editor");
 var XMultilineSwitch_1 = require("./XMultilineSwitch");
 var XMultilineRenderer_1 = require("./XMultilineRenderer");
 var XHtmlRenderer_1 = require("./XHtmlRenderer");
+var XOcfDropdown_1 = require("./XOcfDropdown");
 var XLazyDataTable = function (props) {
     var _a;
     // must be here, is used in createInitFilters()
@@ -239,14 +240,16 @@ var XLazyDataTable = function (props) {
     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 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)(props.multilineSwitchInitValue), 2), multilineSwitchValue = _h[0], setMultilineSwitchValue = _h[1];
-    var _j = __read((0, react_1.useState)(XUtils_1.XUtils.createMultiSortMeta(props.sortField)), 2), multiSortMeta = _j[0], setMultiSortMeta = _j[1];
-    var _k = __read((0, react_1.useState)(null), 2), selectedRow = _k[0], setSelectedRow = _k[1];
-    var _l = __read((_a = props.dataLoadedState) !== null && _a !== void 0 ? _a : (0, react_1.useState)(false), 2), dataLoaded = _l[0], setDataLoaded = _l[1]; // priznak kde si zapiseme, ci uz sme nacitali data
-    var _m = __read((0, react_1.useState)(false), 2), exportRowsDialogOpened = _m[0], setExportRowsDialogOpened = _m[1];
-    var _o = __read((0, react_1.useState)(), 2), exportRowsDialogRowCount = _o[0], setExportRowsDialogRowCount = _o[1]; // param pre dialog
+    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];
+    //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
     // 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
@@ -276,10 +279,13 @@ var XLazyDataTable = function (props) {
     // TODO - preco je to tu? presunut dole ak sa da...
     var dataKey = props.dataKey !== undefined ? props.dataKey : XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity).idField;
     var onPage = function (event) { return __awaiter(void 0, void 0, void 0, function () {
+        var findParam;
         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, fullTextSearch: createXFullTextSearch(ftsInputValue), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+            findParam = createFindParam();
+            findParam.first = event.first; // prepiseme first, lebo je tam stara hodnota (volanie setFirst nezmeni first hned)
+            loadDataBase(findParam);
             return [2 /*return*/];
         });
     }); };
@@ -293,7 +299,9 @@ 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, fullTextSearch: createXFullTextSearch(ftsInputValue), customFilterItems: customFilterItems, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        var findParam = createFindParam();
+        findParam.multiSortMeta = event.multiSortMeta; // prepiseme multiSortMeta, lebo je tam stara hodnota (volanie setMultiSortMeta nezmeni multiSortMeta hned)
+        loadDataBase(findParam);
     };
     var onClickFilter = function () {
         //console.log("zavolany onClickFilter");
@@ -306,9 +314,26 @@ var XLazyDataTable = function (props) {
         if (ftsInputValue) {
             setFtsInputValue(createInitFtsInputValue());
         }
+        if (props.optionalCustomFilters) {
+            setOptionalCustomFilter(undefined);
+        }
     };
     var loadData = function () {
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, fullTextSearch: createXFullTextSearch(ftsInputValue), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
+        loadDataBase(createFindParam());
+    };
+    var createFindParam = function () {
+        return {
+            resultType: FindParam_1.ResultType.RowCountAndPagedRows,
+            first: first,
+            rows: rows,
+            filters: filters,
+            fullTextSearch: createXFullTextSearch(ftsInputValue),
+            customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilter),
+            multiSortMeta: multiSortMeta,
+            entity: props.entity,
+            fields: getFields(true),
+            aggregateItems: aggregateItems
+        };
     };
     var loadDataBase = function (findParam) { return __awaiter(void 0, void 0, void 0, function () {
         var findResult;
@@ -325,6 +350,7 @@ var XLazyDataTable = function (props) {
                     // odlozime si filter hodnoty pre pripadny export - deep cloning vyzera ze netreba
                     setFiltersAfterFiltering(filters);
                     setFtsInputValueAfterFiltering(ftsInputValue ? __assign({}, ftsInputValue) : undefined);
+                    setOptionalCustomFilterAfterFiltering(optionalCustomFilter);
                     return [2 /*return*/];
             }
         });
@@ -353,7 +379,10 @@ var XLazyDataTable = function (props) {
         }
         return xFullTextSearch;
     };
-    var getFields = function () {
+    var createXCustomFilterItems = function (customFilterItems, optionalCustomFilter) {
+        return XUtils_1.XUtils.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;
@@ -372,8 +401,10 @@ var XLazyDataTable = function (props) {
             }
             finally { if (e_3) throw e_3.error; }
         }
-        if (props.fields) {
-            fields.push.apply(fields, __spreadArray([], __read(props.fields), false));
+        if (addPropsFields) {
+            if (props.fields) {
+                fields.push.apply(fields, __spreadArray([], __read(props.fields), false));
+            }
         }
         return fields;
     };
@@ -399,6 +430,28 @@ var XLazyDataTable = function (props) {
         }
         return headers;
     };
+    var getWidths = function () {
+        var e_5, _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
+        var widths = [];
+        var columns = dataTableEl.current.props.children;
+        try {
+            for (var columns_5 = __values(columns), columns_5_1 = columns_5.next(); !columns_5_1.done; columns_5_1 = columns_5.next()) {
+                var column = columns_5_1.value;
+                widths.push((_b = column.props.headerStyle) === null || _b === void 0 ? void 0 : _b.width);
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_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; }
+        }
+        return widths;
+    };
     var hasContentTypeHtml = function () {
         var columns = props.children;
         return columns.some(function (column) { return column.props.contentType === "html"; });
@@ -436,7 +489,7 @@ var XLazyDataTable = function (props) {
         }
     };
     var onClickRemoveRow = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var reread, e_5, e_6;
+        var reread, e_6, e_7;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -451,8 +504,8 @@ var XLazyDataTable = function (props) {
                     reread = _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    e_5 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_5);
+                    e_6 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_6);
                     return [3 /*break*/, 4];
                 case 4:
                     if (reread) {
@@ -474,8 +527,8 @@ var XLazyDataTable = function (props) {
                     _a.sent();
                     return [3 /*break*/, 9];
                 case 8:
-                    e_6 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_6);
+                    e_7 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage((0, XLocale_1.xLocaleOption)('removeRowFailed'), e_7);
                     return [3 /*break*/, 9];
                 case 9:
                     loadData();
@@ -500,30 +553,55 @@ var XLazyDataTable = function (props) {
         }
     };
     var onClickExport = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var findParam, findResult;
+        var fields, findParam, findResult, exportParams;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems };
+                    fields = getFields(false);
+                    findParam = {
+                        resultType: FindParam_1.ResultType.OnlyRowCount,
+                        first: first,
+                        rows: rows,
+                        filters: filtersAfterFiltering,
+                        fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
+                        customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
+                        multiSortMeta: multiSortMeta,
+                        entity: props.entity,
+                        fields: fields,
+                        aggregateItems: aggregateItems
+                    };
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
-                    //setLoading(false);
-                    setExportRowsDialogRowCount(findResult.totalRecords); // param pre dialog
-                    setExportRowsDialogOpened(true);
+                    exportParams = createExportParams(fields, findResult.totalRecords);
+                    setExportRowsDialogState({ dialogOpened: true, exportParams: exportParams });
                     return [2 /*return*/];
             }
         });
     }); };
-    var createExportParams = function () {
-        var queryParam = { filters: filtersAfterFiltering, fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering), customFilterItems: customFilterItems, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
+    var createExportParams = function (fields, rowCount) {
+        var queryParam = {
+            filters: filtersAfterFiltering,
+            fullTextSearch: createXFullTextSearch(ftsInputValueAfterFiltering),
+            customFilterItems: createXCustomFilterItems(customFilterItems, optionalCustomFilterAfterFiltering),
+            multiSortMeta: multiSortMeta,
+            entity: props.entity,
+            fields: fields
+        };
         return {
-            path: "x-lazy-data-table-export",
+            rowCount: rowCount,
+            existsToManyAssoc: existsToManyAssoc(fields),
             queryParam: queryParam,
             headers: getHeaders(),
+            widths: getWidths(),
+            fieldsToDuplicateValues: props.exportFieldsToDuplicateValues,
             fileName: "".concat(props.entity)
         };
     };
+    var existsToManyAssoc = function (fields) {
+        var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity);
+        return fields.some(function (value) { return XUtilsMetadataCommon_1.XUtilsMetadataCommon.hasPathToManyAssoc(xEntity, value); });
+    };
     var onClickChoose = function () {
         //console.log("zavolany onClickChoose");
         if (selectedRow !== null) {
@@ -802,12 +880,12 @@ var XLazyDataTable = function (props) {
                     // display: 'flex' umiestni XCalendar elementy vedla seba
                     filterElement =
                         react_1.default.createElement("div", { style: betweenFilter === "row" ? { display: 'flex' } : undefined },
-                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); }, datetime: xField.type === "datetime" }),
-                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); }, datetime: xField.type === "datetime" }));
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue1(childColumn.props.field), onChange: function (value) { return setFilterValue1(childColumn.props.field, value); }, scale: xField.scale, datetime: xField.type === "datetime" }),
+                            react_1.default.createElement(XCalendar_1.XCalendar, { value: getFilterValue2(childColumn.props.field), onChange: function (value) { return setFilterValue2(childColumn.props.field, value); }, scale: xField.scale, datetime: xField.type === "datetime" }));
                 }
                 else {
                     var dateValue = getFilterValue(childColumn.props.field);
-                    filterElement = react_1.default.createElement(XCalendar_1.XCalendar, { value: dateValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); }, datetime: xField.type === "datetime" });
+                    filterElement = react_1.default.createElement(XCalendar_1.XCalendar, { value: dateValue, onChange: function (value) { return setFilterValue(childColumn.props.field, value); }, scale: xField.scale, datetime: xField.type === "datetime" });
                 }
             }
             else if (xField.type === "decimal" || xField.type === "number") {
@@ -902,13 +980,17 @@ var XLazyDataTable = function (props) {
         }
         return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, footer: footer, filter: true, sortable: true, filterElement: filterElement, dataType: dataType, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
     });
-    // align-items-center centruje vertikalne (posuva smerom doulu do stredu)
+    // align-items-center centruje vertikalne (posuva smerom dolu do stredu)
+    // x-lazy-datatable-label-right-compensation - vyvazuje label, aby item-y v strede isli aspon priblizne do stredu
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center align-items-center" },
+            props.label ? react_1.default.createElement("div", { className: "x-lazy-datatable-label" }, props.label) : null,
             ftsInputValue ? react_1.default.createElement(XFtsInput_1.XFtsInput, { value: ftsInputValue, onChange: function (value) { return setFtsInputValue(value); } }) : null,
             react_1.default.createElement(XButton_1.XButton, { key: "filter", label: (0, XLocale_1.xLocaleOption)('filter'), onClick: onClickFilter }),
             react_1.default.createElement(XButton_1.XButton, { key: "clearFilter", label: (0, XLocale_1.xLocaleOption)('clearFilter'), onClick: onClickClearFilter }),
-            props.multilineSwitch ? react_1.default.createElement(XMultilineSwitch_1.XMultilineSwitch, { value: multilineSwitchValue, onChange: function (value) { return setMultilineSwitchValue(value); }, className: "m-1" }) : null),
+            props.optionalCustomFilters ? react_1.default.createElement(XOcfDropdown_1.XOcfDropdown, { optionalCustomFilters: props.optionalCustomFilters, value: optionalCustomFilter, onChange: function (value) { return setOptionalCustomFilter(value); }, className: "m-1" }) : null,
+            props.multilineSwitch ? react_1.default.createElement(XMultilineSwitch_1.XMultilineSwitch, { value: multilineSwitchValue, onChange: function (value) { return setMultilineSwitchValue(value); }, className: "m-1" }) : null,
+            props.label ? react_1.default.createElement("div", { className: "x-lazy-datatable-label-right-compensation" }) : null),
         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, rowClassName: props.rowClassName, 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" },
@@ -919,7 +1001,7 @@ var XLazyDataTable = function (props) {
             props.appButtonsForRow ? props.appButtonsForRow.map(function (xAppButton) { return react_1.default.createElement(XButton_1.XButton, { key: xAppButton.key, icon: xAppButton.icon, label: xAppButton.label, onClick: function () { return onClickAppButtonForRow(xAppButton.onClick); } }); }) : null,
             props.appButtons,
             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),
+            exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { key: "exportRowsDialog", dialogState: exportRowsDialogState, hideDialog: function () { return setExportRowsDialogState({ dialogOpened: false }); } }) : null),
         hasContentTypeHtml() ? react_1.default.createElement(editor_1.Editor, { style: { display: 'none' }, showHeader: false }) : null /* we want to import css if needed (<style type="text/css" data-primereact-style-id="editor">) */));
 };
 exports.XLazyDataTable = XLazyDataTable;

package/lib/components/XLazyDataTable/XMultilineSwitch.js

@@ -15,6 +15,6 @@ var XMultilineSwitch = function (props) {
     var itemTemplate = function (option) {
         return react_1.default.createElement("i", { className: option.icon });
     };
-    return (react_1.default.createElement(selectbutton_1.SelectButton, { value: props.value, onChange: function (e) { return props.onChange(e.value); }, options: options, optionValue: "value", itemTemplate: itemTemplate, className: props.className }));
+    return (react_1.default.createElement(selectbutton_1.SelectButton, { value: props.value, onChange: function (e) { return props.onChange(e.value); }, options: options, optionValue: "value", itemTemplate: itemTemplate, allowEmpty: false, className: props.className }));
 };
 exports.XMultilineSwitch = XMultilineSwitch;

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { XOptionalCustomFilter } from "./XLazyDataTable";
+export declare const XOcfDropdown: (props: {
+    optionalCustomFilters: XOptionalCustomFilter[];
+    value: XOptionalCustomFilter | undefined;
+    onChange: (value: XOptionalCustomFilter | undefined) => void;
+    className?: string | undefined;
+}) => JSX.Element;

package/lib/components/XLazyDataTable/XOcfDropdown.js

@@ -0,0 +1,53 @@
+"use strict";
+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;
+};
+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));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XOcfDropdown = void 0;
+var react_1 = __importDefault(require("react"));
+var dropdown_1 = require("primereact/dropdown");
+// dropdown for optional custom filter (ocf)
+var XOcfDropdown = function (props) {
+    var onChange = function (e) {
+        var value;
+        // specialna null polozka nema ziadne atributy
+        if (Object.keys(e.value).length === 0) {
+            value = undefined;
+        }
+        else {
+            value = e.value;
+        }
+        props.onChange(value);
+    };
+    // pridame prazdnu polozku
+    // polozku pridavame do kopie zoznamu, lebo inac sa nam "polozka" v props.optionalCustomFilters "mnozi"
+    var options = __spreadArray([], __read(props.optionalCustomFilters), false);
+    options.splice(0, 0, {});
+    return (react_1.default.createElement(dropdown_1.Dropdown, { options: options, optionLabel: "label", value: props.value, onChange: onChange, className: props.className }));
+};
+exports.XOcfDropdown = XOcfDropdown;

package/lib/components/XUtils.d.ts

@@ -1,5 +1,5 @@
 import { XToken } from "./XToken";
-import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
+import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType, XMultilineExportType } from "../serverApi/ExportImportParam";
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
@@ -36,6 +36,7 @@ export declare class XUtils {
     static xTokenPublic: XToken;
     private static appFormMap;
     static exportTypeOptions: ExportType[];
+    static multilineExportTypeOptions: XMultilineExportType[];
     static csvSeparatorOptions: CsvSeparator[];
     static decimalFormatOptions: CsvDecimalFormat[];
     static csvEncodingOptions: CsvEncoding[];
@@ -60,6 +61,7 @@ export declare class XUtils {
     static fetchString(path: string, value: any): Promise<string>;
     static fetch(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any>;
     static post(path: string, value: any): Promise<Response>;
+    static openExcelReport(apiPath: string, requestPayload: any, fileName?: string): Promise<boolean>;
     static fetchBasicJson(path: string, value: any, usePublicToken?: boolean | XToken): Promise<Response>;
     static fetchFile(path: string, jsonFieldValue: any, fileToPost: any): Promise<any>;
     static fetchBasicAuthBasic(path: string, headers: any, body: any, usePublicToken?: boolean | XToken): Promise<Response>;

package/lib/components/XUtils.js

@@ -334,6 +334,36 @@ var XUtils = /** @class */ (function () {
     XUtils.post = function (path, value) {
         return XUtils.fetchBasicJson(path, value);
     };
+    XUtils.openExcelReport = function (apiPath, requestPayload, fileName) {
+        return __awaiter(this, void 0, void 0, function () {
+            var response, e_5, fileNameExt, respBlob, url, a;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, XUtils.fetchBasicJson(apiPath, requestPayload)];
+                    case 1:
+                        response = _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        e_5 = _a.sent();
+                        XUtils.showErrorMessage("Nepodarilo sa vytvori\u0165/stiahnu\u0165 xlsx s\u00FAbor.", e_5); // dalsie info (apiPath, payload) by mali byt v "e"
+                        return [2 /*return*/, false];
+                    case 3:
+                        fileNameExt = "".concat(fileName !== null && fileName !== void 0 ? fileName : apiPath, ".xlsx");
+                        return [4 /*yield*/, response.blob()];
+                    case 4:
+                        respBlob = _a.sent();
+                        url = window.URL.createObjectURL(respBlob);
+                        a = document.createElement('a');
+                        a.href = url;
+                        a.download = fileNameExt;
+                        a.click();
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
     XUtils.fetchBasicJson = function (path, value, usePublicToken) {
         return XUtils.fetchBasic(path, { 'Content-Type': 'application/json' }, XUtilsCommon_1.XUtilsCommon.objectAsJSON(value), usePublicToken);
     };
@@ -538,7 +568,7 @@ var XUtils = /** @class */ (function () {
      * @param idField
      */
     XUtils.arrayIntersect = function (array1, array2, idField) {
-        var e_5, _a;
+        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()) {
@@ -548,12 +578,12 @@ var XUtils = /** @class */ (function () {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        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_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return array1.filter(function (item) { return item && array2IdSet.has(item[idField]); });
     };
@@ -642,7 +672,7 @@ var XUtils = /** @class */ (function () {
     // pomocna metodka
     // ak nie su v xErrorMap ziadne chyby, vrati ""
     XUtils.getErrorMessages = function (xErrorMap) {
-        var e_6, _a;
+        var e_7, _a;
         var _b;
         var msg = "";
         try {
@@ -656,12 +686,12 @@ var XUtils = /** @class */ (function () {
                 }
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         return msg;
     };
@@ -732,7 +762,7 @@ var XUtils = /** @class */ (function () {
     };
     // pomocna metodka
     XUtils.filterAnd = function () {
-        var e_7, _a;
+        var e_8, _a;
         var filters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             filters[_i] = arguments[_i];
@@ -749,12 +779,12 @@ var XUtils = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            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_7) throw e_7.error; }
+                finally { if (e_8) throw e_8.error; }
             }
         }
         return customFilterItemsResult;
@@ -799,7 +829,9 @@ var XUtils = /** @class */ (function () {
     XUtils.xTokenPublic = { username: "xPublicUser", password: "xPublicUserPassword123" };
     // nacachovane metadata (setuju sa v App.fetchAndSetXMetadata)
     XUtils.appFormMap = {};
-    XUtils.exportTypeOptions = [ExportImportParam_1.ExportType.Csv, ExportImportParam_1.ExportType.Json];
+    XUtils.exportTypeOptions = [ExportImportParam_1.ExportType.Excel, ExportImportParam_1.ExportType.Csv, ExportImportParam_1.ExportType.Json];
+    // moznost Off zatial nie je implementovana
+    XUtils.multilineExportTypeOptions = [ExportImportParam_1.XMultilineExportType.Multiline, ExportImportParam_1.XMultilineExportType.Singleline /*, XMultilineExportType.Off*/];
     XUtils.csvSeparatorOptions = [ExportImportParam_1.CsvSeparator.Semicolon, ExportImportParam_1.CsvSeparator.Comma];
     XUtils.decimalFormatOptions = [ExportImportParam_1.CsvDecimalFormat.Comma, ExportImportParam_1.CsvDecimalFormat.Dot];
     XUtils.csvEncodingOptions = [ExportImportParam_1.CsvEncoding.Utf8, ExportImportParam_1.CsvEncoding.Win1250];

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

@@ -16,6 +16,7 @@
         "expRowCount": "Row count",
         "expExportType": "Export type",
         "expCreateHeaderLine": "Create header line",
+        "expDetailRowsExport": "Detail rows export",
         "expCsvSeparator": "Csv separator",
         "expDecimalFormat": "Decimal format",
         "expEncoding": "Encoding",

package/lib/serverApi/ExportImportParam.d.ts

@@ -1,13 +1,22 @@
 import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
 import { XCustomFilterItem, XFullTextSearch } from "./FindParam";
 export declare enum ExportType {
+    Excel = "excel",
     Csv = "csv",
     Json = "json"
 }
-export interface ExportParam {
-    exportType: ExportType;
-    csvParam?: CsvParam;
-    queryParam: LazyDataTableQueryParam | any;
+export interface ExportExcelParam {
+    queryParam: LazyDataTableQueryParam;
+    excelCsvParam: ExcelCsvParam;
+    widths: string[];
+}
+export interface ExportCsvParam {
+    queryParam: LazyDataTableQueryParam;
+    excelCsvParam: ExcelCsvParam;
+    csvParam: CsvParam;
+}
+export interface ExportJsonParam {
+    queryParam: LazyDataTableQueryParam;
 }
 export interface LazyDataTableQueryParam {
     filters: DataTableFilterMeta;
@@ -17,6 +26,22 @@ export interface LazyDataTableQueryParam {
     entity: string;
     fields: string[];
 }
+export interface ExcelCsvParam {
+    headers?: string[];
+    toManyAssocExport: XMultilineExportType;
+    multilineTextExport: XMultilineExportType;
+    fieldsToDuplicateValues?: string[];
+}
+export declare enum XMultilineExportType {
+    Singleline = "singleline",
+    Multiline = "multiline",
+    Off = "off"
+}
+export interface CsvParam {
+    csvSeparator: CsvSeparator;
+    csvDecimalFormat: CsvDecimalFormat;
+    csvEncoding: CsvEncoding;
+}
 export declare enum CsvSeparator {
     Semicolon = ";",
     Comma = ","
@@ -29,13 +54,6 @@ export declare enum CsvEncoding {
     Utf8 = "utf-8",
     Win1250 = "win1250"
 }
-export interface CsvParam {
-    useHeaderLine: boolean;
-    headers?: string[];
-    csvSeparator: CsvSeparator;
-    csvDecimalFormat: CsvDecimalFormat;
-    csvEncoding: CsvEncoding;
-}
 export declare enum ImportType {
     Csv = "csv",
     Json = "json"

package/lib/serverApi/ExportImportParam.js

@@ -1,11 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportType = exports.CsvEncoding = exports.CsvDecimalFormat = exports.CsvSeparator = exports.ExportType = void 0;
+exports.ImportType = exports.CsvEncoding = exports.CsvDecimalFormat = exports.CsvSeparator = exports.XMultilineExportType = exports.ExportType = void 0;
+// ************** export ***************
 var ExportType;
 (function (ExportType) {
+    ExportType["Excel"] = "excel";
     ExportType["Csv"] = "csv";
     ExportType["Json"] = "json";
 })(ExportType = exports.ExportType || (exports.ExportType = {}));
+// exportovanie hodnot z toMany asociacii, pripadne viacriadkovych textov
+var XMultilineExportType;
+(function (XMultilineExportType) {
+    XMultilineExportType["Singleline"] = "singleline";
+    XMultilineExportType["Multiline"] = "multiline";
+    XMultilineExportType["Off"] = "off"; // stlpce obsahujuce viac hodnot/riadkov sa vynechaju z exportu
+})(XMultilineExportType = exports.XMultilineExportType || (exports.XMultilineExportType = {}));
 // vo windowse zavisi od regionalnych nastaveni, default nastavenie je ";" a preto vecsinou aj excel produkuje csv s ";" (menej sa to bije s decimalmi)
 // takze primarne pouzivame ";" a sekundarne "," napr. pri generickom exporte do csv davame uzivatelovi na vyber
 var CsvSeparator;
@@ -27,6 +36,7 @@ var CsvEncoding;
     CsvEncoding["Utf8"] = "utf-8";
     CsvEncoding["Win1250"] = "win1250";
 })(CsvEncoding = exports.CsvEncoding || (exports.CsvEncoding = {}));
+// ************** import ***************
 var ImportType;
 (function (ImportType) {
     ImportType["Csv"] = "csv";