@michalrakus/x-react-web-lib 0.25.0 → 1.1.0

package/lib/components/XSearchButton.js

@@ -40,7 +40,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]) {
@@ -89,32 +89,15 @@ var XSearchButton = /** @class */ (function (_super) {
         props.form.addField(props.assocField + '.' + props.displayField);
         return _this;
     }
-    XSearchButton.prototype.getFieldForEdit = function () {
-        var _a;
-        // TODO - zohladnit aj aktualny readOnly stav
-        var readOnly = (_a = this.props.readOnly) !== null && _a !== void 0 ? _a : false;
-        if (!readOnly) {
-            return this.props.assocField;
-        }
-        return undefined;
+    XSearchButton.prototype.getField = function () {
+        return this.props.assocField;
     };
-    XSearchButton.prototype.checkNotNull = function () {
-        var _a;
-        // TODO - zohladnit aj aktualny readOnly stav
-        return !this.xAssoc.isNullable && !((_a = this.props.readOnly) !== null && _a !== void 0 ? _a : false);
-    };
-    XSearchButton.prototype.getValueFromObject = function () {
-        var object = this.props.form.state.object;
-        var assocObject = object !== null ? object[this.props.assocField] : null;
-        // ak je undefined, pre istotu dame na null, null je standard
-        if (assocObject === undefined) {
-            assocObject = null;
-        }
-        return assocObject;
+    XSearchButton.prototype.isNotNull = function () {
+        return !this.xAssoc.isNullable;
     };
     XSearchButton.prototype.render = function () {
         var _this = this;
-        var _a, _b, _c;
+        var _a;
         var props = this.props;
         var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.xAssoc.entityName);
         var xDisplayField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntityAssoc, props.displayField);
@@ -126,7 +109,7 @@ var XSearchButton = /** @class */ (function (_super) {
         var dialogOpened = this.state.dialogOpened;
         var setDialogOpened = function (dialogOpened) { _this.setState({ dialogOpened: dialogOpened }); };
         var computeInputValue = function () {
-            var inputValue = null;
+            var inputValue;
             if (!inputChanged) {
                 // TODO - pridat cez generikum typ fieldu (ak sa da)
                 // poznamka: ak assocObject === null tak treba do inputu zapisovat prazdny retazec, ak by sme pouzili null, neprejavila by sa zmena v modeli na null
@@ -138,12 +121,7 @@ var XSearchButton = /** @class */ (function (_super) {
             }
             return inputValue;
         };
-        var label = (_a = props.label) !== null && _a !== void 0 ? _a : props.assocField;
-        if (this.checkNotNull()) {
-            label = XUtils_1.XUtils.markNotNull(label);
-        }
-        var readOnly = (_b = props.readOnly) !== null && _b !== void 0 ? _b : false;
-        var size = (_c = props.size) !== null && _c !== void 0 ? _c : xDisplayField.length;
+        var size = (_a = props.size) !== null && _a !== void 0 ? _a : xDisplayField.length;
         var onInputValueChange = function (e) {
             setInputChanged(true);
             setInputValueState(e.target.value);
@@ -186,13 +164,12 @@ var XSearchButton = /** @class */ (function (_super) {
             });
         }); };
         var setValueToModel = function (row) {
-            var error = _this.validateOnChange(row);
-            props.form.onFieldChange(props.assocField, row, error);
+            _this.onValueChangeBase(row);
             setInputChanged(false);
         };
         var onClickSearch = function (e) {
             console.log("zavolany onClickSearch");
-            if (!readOnly) {
+            if (!_this.isReadOnly()) {
                 setDialogOpened(true);
                 // POVODNY KOD
                 //overlayPanelEl.current.toggle(e);
@@ -229,9 +206,9 @@ var XSearchButton = /** @class */ (function (_super) {
         // vypocitame inputValue
         var inputValue = computeInputValue();
         return (react_1.default.createElement("div", { className: "field grid" },
-            react_1.default.createElement("label", { htmlFor: props.assocField, className: "col-fixed", style: { width: XUtils_1.XUtils.FIELD_LABEL_WIDTH } }, label),
+            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: readOnly, ref: this.inputTextEl, maxLength: xDisplayField.length, size: size, style: props.inputStyle }, this.getClassNameTooltip())),
+                react_1.default.createElement(inputtext_1.InputText, __assign({ id: props.assocField, value: inputValue, onChange: onInputValueChange, onBlur: onInputBlur, readOnly: this.isReadOnly(), ref: this.inputTextEl, 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: {

package/lib/components/XSearchButtonDT.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];
@@ -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]) {
@@ -79,10 +83,10 @@ var button_1 = require("primereact/button");
 var dialog_1 = require("primereact/dialog");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XSearchButtonDT = function (props) {
-    var inputTextEl = react_1.useRef(null);
-    var _a = __read(react_1.useState(false), 2), inputChanged = _a[0], setInputChanged = _a[1]; // priznak, ci uzivatel typovanim zmenil hodnotu v inpute
-    var _b = __read(react_1.useState(null), 2), inputValueState = _b[0], setInputValueState = _b[1]; // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
-    var _c = __read(react_1.useState(false), 2), dialogOpened = _c[0], setDialogOpened = _c[1];
+    var inputTextEl = (0, react_1.useRef)(null);
+    var _a = __read((0, react_1.useState)(false), 2), inputChanged = _a[0], setInputChanged = _a[1]; // priznak, ci uzivatel typovanim zmenil hodnotu v inpute
+    var _b = __read((0, react_1.useState)(null), 2), inputValueState = _b[0], setInputValueState = _b[1]; // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
+    var _c = __read((0, react_1.useState)(false), 2), dialogOpened = _c[0], setDialogOpened = _c[1];
     var computeInputValue = function () {
         var inputValue = null;
         if (!inputChanged) {

package/lib/components/XSearchButtonOld.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];
@@ -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]) {
@@ -87,10 +91,10 @@ var XSearchButtonOld = function (props) {
     var xDisplayField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntityAssoc, props.displayField);
     // POVODNY KOD
     //const overlayPanelEl = useRef<any>(null);
-    var inputTextEl = react_1.useRef(null);
-    var _d = __read(react_1.useState(false), 2), inputChanged = _d[0], setInputChanged = _d[1]; // priznak, ci uzivatel typovanim zmenil hodnotu v inpute
-    var _e = __read(react_1.useState(null), 2), inputValueState = _e[0], setInputValueState = _e[1]; // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
-    var _f = __read(react_1.useState(false), 2), dialogOpened = _f[0], setDialogOpened = _f[1];
+    var inputTextEl = (0, react_1.useRef)(null);
+    var _d = __read((0, react_1.useState)(false), 2), inputChanged = _d[0], setInputChanged = _d[1]; // priznak, ci uzivatel typovanim zmenil hodnotu v inpute
+    var _e = __read((0, react_1.useState)(null), 2), inputValueState = _e[0], setInputValueState = _e[1]; // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
+    var _f = __read((0, react_1.useState)(false), 2), dialogOpened = _f[0], setDialogOpened = _f[1];
     var computeInputValue = function () {
         var inputValue = null;
         if (!inputChanged) {

package/lib/components/XToken.d.ts

@@ -1,5 +1,6 @@
 export interface XToken {
-    username: string;
-    password: string;
-    customUser?: any;
+    username?: string;
+    password?: string;
+    accessToken?: string;
+    xUser?: any;
 }

package/lib/components/XUtils.d.ts

@@ -1,6 +1,8 @@
 import { XToken } from "./XToken";
 import { CsvDecimalFormat, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
 import React from "react";
+import { XEnvVar } from "./XEnvVars";
+import { XError } from "./XErrors";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -9,7 +11,7 @@ export declare enum OperationType {
 }
 export declare class XUtils {
     static dropdownEmptyOptionValue: string;
-    static xServerUrl: string | null;
+    static xBackendUrl: string | undefined;
     static xToken: XToken | null;
     static xTokenPublic: XToken;
     private static appFormMap;
@@ -37,18 +39,25 @@ export declare class XUtils {
     static post(path: string, value: any): Promise<Response>;
     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>;
     static fetchBasic(path: string, headers: any, body: any, usePublicToken?: boolean | XToken): Promise<Response>;
     static fetchById(entity: string, fields: string[], id: number): Promise<any>;
     static setXToken(xToken: XToken | null): void;
     static getXToken(): XToken | null;
     static getUsername(): string | undefined;
-    static getXServerUrl(): string;
-    static setXServerUrl(xServerUrl: string): void;
+    static getXBackendUrl(): string;
+    static setXBackendUrl(xBackendUrl: string | undefined): void;
+    /**
+     * returns value of environment variable from configuration file .env
+     * @param envVar
+     */
+    static getEnvVarValue(envVarEnum: XEnvVar): string;
     static removeRow(entity: string, row: any): Promise<void>;
     static arrayMoveElement(array: any[], position: number, offset: number): void;
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;
     static markNotNull(label: string): string;
-    static showErrorMessage(message: string, e: Error): void;
+    static showErrorMessage(message: string, e: unknown): void;
     static createErrorProps(error: string | undefined): {};
+    static getXErrorMessage(xError: XError): string | undefined;
     static normalizeString(value: string): string;
 }

package/lib/components/XUtils.js

@@ -25,7 +25,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]) {
@@ -90,7 +90,7 @@ var XUtils = /** @class */ (function () {
     function XUtils() {
     }
     XUtils.demo = function () {
-        return XUtils.getXServerUrl().indexOf('x-demo-server') !== -1;
+        return XUtils.getXBackendUrl().indexOf('x-demo-server') !== -1;
     };
     XUtils.isMobile = function () {
         // extra small displays (podla https://www.w3schools.com/howto/howto_css_media_query_breakpoints.asp)
@@ -202,7 +202,7 @@ var XUtils = /** @class */ (function () {
             finally { if (e_2) throw e_2.error; }
         }
         // should not happen
-        console.log("XUtils.processGridBreakpoints: unexpected error: no breakpoint value found, breakpointExp = " + breakpointExp + ", availWidth = " + availWidth);
+        console.log("XUtils.processGridBreakpoints: unexpected error: no breakpoint value found, breakpointExp = ".concat(breakpointExp, ", availWidth = ").concat(availWidth));
         return undefined;
     };
     XUtils.processPropWidth = function (widthProp) {
@@ -306,6 +306,43 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
+    // nepouzivana stara Basic autentifikacia
+    XUtils.fetchBasicAuthBasic = function (path, headers, body, usePublicToken) {
+        return __awaiter(this, void 0, void 0, function () {
+            var xToken, response, responseBody;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (typeof usePublicToken === 'object') {
+                            xToken = usePublicToken;
+                        }
+                        else if (usePublicToken) {
+                            xToken = XUtils.xTokenPublic; // public token vzdy
+                        }
+                        else {
+                            xToken = XUtils.getXToken();
+                            if (xToken === null) {
+                                xToken = XUtils.xTokenPublic; // ak nikto nie je prihlaseny, posleme public token
+                            }
+                        }
+                        headers = __assign(__assign({}, headers), { 'Authorization': "Basic ".concat(Buffer.from(xToken.username + ':' + xToken.password).toString('base64')) });
+                        return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
+                                method: 'POST',
+                                headers: headers,
+                                body: body
+                            })];
+                    case 1:
+                        response = _a.sent();
+                        if (!!response.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        responseBody = _a.sent();
+                        throw new XResponseError_1.XResponseError(path, response.status, response.statusText, responseBody);
+                    case 3: return [2 /*return*/, response];
+                }
+            });
+        });
+    };
     XUtils.fetchBasic = function (path, headers, body, usePublicToken) {
         return __awaiter(this, void 0, void 0, function () {
             var xToken, response, responseBody;
@@ -324,8 +361,8 @@ var XUtils = /** @class */ (function () {
                                 xToken = XUtils.xTokenPublic; // ak nikto nie je prihlaseny, posleme public token
                             }
                         }
-                        headers = __assign(__assign({}, headers), { 'Authorization': "Basic " + Buffer.from(xToken.username + ':' + xToken.password).toString('base64') });
-                        return [4 /*yield*/, fetch(XUtils.getXServerUrl() + path, {
+                        headers = __assign(__assign({}, headers), { 'Authorization': "Bearer ".concat(xToken.accessToken) });
+                        return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
                                 method: 'POST',
                                 headers: headers,
                                 body: body
@@ -352,17 +389,28 @@ var XUtils = /** @class */ (function () {
         return XUtils.xToken;
     };
     XUtils.getUsername = function () {
-        var _a;
-        return (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.username;
+        var _a, _b;
+        return (_b = (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.xUser) === null || _b === void 0 ? void 0 : _b.username;
     };
-    XUtils.getXServerUrl = function () {
-        if (XUtils.xServerUrl === null) {
-            throw "XUtils.xServerUrl is null";
+    XUtils.getXBackendUrl = function () {
+        if (XUtils.xBackendUrl === undefined) {
+            throw "XUtils.xBackendUrl is undefined";
         }
-        return XUtils.xServerUrl;
-    };
-    XUtils.setXServerUrl = function (xServerUrl) {
-        XUtils.xServerUrl = xServerUrl;
+        return XUtils.xBackendUrl;
+    };
+    XUtils.setXBackendUrl = function (xBackendUrl) {
+        XUtils.xBackendUrl = xBackendUrl;
+    };
+    /**
+     * returns value of environment variable from configuration file .env
+     * @param envVar
+     */
+    XUtils.getEnvVarValue = function (envVarEnum) {
+        var value = process.env[envVarEnum];
+        if (value === undefined) {
+            throw "Environment variable ".concat(envVarEnum, " - value not found. Check configuration file .env*");
+        }
+        return value;
     };
     // funkcionalita ktoru by bolo dobre dat do servisov
     XUtils.removeRow = function (entity, row) {
@@ -419,12 +467,39 @@ var XUtils = /** @class */ (function () {
         else if (e instanceof Error) {
             msg += e.message;
         }
+        else if (typeof e === 'string' || typeof e === 'number') {
+            // chyba typu: throw 'nieco'
+            msg += e;
+        }
         alert(msg);
     };
     // pouziva sa hlavne na inputy
     XUtils.createErrorProps = function (error) {
         return error ? { className: "p-invalid", tooltip: error, tooltipOptions: { className: 'pink-tooltip', position: 'bottom' } } : {};
     };
+    // pomocna metodka
+    XUtils.getXErrorMessage = function (xError) {
+        if (xError.onChange || xError.onBlur || xError.form) {
+            var message = '';
+            if (xError.onChange) {
+                message += xError.onChange;
+            }
+            if (xError.onBlur) {
+                if (message !== '') {
+                    message += ' ';
+                }
+                message += xError.onBlur;
+            }
+            if (xError.form) {
+                if (message !== '') {
+                    message += ' ';
+                }
+                message += xError.form;
+            }
+            return message;
+        }
+        return undefined;
+    };
     // pomocna metodka pouzivana (zatial len) pre autocomplete na ignorovanie velkych-malych znakov a diakritiky
     XUtils.normalizeString = function (value) {
         if (value) {
@@ -434,7 +509,7 @@ var XUtils = /** @class */ (function () {
         return value;
     };
     XUtils.dropdownEmptyOptionValue = " ";
-    XUtils.xServerUrl = null;
+    XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela
     XUtils.xToken = null;
     // token pouzivany pre public stranky (napr. XLoginForm), meno/heslo natvrdo (lepsie ako nic)

package/lib/components/XUtilsConversions.js

@@ -55,7 +55,7 @@ function dateFromModel(value) {
 exports.dateFromModel = dateFromModel;
 function dateAsUI(value) {
     if (value !== null) {
-        return XUtilsCommon_1.dateFormat(value, dateFormatUI());
+        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI());
     }
     else {
         return "";
@@ -64,7 +64,7 @@ function dateAsUI(value) {
 exports.dateAsUI = dateAsUI;
 function datetimeAsUI(value) {
     if (value !== null) {
-        return XUtilsCommon_1.dateFormat(value, datetimeFormatUI());
+        return (0, XUtilsCommon_1.dateFormat)(value, datetimeFormatUI());
     }
     else {
         return "";
@@ -82,6 +82,14 @@ function timeFromModel(value) {
             // mame '19:30:00' -> pridame hociaky rok aby sme skonvertovali na validny Date
             rowDataCasStr = '1970-01-01 ' + rowDataCasStr;
         }
+        // na safari nefunguje konverzia new Date('2021-06-07 19:30:00') - vrati NaN
+        // preto string prehodime na '2021-06-07T19:30:00+01:00'
+        // 19:30:00 je cas z timezony Central Europe (taka je nastavena na nodejs)), preto oznacime tento cas touto timezonou
+        // (spravne riesenie je posielat time cez json vzdy vo formate '2021-06-07T18:30:00Z', v tomto formate chodia aj datetime atributy)
+        rowDataCasStr = rowDataCasStr.replace(' ', 'T');
+        if (!rowDataCasStr.endsWith('Z') && rowDataCasStr.indexOf('+') === -1) {
+            rowDataCasStr += '+01:00'; // Central Europe timezone
+        }
         timeValue = new Date(rowDataCasStr);
     }
     else if (typeof value === 'object' && value instanceof Date) {

package/lib/components/XUtilsMetadata.d.ts

@@ -22,7 +22,7 @@ export declare class XUtilsMetadata {
         size?: number;
     };
     static CHAR_SIZE: number;
-    static computeColumnWidth(xField: XField, formColumnType: string | undefined, header: string | undefined): string | undefined;
+    static computeColumnWidth(xField: XField, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, filterButtonInHeader: boolean): string | undefined;
     static computeColumnWidthBase(charSize?: number, paddingAndOther?: number): number | undefined;
     static getXBrowseMeta(entity: string, browseId?: string): XBrowseMeta;
     static setXBrowseMeta(entity: string, browseId: string | undefined, xBrowseMeta: XBrowseMeta): void;

package/lib/components/XUtilsMetadata.js

@@ -14,7 +14,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]) {
@@ -109,7 +109,7 @@ var XUtilsMetadata = /** @class */ (function () {
     XUtilsMetadata.getXEntity = function (entity) {
         var xEntity = XUtilsMetadata.xEntityMap[entity];
         if (xEntity === undefined) {
-            throw "Entity " + entity + " was not found in entity metadata";
+            throw "Entity ".concat(entity, " was not found in entity metadata");
         }
         return xEntity;
     };
@@ -117,7 +117,7 @@ var XUtilsMetadata = /** @class */ (function () {
         // TODO - pozor, vo fieldMap su aj asociacie, trebalo by zmenit vytvaranie metadat tak aby tam tie asociacie neboli
         var xField = xEntity.fieldMap[field];
         if (xField === undefined) {
-            throw "Field " + field + " was not found in entity " + xEntity.name;
+            throw "Field ".concat(field, " was not found in entity ").concat(xEntity.name);
         }
         return xField;
     };
@@ -192,7 +192,7 @@ var XUtilsMetadata = /** @class */ (function () {
             size = precision;
         }
         else {
-            throw "XInputDecimal: field " + xField.name + " has unsupported type " + xField.type + ". Supported types are decimal and number.";
+            throw "XInputDecimal: field ".concat(xField.name, " has unsupported type ").concat(xField.type, ". Supported types are decimal and number.");
         }
         var min = undefined;
         var max = undefined;
@@ -203,7 +203,7 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return { useGrouping: useGrouping, fractionDigits: fractionDigits, min: min, max: max, size: size };
     };
-    XUtilsMetadata.computeColumnWidth = function (xField, formColumnType, header) {
+    XUtilsMetadata.computeColumnWidth = function (xField, filterMenuInFilterRow, formColumnType, header, filterButtonInHeader) {
         var width;
         if (formColumnType === undefined) {
             // lazy datatable (no inputs, no buttons, only text and padding)
@@ -224,7 +224,7 @@ var XUtilsMetadata = /** @class */ (function () {
                 width = 1.43 + 0.5 + 0.5; // checkbox ma sirku 20px
             }
             else {
-                throw "XField " + xField.name + ": unknown xField.type = " + xField.type;
+                throw "XField ".concat(xField.name, ": unknown xField.type = ").concat(xField.type);
             }
         }
         else {
@@ -248,7 +248,7 @@ var XUtilsMetadata = /** @class */ (function () {
                     width = 1.43 + 0.5 + 0.5; // checkbox ma sirku 20px
                 }
                 else {
-                    throw "XField " + xField.name + ": unknown xField.type = " + xField.type;
+                    throw "XField ".concat(xField.name, ": unknown xField.type = ").concat(xField.type);
                 }
             }
             else if (formColumnType === "dropdown" || formColumnType === "searchButton" || formColumnType === "autoComplete") {
@@ -268,7 +268,7 @@ var XUtilsMetadata = /** @class */ (function () {
                     width = XUtilsMetadata.computeColumnWidthBase(10 + 9, padding + padding); // napr. 31.12.2021 03:03:00
                 }
                 else {
-                    throw "XField " + xField.name + ": xField.type = " + xField.type + " not implemented for dropdown/searchButton/autoComplete";
+                    throw "XField ".concat(xField.name, ": xField.type = ").concat(xField.type, " not implemented for dropdown/searchButton/autoComplete");
                 }
                 // pridame sirku buttonu
                 if (formColumnType === "dropdown") {
@@ -282,16 +282,25 @@ var XUtilsMetadata = /** @class */ (function () {
                     }
                 }
                 else if (formColumnType === "autoComplete") {
-                    throw "XField " + xField.name + ": computing button width not implemented for autoComplete";
+                    throw "XField ".concat(xField.name, ": computing button width not implemented for autoComplete");
                 }
             }
             else {
                 throw "Unknown prop type = " + formColumnType;
             }
         }
+        if (filterMenuInFilterRow) {
+            // if the column has width of 25 characters or more, then the input field can be shorter
+            if (width !== undefined && width < 25 * XUtilsMetadata.CHAR_SIZE) {
+                width += 1.25; // filter menu icon
+            }
+        }
         // ak je label dlhsi ako sirka stlpca, tak sirka stlpca bude podla label-u
         if (header !== undefined) {
-            var widthHeader = XUtilsMetadata.computeColumnWidthBase(header.length, 0.5 + 0.5 + 1.28 + 0.5); // padding (7px) + space (7px) + sort icon (18px) + padding (7px)
+            var widthHeader = XUtilsMetadata.computeColumnWidthBase(header.length, 0.5 + 0.5 + 1.28); // padding (7px) + space (7px) + sort icon (18px)
+            if (filterButtonInHeader && widthHeader !== undefined) {
+                widthHeader += 1.5; // filter icon (21px = 14px (icon body) + 7px (right padding))
+            }
             if (widthHeader !== undefined) {
                 if (width === undefined || widthHeader > width) {
                     width = widthHeader;
@@ -329,7 +338,7 @@ var XUtilsMetadata = /** @class */ (function () {
     XUtilsMetadata.getXAssoc = function (xEntity, assocMap, assocField) {
         var xAssoc = assocMap[assocField];
         if (xAssoc === undefined) {
-            throw "Assoc " + assocField + " was not found in entity = " + xEntity.name;
+            throw "Assoc ".concat(assocField, " was not found in entity = ").concat(xEntity.name);
         }
         return xAssoc;
     };

package/lib/components/useXToken.js

@@ -27,7 +27,7 @@ function useXToken() {
         }
         return xToken;
     };
-    var _a = __read(react_1.useState(getXToken()), 2), xToken = _a[0], setXToken = _a[1];
+    var _a = __read((0, react_1.useState)(getXToken()), 2), xToken = _a[0], setXToken = _a[1];
     XUtils_1.XUtils.setXToken(xToken);
     var saveXToken = function (xToken) {
         if (xToken !== null) {

package/lib/serverApi/ExportImportParam.d.ts

@@ -1,12 +1,12 @@
-import { Filters, SortMeta } from "./FindParam";
+import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
 export declare enum ExportType {
     Csv = "csv",
     Json = "json"
 }
 export interface ExportParam {
     exportType: ExportType;
-    filters: Filters;
-    multiSortMeta?: SortMeta[];
+    filters: DataTableFilterMeta;
+    multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];
     csvParam?: CsvParam;

package/lib/serverApi/FindParam.d.ts

@@ -1,14 +1,4 @@
-export interface FilterValue {
-    value: string;
-    matchMode: 'startsWith' | 'equals';
-}
-export interface Filters {
-    [field: string]: FilterValue;
-}
-export interface SortMeta {
-    field: string;
-    order: 1 | -1;
-}
+import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
 export declare enum ResultType {
     OnlyRowCount = 0,
     RowCountAndPagedRows = 1,
@@ -18,8 +8,8 @@ export interface FindParam {
     resultType: ResultType;
     first?: number;
     rows?: number;
-    filters: Filters;
-    multiSortMeta?: SortMeta[];
+    filters: DataTableFilterMeta;
+    multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];
 }

package/lib/serverApi/FindParam.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResultType = void 0;
+// TODO - replaced with DataTableFilterMetaData
+// export interface FilterValue {
+//     value : string;
+//     matchMode : 'startsWith' | 'equals'; // matchMode ma konstanty napr. startsWith
+// }
+// TODO - replaced with DataTableFilterMeta
+// export interface Filters {
+//     [field: string]: FilterValue; // specialny typ pre object (dictionary) ktory ma dynamicky pocet propertiesov
+// }
+// TODO - replace with DataTableSortMeta
+// export interface SortMeta {
+//     field : string;
+//     order : 1 | -1; // hodnoty 1 alebo -1
+// }
 var ResultType;
 (function (ResultType) {
     ResultType[ResultType["OnlyRowCount"] = 0] = "OnlyRowCount";

package/lib/serverApi/XUser.d.ts

@@ -3,4 +3,5 @@ export interface XUser {
     username: string;
     password: string;
     name: string;
+    enabled: boolean;
 }

package/lib/serverApi/XUtilsCommon.js

@@ -64,11 +64,11 @@ var XUtilsCommon = /** @class */ (function () {
             // TODO - ak pre datetime nastavime vsetky zlozky casu na 00:00:00, tak sformatuje hodnotu ako datum a spravi chybu pri zapise do DB - zapise  1:00:00
             var dateStr;
             if (this.getHours() === 0 && this.getMinutes() === 0 && this.getSeconds() === 0) {
-                dateStr = exports.dateFormat(this, 'yyyy-mm-dd');
+                dateStr = (0, exports.dateFormat)(this, 'yyyy-mm-dd');
             }
             else {
                 // jedna sa o datetime
-                dateStr = exports.dateFormat(this, 'yyyy-mm-dd HH:MM:ss');
+                dateStr = (0, exports.dateFormat)(this, 'yyyy-mm-dd HH:MM:ss');
             }
             return dateStr;
         };