@michalrakus/x-react-web-lib 1.0.0 → 1.2.0

package/lib/components/XLazyDataTable.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -25,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -44,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -65,6 +69,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -81,17 +96,6 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XLazyColumn = exports.XLazyDataTable = void 0;
 var react_1 = __importStar(require("react"));
@@ -107,32 +111,97 @@ var XButtonIconSmall_1 = require("./XButtonIconSmall");
 var tristatecheckbox_1 = require("primereact/tristatecheckbox");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var XExportRowsDialog_1 = require("./XExportRowsDialog");
-exports.XLazyDataTable = function (props) {
-    var dataTableEl = react_1.useRef(null);
-    var _a = __read(react_1.useState({ rowList: [], totalRecords: 0 }), 2), value = _a[0], setValue = _a[1];
-    var _b = __read(react_1.useState(false), 2), loading = _b[0], setLoading = _b[1];
-    var _c = __read(react_1.useState(0), 2), first = _c[0], setFirst = _c[1];
-    var _d = __read(react_1.useState(props.paginator ? props.rows : undefined), 2), rows = _d[0], setRows = _d[1];
-    var filtersInit = {};
-    if (props.searchTableParams !== undefined && props.searchTableParams.filter !== undefined) {
-        filtersInit[props.searchTableParams.displayField] = { value: props.searchTableParams.filter, matchMode: "startsWith" };
+var api_1 = require("primereact/api");
+var XLazyDataTable = function (props) {
+    // must be here, is used in createInitFilters()
+    var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity);
+    var createInitFilters = function () {
+        var e_1, _a;
+        var initFilters = {};
+        //let columns = dataTableEl.current.props.children; - does not work
+        var columns = props.children;
+        try {
+            for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
+                var column = columns_1_1.value;
+                var xLazyColumn = column; // nevedel som to krajsie...
+                var field = xLazyColumn.props.field;
+                var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntity, field);
+                // TODO column.props.dropdownInFilter - pre "menu" by bolo fajn mat zoznam "enumov"
+                var filterMatchMode = getFilterMatchMode(xField);
+                initFilters[field] = createFilterItem(props.filterDisplay, { value: null, matchMode: filterMatchMode });
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (columns_1_1 && !columns_1_1.done && (_a = columns_1.return)) _a.call(columns_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return initFilters;
+    };
+    var getFilterMatchMode = function (xField) {
+        var filterMatchMode;
+        if (xField.type === "string") {
+            filterMatchMode = api_1.FilterMatchMode.STARTS_WITH;
+        }
+        // zatial vsetky ostatne EQUALS
+        else if (xField.type === "decimal" || xField.type === "number" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
+            filterMatchMode = api_1.FilterMatchMode.EQUALS;
+        }
+        else {
+            throw "XField ".concat(xField.name, ": unknown xField.type = ").concat(xField.type);
+        }
+        return filterMatchMode;
+    };
+    var createFilterItem = function (filterDisplay, constraint) {
+        var filterItem;
+        if (filterDisplay === "menu") {
+            // DataTableOperatorFilterMetaData: operator + filter values
+            filterItem = {
+                operator: api_1.FilterOperator.OR,
+                constraints: [constraint]
+            };
+        }
+        else {
+            // props.filterDisplay === "row"
+            // DataTableFilterMetaData: filter value
+            filterItem = constraint;
+        }
+        return filterItem;
+    };
+    // premenne platne pre cely component (obdoba member premennych v class-e)
+    var dataTableEl = (0, react_1.useRef)(null);
+    var customFilter = props.customFilter;
+    var _a = __read((0, react_1.useState)({ rowList: [], totalRecords: 0 }), 2), value = _a[0], setValue = _a[1];
+    var _b = __read((0, react_1.useState)(false), 2), loading = _b[0], setLoading = _b[1];
+    var _c = __read((0, react_1.useState)(0), 2), first = _c[0], setFirst = _c[1];
+    var _d = __read((0, react_1.useState)(props.paginator ? props.rows : undefined), 2), rows = _d[0], setRows = _d[1];
+    var filtersInit = createInitFilters();
+    if (props.searchTableParams !== undefined) {
+        var displayFieldFilter = props.searchTableParams.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);
     }
-    var _e = __read(react_1.useState(filtersInit), 2), filters = _e[0], setFilters = _e[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
-    var _f = __read(react_1.useState([]), 2), multiSortMeta = _f[0], setMultiSortMeta = _f[1];
-    var _g = __read(react_1.useState(null), 2), selectedRow = _g[0], setSelectedRow = _g[1];
-    var _h = __read(react_1.useState(false), 2), dataLoaded = _h[0], setDataLoaded = _h[1]; // priznak kde si zapiseme, ci uz sme nacitali data
-    var _j = __read(react_1.useState(false), 2), exportRowsDialogOpened = _j[0], setExportRowsDialogOpened = _j[1];
-    var _k = __read(react_1.useState(), 2), exportRowsDialogRowCount = _k[0], setExportRowsDialogRowCount = _k[1]; // param pre dialog
-    var _l = __read(react_1.useState(filtersInit), 2), filtersAfterFiltering = _l[0], setFiltersAfterFiltering = _l[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
+    var _e = __read((0, react_1.useState)(filtersInit), 2), filters = _e[0], setFilters = _e[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
+    var _f = __read((0, react_1.useState)(props.initSortField ? [{ field: props.initSortField, order: 1 }] : []), 2), multiSortMeta = _f[0], setMultiSortMeta = _f[1];
+    var _g = __read((0, react_1.useState)(null), 2), selectedRow = _g[0], setSelectedRow = _g[1];
+    var _h = __read((0, react_1.useState)(false), 2), dataLoaded = _h[0], setDataLoaded = _h[1]; // priznak kde si zapiseme, ci uz sme nacitali data
+    var _j = __read((0, react_1.useState)(false), 2), exportRowsDialogOpened = _j[0], setExportRowsDialogOpened = _j[1];
+    var _k = __read((0, react_1.useState)(), 2), exportRowsDialogRowCount = _k[0], setExportRowsDialogRowCount = _k[1]; // param pre dialog
+    var _l = __read((0, react_1.useState)(filtersInit), 2), filtersAfterFiltering = _l[0], setFiltersAfterFiltering = _l[1]; // sem si odkladame stav filtra po kliknuti na button Filter (chceme exportovat presne to co vidno vyfiltrovane)
     // parameter [] zabezpeci ze sa metoda zavola len po prvom renderingu (a nie po kazdej zmene stavu (zavolani setNieco()))
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         // jednoduchy sposob - nepouzivame parameter props.displayed a priznak dataLoaded
         if (props.displayed === undefined) {
             loadData();
             //console.log("XLazyDataTable - data loaded (simple)");
         }
     }, []); // eslint-disable-line react-hooks/exhaustive-deps
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         // sposob pozivany pri XFormNavigator (potrebujeme refreshnut data pri navrate z formulara)
         if (props.displayed !== undefined) {
             if (props.displayed) {
@@ -150,12 +219,13 @@ exports.XLazyDataTable = function (props) {
             }
         }
     }); // eslint-disable-line react-hooks/exhaustive-deps
+    // TODO - preco je to tu? presunut dole ak sa da...
     var dataKey = props.dataKey !== undefined ? props.dataKey : XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity).idField;
     var onPage = function (event) { return __awaiter(void 0, void 0, void 0, function () {
         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, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() });
+            loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: event.first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() });
             return [2 /*return*/];
         });
     }); };
@@ -169,14 +239,14 @@ exports.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, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields() });
+        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: event.multiSortMeta, entity: props.entity, fields: getFields() });
     };
     var onClickFilter = function () {
         //console.log("zavolany onClickFilter");
         loadData();
     };
     var loadData = function () {
-        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() });
+        loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() });
     };
     var loadDataBase = function (findParam) { return __awaiter(void 0, void 0, void 0, function () {
         var findResult;
@@ -210,43 +280,43 @@ exports.XLazyDataTable = function (props) {
     var getFields = function () {
         // krasne zobrazi cely objekt!
         //console.log(dataTableEl.current);
-        var e_1, _a;
+        var e_2, _a;
         var fields = [];
         var columns = dataTableEl.current.props.children;
         try {
-            for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
-                var column = columns_1_1.value;
+            for (var columns_2 = __values(columns), columns_2_1 = columns_2.next(); !columns_2_1.done; columns_2_1 = columns_2.next()) {
+                var column = columns_2_1.value;
                 fields.push(column.props.field);
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (columns_1_1 && !columns_1_1.done && (_a = columns_1.return)) _a.call(columns_1);
+                if (columns_2_1 && !columns_2_1.done && (_a = columns_2.return)) _a.call(columns_2);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_2) throw e_2.error; }
         }
         return fields;
     };
     var getHeaders = function () {
         // krasne zobrazi cely objekt!
         //console.log(dataTableEl.current);
-        var e_2, _a;
+        var e_3, _a;
         var headers = [];
         var columns = dataTableEl.current.props.children;
         try {
-            for (var columns_2 = __values(columns), columns_2_1 = columns_2.next(); !columns_2_1.done; columns_2_1 = columns_2.next()) {
-                var column = columns_2_1.value;
+            for (var columns_3 = __values(columns), columns_3_1 = columns_3.next(); !columns_3_1.done; columns_3_1 = columns_3.next()) {
+                var column = columns_3_1.value;
                 // pozor! headers tahame z primereact DataTable a napr. pri editacii nemusi byt v atribute header string
                 headers.push(column.props.header);
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (columns_2_1 && !columns_2_1.done && (_a = columns_2.return)) _a.call(columns_2);
+                if (columns_3_1 && !columns_3_1.done && (_a = columns_3.return)) _a.call(columns_3);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         return headers;
     };
@@ -283,7 +353,7 @@ exports.XLazyDataTable = function (props) {
         }
     };
     var onClickRemoveRow = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var reread, e_3, e_4;
+        var reread, e_4, e_5;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -298,12 +368,15 @@ exports.XLazyDataTable = function (props) {
                     reread = _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    e_3 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage("Remove row failed.", e_3);
+                    e_4 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage("Remove row failed.", e_4);
                     return [3 /*break*/, 4];
                 case 4:
                     if (reread) {
                         loadData();
+                        if (props.onRemoveRow) {
+                            props.onRemoveRow(selectedRow, XUtils_1.OperationType.Remove);
+                        }
                     }
                     return [3 /*break*/, 10];
                 case 5:
@@ -318,11 +391,14 @@ exports.XLazyDataTable = function (props) {
                     _a.sent();
                     return [3 /*break*/, 9];
                 case 8:
-                    e_4 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage("Remove row failed.", e_4);
+                    e_5 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage("Remove row failed.", e_5);
                     return [3 /*break*/, 9];
                 case 9:
                     loadData();
+                    if (props.onRemoveRow) {
+                        props.onRemoveRow(selectedRow, XUtils_1.OperationType.Remove);
+                    }
                     _a.label = 10;
                 case 10: return [3 /*break*/, 12];
                 case 11:
@@ -337,7 +413,7 @@ exports.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, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
+                    findParam = { resultType: FindParam_1.ResultType.OnlyRowCount, first: first, rows: rows, filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
                     return [4 /*yield*/, findByFilter(findParam)];
                 case 1:
                     findResult = _a.sent();
@@ -349,7 +425,7 @@ exports.XLazyDataTable = function (props) {
         });
     }); };
     var exportRowsDialogOnHide = function (ok, exportType, csvParam) { return __awaiter(void 0, void 0, void 0, function () {
-        var path, exportParam, response, e_5, fileExt, fileName, respBlob, url, a;
+        var path, exportParam, response, e_6, fileExt, fileName, respBlob, url, a;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -371,12 +447,12 @@ exports.XLazyDataTable = function (props) {
                     response = _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    e_5 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage("Export failed.", e_5);
+                    e_6 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage("Export failed.", e_6);
                     return [2 /*return*/];
                 case 4:
                     fileExt = exportType;
-                    fileName = props.entity + "." + fileExt;
+                    fileName = "".concat(props.entity, ".").concat(fileExt);
                     return [4 /*yield*/, response.blob()];
                 case 5:
                     respBlob = _a.sent();
@@ -400,15 +476,18 @@ exports.XLazyDataTable = function (props) {
             console.log("Nie je vyselectovany ziaden zaznam.");
         }
     };
+    // ****** checkbox vo filtri ********
+    // pouziva sa len pre simple filtrovanie (filterDisplay="row")
     var onCheckboxFilterChange = function (field, checkboxValue) {
         // TODO - treba vyklonovat?
         var filtersCloned = __assign({}, filters);
         if (checkboxValue !== null) {
-            filtersCloned[field] = { value: checkboxValue ? "1" : "0", matchMode: "equals" };
+            filtersCloned[field] = { value: checkboxValue ? "1" : "0", matchMode: api_1.FilterMatchMode.EQUALS };
         }
         else {
             // pouzivatel zrusil hodnotu vo filtri (vybral prazdny stav v checkboxe), zrusime polozku z filtra
-            delete filtersCloned[field];
+            //delete filtersCloned[field];
+            filtersCloned[field] = { value: null, matchMode: api_1.FilterMatchMode.EQUALS };
         }
         setFilters(filtersCloned);
     };
@@ -425,15 +504,18 @@ exports.XLazyDataTable = function (props) {
         }
         return checkboxValue;
     };
+    // ****** dropdown vo filtri ********
+    // pouziva sa len pre simple filtrovanie (filterDisplay="row")
     var onDropdownFilterChange = function (field, displayValue) {
         // TODO - treba vyklonovat?
         var filtersCloned = __assign({}, filters);
         if (displayValue !== XUtils_1.XUtils.dropdownEmptyOptionValue) {
-            filtersCloned[field] = { value: displayValue, matchMode: "equals" };
+            filtersCloned[field] = { value: displayValue, matchMode: api_1.FilterMatchMode.EQUALS };
         }
         else {
             // pouzivatel zrusil hodnotu vo filtri (vybral prazdny riadok), zrusime polozku z filtra
-            delete filtersCloned[field];
+            //delete filtersCloned[field];
+            filtersCloned[field] = { value: null, matchMode: api_1.FilterMatchMode.EQUALS };
         }
         setFilters(filtersCloned);
     };
@@ -441,7 +523,9 @@ exports.XLazyDataTable = function (props) {
         var dropdownValue = XUtils_1.XUtils.dropdownEmptyOptionValue;
         var filterValue = filters[field];
         if (filterValue !== undefined && filterValue !== null) {
-            dropdownValue = filterValue.value;
+            if (filterValue.value !== null) {
+                dropdownValue = filterValue.value;
+            }
         }
         return dropdownValue;
     };
@@ -457,7 +541,7 @@ exports.XLazyDataTable = function (props) {
             else if (typeof rowDataValue === 'number') {
                 numberValue = rowDataValue;
             }
-            bodyValue = XUtilsConversions_1.numberAsUI(numberValue, xField.scale);
+            bodyValue = (0, XUtilsConversions_1.numberAsUI)(numberValue, xField.scale);
         }
         else if (xField.type === "date") {
             // tuto zatial hack, mal by prist Date
@@ -468,7 +552,7 @@ exports.XLazyDataTable = function (props) {
             else if (typeof rowDataValue === 'object' && rowDataValue instanceof Date) {
                 dateValue = rowDataValue;
             }
-            bodyValue = XUtilsConversions_1.dateAsUI(dateValue);
+            bodyValue = (0, XUtilsConversions_1.dateAsUI)(dateValue);
         }
         else if (xField.type === "datetime") {
             // tuto zatial hack, mal by prist Date
@@ -479,7 +563,7 @@ exports.XLazyDataTable = function (props) {
             else if (typeof rowDataValue === 'object' && rowDataValue instanceof Date) {
                 dateValue = rowDataValue;
             }
-            bodyValue = XUtilsConversions_1.datetimeAsUI(dateValue);
+            bodyValue = (0, XUtilsConversions_1.datetimeAsUI)(dateValue);
         }
         else if (xField.type === "boolean") {
             // TODO - efektivnejsie by bolo renderovat len prislusne ikonky
@@ -487,8 +571,7 @@ exports.XLazyDataTable = function (props) {
         }
         return bodyValue;
     };
-    var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity);
-    // ak mame scrollWidth/scrollHeight = viewport (default), vyratame scrollWidth/scrollHeight tak aby tabulka "sadla" okna (viewport-u)
+    // ak mame scrollWidth/scrollHeight = viewport (default), vyratame scrollWidth/scrollHeight tak aby tabulka "sadla" do okna (viewport-u)
     var scrollWidth = undefined; // vypnute horizontalne scrollovanie
     var scrollHeight = undefined; // vypnute vertikalne scrollovanie
     if (props.scrollable) {
@@ -513,17 +596,20 @@ exports.XLazyDataTable = function (props) {
                 if (props.searchTableParams === undefined) {
                     // sme v standardnom formulari
                     viewHeight = '100vh';
-                    headerFooterHeight = XUtils_1.XUtils.toPX0('20.89rem') - XUtils_1.XUtils.toPX0('4.43rem'); // experimentalne zistena vyska header/footer (body - table body) bez formFooterHeight
+                    // experimentalne zistena vyska header/footer
+                    // da sa vyratat ako vysku body (celej stranky) - vyska div-u ktory sa scrolluje (div na ktorom je style="max-height: calc(100vh - 266.42px);)
+                    // (treba odratat vysku paginatora a formFooterHeight (lebo tie sa odratavaju nizsie))
+                    headerFooterHeight = XUtils_1.XUtils.toPX0('10.89rem');
                 }
                 else {
                     // sme v dialogu
                     if (XUtils_1.XUtils.isMobile()) {
                         viewHeight = '98vh'; // .p-dialog pre mobil ma max-height: 98%
-                        headerFooterHeight = XUtils_1.XUtils.toPX0('17.60rem'); // rucne zratane
+                        headerFooterHeight = XUtils_1.XUtils.toPX0('12.03rem'); // rucne zratane
                     }
                     else {
                         viewHeight = '90vh'; // .p-dialog pre desktop ma max-height: 90%
-                        headerFooterHeight = XUtils_1.XUtils.toPX0('18.60rem'); // rucne zratane (desktop ma vecsi margin dole na dialogu)
+                        headerFooterHeight = XUtils_1.XUtils.toPX0('13.03rem'); // rucne zratane (desktop ma vecsi margin dole na dialogu)
                     }
                 }
                 // pridame vysku paging-u, ak treba
@@ -534,7 +620,7 @@ exports.XLazyDataTable = function (props) {
                 if (props.formFooterHeight !== undefined) {
                     headerFooterHeight += XUtils_1.XUtils.toPX0(XUtils_1.XUtils.processGridBreakpoints(props.formFooterHeight));
                 }
-                scrollHeight = "calc(" + viewHeight + " - " + headerFooterHeight + "px)";
+                scrollHeight = "calc(".concat(viewHeight, " - ").concat(headerFooterHeight, "px)");
             }
         }
     }
@@ -545,13 +631,14 @@ exports.XLazyDataTable = function (props) {
     if (props.shrinkWidth) {
         style.maxWidth = 'min-content'; // ak nic nedame (nechame auto), tak (v pripade ak nebudeme mat horizontalny scrollbar) natiahne tabulku na celu sirku stranky, co nechceme
     }
-    var tableStyle;
+    // pri prechode z Primereact 6.x na 9.x sa tableLayout zmenil z fixed na auto a nefungovalo nastavenie sirok stlpcov - docasne teda takto
+    var tableStyle = { tableLayout: 'fixed' };
     if (props.width !== undefined) {
         var width = props.width;
         if (!isNaN(Number(width))) { // if width is number
             width = width + 'rem';
         }
-        tableStyle = { width: width };
+        tableStyle = __assign(__assign({}, tableStyle), { width: width });
     }
     // check
     if ((props.editMode === true || props.editMode === false) && props.editModeHandlers === undefined) {
@@ -606,6 +693,22 @@ exports.XLazyDataTable = function (props) {
             var dropdownValue = getDropdownFilterValue(childColumn.props.field);
             filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange });
         }
+        // *********** showFilterMenu ***********
+        var showFilterMenu;
+        if (childColumn.props.showFilterMenu !== undefined) {
+            showFilterMenu = childColumn.props.showFilterMenu;
+        }
+        else {
+            showFilterMenu = true; // default
+            if (props.filterDisplay === "row") {
+                if (xField.type === "boolean" || childColumn.props.dropdownInFilter) {
+                    showFilterMenu = false;
+                }
+            }
+        }
+        // *********** showClearButton ***********
+        // pre filterDisplay = "row" nechceme clear button, chceme setrit miesto
+        var showClearButton = props.filterDisplay === "menu";
         // *********** body ***********
         // TODO - mozno by bolo dobre vytvarat body pre kazdy field, nech je to vsetko konzistentne
         var body;
@@ -615,14 +718,17 @@ exports.XLazyDataTable = function (props) {
         // *********** width/headerStyle ***********
         var width = XUtils_1.XUtils.processPropWidth(childColumn.props.width);
         if (width === undefined || width === "default") {
-            width = XUtilsMetadata_1.XUtilsMetadata.computeColumnWidth(xField, undefined, headerLabel);
+            // TODO - if filter not used at all, then buttons flags should be false
+            var filterMenuInFilterRow = props.filterDisplay === "row" && showFilterMenu;
+            var filterButtonInHeader = props.filterDisplay === "menu";
+            width = XUtilsMetadata_1.XUtilsMetadata.computeColumnWidth(xField, filterMenuInFilterRow, undefined, headerLabel, true, filterButtonInHeader);
         }
         var headerStyle = {};
         if (width !== undefined) {
             headerStyle = { width: width };
         }
         // *********** align ***********
-        var align = "left"; // default
+        var align = undefined; // default undefined (left)
         if (childColumn.props.align !== undefined && childColumn.props.align !== null) {
             align = childColumn.props.align;
         }
@@ -635,20 +741,13 @@ exports.XLazyDataTable = function (props) {
                 align = "center";
             }
         }
-        // *********** style ***********
-        var style = {};
-        // TODO - pouzit className a nie style
-        if (align === "center" || align === "right") {
-            style = { 'textAlign': align };
-            headerStyle = __assign(__assign({}, headerStyle), style); // headerStyle overrides style in TH cell
-        }
-        return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, filter: true, sortable: true, filterElement: filterElement, body: body, headerStyle: headerStyle, style: style });
+        return react_1.default.createElement(column_1.Column, { field: childColumn.props.field, header: header, filter: true, sortable: true, filterElement: filterElement, showFilterMenu: showFilterMenu, showClearButton: showClearButton, body: body, headerStyle: headerStyle, align: align });
     });
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center" },
             react_1.default.createElement(XButton_1.XButton, { label: "Filter", onClick: onClickFilter })),
         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, 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(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, { label: "Add row", onClick: onClickAddRow }) : null,
             props.onEdit !== undefined ? react_1.default.createElement(XButton_1.XButton, { label: "Edit", onClick: onClickEdit }) : null,
@@ -658,16 +757,19 @@ exports.XLazyDataTable = function (props) {
             props.searchTableParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { label: "Choose", onClick: onClickChoose }) : null,
             exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { dialogOpened: exportRowsDialogOpened, rowCount: exportRowsDialogRowCount, onHideDialog: exportRowsDialogOnHide }) : null)));
 };
+exports.XLazyDataTable = XLazyDataTable;
 exports.XLazyDataTable.defaultProps = {
     paginator: true,
     rows: 10,
+    filterDisplay: "row",
     scrollable: true,
     scrollWidth: 'viewport',
     scrollHeight: 'viewport',
     shrinkWidth: true
 };
 // TODO - XLazyColumn neni idealny nazov, lepsi je XColumn (ale zatial nechame XLazyColumn)
-exports.XLazyColumn = function (props) {
+var XLazyColumn = function (props) {
     // nevadi ze tu nic nevraciame, field a header vieme precitat a zvysok by sme aj tak zahodili lebo vytvarame novy element
     return (null);
 };
+exports.XLazyColumn = XLazyColumn;

package/lib/components/XLoginDialog.js

@@ -7,7 +7,7 @@ exports.XLoginDialog = void 0;
 var react_1 = __importDefault(require("react"));
 var dialog_1 = require("primereact/dialog");
 var XLoginForm_1 = require("./XLoginForm");
-exports.XLoginDialog = function (props) {
+var XLoginDialog = function (props) {
     // bez tejto metody by pri opetovnom otvoreni dialogu ponechal povodne hodnoty
     var onShow = function () {
     };
@@ -18,3 +18,4 @@ exports.XLoginDialog = function (props) {
     return (react_1.default.createElement(dialog_1.Dialog, { visible: props.dialogOpened, onShow: onShow, onHide: function () { return props.onHideDialog(false); } },
         react_1.default.createElement(XLoginForm_1.XLoginForm, { setXToken: props.setXToken, onLogin: onLogin, customUserService: props.customUserService })));
 };
+exports.XLoginDialog = XLoginDialog;

package/lib/components/XLoginForm.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -33,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -77,9 +81,9 @@ var react_1 = __importStar(require("react"));
 var password_1 = require("primereact/password");
 var button_1 = require("primereact/button");
 var XUtils_1 = require("./XUtils");
-exports.XLoginForm = function (props) {
-    var _a = __read(react_1.useState(""), 2), username = _a[0], setUsername = _a[1];
-    var _b = __read(react_1.useState(""), 2), password = _b[0], setPassword = _b[1];
+var XLoginForm = function (props) {
+    var _a = __read((0, react_1.useState)(""), 2), username = _a[0], setUsername = _a[1];
+    var _b = __read((0, react_1.useState)(""), 2), password = _b[0], setPassword = _b[1];
     var onClickLogIn = function () { return __awaiter(void 0, void 0, void 0, function () {
         var xUserAuthenticationRequest, xUserAuthenticationResponse, customUser;
         return __generator(this, function (_a) {
@@ -121,3 +125,4 @@ exports.XLoginForm = function (props) {
             react_1.default.createElement(password_1.Password, { id: "password", value: password, onChange: function (e) { return setPassword(e.target.value); }, feedback: false, maxLength: 64 })),
         react_1.default.createElement(button_1.Button, { label: "Log in", onClick: onClickLogIn })));
 };
+exports.XLoginForm = XLoginForm;