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

package/lib/components/XLazyDataTable.js

@@ -105,7 +105,7 @@ var XButton_1 = require("./XButton");
 var XUtils_1 = require("./XUtils");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XDropdownDTFilter_1 = require("./XDropdownDTFilter");
-var XUtilsConversions_1 = require("./XUtilsConversions");
+var XUtilsConversions_1 = require("../serverApi/XUtilsConversions");
 var FindParam_1 = require("../serverApi/FindParam");
 var XButtonIconSmall_1 = require("./XButtonIconSmall");
 var tristatecheckbox_1 = require("primereact/tristatecheckbox");
@@ -116,10 +116,11 @@ var XCalendar_1 = require("./XCalendar");
 var XInputDecimalBase_1 = require("./XInputDecimalBase");
 var XLocale_1 = require("./XLocale");
 var XFtsInput_1 = require("./XFtsInput");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XLazyDataTable = function (props) {
     var _a;
     // must be here, is used in createInitFilters()
-    var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity);
+    var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity);
     var createAggregateItems = function () {
         var e_1, _a;
         var aggregateItems = [];
@@ -152,7 +153,7 @@ var XLazyDataTable = function (props) {
                 var column = columns_2_1.value;
                 var xLazyColumn = column; // nevedel som to krajsie...
                 var field = xLazyColumn.props.field;
-                var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntity, field);
+                var xField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldByPath(xEntity, field);
                 // TODO column.props.dropdownInFilter - pre "menu" by bolo fajn mat zoznam "enumov"
                 var filterMatchMode = getFilterMatchMode(xField);
                 initFilters[field] = createFilterItem(props.filterDisplay, { value: null, matchMode: filterMatchMode });
@@ -170,7 +171,7 @@ var XLazyDataTable = function (props) {
     var getFilterMatchMode = function (xField) {
         var filterMatchMode;
         if (xField.type === "string") {
-            filterMatchMode = api_1.FilterMatchMode.STARTS_WITH;
+            filterMatchMode = api_1.FilterMatchMode.CONTAINS;
         }
         // zatial vsetky ostatne EQUALS
         else if (xField.type === "decimal" || xField.type === "number" || xField.type === "date" || xField.type === "datetime" || xField.type === "boolean") {
@@ -259,7 +260,7 @@ var XLazyDataTable = function (props) {
         }
     }); // eslint-disable-line react-hooks/exhaustive-deps
     // TODO - preco je to tu? presunut dole ak sa da...
-    var dataKey = props.dataKey !== undefined ? props.dataKey : XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity).idField;
+    var dataKey = props.dataKey !== undefined ? props.dataKey : XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity).idField;
     var onPage = function (event) { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             //console.log("zavolany onPage");
@@ -468,6 +469,14 @@ var XLazyDataTable = function (props) {
             }
         });
     }); };
+    var onClickAppButtonForRow = function (onClick) {
+        if (selectedRow !== null) {
+            onClick(selectedRow);
+        }
+        else {
+            alert((0, XLocale_1.xLocaleOption)('pleaseSelectRow'));
+        }
+    };
     var onClickExport = function () { return __awaiter(void 0, void 0, void 0, function () {
         var findParam, findResult;
         return __generator(this, function (_a) {
@@ -594,47 +603,15 @@ var XLazyDataTable = function (props) {
         return betweenFilter;
     };
     var valueAsUI = function (value, xField) {
-        var valueResult = '';
-        if (xField.type === "decimal") {
-            // tuto zatial hack, mal by vzdy prist number
-            var numberValue = null;
-            if (typeof value === 'string') {
-                numberValue = parseFloat(value);
-            }
-            else if (typeof value === 'number') {
-                numberValue = value;
-            }
-            valueResult = (0, XUtilsConversions_1.numberAsUI)(numberValue, xField.scale);
-        }
-        else if (xField.type === "date") {
-            // tuto zatial hack, mal by prist Date
-            var dateValue = null;
-            if (typeof value === 'string') {
-                dateValue = new Date(value);
-            }
-            else if (typeof value === 'object' && value instanceof Date) {
-                dateValue = value;
-            }
-            valueResult = (0, XUtilsConversions_1.dateAsUI)(dateValue);
-        }
-        else if (xField.type === "datetime") {
-            // tuto zatial hack, mal by prist Date
-            var dateValue = null;
-            if (typeof value === 'string') {
-                dateValue = new Date(value);
-            }
-            else if (typeof value === 'object' && value instanceof Date) {
-                dateValue = value;
-            }
-            valueResult = (0, XUtilsConversions_1.datetimeAsUI)(dateValue);
-        }
-        else if (xField.type === "boolean") {
+        var valueResult;
+        if (xField.type === "boolean") {
             // TODO - efektivnejsie by bolo renderovat len prislusne ikonky
             valueResult = react_1.default.createElement(tristatecheckbox_1.TriStateCheckbox, { value: value, disabled: true });
         }
         else {
-            // string a ine typy
-            valueResult = value;
+            // ine typy - convertValue vrati string
+            // mame zapnutu konverziu fromModel, lebo z json-u nam prichadzaju objekty typu string (napr. pri datumoch)
+            valueResult = (0, XUtilsConversions_1.convertValue)(xField, value, true, XUtilsConversions_1.AsUIType.Form);
         }
         return valueResult;
     };
@@ -743,12 +720,12 @@ var XLazyDataTable = function (props) {
     // export pre search button-y zatial vypneme
     var exportRows = (props.searchBrowseParams === undefined);
     // pre lepsiu citatelnost vytvarame stlpce uz tu
-    var columnElemList = react_1.default.Children.map(props.children, function (child) {
+    var columnElemList = react_1.default.Children.map(props.children.filter(function (child) { return XUtils_1.XUtils.xViewStatus(child.props.columnViewStatus) !== XUtils_1.XViewStatus.Hidden; }), function (child) {
         // ak chceme zmenit child element, tak treba bud vytvorit novy alebo vyklonovat
         // priklad je na https://soshace.com/building-react-components-using-children-props-and-context-api/
         // (vzdy musime robit manipulacie so stlpcom, lebo potrebujeme pridat filter={true} sortable={true}
         var childColumn = child; // nevedel som to krajsie...
-        var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntity, childColumn.props.field);
+        var xField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldByPath(xEntity, childColumn.props.field);
         // *********** header ***********
         var headerLabel = childColumn.props.header !== undefined ? childColumn.props.header : childColumn.props.field;
         var header;
@@ -782,7 +759,7 @@ var XLazyDataTable = function (props) {
             }
             else if (childColumn.props.dropdownInFilter) {
                 var dropdownValue = getDropdownFilterValue(childColumn.props.field);
-                filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange });
+                filterElement = react_1.default.createElement(XDropdownDTFilter_1.XDropdownDTFilter, { entity: props.entity, path: childColumn.props.field, value: dropdownValue, onValueChange: onDropdownFilterChange, filter: childColumn.props.dropdownFilter, sortField: childColumn.props.dropdownSortField });
             }
             else if (xField.type === "date" || xField.type === "datetime") {
                 betweenFilter = getBetweenFilter(childColumn.props.betweenFilter, props.betweenFilter);
@@ -903,6 +880,7 @@ var XLazyDataTable = function (props) {
             props.onEdit !== undefined && props.searchBrowseParams === undefined ? react_1.default.createElement(XButton_1.XButton, { key: "editRow", icon: "pi pi-pencil", label: (0, XLocale_1.xLocaleOption)('editRow'), onClick: onClickEdit }) : null,
             props.removeRow !== undefined && props.removeRow !== false && props.searchBrowseParams === undefined ? react_1.default.createElement(XButton_1.XButton, { key: "removeRow", icon: "pi pi-times", label: (0, XLocale_1.xLocaleOption)('removeRow'), onClick: onClickRemoveRow }) : null,
             exportRows ? react_1.default.createElement(XButton_1.XButton, { key: "exportRows", icon: "pi pi-file-export", label: (0, XLocale_1.xLocaleOption)('exportRows'), onClick: onClickExport }) : null,
+            props.appButtonsForRow ? props.appButtonsForRow.map(function (xAppButton) { return react_1.default.createElement(XButton_1.XButton, { key: xAppButton.key, icon: xAppButton.icon, label: xAppButton.label, onClick: function () { return onClickAppButtonForRow(xAppButton.onClick); } }); }) : null,
             props.appButtons,
             props.searchBrowseParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "choose", label: (0, XLocale_1.xLocaleOption)('chooseRow'), onClick: onClickChoose }) : null,
             exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { key: "exportRowsDialog", dialogOpened: exportRowsDialogOpened, hideDialog: function () { return setExportRowsDialogOpened(false); }, rowCount: exportRowsDialogRowCount, exportParams: createExportParams }) : null)));
@@ -924,3 +902,6 @@ var XLazyColumn = function (props) {
     return (null);
 };
 exports.XLazyColumn = XLazyColumn;
+exports.XLazyColumn.defaultProps = {
+    columnViewStatus: true // XViewStatus.ReadWrite
+};

package/lib/components/XSearchButton.js

@@ -71,13 +71,13 @@ var inputtext_1 = require("primereact/inputtext");
 var button_1 = require("primereact/button");
 var XUtils_1 = require("./XUtils");
 var dialog_1 = require("primereact/dialog");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XFormComponent_1 = require("./XFormComponent");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XSearchButton = /** @class */ (function (_super) {
     __extends(XSearchButton, _super);
     function XSearchButton(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.inputTextRef = react_1.default.createRef();
         // POVODNY KOD
         //this.overlayPanelEl = React.createRef();
@@ -99,8 +99,8 @@ var XSearchButton = /** @class */ (function (_super) {
         var _this = this;
         var _a;
         var props = this.props;
-        var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntity(this.xAssoc.entityName);
-        var xDisplayField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntityAssoc, props.displayField);
+        var xEntityAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(this.xAssoc.entityName);
+        var xDisplayField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldByPath(xEntityAssoc, props.displayField);
         // tu boli hook-y kedysi...
         var inputChanged = this.state.inputChanged;
         var setInputChanged = function (inputChanged) { _this.setState({ inputChanged: inputChanged }); };

package/lib/components/XSearchButtonDT.js

@@ -81,7 +81,7 @@ var XUtils_1 = require("./XUtils");
 var inputtext_1 = require("primereact/inputtext");
 var button_1 = require("primereact/button");
 var dialog_1 = require("primereact/dialog");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XSearchButtonDT = function (props) {
     var inputTextRef = (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
@@ -147,8 +147,8 @@ var XSearchButtonDT = function (props) {
         }
         else {
             if (props.assocForm !== undefined) {
-                var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.entity);
-                var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntityForAssocToOne(xEntity, props.assocField);
+                var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity);
+                var xEntityAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntityForAssocToOne(xEntity, props.assocField);
                 if (props.rowData !== null) {
                     var assocObject = props.rowData[props.assocField];
                     // OTAZKA - ziskavat id priamo z root objektu? potom ho vsak treba do root objektu pridat

package/lib/components/XSearchButtonOld.js

@@ -81,14 +81,14 @@ var inputtext_1 = require("primereact/inputtext");
 var button_1 = require("primereact/button");
 var XUtils_1 = require("./XUtils");
 var dialog_1 = require("primereact/dialog");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XSearchButtonOld = function (props) {
     var _a, _b, _c;
     props.form.addField(props.assocField + '.' + props.displayField);
-    var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.form.getEntity());
-    var xAssoc = XUtilsMetadata_1.XUtilsMetadata.getXAssocToOne(xEntity, props.assocField);
-    var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntity(xAssoc.entityName);
-    var xDisplayField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPath(xEntityAssoc, props.displayField);
+    var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity());
+    var xAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(xEntity, props.assocField);
+    var xEntityAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(xAssoc.entityName);
+    var xDisplayField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXFieldByPath(xEntityAssoc, props.displayField);
     // POVODNY KOD
     //const overlayPanelEl = useRef<any>(null);
     var inputTextEl = (0, react_1.useRef)(null);

package/lib/components/XToOneAssocButton.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.XToOneAssocButton = void 0;
 var react_1 = __importDefault(require("react"));
 var button_1 = require("primereact/button");
-var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtils_1 = require("./XUtils");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var XToOneAssocButton = function (props) {
     // mozno lepsie by bolo sem dat xEntityAssoc.idField ale postaci aj *FAKE*
     props.form.addField(props.assocField + '.*FAKE*');
@@ -15,8 +15,8 @@ var XToOneAssocButton = function (props) {
     var object = props.form.state.object;
     var assocObject = object !== null ? object[props.assocField] : null;
     var onClickButton = function (e) {
-        var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.form.getEntity());
-        var xEntityAssoc = XUtilsMetadata_1.XUtilsMetadata.getXEntityForAssocToOne(xEntity, props.assocField);
+        var xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.form.getEntity());
+        var xEntityAssoc = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntityForAssocToOne(xEntity, props.assocField);
         // OTAZKA - ziskavat id priamo z root objektu? potom ho vsak treba do root objektu pridat
         var id = assocObject !== null ? assocObject[xEntityAssoc.idField] : null;
         // klonovanim elementu pridame atribut id

package/lib/components/XUtils.d.ts

@@ -13,6 +13,12 @@ export declare enum OperationType {
     Update = 2,
     Remove = 3
 }
+export declare enum XViewStatus {
+    ReadWrite = 0,
+    ReadOnly = 1,
+    Hidden = 2
+}
+export type XViewStatusOrBoolean = XViewStatus | boolean;
 export interface IPostgresInterval {
     years?: number;
     months?: number;
@@ -103,5 +109,7 @@ export declare class XUtils {
     static normalizeString(value: string): string;
     static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
     static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
+    static filterIdIn(idField: string, idList: number[]): XCustomFilter;
     static isTableRowInserted(tableRow: any): boolean;
+    static xViewStatus(xViewStatusOrBoolean: XViewStatusOrBoolean): XViewStatus;
 }

package/lib/components/XUtils.js

@@ -83,12 +83,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XUtils = exports.OperationType = void 0;
+exports.XUtils = exports.XViewStatus = exports.OperationType = void 0;
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 var ExportImportParam_1 = require("../serverApi/ExportImportParam");
 var XResponseError_1 = require("./XResponseError");
 var FindParam_1 = require("../serverApi/FindParam");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 var OperationType;
 (function (OperationType) {
     OperationType[OperationType["None"] = 0] = "None";
@@ -96,6 +97,12 @@ var OperationType;
     OperationType[OperationType["Update"] = 2] = "Update";
     OperationType[OperationType["Remove"] = 3] = "Remove";
 })(OperationType = exports.OperationType || (exports.OperationType = {}));
+var XViewStatus;
+(function (XViewStatus) {
+    XViewStatus[XViewStatus["ReadWrite"] = 0] = "ReadWrite";
+    XViewStatus[XViewStatus["ReadOnly"] = 1] = "ReadOnly";
+    XViewStatus[XViewStatus["Hidden"] = 2] = "Hidden";
+})(XViewStatus = exports.XViewStatus || (exports.XViewStatus = {}));
 var XUtils = /** @class */ (function () {
     function XUtils() {
     }
@@ -454,7 +461,7 @@ var XUtils = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(entity);
+                        xEntity = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(entity);
                         id = row[xEntity.idField];
                         return [4 /*yield*/, XUtils.post('removeRow', { entity: entity, id: id })];
                     case 1:
@@ -724,10 +731,26 @@ var XUtils = /** @class */ (function () {
         return customFilterItemsResult;
     };
     // pomocna metodka
+    // ak je idList prazdny, vytvori podmienku id IN (0) a nevrati ziadne zaznamy
+    XUtils.filterIdIn = function (idField, idList) {
+        return { where: "[".concat(idField, "] IN (:...idList)"), params: { "idList": idList.length > 0 ? idList : [0] } };
+    };
+    // pomocna metodka
     XUtils.isTableRowInserted = function (tableRow) {
         var _a;
         return (_a = tableRow.__x_generatedRowId) !== null && _a !== void 0 ? _a : false; // specialny priznak, ze sme vygenerovali id-cko
     };
+    // pomocna metodka
+    XUtils.xViewStatus = function (xViewStatusOrBoolean) {
+        var xViewStatus;
+        if (typeof xViewStatusOrBoolean === "boolean") {
+            xViewStatus = xViewStatusOrBoolean ? XViewStatus.ReadWrite : XViewStatus.Hidden;
+        }
+        else {
+            xViewStatus = xViewStatusOrBoolean;
+        }
+        return xViewStatus;
+    };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela

package/lib/components/XUtilsMetadata.d.ts

@@ -1,25 +1,10 @@
-import { XAssoc, XEntity, XField, XRelationType } from "../serverApi/XEntityMetadata";
+import { XField } from "../serverApi/XEntityMetadata";
 import { XBrowseMeta } from "../serverApi/XBrowseMetadata";
 import { XBetweenFilterProp } from "./XLazyDataTable";
 export declare class XUtilsMetadata {
-    private static xEntityMap;
     private static xBrowseMetaMap;
     static fetchAndSetXEntityMap(): Promise<any>;
     static fetchAndSetXBrowseMetaMap(): Promise<any>;
-    static getXEntity(entity: string): XEntity;
-    static getXField(xEntity: XEntity, field: string): XField;
-    static getXFieldByPath(xEntity: XEntity, path: string): XField;
-    static getXFieldByPathStr(entity: string, path: string): XField;
-    static getXAssocByPath(xEntity: XEntity, path: string): XAssoc;
-    static getLastXAssocByPath(xEntity: XEntity, path: string): XAssoc;
-    static getXAssocToOne(xEntity: XEntity, assocField: string): XAssoc;
-    static getXAssocToMany(xEntity: XEntity, assocField: string): XAssoc;
-    static getXAssocToOneByAssocEntity(xEntity: XEntity, assocEntityName: string): XAssoc;
-    static getXAssocToManyByAssocEntity(xEntity: XEntity, assocEntityName: string): XAssoc;
-    static getXEntityForAssocToOne(xEntity: XEntity, assocField: string): XEntity;
-    static getXEntityForAssocToMany(xEntity: XEntity, assocField: string): XEntity;
-    static getXFieldList(xEntity: XEntity): XField[];
-    static getXAssocList(xEntity: XEntity, relationTypeList?: XRelationType[]): XAssoc[];
     static getParamsForInputNumber(xField: XField): {
         useGrouping: boolean;
         fractionDigits?: number;
@@ -33,7 +18,4 @@ export declare class XUtilsMetadata {
     static getXBrowseMeta(entity: string, browseId?: string): XBrowseMeta;
     static setXBrowseMeta(entity: string, browseId: string | undefined, xBrowseMeta: XBrowseMeta): void;
     static getXBrowseFormMetaKey(entity: string, browseId?: string): string;
-    private static getXAssoc;
-    private static getXAssocByAssocEntity;
-    private static getXEntityForAssoc;
 }

package/lib/components/XUtilsMetadata.js

@@ -35,37 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XUtilsMetadata = void 0;
 var XUtils_1 = require("./XUtils");
-var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
 // idelany nazov: UtilsEntityMetadata - ale strasne dlhy
 // tato funkcionalita by mala ist bud do tried XEntity, XField alebo lepsie do nejakeho servisu
 // ekvivalentna funkcionalita sa nachadza aj na servri v servise XEntityMetadataService.ts (TODO - v buducnosti spravit spolocnu triedu/servis)
@@ -74,16 +47,16 @@ var XUtilsMetadata = /** @class */ (function () {
     }
     XUtilsMetadata.fetchAndSetXEntityMap = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (!(XUtilsMetadata.xEntityMap === undefined)) return [3 /*break*/, 2];
-                        _a = XUtilsMetadata;
+                        if (!(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntityMap() === undefined)) return [3 /*break*/, 2];
+                        _b = (_a = XUtilsMetadataCommon_1.XUtilsMetadataCommon).setXEntityMap;
                         return [4 /*yield*/, XUtils_1.XUtils.fetch("getXEntityMap", { dummy: "dummy" })];
                     case 1:
-                        _a.xEntityMap = _b.sent();
-                        _b.label = 2;
+                        _b.apply(_a, [_c.sent()]);
+                        _c.label = 2;
                     case 2: return [2 /*return*/];
                 }
             });
@@ -106,111 +79,6 @@ var XUtilsMetadata = /** @class */ (function () {
             });
         });
     };
-    XUtilsMetadata.getXEntity = function (entity) {
-        var xEntity = XUtilsMetadata.xEntityMap[entity];
-        if (xEntity === undefined) {
-            throw "Entity ".concat(entity, " was not found in entity metadata");
-        }
-        return xEntity;
-    };
-    XUtilsMetadata.getXField = function (xEntity, field) {
-        // 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 ".concat(field, " was not found in entity ").concat(xEntity.name);
-        }
-        return xField;
-    };
-    XUtilsMetadata.getXFieldByPath = function (xEntity, path) {
-        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
-        if (restPath === null) {
-            return XUtilsMetadata.getXField(xEntity, field);
-        }
-        else {
-            var xAssoc = XUtilsMetadata.getXAssoc(xEntity, field);
-            var xAssocEntity = XUtilsMetadata.getXEntity(xAssoc.entityName);
-            return XUtilsMetadata.getXFieldByPath(xAssocEntity, restPath);
-        }
-    };
-    XUtilsMetadata.getXFieldByPathStr = function (entity, path) {
-        return XUtilsMetadata.getXFieldByPath(XUtilsMetadata.getXEntity(entity), path);
-    };
-    XUtilsMetadata.getXAssocByPath = function (xEntity, path) {
-        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
-        if (restPath === null) {
-            return XUtilsMetadata.getXAssoc(xEntity, field);
-        }
-        else {
-            var xAssoc = XUtilsMetadata.getXAssoc(xEntity, field);
-            var xAssocEntity = XUtilsMetadata.getXEntity(xAssoc.entityName);
-            return XUtilsMetadata.getXAssocByPath(xAssocEntity, restPath);
-        }
-    };
-    // for path assoc1.assoc2.field returns assoc2 (last assoc before field)
-    XUtilsMetadata.getLastXAssocByPath = function (xEntity, path) {
-        var pathToAssoc = XUtilsCommon_1.XUtilsCommon.getPathToAssoc(path);
-        return XUtilsMetadata.getXAssocByPath(xEntity, pathToAssoc);
-    };
-    XUtilsMetadata.getXAssocToOne = function (xEntity, assocField) {
-        return XUtilsMetadata.getXAssoc(xEntity, assocField, ["many-to-one", "one-to-one"]);
-    };
-    XUtilsMetadata.getXAssocToMany = function (xEntity, assocField) {
-        return XUtilsMetadata.getXAssoc(xEntity, assocField, ["one-to-many", "many-to-many"]);
-    };
-    XUtilsMetadata.getXAssocToOneByAssocEntity = function (xEntity, assocEntityName) {
-        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, assocEntityName, ["many-to-one", "one-to-one"]);
-    };
-    XUtilsMetadata.getXAssocToManyByAssocEntity = function (xEntity, assocEntityName) {
-        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, assocEntityName, ["one-to-many", "many-to-many"]);
-    };
-    XUtilsMetadata.getXEntityForAssocToOne = function (xEntity, assocField) {
-        return XUtilsMetadata.getXEntityForAssoc(XUtilsMetadata.getXAssocToOne(xEntity, assocField));
-    };
-    XUtilsMetadata.getXEntityForAssocToMany = function (xEntity, assocField) {
-        return XUtilsMetadata.getXEntityForAssoc(XUtilsMetadata.getXAssocToMany(xEntity, assocField));
-    };
-    XUtilsMetadata.getXFieldList = function (xEntity) {
-        var e_1, _a;
-        var xFieldList = [];
-        try {
-            for (var _b = __values(Object.entries(xEntity.fieldMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), key = _d[0], xField = _d[1];
-                // assoc fieldy sa nachadzaju aj v xEntity.fieldMap ako typ number (netusim preco), preto ich vyfiltrujeme
-                if (xEntity.assocMap[xField.name] === undefined) {
-                    xFieldList.push(xField);
-                }
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return xFieldList;
-    };
-    XUtilsMetadata.getXAssocList = function (xEntity, relationTypeList) {
-        var e_2, _a;
-        //const xAssocList: XAssoc[] = Array.from(xEntity.assocMap, (v: XAssoc, k: string) => v);
-        var xAssocList = [];
-        try {
-            for (var _b = __values(Object.entries(xEntity.assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), key = _d[0], xAssoc = _d[1];
-                if (relationTypeList === undefined || relationTypeList.includes(xAssoc.relationType)) {
-                    xAssocList.push(xAssoc);
-                }
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        return xAssocList;
-    };
     // docasne sem, kym nemame jednotny XInputDecimal/XInputDecimalDT
     XUtilsMetadata.getParamsForInputNumber = function (xField) {
         var useGrouping = true;
@@ -399,52 +267,6 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return key;
     };
-    XUtilsMetadata.getXAssoc = function (xEntity, assocField, relationTypeList) {
-        var xAssoc = xEntity.assocMap[assocField];
-        if (xAssoc === undefined) {
-            throw "Assoc ".concat(assocField, " was not found in entity = ").concat(xEntity.name);
-        }
-        // relationTypeList is optional and is only for check (not to get some unwanted type of assoc)
-        if (relationTypeList !== undefined && !relationTypeList.includes(xAssoc.relationType)) {
-            throw "Assoc ".concat(assocField, " in entity ").concat(xEntity.name, " is of type ").concat(xAssoc.relationType, " and required type is ").concat(JSON.stringify(relationTypeList));
-        }
-        return xAssoc;
-    };
-    XUtilsMetadata.getXAssocByAssocEntity = function (xEntity, assocEntityName, relationTypeList) {
-        var e_3, _a;
-        var xAssocFound = undefined;
-        try {
-            for (var _b = __values(Object.entries(xEntity.assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), key = _d[0], xAssoc = _d[1];
-                if (xAssoc.entityName === assocEntityName) {
-                    if (xAssocFound === undefined) {
-                        xAssocFound = xAssoc;
-                    }
-                    else {
-                        throw "In entity ".concat(xEntity.name, " found more then 1 assoc for assocEntityName = ").concat(assocEntityName);
-                    }
-                }
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
-        if (xAssocFound === undefined) {
-            throw "Assoc for assocEntityName = ".concat(assocEntityName, " not found in entity ").concat(xEntity.name);
-        }
-        // relationTypeList is optional and is only for check (not to get some unwanted type of assoc)
-        if (relationTypeList !== undefined && !relationTypeList.includes(xAssocFound.relationType)) {
-            throw "Assoc for assocEntityName = ".concat(assocEntityName, " in entity ").concat(xEntity.name, " is of type ").concat(xAssocFound.relationType, " and required type is ").concat(JSON.stringify(relationTypeList));
-        }
-        return xAssocFound;
-    };
-    XUtilsMetadata.getXEntityForAssoc = function (xAssoc) {
-        return XUtilsMetadata.getXEntity(xAssoc.entityName);
-    };
     //static CHAR_SIZE: number = 0.57; // 0.57rem (8px)
     XUtilsMetadata.CHAR_SIZE = 0.5; // 0.5rem (7px) - skusime
     return XUtilsMetadata;

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

@@ -24,6 +24,9 @@
         "fileDownloadFailed": "File download failed.",
         "fieldSetSaveEditConfirm": "Are you sure to save the form?",
         "fieldSetCancelEditConfirm": "Are you sure to cancel editing? All changes will be lost.",
-        "fieldSetRemoveFieldConfirm": "Are you sure to remove the field?"
+        "fieldSetRemoveFieldConfirm": "Are you sure to remove the field?",
+        "upload": "Upload",
+        "yes": "yes",
+        "no": "no"
     }
 }

package/lib/{components → serverApi}/XUtilsConversions.d.ts

@@ -1,6 +1,8 @@
-import { IPostgresInterval } from "./XUtils";
+import { IPostgresInterval } from "../components/XUtils";
+import { XField } from "./XEntityMetadata";
 export declare function stringFromUI(stringValue: string): string | null;
 export declare function stringAsUI(value: string | null): string;
+export declare function stringAsDB(value: string | null): string;
 export declare function numberFromUI(stringValue: string): number | null;
 export declare function numberAsUI(value: number | null, fractionDigits?: number): string;
 export declare function numberFromModel(value: any): number | null;
@@ -13,3 +15,18 @@ export declare function dateFormatCalendar(): string;
 export declare function datetimeFormatUI(): string;
 export declare function intervalFromUI(valueString: string): IPostgresInterval | null | undefined;
 export declare function intervalAsUI(valueInterval: IPostgresInterval | null): string;
+export declare function booleanAsUIText(value: boolean | null): string;
+export declare enum AsUIType {
+    Form = 1,
+    Text = 2
+}
+/**
+ * converts values of object
+ *
+ * @param entity
+ * @param object
+ * @param fromModel
+ * @param asUI
+ */
+export declare function convertObject(entity: string, object: any, fromModel: boolean, asUI: AsUIType | undefined): void;
+export declare function convertValue(xField: XField, value: any, fromModel: boolean, asUI: AsUIType | undefined): any;