@michalrakus/x-react-web-lib 1.12.0 → 1.14.0

package/XFormCol.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/components/XFormRowCol/XFormCol';

package/XFormCol.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/components/XFormRowCol/XFormCol.js');

package/XFormInlineRow.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/components/XFormRowCol/XFormInlineRow';

package/XFormInlineRow.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/components/XFormRowCol/XFormInlineRow.js');

package/XFormRow.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/components/XFormRowCol/XFormRow';

package/XFormRow.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/components/XFormRowCol/XFormRow.js');

package/XFormRowCol.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/components/XFormRowCol/XFormRowCol';

package/XFormRowCol.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/components/XFormRowCol/XFormRowCol.js');

package/XUtilsConversions.d.ts

@@ -1,3 +1,3 @@
 // generated by gulp
 
-export * from './lib/components/XUtilsConversions';
+export * from './lib/serverApi/XUtilsConversions';

package/XUtilsConversions.js

@@ -2,4 +2,4 @@
 
 'use strict';
 
-module.exports = require('./lib/components/XUtilsConversions.js');
+module.exports = require('./lib/serverApi/XUtilsConversions.js');

package/XUtilsMetadataCommon.d.ts

@@ -0,0 +1,3 @@
+// generated by gulp
+
+export * from './lib/serverApi/XUtilsMetadataCommon';

package/XUtilsMetadataCommon.js

@@ -0,0 +1,5 @@
+// generated by gulp
+
+'use strict';
+
+module.exports = require('./lib/serverApi/XUtilsMetadataCommon.js');

package/gulpfile.js

@@ -18,6 +18,11 @@ function generateApi(cb) {
         "./lib/administration/XBrowseMetaBrowse",
         "./lib/administration/XBrowseMetaForm",
 
+        "./lib/components/XFormRowCol/XFormCol",
+        "./lib/components/XFormRowCol/XFormInlineRow",
+        "./lib/components/XFormRowCol/XFormRow",
+        "./lib/components/XFormRowCol/XFormRowCol",
+
         "./lib/components/useXToken",
         "./lib/components/XAutoComplete",
         "./lib/components/XAutoCompleteBase",
@@ -59,12 +64,13 @@ function generateApi(cb) {
         "./lib/components/XToken",
         "./lib/components/XToOneAssocButton",
         "./lib/components/XUtils",
-        "./lib/components/XUtilsConversions",
         "./lib/components/XUtilsMetadata",
 
         "./lib/serverApi/ExportImportParam",
         "./lib/serverApi/FindParam",
-        "./lib/serverApi/XUtilsCommon"
+        "./lib/serverApi/XUtilsCommon",
+        "./lib/serverApi/XUtilsConversions",
+        "./lib/serverApi/XUtilsMetadataCommon"
     ];
 
     for (const apiFile of apiFileList) {

package/lib/components/XAutoComplete.d.ts

@@ -13,7 +13,8 @@ export interface XAutoCompleteProps extends XFormComponentProps<XObject> {
     filter?: XFilterProp;
     sortField?: string | DataTableSortMeta[];
     suggestions?: any[];
-    size?: number;
+    lazy?: boolean;
+    width?: string;
     inputStyle?: React.CSSProperties;
 }
 export declare class XAutoComplete extends XFormComponent<XObject, XAutoCompleteProps> {
@@ -24,12 +25,13 @@ export declare class XAutoComplete extends XFormComponent<XObject, XAutoComplete
     };
     constructor(props: XAutoCompleteProps);
     componentDidMount(): void;
-    readAndSetSuggestions(): Promise<void>;
+    readAndSetSuggestions(setStateCallback?: () => void): Promise<void>;
     getField(): string;
     isNotNull(): boolean;
     getValue(): any | null;
     onChangeAutoCompleteBase(object: any, objectChange: OperationType): void;
     onErrorChangeAutoCompleteBase(error: string | undefined): void;
+    onSearchStart(finishSearchStart?: () => void): void;
     validate(): {
         field: string;
         xError: XError;

package/lib/components/XAutoComplete.js

@@ -57,28 +57,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XAutoComplete = void 0;
 var react_1 = __importDefault(require("react"));
 var XFormComponent_1 = require("./XFormComponent");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtils_1 = require("./XUtils");
 var XAutoCompleteBase_1 = require("./XAutoCompleteBase");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XAutoComplete = /** @class */ (function (_super) {
     __extends(XAutoComplete, _super);
     function XAutoComplete(props) {
         var _this = _super.call(this, props) || this;
-        _this.xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.form.getEntity()), props.assocField);
+        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity()), props.assocField);
         _this.errorInBase = undefined;
         _this.state = {
             suggestions: []
         };
         _this.onChangeAutoCompleteBase = _this.onChangeAutoCompleteBase.bind(_this);
         _this.onErrorChangeAutoCompleteBase = _this.onErrorChangeAutoCompleteBase.bind(_this);
+        _this.onSearchStart = _this.onSearchStart.bind(_this);
         props.form.addField(props.assocField + '.' + props.displayField);
         return _this;
     }
     XAutoComplete.prototype.componentDidMount = function () {
         //console.log("volany XAutoComplete.componentDidMount()");
-        this.readAndSetSuggestions();
+        if (!this.props.lazy) {
+            this.readAndSetSuggestions();
+        }
     };
-    XAutoComplete.prototype.readAndSetSuggestions = function () {
+    XAutoComplete.prototype.readAndSetSuggestions = function (setStateCallback) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var suggestions;
@@ -89,7 +92,7 @@ var XAutoComplete = /** @class */ (function (_super) {
                         return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, this.getFilterBase(this.props.filter), (_a = this.props.sortField) !== null && _a !== void 0 ? _a : this.props.displayField)];
                     case 1:
                         suggestions = _b.sent();
-                        this.setState({ suggestions: suggestions });
+                        this.setState({ suggestions: suggestions }, setStateCallback);
                         _b.label = 2;
                     case 2: return [2 /*return*/];
                 }
@@ -119,6 +122,9 @@ var XAutoComplete = /** @class */ (function (_super) {
     XAutoComplete.prototype.onErrorChangeAutoCompleteBase = function (error) {
         this.errorInBase = error; // odlozime si error
     };
+    XAutoComplete.prototype.onSearchStart = function (finishSearchStart) {
+        this.readAndSetSuggestions(finishSearchStart);
+    };
     // overrides method in XFormComponent
     XAutoComplete.prototype.validate = function () {
         if (this.errorInBase) {
@@ -131,15 +137,11 @@ var XAutoComplete = /** @class */ (function (_super) {
     XAutoComplete.prototype.render = function () {
         var _this = this;
         var _a;
-        var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.xAssoc.entityName);
-        //const xDisplayField = XUtilsMetadata.getXFieldByPath(xEntityAssoc, this.props.displayField);
-        // TODO - readOnly
-        // TODO - size
-        //const size = this.props.size ?? xDisplayField.length;
+        var xEntityAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.xAssoc.entityName);
         // div className="col" nam zabezpeci aby XAutoCompleteBase nezaberal celu dlzku grid-u (ma nastaveny width=100% vdaka "formgroup-inline")
         return (react_1.default.createElement("div", { className: "field grid" },
             react_1.default.createElement("label", { htmlFor: this.props.assocField, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
-            react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), suggestions: (_a = this.props.suggestions) !== null && _a !== void 0 ? _a : this.state.suggestions, onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, searchBrowse: this.props.searchBrowse, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase, customFilterFunction: function () { return _this.getFilterBase(_this.props.filter); } })));
+            react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), suggestions: (_a = this.props.suggestions) !== null && _a !== void 0 ? _a : this.state.suggestions, onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, searchBrowse: this.props.searchBrowse, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, readOnly: this.isReadOnly(), error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase, width: this.props.width, customFilterFunction: function () { return _this.getFilterBase(_this.props.filter); }, onSearchStart: this.props.lazy ? this.onSearchStart : undefined })));
     };
     return XAutoComplete;
 }(XFormComponent_1.XFormComponent));

package/lib/components/XAutoCompleteBase.d.ts

@@ -13,11 +13,13 @@ export interface XAutoCompleteBaseProps {
     valueForm?: JSX.Element;
     idField?: string;
     maxLength?: number;
+    width?: string;
     readOnly?: boolean;
     error?: string;
     onErrorChange: (error: string | undefined) => void;
     setFocusOnCreate?: boolean;
     customFilterFunction?: () => XCustomFilter | undefined;
+    onSearchStart?: (finishSearchStart?: () => void) => void;
 }
 export declare class XAutoCompleteBase extends Component<XAutoCompleteBaseProps> {
     autoCompleteRef: any;
@@ -29,6 +31,7 @@ export declare class XAutoCompleteBase extends Component<XAutoCompleteBaseProps>
         formDialogOpened: boolean;
         searchDialogOpened: boolean;
     };
+    wasSearchStartCalled: boolean;
     formDialogObjectId: number | undefined;
     formDialogInitValuesForInsert: any | undefined;
     constructor(props: XAutoCompleteBaseProps);
@@ -49,6 +52,8 @@ export declare class XAutoCompleteBase extends Component<XAutoCompleteBaseProps>
     createInsertUpdateItems(splitButtonItems: MenuItem[]): void;
     createSearchItem(splitButtonItems: MenuItem[]): void;
     createDropdownItem(splitButtonItems: MenuItem[]): void;
+    onOpenDropdown(e: any): void;
+    openDropdown(e: any): void;
     computeInputValue(): any;
     createSearchBrowseParams(): XSearchBrowseParams;
     render(): JSX.Element;

package/lib/components/XAutoCompleteBase.js

@@ -94,6 +94,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
             formDialogOpened: false,
             searchDialogOpened: false
         };
+        _this.wasSearchStartCalled = false;
         _this.completeMethod = _this.completeMethod.bind(_this);
         _this.onChange = _this.onChange.bind(_this);
         _this.onSelect = _this.onSelect.bind(_this);
@@ -132,6 +133,15 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
     };
     XAutoCompleteBase.prototype.onChange = function (e) {
         if (typeof e.value === 'string') {
+            // ak user zacne typovat znaky, nacitame suggestions, ak sme lazy (onSearchStart !== undefined)
+            if (this.props.onSearchStart) {
+                if (e.value !== '') { // ak user vymaze cely input, este nechceme nacitat suggestions, az ked zapise nejaky znak
+                    if (!this.wasSearchStartCalled) {
+                        this.props.onSearchStart();
+                        this.wasSearchStartCalled = true; // ak user dalej typuje, nechceme znova nacitavat suggestions
+                    }
+                }
+            }
             this.setState({ inputChanged: true, inputValueState: e.value });
         }
     };
@@ -180,6 +190,8 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                 }
             }
         }
+        // odchadzame z inputu, zresetujeme priznak - ak zacne user pracovat s autocomplete-om, nacitaju sa suggestions z DB (ak mame lazy)
+        this.wasSearchStartCalled = false;
     };
     XAutoCompleteBase.prototype.createErrorMessage = function () {
         return "Value \"".concat(this.state.inputValueState, "\" was not found among valid values.");
@@ -314,10 +326,29 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
                 // this.autoCompleteRef.current je element <AutoComplete .../>, ktory vytvarame v render metode
                 //console.log(this.autoCompleteRef.current);
                 // otvori dropdown (search je metoda popisana v API, volanie sme skopcili zo zdrojakov primereact)
-                _this.autoCompleteRef.current.search(e, '', 'dropdown');
+                // if (this.props.onSearchStart) {
+                //     this.props.onSearchStart(() => this.finishSearchStart(e));
+                // }
+                // this.autoCompleteRef.current.search(e, '', 'dropdown');
+                _this.onOpenDropdown(e);
             }
         });
     };
+    XAutoCompleteBase.prototype.onOpenDropdown = function (e) {
+        var _this = this;
+        if (this.props.onSearchStart) {
+            this.props.onSearchStart(function () { return _this.openDropdown(e); });
+        }
+        else {
+            // otvori dropdown (search je metoda popisana v API, volanie sme skopcili zo zdrojakov primereact)
+            //this.autoCompleteRef.current.search(e, '', 'dropdown');
+            this.openDropdown(e);
+        }
+    };
+    XAutoCompleteBase.prototype.openDropdown = function (e) {
+        // otvori dropdown (search je metoda popisana v API, volanie sme skopcili zo zdrojakov primereact)
+        this.autoCompleteRef.current.search(e, '', 'dropdown');
+    };
     // vracia objekt (ak inputChanged === false) alebo string (ak inputChanged === true)
     XAutoCompleteBase.prototype.computeInputValue = function () {
         var inputValue;
@@ -358,7 +389,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         }
         else {
             // mame len 1 operaciu - dame jednoduchy button
-            dropdownButton = react_1.default.createElement(button_1.Button, { icon: "pi pi-chevron-down", onClick: function (e) { return _this.autoCompleteRef.current.search(e, '', 'dropdown'); }, className: 'x-dropdownbutton' + XUtils_1.XUtils.mobileCssSuffix(), disabled: readOnly });
+            dropdownButton = react_1.default.createElement(button_1.Button, { icon: "pi pi-chevron-down", onClick: function (e) { return _this.onOpenDropdown(e); }, className: 'x-dropdownbutton' + XUtils_1.XUtils.mobileCssSuffix(), disabled: readOnly });
         }
         // vypocitame inputValue
         var inputValue = this.computeInputValue();
@@ -374,7 +405,7 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         // <DobrovolnikForm id={this.formDialogObjectId} object={this.formDialogInitValuesForInsert} onSaveOrCancel={this.formDialogOnSaveOrCancel}/>
         // formgroup-inline lepi SplitButton na autocomplete a zarovna jeho vysku
         return (react_1.default.createElement("div", { className: "x-auto-complete-base" },
-            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, field: this.props.field, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, maxLength: this.props.maxLength, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createErrorProps(error))),
+            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, field: this.props.field, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, maxLength: this.props.maxLength, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createErrorProps(error), { style: { width: this.props.width } })),
             dropdownButton,
             this.props.valueForm != undefined && !readOnly ?
                 react_1.default.createElement(dialog_1.Dialog, { visible: this.state.formDialogOpened, onHide: this.formDialogOnHide, header: this.formDialogObjectId ? 'Modification' : 'New row' }, react_1.default.cloneElement(this.props.valueForm, {

package/lib/components/XAutoCompleteDT.js

@@ -55,16 +55,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XAutoCompleteDT = void 0;
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var react_1 = __importDefault(require("react"));
 var XFormComponentDT_1 = require("./XFormComponentDT");
 var XUtils_1 = require("./XUtils");
 var XAutoCompleteBase_1 = require("./XAutoCompleteBase");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XAutoCompleteDT = /** @class */ (function (_super) {
     __extends(XAutoCompleteDT, _super);
     function XAutoCompleteDT(props) {
         var _this = _super.call(this, props) || this;
-        _this.xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity), props.assocField);
+        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity), props.assocField);
         _this.errorInBase = undefined;
         _this.state = {
             suggestions: []
@@ -129,8 +129,8 @@ var XAutoCompleteDT = /** @class */ (function (_super) {
     XAutoCompleteDT.prototype.render = function () {
         var _this = this;
         var _a;
-        var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.xAssoc.entityName);
-        //const xDisplayField = XUtilsMetadata.getXFieldByPath(xEntityAssoc, this.props.displayField);
+        var xEntityAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.xAssoc.entityName);
+        //const xDisplayField = XUtilsMetadataCommon.getXFieldByPath(xEntityAssoc, this.props.displayField);
         // TODO - size
         //const size = this.props.size ?? xDisplayField.length;
         // div className="col" nam zabezpeci aby XAutoCompleteBase nezaberal celu dlzku grid-u (ma nastaveny width=100% vdaka "formgroup-inline")

package/lib/components/XCalendar.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XCalendar = void 0;
 var react_1 = __importDefault(require("react"));
 var calendar_1 = require("primereact/calendar");
-var XUtilsConversions_1 = require("./XUtilsConversions");
+var XUtilsConversions_1 = require("../serverApi/XUtilsConversions");
 // wrapper for Calendar component, maybe better name would be XInputDateBase
 var XCalendar = function (props) {
     var _a;

package/lib/components/XDropdown.js

@@ -20,14 +20,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XDropdown = void 0;
 var react_1 = __importDefault(require("react"));
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XFormComponent_1 = require("./XFormComponent");
 var XDropdownForEntity_1 = require("./XDropdownForEntity");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XDropdown = /** @class */ (function (_super) {
     __extends(XDropdown, _super);
     function XDropdown(props) {
         var _this = _super.call(this, props) || this;
-        _this.xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.form.getEntity()), props.assocField);
+        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity()), props.assocField);
         props.form.addField(props.assocField + '.' + props.displayField);
         return _this;
     }

package/lib/components/XDropdownDT.js

@@ -63,12 +63,12 @@ exports.XDropdownDT = void 0;
 var react_1 = __importStar(require("react"));
 var XUtils_1 = require("./XUtils");
 var dropdown_1 = require("primereact/dropdown");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XDropdownDT = function (props) {
     // poznamka: nacitanie/ulozenie options je vytiahnute do parent komponentu XFormDataTable koli tomu aby sme nenacitavali options pre kazdy riadok tabulky
     // "members"
-    var xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity), props.assocField);
-    var idField = XUtilsMetadata_1.XUtilsMetadata.getXEntity(xAssoc.entityName).idField;
+    var xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity), props.assocField);
+    var idField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(xAssoc.entityName).idField;
     // parameter [] zabezpeci ze sa metoda zavola len po prvom renderingu (a nie po kazdej zmene stavu (zavolani setNieco()))
     (0, react_1.useEffect)(function () {
         //console.log("XDropdownDT - zavolany useEffect *******************")
@@ -88,7 +88,7 @@ var XDropdownDT = function (props) {
                     // Nacitanie z DB sa koli asynchronnosti vykona az po zavolani tejto metody pre vsetky riadky tabulky, co je pre nas neskoro.
                     // ak by tu tento riadok nebol, tak by sa options nacitavali tolkokrat, kolko je riadkov v tabulke
                     props.dropdownOptionsMap[props.assocField] = [];
-                    xAssoc_1 = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity), props.assocField);
+                    xAssoc_1 = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity), props.assocField);
                     return [4 /*yield*/, XUtils_1.XUtils.fetchRows(xAssoc_1.entityName, props.filter, (_a = props.sortField) !== null && _a !== void 0 ? _a : props.displayField)];
                 case 1:
                     //options = await XUtils.fetchMany('findRowsForAssoc', {entity: props.entity, assocField: props.assocField});

package/lib/components/XDropdownDTFilter.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="react" />
+import { XCustomFilter } from "../serverApi/FindParam";
 export declare const XDropdownDTFilter: (props: {
     entity: string;
     path: string;
     value: any;
     onValueChange: (field: string, displayValue: any) => void;
+    filter?: XCustomFilter | undefined;
+    sortField?: string | undefined;
 }) => JSX.Element;

package/lib/components/XDropdownDTFilter.js

@@ -80,7 +80,7 @@ var react_1 = __importStar(require("react"));
 var XUtils_1 = require("./XUtils");
 var dropdown_1 = require("primereact/dropdown");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 // pouzivany vo filtri v XLazyDataTable aj v XFormDataTable2
 var XDropdownDTFilter = function (props) {
     var _a = __read((0, react_1.useState)([]), 2), options = _a[0], setOptions = _a[1];
@@ -98,13 +98,14 @@ var XDropdownDTFilter = function (props) {
     };
     var findOptions = function (entity, path, displayField) { return __awaiter(void 0, void 0, void 0, function () {
         var xAssoc, options, emptyOption;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    xAssoc = XUtilsMetadata_1.XUtilsMetadata.getLastXAssocByPath(XUtilsMetadata_1.XUtilsMetadata.getXEntity(entity), path);
-                    return [4 /*yield*/, XUtils_1.XUtils.fetchRows(xAssoc.entityName, undefined, displayField)];
+                    xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getLastXAssocByPath(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(entity), path);
+                    return [4 /*yield*/, XUtils_1.XUtils.fetchRows(xAssoc.entityName, props.filter, (_a = props.sortField) !== null && _a !== void 0 ? _a : displayField)];
                 case 1:
-                    options = _a.sent();
+                    options = _b.sent();
                     emptyOption = {};
                     emptyOption[displayField] = XUtils_1.XUtils.dropdownEmptyOptionValue;
                     options.splice(0, 0, emptyOption); // null polozka (nepridavat pre not null atributy)

package/lib/components/XDropdownForEntity.js

@@ -89,7 +89,7 @@ exports.XDropdownForEntity = void 0;
 var react_1 = __importStar(require("react"));
 var dropdown_1 = require("primereact/dropdown");
 var XUtils_1 = require("./XUtils");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 // vseobecny Dropdown ktoreho parametrom je entity, zobrazuje zaznamy danej entity, po selectnuti vracia zaznam danej entity
 // ambicia je pouzivat ho vsade - vo formulari, vo filtroch, vo form tabulke, priamo aplikacnym programmerom
 // dalo by sa vyclenit este XDropdownBase, ktory by dostaval ako parameter options (bol by nezavisly od DB), zatial ho nerobime,
@@ -101,7 +101,7 @@ var XDropdownForEntity = /** @class */ (function (_super) {
     __extends(XDropdownForEntity, _super);
     function XDropdownForEntity(props) {
         var _this = _super.call(this, props) || this;
-        _this.idField = XUtilsMetadata_1.XUtilsMetadata.getXEntity(_this.props.entity).idField;
+        _this.idField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(_this.props.entity).idField;
         _this.state = {
             options: []
         };

package/lib/components/XEditBrowse.js

@@ -109,6 +109,7 @@ var _ = __importStar(require("lodash"));
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtils_1 = require("./XUtils");
 var XLazyDataTable_1 = require("./XLazyDataTable");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 // TODO - pouzit extends XEditBrowseBase, ako je tomu pri CarForm?
 var XEditBrowse = /** @class */ (function (_super) {
     __extends(XEditBrowse, _super);
@@ -147,8 +148,8 @@ var XEditBrowse = /** @class */ (function (_super) {
     XEditBrowse.prototype.createDefaultXBrowseMeta = function () {
         var e_1, _a;
         var xColumnMetaList = [];
-        var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.props.entity);
-        var xFieldList = XUtilsMetadata_1.XUtilsMetadata.getXFieldList(xEntity);
+        var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.props.entity);
+        var xFieldList = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldList(xEntity);
         try {
             for (var xFieldList_1 = __values(xFieldList), xFieldList_1_1 = xFieldList_1.next(); !xFieldList_1_1.done; xFieldList_1_1 = xFieldList_1.next()) {
                 var xField = xFieldList_1_1.value;
@@ -310,7 +311,7 @@ var XEditBrowse = /** @class */ (function (_super) {
     XEditBrowse.prototype.onEdit = function (selectedRow) {
         var formElement = XUtils_1.XUtils.getAppForm(this.props.entity);
         if (formElement !== undefined) {
-            var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.props.entity);
+            var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.props.entity);
             var id = selectedRow[xEntity.idField];
             // we add property id={selectedRow.<id>} into formElement
             var formElementCloned = react_1.default.cloneElement(formElement, { id: id }, formElement.children);

package/lib/components/XExportRowsDialog.js

@@ -84,7 +84,7 @@ var dropdown_1 = require("primereact/dropdown");
 var checkbox_1 = require("primereact/checkbox");
 var XButton_1 = require("./XButton");
 var XUtils_1 = require("./XUtils");
-var XUtilsConversions_1 = require("./XUtilsConversions");
+var XUtilsConversions_1 = require("../serverApi/XUtilsConversions");
 var XLocale_1 = require("./XLocale");
 var XExportRowsDialog = function (props) {
     var _a, _b;

package/lib/components/XFieldSelector.js

@@ -54,7 +54,7 @@ exports.XFieldSelector = void 0;
 var react_1 = __importStar(require("react"));
 var treetable_1 = require("primereact/treetable");
 var column_1 = require("primereact/column");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XFieldSelector = function (props) {
     // poznamka: treeNodeList by sme mohli vypocitavat priamo, ale ked pouzijeme useState/useEffect tak sa createTreeNodeList zavola len raz pri vytvoreni komponentu
     var _a = __read((0, react_1.useState)([]), 2), treeNodeList = _a[0], setTreeNodeList = _a[1];
@@ -65,8 +65,8 @@ var XFieldSelector = function (props) {
     var createTreeNodeList = function (entity, keyPrefix) {
         var e_1, _a, e_2, _b;
         var treeNodeList = [];
-        var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(entity);
-        var xFieldList = XUtilsMetadata_1.XUtilsMetadata.getXFieldList(xEntity);
+        var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(entity);
+        var xFieldList = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldList(xEntity);
         try {
             for (var xFieldList_1 = __values(xFieldList), xFieldList_1_1 = xFieldList_1.next(); !xFieldList_1_1.done; xFieldList_1_1 = xFieldList_1.next()) {
                 var xField = xFieldList_1_1.value;
@@ -84,7 +84,7 @@ var XFieldSelector = function (props) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        var assocToOneList = XUtilsMetadata_1.XUtilsMetadata.getXAssocList(xEntity, ["many-to-one", "one-to-one"]);
+        var assocToOneList = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocList(xEntity, ["many-to-one", "one-to-one"]);
         try {
             for (var assocToOneList_1 = __values(assocToOneList), assocToOneList_1_1 = assocToOneList_1.next(); !assocToOneList_1_1.done; assocToOneList_1_1 = assocToOneList_1.next()) {
                 var xAssoc = assocToOneList_1_1.value;

package/lib/components/XFormDataTable2.d.ts

@@ -2,6 +2,7 @@ import { XFormBase } from "./XFormBase";
 import { Component, ReactChild } from "react";
 import { DataTableFilterMeta } from "primereact/datatable";
 import { XEntity, XField } from "../serverApi/XEntityMetadata";
+import { XViewStatusOrBoolean } from "./XUtils";
 import { FilterMatchMode } from "primereact/api";
 import { XTableFieldChangeEvent } from "./XFieldChangeEvent";
 import { XCustomFilter } from "../serverApi/FindParam";
@@ -65,8 +66,8 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
         filters: DataTableFilterMeta;
     };
     constructor(props: XFormDataTableProps);
-    getPathForColumn(columnProps: XFormColumnProps): string;
-    static getHeader(columnProps: XFormColumnProps, xEntity: XEntity, field: string, xField: XField): string;
+    getPathForColumn(columnProps: XFormColumnBaseProps): string;
+    static getHeader(columnProps: XFormColumnBaseProps, xEntity: XEntity, field: string, xField: XField): string;
     static isReadOnlyHeader(path: string | undefined, readOnly: XTableFieldReadOnlyProp | undefined): boolean;
     getEntity(): string;
     createInitFilters(): DataTableFilterMeta;
@@ -78,7 +79,7 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
     getCheckboxFilterValue(field: string): boolean | null;
     onDropdownFilterChange(field: string, displayValue: any): void;
     getDropdownFilterValue(field: string): any;
-    bodyTemplate(columnProps: XFormColumnProps, tableReadOnly: boolean, rowData: any, xEntity: XEntity): any;
+    bodyTemplate(columnProps: XFormColumnBaseProps, tableReadOnly: boolean, rowData: any, xEntity: XEntity): any;
     onClickAddRow(): void;
     onClickRemoveRowBySelection(): void;
     removeRow(row: any): void;
@@ -89,7 +90,7 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
 export type XTableFieldOnChange = (e: XTableFieldChangeEvent<any, any>) => void;
 export type XTableFieldReadOnlyProp = boolean | ((object: any, tableRow: any) => boolean);
 export type XTableFieldFilterProp = XCustomFilter | ((object: any, rowData: any) => XCustomFilter | undefined);
-export interface XFormColumnProps {
+export interface XFormColumnBaseProps {
     type: "inputSimple" | "dropdown" | "autoComplete" | "searchButton";
     header?: any;
     readOnly?: XTableFieldReadOnlyProp;
@@ -97,17 +98,18 @@ export interface XFormColumnProps {
     showFilterMenu?: boolean;
     width?: string;
     onChange?: XTableFieldOnChange;
+    columnViewStatus: XViewStatusOrBoolean;
 }
-export interface XFormInputSimpleColumnProps extends XFormColumnProps {
+export interface XFormColumnProps extends XFormColumnBaseProps {
     field: string;
 }
-export interface XFormDropdownColumnProps extends XFormColumnProps {
+export interface XFormDropdownColumnProps extends XFormColumnBaseProps {
     assocField: string;
     displayField: string;
     sortField?: string;
     filter?: XCustomFilter;
 }
-export interface XFormAutoCompleteColumnProps extends XFormColumnProps {
+export interface XFormAutoCompleteColumnProps extends XFormColumnBaseProps {
     assocField: string;
     displayField: string;
     searchBrowse?: JSX.Element;
@@ -115,32 +117,36 @@ export interface XFormAutoCompleteColumnProps extends XFormColumnProps {
     filter?: XTableFieldFilterProp;
     suggestions?: any[];
 }
-export interface XFormSearchButtonColumnProps extends XFormColumnProps {
+export interface XFormSearchButtonColumnProps extends XFormColumnBaseProps {
     assocField: string;
     displayField: string;
     searchBrowse: JSX.Element;
 }
 export declare const XFormColumn: {
-    (props: XFormInputSimpleColumnProps): null;
+    (props: XFormColumnProps): null;
     defaultProps: {
         type: string;
+        columnViewStatus: boolean;
     };
 };
 export declare const XFormDropdownColumn: {
     (props: XFormDropdownColumnProps): null;
     defaultProps: {
         type: string;
+        columnViewStatus: boolean;
     };
 };
 export declare const XFormAutoCompleteColumn: {
     (props: XFormAutoCompleteColumnProps): null;
     defaultProps: {
         type: string;
+        columnViewStatus: boolean;
     };
 };
 export declare const XFormSearchButtonColumn: {
     (props: XFormSearchButtonColumnProps): null;
     defaultProps: {
         type: string;
+        columnViewStatus: boolean;
     };
 };