@michalrakus/x-react-web-lib 1.21.0 → 1.23.0

package/XFormHeader.d.ts

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

package/XFormHeader.js

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

package/XMultiSelect.d.ts

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

package/XMultiSelect.js

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

package/XMultiSelectBase.d.ts

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

package/XMultiSelectBase.js

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

package/gulpfile.js

@@ -53,6 +53,7 @@ function generateApi(cb) {
         "./lib/components/XFormBaseT",
         "./lib/components/XFormDataTable2",
         "./lib/components/XFormFooter",
+        "./lib/components/XFormHeader",
         "./lib/components/XFormNavigator3",
         "./lib/components/XHolders",
         "./lib/components/XInputDate",
@@ -67,6 +68,8 @@ function generateApi(cb) {
         "./lib/components/XLocale",
         "./lib/components/XLoginDialog",
         "./lib/components/XLoginForm",
+        "./lib/components/XMultiSelect",
+        "./lib/components/XMultiSelectBase",
         "./lib/components/XObject",
         "./lib/components/XSearchButton",
         "./lib/components/XToken",

package/lib/administration/XBrowseMetaBrowse.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
 import { XBrowseProps } from "../components/XLazyDataTable/XLazyDataTable";
-export declare const XBrowseMetaBrowse: (props: XBrowseProps) => JSX.Element;
+import React from "react";
+export declare const XBrowseMetaBrowse: (props: XBrowseProps) => React.JSX.Element;

package/lib/administration/XBrowseMetaForm.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { XFormBase } from "../components/XFormBase";
+import React from "react";
 export declare class XBrowseMetaForm extends XFormBase {
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/administration/XParamBrowse.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from "react";
 import { XBrowseProps } from "../components/XLazyDataTable/XLazyDataTable";
 import { XCustomFilter } from "../serverApi/FindParam";
 export declare const XParamBrowse: (props: XBrowseProps & {
     customFilter?: XCustomFilter;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/administration/XParamBrowse.js

@@ -16,7 +16,7 @@ var XParamBrowse = function (props) {
         // openForm pridavame automaticky v XFormNavigator3 pri renderovani komponentu
         props.openForm(react_1.default.createElement(XParamForm_1.XParamForm, { id: selectedRow.id }));
     };
-    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XParam", sortField: "id", rows: 30, customFilter: props.customFilter, onAddRow: onAddRow, onEdit: onEdit, removeRow: true, displayed: props.displayed },
+    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XParam", label: "Parameters", sortField: "id", rows: 30, customFilter: props.customFilter, onAddRow: onAddRow, onEdit: onEdit, removeRow: true, displayed: props.displayed },
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "id", header: "ID", width: "8rem" }),
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "code", header: "Code", width: "16rem" }),
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "name", header: "Name", width: "45rem" }),

package/lib/administration/XParamForm.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from "react";
 import { XFormBaseModif } from "../components/XFormBaseModif";
 import { XObject } from "../components/XObject";
 export declare class XParamForm extends XFormBaseModif {
     createNewObject(): XObject;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/administration/XParamForm.js

@@ -32,6 +32,7 @@ var XInputDecimal_1 = require("../components/XInputDecimal");
 var XInputDate_1 = require("../components/XInputDate");
 var XInputText_1 = require("../components/XInputText");
 var XFormFooter_1 = require("../components/XFormFooter");
+var XFormHeader_1 = require("../components/XFormHeader");
 var XParamForm = /** @class */ (function (_super) {
     __extends(XParamForm, _super);
     function XParamForm() {
@@ -42,6 +43,7 @@ var XParamForm = /** @class */ (function (_super) {
     };
     XParamForm.prototype.render = function () {
         return (react_1.default.createElement("div", null,
+            react_1.default.createElement(XFormHeader_1.XFormHeader, { label: "Parameter" }),
             react_1.default.createElement("div", { className: "x-form-row" },
                 react_1.default.createElement("div", { className: "x-form-col" },
                     react_1.default.createElement(XInputDecimal_1.XInputDecimal, { form: this, field: "id", label: "ID", readOnly: true }),

package/lib/administration/XUserBrowse.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
 import { XBrowseProps } from "../components/XLazyDataTable/XLazyDataTable";
-export declare const XUserBrowse: (props: XBrowseProps) => JSX.Element;
+import React from "react";
+export declare const XUserBrowse: (props: XBrowseProps) => React.JSX.Element;

package/lib/administration/XUserBrowse.js

@@ -75,7 +75,7 @@ var XUserBrowse = function (props) {
             }
         });
     }); };
-    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XUser", rows: 10, onAddRow: onAddRow, onEdit: onEdit, removeRow: onRemoveRow, displayed: props.displayed },
+    return (react_1.default.createElement(XLazyDataTable_1.XLazyDataTable, { entity: "XUser", label: "Users", rows: 10, onAddRow: onAddRow, onEdit: onEdit, removeRow: onRemoveRow, displayed: props.displayed },
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "id", header: "ID" }),
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "username", header: "Username", width: "17rem" }),
         react_1.default.createElement(XLazyDataTable_1.XLazyColumn, { field: "name", header: "Name", width: "17rem" }),

package/lib/administration/XUserForm.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { XFormProps } from "../components/XFormBase";
+import React from "react";
 import { OperationType } from "../components/XUtils";
 import { XFormBaseModif } from "../components/XFormBaseModif";
 import { XObject } from "../components/XObject";
@@ -8,5 +8,5 @@ export declare class XUserForm extends XFormBaseModif {
     createNewObject(): XObject;
     preInitForm(object: XObject, operationType: OperationType.Insert | OperationType.Update): void;
     onClickSave(): Promise<void>;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/administration/XUserForm.js

@@ -75,6 +75,7 @@ var XCheckbox_1 = require("../components/XCheckbox");
 var XEnvVars_1 = require("../components/XEnvVars");
 var XFormBaseModif_1 = require("../components/XFormBaseModif");
 var XInputDate_1 = require("../components/XInputDate");
+var XFormHeader_1 = require("../components/XFormHeader");
 var XUserForm = /** @class */ (function (_super) {
     __extends(XUserForm, _super);
     function XUserForm(props) {
@@ -100,8 +101,9 @@ var XUserForm = /** @class */ (function (_super) {
             var e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!this.validateSave()) {
+                    case 0: return [4 /*yield*/, this.validateSave()];
+                    case 1:
+                        if (!(_a.sent())) {
                             return [2 /*return*/];
                         }
                         // v deme nedovolime zmenit uzivatelov ktori sa pouzivaju na skusanie dema
@@ -134,18 +136,18 @@ var XUserForm = /** @class */ (function (_super) {
                             }
                         }
                         this.preSave(this.state.object);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, XUtils_1.XUtils.post('userSaveRow', { entity: this.getEntity(), object: this.state.object })];
+                        _a.label = 2;
                     case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, XUtils_1.XUtils.post('userSaveRow', { entity: this.getEntity(), object: this.state.object })];
                     case 3:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
                         e_1 = _a.sent();
                         XUtils_1.XUtils.showErrorMessage("Save row failed.", e_1);
                         return [2 /*return*/]; // zostavame vo formulari
-                    case 4:
+                    case 5:
                         this.props.openForm(null); // save zbehol, ideme naspet do browsu
                         return [2 /*return*/];
                 }
@@ -167,6 +169,7 @@ var XUserForm = /** @class */ (function (_super) {
             ];
         }
         return (react_1.default.createElement("div", null,
+            react_1.default.createElement(XFormHeader_1.XFormHeader, { label: "User" }),
             react_1.default.createElement("div", { className: "x-form-row" },
                 react_1.default.createElement("div", { className: "x-form-col" },
                     react_1.default.createElement(XInputDecimal_1.XInputDecimal, { form: this, field: "id", label: "ID", readOnly: true, labelStyle: { width: '14rem' } }),

package/lib/components/SourceCodeLinkEntity.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 export declare const SourceCodeLinkEntity: (props: {
     sourceCodeFile: string;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XAutoComplete.d.ts

@@ -24,6 +24,7 @@ export interface XAutoCompleteProps extends XFormComponentProps<XObject> {
     scrollHeight?: string;
     inputClassName?: string;
     inputStyle?: React.CSSProperties;
+    setFocusOnCreate?: boolean;
 }
 export declare class XAutoComplete extends XFormComponent<XObject, XAutoCompleteProps> {
     protected xAssoc: XAssoc;
@@ -39,5 +40,5 @@ export declare class XAutoComplete extends XFormComponent<XObject, XAutoComplete
         field: string;
         xError: XError;
     } | undefined;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XAutoComplete.js

@@ -27,7 +27,7 @@ var XAutoComplete = /** @class */ (function (_super) {
     __extends(XAutoComplete, _super);
     function XAutoComplete(props) {
         var _this = _super.call(this, props) || this;
-        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity()), props.assocField);
+        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOneByPath(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity()), props.assocField);
         _this.errorInBase = undefined;
         _this.onChangeAutoCompleteBase = _this.onChangeAutoCompleteBase.bind(_this);
         _this.onErrorChangeAutoCompleteBase = _this.onErrorChangeAutoCompleteBase.bind(_this);
@@ -70,7 +70,7 @@ var XAutoComplete = /** @class */ (function (_super) {
         // 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(), onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, itemTemplate: this.props.itemTemplate, searchBrowse: this.props.searchBrowse, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, readOnly: this.isReadOnly(), error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase, width: this.props.width, scrollHeight: this.props.scrollHeight, suggestions: this.props.suggestions, suggestionsLoad: this.props.suggestionsLoad, lazyLoadMaxRows: this.props.lazyLoadMaxRows, splitQueryValue: this.props.splitQueryValue, minLength: this.props.minLength, suggestionsQuery: { entity: this.xAssoc.entityName, filter: function () { return _this.getFilterBase(_this.props.filter); }, sortField: this.props.sortField, fields: this.props.fields }, inputClassName: this.props.inputClassName })));
+            react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, itemTemplate: this.props.itemTemplate, searchBrowse: this.props.searchBrowse, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, readOnly: this.isReadOnly(), error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase, width: this.props.width, scrollHeight: this.props.scrollHeight, suggestions: this.props.suggestions, suggestionsLoad: this.props.suggestionsLoad, lazyLoadMaxRows: this.props.lazyLoadMaxRows, splitQueryValue: this.props.splitQueryValue, minLength: this.props.minLength, suggestionsQuery: { entity: this.xAssoc.entityName, filter: function () { return _this.getFilterBase(_this.props.filter); }, sortField: this.props.sortField, fields: this.props.fields }, inputClassName: this.props.inputClassName, setFocusOnCreate: this.props.setFocusOnCreate })));
     };
     return XAutoComplete;
 }(XFormComponent_1.XFormComponent));

package/lib/components/XAutoCompleteBase.d.ts

@@ -1,19 +1,11 @@
 import React, { Component } from "react";
 import { AutoCompleteChangeEvent } from "primereact/autocomplete";
-import { OperationType } from "./XUtils";
+import { OperationType, XQuery } from "./XUtils";
 import { MenuItem } from "primereact/menuitem";
 import { XSearchBrowseParams } from "./XSearchBrowseParams";
-import { XCustomFilter } from "../serverApi/FindParam";
 import { DataTableSortMeta } from "primereact/datatable";
 export type XSuggestionsLoadProp = "eager" | "onSearchStart" | "lazy";
 export type XSuggestionsLoadType = "suggestions" | XSuggestionsLoadProp;
-export type XFilterOrFunction = XCustomFilter | (() => XCustomFilter | undefined);
-export interface XQuery {
-    entity: string;
-    filter?: XFilterOrFunction;
-    sortField?: string | DataTableSortMeta[];
-    fields?: string[];
-}
 export interface XAutoCompleteBaseProps {
     value: any;
     onChange: (object: any, objectChange: OperationType) => void;
@@ -27,6 +19,7 @@ export interface XAutoCompleteBaseProps {
     searchBrowse?: JSX.Element;
     valueForm?: JSX.Element;
     idField?: string;
+    onAddRow?: (inputValue: string) => void;
     minLength?: number;
     width?: string;
     scrollHeight?: string;
@@ -79,7 +72,8 @@ export declare class XAutoCompleteBase extends Component<XAutoCompleteBaseProps>
     formDialogOnHide(): void;
     searchDialogOnChoose(chosenRow: any): void;
     searchDialogOnHide(): void;
-    createInsertUpdateItems(splitButtonItems: MenuItem[]): void;
+    createInsertItem(splitButtonItems: MenuItem[]): void;
+    createUpdateItem(splitButtonItems: MenuItem[]): void;
     createSearchItem(splitButtonItems: MenuItem[]): void;
     createDropdownItem(splitButtonItems: MenuItem[]): void;
     onOpenDropdown(e: any): void;
@@ -92,5 +86,5 @@ export declare class XAutoCompleteBase extends Component<XAutoCompleteBaseProps>
     computeDefaultDisplayValue(suggestion: any): string;
     static isMoreSuggestions(suggestion: any): boolean;
     createSearchBrowseParams(): XSearchBrowseParams;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XAutoCompleteBase.js

@@ -487,21 +487,35 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
             this.setFocusToInput();
         }
     };
-    XAutoCompleteBase.prototype.createInsertUpdateItems = function (splitButtonItems) {
+    XAutoCompleteBase.prototype.createInsertItem = function (splitButtonItems) {
         var _this = this;
         splitButtonItems.push({
             icon: 'pi pi-plus',
             command: function (e) {
-                // otvorime dialog na insert
-                _this.formDialogObjectId = undefined;
-                _this.formDialogInitValuesForInsert = {};
-                // ak mame nevalidnu hodnotu, tak ju predplnime (snaha o user friendly)
-                if (_this.state.inputChanged) {
-                    _this.formDialogInitValuesForInsert[_this.getFirstField()] = _this.state.inputValueState;
+                if (_this.props.onAddRow) {
+                    // mame custom handler pre "plus" button
+                    // ak mame nevalidnu hodnotu, tak ju odovzdame (snaha o user friendly) - TODO - ak nie sme v nevalidnom stave
+                    var inputValue = "";
+                    if (_this.state.inputChanged) {
+                        inputValue = _this.state.inputValueState;
+                    }
+                    _this.props.onAddRow(inputValue);
+                }
+                else {
+                    // otvorime dialog na insert
+                    _this.formDialogObjectId = undefined;
+                    _this.formDialogInitValuesForInsert = {};
+                    // ak mame nevalidnu hodnotu, tak ju predplnime (snaha o user friendly)
+                    if (_this.state.inputChanged) {
+                        _this.formDialogInitValuesForInsert[_this.getFirstField()] = _this.state.inputValueState;
+                    }
+                    _this.setState({ formDialogOpened: true });
                 }
-                _this.setState({ formDialogOpened: true });
             }
         });
+    };
+    XAutoCompleteBase.prototype.createUpdateItem = function (splitButtonItems) {
+        var _this = this;
         splitButtonItems.push({
             icon: 'pi pi-pencil',
             command: function (e) {
@@ -642,11 +656,14 @@ var XAutoCompleteBase = /** @class */ (function (_super) {
         var readOnly = (_a = this.props.readOnly) !== null && _a !== void 0 ? _a : false;
         var dropdownButton;
         if (!readOnly) {
-            if (this.props.searchBrowse || this.props.valueForm) {
+            if (this.props.searchBrowse || this.props.valueForm || this.props.onAddRow) {
                 // mame searchBrowse alebo CRUD operacie, potrebujeme SplitButton
                 var splitButtonItems = [];
+                if (this.props.valueForm || this.props.onAddRow) {
+                    this.createInsertItem(splitButtonItems);
+                }
                 if (this.props.valueForm) {
-                    this.createInsertUpdateItems(splitButtonItems);
+                    this.createUpdateItem(splitButtonItems);
                 }
                 if (this.props.searchBrowse && !readOnly) {
                     this.createSearchItem(splitButtonItems);
@@ -684,7 +701,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", style: { width: this.props.width } },
-            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createErrorProps(error), { inputClassName: this.props.inputClassName })),
+            react_1.default.createElement(autocomplete_1.AutoComplete, __assign({ value: inputValue, suggestions: this.state.filteredSuggestions, completeMethod: this.completeMethod, itemTemplate: this.itemTemplate, onChange: this.onChange, onSelect: this.onSelect, onBlur: this.onBlur, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, ref: this.autoCompleteRef, readOnly: readOnly, disabled: readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(error), { inputClassName: this.props.inputClassName })),
             dropdownButton,
             this.props.valueForm != undefined ?
                 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.d.ts

@@ -36,5 +36,5 @@ export declare class XAutoCompleteDT extends XFormComponentDT<XAutoCompleteDTPro
         field: string;
         xError: XError;
     } | undefined;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XButton.d.ts

@@ -6,4 +6,4 @@ export declare const XButton: (props: {
     icon?: IconType<ButtonProps>;
     onClick: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
     disabled?: boolean | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XButtonIconMedium.d.ts

@@ -6,4 +6,4 @@ export declare const XButtonIconMedium: (props: {
     onClick: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
     disabled?: boolean | undefined;
     tooltip?: any;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XButtonIconNarrow.d.ts

@@ -7,4 +7,4 @@ export declare const XButtonIconNarrow: (props: {
     disabled?: boolean | undefined;
     tooltip?: any;
     addMargin?: boolean | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XButtonIconSmall.d.ts

@@ -6,4 +6,4 @@ export declare const XButtonIconSmall: (props: {
     onClick: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
     disabled?: boolean | undefined;
     tooltip?: any;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XCalendar.d.ts

@@ -1,9 +1,16 @@
-/// <reference types="react" />
-export declare const XCalendar: (props: {
-    id?: string | undefined;
-    value: Date | null;
-    onChange: (value: Date | null) => void;
-    readOnly?: boolean | undefined;
-    error?: string | undefined;
-    datetime?: boolean | undefined;
-}) => JSX.Element;
+import React from "react";
+import { XDateScale } from "../serverApi/XUtilsConversions";
+export declare const XCalendar: {
+    (props: {
+        id?: string | undefined;
+        value: Date | null;
+        onChange: (value: Date | null) => void;
+        readOnly?: boolean | undefined;
+        error?: string | undefined;
+        scale: XDateScale;
+        datetime?: boolean | undefined;
+    }): React.JSX.Element;
+    defaultProps: {
+        scale: XDateScale;
+    };
+};

package/lib/components/XCalendar.js

@@ -84,7 +84,7 @@ var XCalendar = function (props) {
     var onBlur = function (e) {
         if (inputChanged) {
             // poznamka: e.target.value aj inputValueState obsahuju tu istu string hodnotu
-            var value = (0, XUtilsConversions_1.dateFromUI)(e.target.value);
+            var value = (0, XUtilsConversions_1.dateFromUI)(e.target.value, props.scale);
             props.onChange(value !== null && value !== void 0 ? value : null); // nekorektnu hodnotu reprezentovanu cez undefined budeme riesit akokeby user zadal null (field sa vyprazdni)
             setInputChanged(false);
             setInputValueState(undefined); // pre poriadok
@@ -100,9 +100,28 @@ var XCalendar = function (props) {
         }
         return inputValue;
     };
+    var getView = function (dateScale) {
+        var view;
+        if (dateScale === XUtilsConversions_1.XDateScale.Date) {
+            view = "date";
+        }
+        else if (dateScale === XUtilsConversions_1.XDateScale.Month) {
+            view = "month";
+        }
+        else if (dateScale === XUtilsConversions_1.XDateScale.Year) {
+            view = "year";
+        }
+        else {
+            throw "Unimplemented dateScale = " + dateScale;
+        }
+        return view;
+    };
     var datetime = (_a = props.datetime) !== null && _a !== void 0 ? _a : false;
     // poznamka: parseDateTime nerobi ziadny parse, nechceme aby Calendar "rusil" uzivatela pri typovani datumu
     // konverzia (a volanie props.onChange) sa robi az pri onBlur
-    return (react_1.default.createElement(calendar_1.Calendar, __assign({ id: props.id, value: getInputValue(), onChange: onChange, disabled: props.readOnly, showIcon: true, showOnFocus: false, dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(), keepInvalid: true, parseDateTime: function (text) { return text; }, showTime: datetime, showSeconds: datetime, inputClassName: datetime ? 'x-input-datetime' : 'x-input-date', onSelect: onSelect, onBlur: onBlur }, XUtils_1.XUtils.createErrorProps(props.error))));
+    return (react_1.default.createElement(calendar_1.Calendar, __assign({ id: props.id, value: getInputValue(), onChange: onChange, disabled: props.readOnly, showIcon: true, showOnFocus: false, view: getView(props.scale), dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(props.scale), keepInvalid: true, parseDateTime: function (text) { return text; }, showTime: datetime, showSeconds: datetime, inputClassName: datetime ? 'x-input-datetime' : 'x-input-date', onSelect: onSelect, onBlur: onBlur }, XUtils_1.XUtils.createTooltipOrErrorProps(props.error))));
 };
 exports.XCalendar = XCalendar;
+exports.XCalendar.defaultProps = {
+    scale: XUtilsConversions_1.XDateScale.Date
+};

package/lib/components/XChangePasswordForm.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { XToken } from "./XToken";
+import React from "react";
 export declare const XChangePasswordForm: (props: {
     setXToken: (xToken: XToken | null) => void;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XCheckboxDT.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import React from "react";
 import { XField } from "../serverApi/XEntityMetadata";
 import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XCheckboxDT: (props: {
@@ -8,4 +8,4 @@ export declare const XCheckboxDT: (props: {
     field: string;
     rowData: any;
     readOnly?: XTableFieldReadOnlyProp | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XDataTable.d.ts

@@ -1,10 +1,10 @@
-import { ReactChild } from "react";
+import React, { ReactChild } from "react";
 export declare const XDataTable: (props: {
     entity: string;
     dataKey: string;
     onSelect: (selectedRow: any) => void;
     children: ReactChild[];
-}) => JSX.Element;
+}) => React.JSX.Element;
 export declare const XColumn: (props: {
     field: string;
     header?: any;

package/lib/components/XDropdown.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 import { XFilterProp, XFormComponent, XFormComponentProps } from "./XFormComponent";
 import { XAssoc } from "../serverApi/XEntityMetadata";
 import { XObject } from "./XObject";
@@ -14,5 +14,5 @@ export declare class XDropdown extends XFormComponent<XObject, XDropdownProps> {
     getField(): string;
     isNotNull(): boolean;
     getValue(): any | null;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XDropdown.js

@@ -27,7 +27,7 @@ var XDropdown = /** @class */ (function (_super) {
     __extends(XDropdown, _super);
     function XDropdown(props) {
         var _this = _super.call(this, props) || this;
-        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity()), props.assocField);
+        _this.xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOneByPath(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity()), props.assocField);
         props.form.addField(props.assocField + '.' + props.displayField);
         return _this;
     }

package/lib/components/XDropdownDT.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import React from "react";
 import { XDropdownOptionsMap, XTableFieldReadOnlyProp } from "./XFormDataTable2";
 import { XCustomFilter } from "../serverApi/FindParam";
 export declare const XDropdownDT: (props: {
@@ -13,4 +13,4 @@ export declare const XDropdownDT: (props: {
     onDropdownOptionsMapChange: (dropdownOptionsMap: XDropdownOptionsMap) => void;
     rowData: any;
     readOnly?: XTableFieldReadOnlyProp | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XDropdownDTFilter.d.ts

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

package/lib/components/XDropdownForEntity.d.ts

@@ -1,4 +1,4 @@
-import { Component } from "react";
+import React, { Component } from "react";
 import { DropdownChangeEvent } from "primereact/dropdown";
 import { XCustomFilter } from "../serverApi/FindParam";
 export interface XDropdownForEntityProps {
@@ -22,5 +22,5 @@ export declare class XDropdownForEntity extends Component<XDropdownForEntityProp
     componentDidMount(): void;
     loadOptions(): Promise<void>;
     onChange(e: DropdownChangeEvent): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XDropdownForEntity.js

@@ -144,7 +144,7 @@ var XDropdownForEntity = /** @class */ (function (_super) {
     XDropdownForEntity.prototype.render = function () {
         // TODO - mozno by nebolo od veci pouzivat InputText ak readOnly === true (chybala by len sipka (rozbalovac)) a dalo by sa copy-paste-ovat
         // propertiesy na Dropdown-e: readOnly vyseduje, disabled znemoznuje vyber polozky
-        return (react_1.default.createElement(dropdown_1.Dropdown, __assign({ id: this.props.id, options: this.state.options, optionLabel: this.props.displayField, dataKey: this.idField, value: this.props.value, onChange: this.onChange, readOnly: this.props.readOnly, disabled: this.props.readOnly }, XUtils_1.XUtils.createErrorProps(this.props.error))));
+        return (react_1.default.createElement(dropdown_1.Dropdown, __assign({ id: this.props.id, options: this.state.options, optionLabel: this.props.displayField, dataKey: this.idField, value: this.props.value, onChange: this.onChange, readOnly: this.props.readOnly, disabled: this.props.readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(this.props.error))));
     };
     return XDropdownForEntity;
 }(react_1.Component));

package/lib/components/XDropdownFormDTFilter.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from "react";
 import { XFormDataTable2 } from "./XFormDataTable2";
 export declare const XDropdownFormDTFilter: (props: {
     dataTable: XFormDataTable2;
     assocField: string;
     displayField: string;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XEditBrowse.d.ts

@@ -1,4 +1,4 @@
-import { Component } from "react";
+import React, { Component } from "react";
 import { XEditColumnDialogValues } from "./XEditColumnDialog";
 import { XBrowseMeta } from "../serverApi/XBrowseMetadata";
 export interface XEditBrowseProps {
@@ -29,5 +29,5 @@ export declare class XEditBrowse extends Component<XEditBrowseProps> {
     moveColumn(field: string, offset: -1 | 1): void;
     getIndexForColumn(field: string): number | undefined;
     onEdit(selectedRow: any): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XEditColumnDialog.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from "react";
 export interface XEditColumnDialogValues {
     field: string;
     header: string;
@@ -10,4 +10,4 @@ export declare const XEditColumnDialog: (props: {
     entity: string;
     xEditColumnDialogValues?: XEditColumnDialogValues | undefined;
     onHideDialog: (xEditColumnDialogValues: XEditColumnDialogValues | null) => void;
-}) => JSX.Element;
+}) => React.JSX.Element;