@michalrakus/x-react-web-lib 1.10.0 → 1.11.1

package/lib/components/XFormNavigator3.js

@@ -110,11 +110,11 @@ var XFormNavigator3 = /** @class */ (function (_super) {
     };
     XFormNavigator3.prototype.render = function () {
         var _this = this;
-        var formElements = this.props.rootFormElement !== null ? __spreadArray([this.props.rootFormElement], __read(this.state.formElements), false) : this.state.formElements;
+        var formElements = this.props.rootFormElement ? __spreadArray([this.props.rootFormElement], __read(this.state.formElements), false) : this.state.formElements;
         var forms = formElements.map(function (formElement, index) {
             var displayed = (index === formElements.length - 1);
             // klonovanim elementu pridame atribut openForm={this.openForm} (nemusime tento atribut pridavat pri vytvarani elementu)
-            var formElementCloned = react_1.default.cloneElement(formElement, { openForm: _this.openForm, displayed: displayed }, formElement.children);
+            var formElementCloned = react_1.default.cloneElement(formElement, { openForm: _this.openForm, displayed: displayed } /*, (formElement as any).children*/);
             // prvych n - 1 komponentov skryjeme cez display: "none" a az posledny vyrenderujeme naozaj (cez display: "block")
             // TODO - do buducnosti - ak nechceme drzat stav componentu cez display: "none", staci vratit null (komponent vobec nevyrenderujeme)
             var display = (displayed ? "block" : "none");

package/lib/components/XInputDateDT.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
 import { XField } from "../serverApi/XEntityMetadata";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XInputDateDT: (props: {
     form: XFormBase;
     xField: XField;
     field: string;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XInputDateDT.js

@@ -8,18 +8,10 @@ var XUtilsConversions_1 = require("./XUtilsConversions");
 var calendar_1 = require("primereact/calendar");
 var react_1 = __importDefault(require("react"));
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
+var XUtils_1 = require("./XUtils");
 var XInputDateDT = function (props) {
     var showTime = (props.xField.type === 'datetime');
     var cssClassName = showTime ? 'x-input-datetime' : 'x-input-date';
-    // ak mame path, field je vzdy readOnly
-    var readOnly;
-    var posDot = props.field.indexOf(".");
-    if (posDot !== -1) {
-        readOnly = true;
-    }
-    else {
-        readOnly = props.readOnly !== undefined ? props.readOnly : false;
-    }
     var onValueChange = function (field, rowData, newValue) {
         // z Calendar prichadza e.value - typ Date alebo null
         // zmenime hodnotu v modeli (odtial sa hodnota cita)
@@ -47,6 +39,7 @@ var XInputDateDT = function (props) {
         }
         // fieldValue zostalo undefined (konvertujeme null -> undefined) - Calendar pozaduje undefined, nechce null
     }
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(props.field, props.readOnly, props.form.state.object, props.rowData);
     // TODO - nefunguje dobre pridavanie noveho riadku - su tam stare neupdatnute hodnoty - este to asi neopravili https://github.com/primefaces/primereact/issues/1277
     // test mame na TestovaciForm
     // appendTo={document.body} appenduje overlay panel na element body - eliminuje problem s overflow (pozri poznamku v XDropdownDTFilter)

package/lib/components/XInputTextDT.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XInputTextDT: (props: {
     form: XFormBase;
     entity: string;
     field: string;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XInputTextDT.js

@@ -9,17 +9,9 @@ var inputtext_1 = require("primereact/inputtext");
 var XUtilsConversions_1 = require("./XUtilsConversions");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
+var XUtils_1 = require("./XUtils");
 var XInputTextDT = function (props) {
     var xField = XUtilsMetadata_1.XUtilsMetadata.getXFieldByPathStr(props.entity, props.field);
-    // ak mame path, field je vzdy readOnly
-    var readOnly;
-    var posDot = props.field.indexOf(".");
-    if (posDot !== -1) {
-        readOnly = true;
-    }
-    else {
-        readOnly = props.readOnly !== undefined ? props.readOnly : false;
-    }
     var onValueChange = function (field, rowData, newValue) {
         // zmenime hodnotu v modeli (odtial sa hodnota cita)
         rowData[field] = (0, XUtilsConversions_1.stringFromUI)(newValue);
@@ -37,6 +29,7 @@ var XInputTextDT = function (props) {
         // konvertovat null hodnotu na "" (vo funkcii stringAsUI) je dolezite aby sa prejavila zmena na null v modeli (a tiez aby korektne pridal novy riadok)
         fieldValue = (0, XUtilsConversions_1.stringAsUI)(rowDataValue);
     }
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(props.field, props.readOnly, props.form.state.object, props.rowData);
     return (react_1.default.createElement(inputtext_1.InputText, { id: props.field, value: fieldValue, onChange: function (e) { return onValueChange(props.field, props.rowData, e.target.value); }, readOnly: readOnly, maxLength: xField.length, className: "x-input-to-resize" }));
 };
 exports.XInputTextDT = XInputTextDT;

package/lib/components/XLazyDataTable.d.ts

@@ -1,7 +1,7 @@
 import React, { ReactChild } from 'react';
 import { DataTableFilterMeta, DataTableFilterMetaData, DataTableOperatorFilterMetaData } from 'primereact/datatable';
 import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
-import { SearchTableParams } from "./SearchTableParams";
+import { XSearchBrowseParams } from "./XSearchBrowseParams";
 import { XAggregateType, XCustomFilter } from "../serverApi/FindParam";
 import { XOnSaveOrCancelProp } from "./XFormBase";
 export type XBetweenFilterProp = "row" | "column" | undefined;
@@ -15,6 +15,13 @@ export interface XEditModeHandlers {
     onMoveColumnLeft: (field: string) => void;
     onMoveColumnRight: (field: string) => void;
 }
+export interface XBrowseProps {
+    displayed?: boolean;
+    openForm?: (newFormElement: JSX.Element | null) => void;
+}
+export interface XSearchBrowseProps {
+    searchBrowseParams?: XSearchBrowseParams;
+}
 export interface XLazyDataTableProps {
     entity: string;
     dataKey?: string;
@@ -35,7 +42,7 @@ export interface XLazyDataTableProps {
     filters?: DataTableFilterMeta;
     customFilter?: XCustomFilter;
     sortField?: string;
-    searchTableParams?: SearchTableParams;
+    searchBrowseParams?: XSearchBrowseParams;
     width?: string;
     dataLoadedState?: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
     editMode?: boolean;

package/lib/components/XLazyDataTable.js

@@ -208,13 +208,15 @@ var XLazyDataTable = function (props) {
     if (props.filters) {
         filtersInit = __assign(__assign({}, filtersInit), props.filters); // items from props.filters will replace existing items in filtersInit
     }
-    if (props.searchTableParams !== undefined) {
-        var displayFieldFilter = props.searchTableParams.displayFieldFilter;
+    if (props.searchBrowseParams !== undefined) {
+        var displayFieldFilter = props.searchBrowseParams.displayFieldFilter;
         if (displayFieldFilter !== undefined) {
             filtersInit[displayFieldFilter.field] = createFilterItem(props.filterDisplay, displayFieldFilter.constraint);
         }
-        // ak mame props.searchTableParams.customFilterItems, pridame ho
-        customFilterItems = XUtils_1.XUtils.filterAnd(customFilterItems, props.searchTableParams.customFilter);
+        // ak mame props.searchBrowseParams.customFilterFunction, pridame filter
+        if (props.searchBrowseParams.customFilterFunction) {
+            customFilterItems = XUtils_1.XUtils.filterAnd(customFilterItems, props.searchBrowseParams.customFilterFunction());
+        }
     }
     var _f = __read((0, react_1.useState)(filtersInit), 2), filters = _f[0], setFilters = _f[1]; // filtrovanie na "controlled manner" (moze sa sem nainicializovat nejaka hodnota)
     var _g = __read((0, react_1.useState)(props.sortField ? [{ field: props.sortField, order: 1 }] : []), 2), multiSortMeta = _g[0], setMultiSortMeta = _g[1];
@@ -364,11 +366,11 @@ var XLazyDataTable = function (props) {
     var onRowDoubleClick = function (event) {
         //console.log("zavolany onRowDoubleClick");
         //console.log(event.data);
-        if (props.onEdit !== undefined) {
+        if (props.onEdit !== undefined && props.searchBrowseParams === undefined) {
             props.onEdit(event.data);
         }
-        else if (props.searchTableParams !== undefined) {
-            props.searchTableParams.onChoose(event.data);
+        else if (props.searchBrowseParams !== undefined) {
+            props.searchBrowseParams.onChoose(event.data);
         }
     };
     var onClickAddRow = function () {
@@ -472,8 +474,8 @@ var XLazyDataTable = function (props) {
     var onClickChoose = function () {
         //console.log("zavolany onClickChoose");
         if (selectedRow !== null) {
-            if (props.searchTableParams !== undefined) {
-                props.searchTableParams.onChoose(selectedRow);
+            if (props.searchBrowseParams !== undefined) {
+                props.searchBrowseParams.onChoose(selectedRow);
             }
         }
         else {
@@ -648,7 +650,7 @@ var XLazyDataTable = function (props) {
                 // }
                 var viewHeight = void 0;
                 var headerFooterHeight = void 0;
-                if (props.searchTableParams === undefined) {
+                if (props.searchBrowseParams === undefined) {
                     // sme v standardnom formulari
                     viewHeight = '100vh';
                     // experimentalne zistena vyska header/footer
@@ -717,7 +719,7 @@ var XLazyDataTable = function (props) {
     }
     // else - editMode is undefined - browse is not editable
     // export pre search button-y zatial vypneme
-    var exportRows = (props.searchTableParams === undefined);
+    var exportRows = (props.searchBrowseParams === undefined);
     // pre lepsiu citatelnost vytvarame stlpce uz tu
     var columnElemList = react_1.default.Children.map(props.children, function (child) {
         // ak chceme zmenit child element, tak treba bud vytvorit novy alebo vyklonovat
@@ -873,12 +875,12 @@ var XLazyDataTable = function (props) {
         react_1.default.createElement("div", { className: "flex justify-content-center" },
             react_1.default.createElement(datatable_1.DataTable, { value: value.rowList, dataKey: dataKey, paginator: props.paginator, rows: rows, totalRecords: value.totalRecords, lazy: true, first: first, onPage: onPage, loading: loading, filterDisplay: props.filterDisplay, filters: filters, onFilter: onFilter, sortMode: "multiple", removableSort: true, multiSortMeta: multiSortMeta, onSort: onSort, selectionMode: "single", selection: selectedRow, onSelectionChange: onSelectionChange, onRowDoubleClick: onRowDoubleClick, ref: dataTableEl, className: "p-datatable-sm x-lazy-datatable", resizableColumns: true, columnResizeMode: "expand", tableStyle: tableStyle, paginatorLeft: paginatorLeft, paginatorRight: paginatorRight, scrollable: props.scrollable, scrollHeight: scrollHeight, style: style }, columnElemList)),
         react_1.default.createElement("div", { className: "flex justify-content-center" },
-            props.onAddRow !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "addRow", icon: "pi pi-plus", label: (0, XLocale_1.xLocaleOption)('addRow'), onClick: onClickAddRow }) : null,
-            props.onEdit !== 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 ? react_1.default.createElement(XButton_1.XButton, { key: "removeRow", icon: "pi pi-times", label: (0, XLocale_1.xLocaleOption)('removeRow'), onClick: onClickRemoveRow }) : null,
+            props.onAddRow !== undefined && props.searchBrowseParams === undefined ? react_1.default.createElement(XButton_1.XButton, { key: "addRow", icon: "pi pi-plus", label: (0, XLocale_1.xLocaleOption)('addRow'), onClick: onClickAddRow }) : null,
+            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.appButtons,
-            props.searchTableParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { key: "choose", label: (0, XLocale_1.xLocaleOption)('chooseRow'), onClick: onClickChoose }) : null,
+            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)));
 };
 exports.XLazyDataTable = XLazyDataTable;

package/lib/components/{SearchTableParams.d.ts → XSearchBrowseParams.d.ts}

@@ -4,8 +4,8 @@ export interface XFieldFilter {
     field: string;
     constraint: DataTableFilterMetaData;
 }
-export interface SearchTableParams {
+export interface XSearchBrowseParams {
     onChoose: (chosenRow: any) => void;
     displayFieldFilter?: XFieldFilter;
-    customFilter?: XCustomFilter;
+    customFilterFunction?: () => XCustomFilter | undefined;
 }

package/lib/components/XSearchButton.d.ts

@@ -5,8 +5,8 @@ import { XObject } from "./XObject";
 export interface XSearchButtonProps extends XFormComponentProps<XObject> {
     assocField: string;
     displayField: string;
-    searchTable: any;
-    assocForm?: any;
+    searchBrowse: JSX.Element;
+    assocForm?: JSX.Element;
     filter?: XFilterProp;
     size?: number;
     inputStyle?: React.CSSProperties;

package/lib/components/XSearchButton.js

@@ -166,7 +166,7 @@ var XSearchButton = /** @class */ (function (_super) {
             setInputChanged(false);
         };
         var onClickSearch = function (e) {
-            console.log("zavolany onClickSearch");
+            //console.log("zavolany onClickSearch");
             if (!_this.isReadOnly()) {
                 setDialogOpened(true);
                 // POVODNY KOD
@@ -178,13 +178,13 @@ var XSearchButton = /** @class */ (function (_super) {
                     // 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
-                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id }, props.assocForm.children);
+                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id } /*, props.assocForm.children*/);
                     props.form.props.openForm(assocForm);
                 }
             }
         };
         var onChoose = function (chosenRow) {
-            console.log("zavolany onChoose");
+            //console.log("zavolany onChoose");
             // zavrieme search dialog
             // POVODNY KOD
             //overlayPanelEl.current.hide();
@@ -199,14 +199,12 @@ var XSearchButton = /** @class */ (function (_super) {
                 _this.inputTextRef.current.focus();
             }
         };
-        // {React.createElement(props.searchTable, {searchTableParams: {onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}, ...props.searchTableProps}, null)}
-        // <BrandSearchTable searchTableParams={{onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}} qqq="fiha"/>
         // takto cez metodku, mozno sa metodka vola len ked sa otvori dialog a usetrime nieco...
-        var createSearchTableParams = function () {
+        var createSearchBrowseParams = function () {
             return {
                 onChoose: onChoose,
                 displayFieldFilter: (inputChanged ? { field: props.displayField, constraint: { value: inputValueState, matchMode: "startsWith" } } : undefined),
-                customFilter: _this.getFilterBase(_this.props.filter)
+                customFilterFunction: function () { return _this.getFilterBase(_this.props.filter); }
             };
         };
         // vypocitame inputValue
@@ -215,10 +213,8 @@ var XSearchButton = /** @class */ (function (_super) {
             react_1.default.createElement("label", { htmlFor: props.assocField, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
             react_1.default.createElement("div", { className: "x-search-button-base" },
                 react_1.default.createElement(inputtext_1.InputText, __assign({ id: props.assocField, value: inputValue, onChange: onInputValueChange, onBlur: onInputBlur, readOnly: this.isReadOnly(), ref: this.inputTextRef, maxLength: xDisplayField.length, size: size, style: props.inputStyle }, this.getClassNameTooltip())),
-                react_1.default.createElement(button_1.Button, { label: "...", onClick: onClickSearch })),
-            react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchTable, {
-                searchTableParams: createSearchTableParams()
-            }, props.searchTable.children))));
+                react_1.default.createElement(button_1.Button, { icon: "pi pi-search", onClick: onClickSearch })),
+            react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchBrowse, { searchBrowseParams: createSearchBrowseParams() } /*, props.searchBrowse.children*/))));
     };
     return XSearchButton;
 }(XFormComponent_1.XFormComponent));

package/lib/components/XSearchButtonDT.d.ts

@@ -1,12 +1,13 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XSearchButtonDT: (props: {
     form: XFormBase;
     entity: string;
     assocField: string;
     displayField: string;
-    searchTable: any;
-    assocForm?: any;
+    searchBrowse: JSX.Element;
+    assocForm?: JSX.Element | undefined;
     rowData: any;
-    readOnly?: boolean | undefined;
+    readOnly?: XTableFieldReadOnlyProp | undefined;
 }) => JSX.Element;

package/lib/components/XSearchButtonDT.js

@@ -102,7 +102,6 @@ var XSearchButtonDT = function (props) {
         }
         return inputValue;
     };
-    var readOnly = props.readOnly !== undefined ? props.readOnly : false;
     var onInputValueChange = function (e) {
         setInputChanged(true);
         setInputValueState(e.target.value);
@@ -155,7 +154,7 @@ var XSearchButtonDT = function (props) {
                     // OTAZKA - ziskavat id priamo z root objektu? potom ho vsak treba do root objektu pridat
                     var id = (assocObject !== null && assocObject !== undefined) ? assocObject[xEntityAssoc.idField] : null;
                     // klonovanim elementu pridame atribut id
-                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id }, props.assocForm.children);
+                    var assocForm = react_1.default.cloneElement(props.assocForm, { id: id } /*, props.assocForm.children*/);
                     props.form.props.openForm(assocForm);
                 }
             }
@@ -175,14 +174,19 @@ var XSearchButtonDT = function (props) {
             inputTextRef.current.focus();
         }
     };
-    // {React.createElement(props.searchTable, {searchTableParams: {onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}, ...props.searchTableProps}, null)}
-    // <BrandSearchTable searchTableParams={{onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined)}} qqq="fiha"/>
     // vypocitame inputValue
     var inputValue = computeInputValue();
+    var readOnly = XUtils_1.XUtils.isReadOnlyTableField(undefined, props.readOnly, props.form.state.object, props.rowData);
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "x-search-button-base" },
             react_1.default.createElement(inputtext_1.InputText, { id: props.assocField, value: inputValue, onChange: onInputValueChange, onBlur: onInputBlur, readOnly: readOnly, ref: inputTextRef }),
-            react_1.default.createElement(button_1.Button, { label: "...", onClick: onClickSearch })),
-        react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchTable, { searchTableParams: { onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined) } }, props.searchTable.children))));
+            react_1.default.createElement(button_1.Button, { icon: "pi pi-search", onClick: onClickSearch })),
+        react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchBrowse, {
+            searchBrowseParams: {
+                onChoose: onChoose,
+                displayFieldFilter: (inputChanged ? { field: props.displayField, constraint: { value: inputValueState, matchMode: "startsWith" } } : undefined),
+                customFilterFunction: function () { return undefined; } // TODO - dorobit
+            }
+        } /*, props.searchBrowse.children*/))));
 };
 exports.XSearchButtonDT = XSearchButtonDT;

package/lib/components/XUtils.d.ts

@@ -4,6 +4,9 @@ import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
 import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
+import { DataTableSortMeta } from "primereact/datatable";
+import { XObject } from "./XObject";
+import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -44,7 +47,7 @@ export declare class XUtils {
     static registerAppForm(elem: any, entity: string, formId?: string): void;
     static getAppForm(entity: string, formId?: string): any;
     static fetchMany(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any[]>;
-    static fetchRows(entity: string, customFilter?: XCustomFilter | undefined, sortField?: string, fields?: string[]): Promise<any[]>;
+    static fetchRows(entity: string, customFilter?: XCustomFilter | undefined, sortField?: string | DataTableSortMeta[] | undefined, fields?: string[]): Promise<any[]>;
     static fetchOne(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any>;
     static fetchString(path: string, value: any): Promise<string>;
     static fetch(path: string, value: any, usePublicToken?: boolean | XToken): Promise<any>;
@@ -67,7 +70,26 @@ export declare class XUtils {
     static removeRow(entity: string, row: any): Promise<void>;
     static arrayMoveElement(array: any[], position: number, offset: number): void;
     static arraySort(array: any[], fieldOrStringFunction: string | ((item: any) => string)): any[];
+    /**
+     * returns true, if param item is member of the array
+     * remark: null/undefined items in array are ignored, item = null/undefined is ignored
+     *
+     * @param array
+     * @param item
+     * @param idField
+     */
+    static arrayIncludes<T>(array: T[], item: T, idField: string): boolean;
+    /**
+     * returns intersection of 2 row lists
+     * remark: null/undefined items in both array1 and array2 are ignored
+     *
+     * @param array1
+     * @param array2
+     * @param idField
+     */
+    static arrayIntersect<T>(array1: T[], array2: T[], idField: string): T[];
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;
+    static isReadOnlyTableField(path: string | undefined, readOnly: XTableFieldReadOnlyProp | undefined, object: XObject | null, tableRow: any): boolean;
     static markNotNull(label: string): string;
     static showErrorMessage(message: string, e: unknown): void;
     static createErrorProps(error: string | undefined): {};
@@ -81,4 +103,5 @@ export declare class XUtils {
     static normalizeString(value: string): string;
     static createCustomFilterItems(customFilter: XCustomFilter | undefined): XCustomFilterItem[] | undefined;
     static filterAnd(...filters: (XCustomFilter | undefined)[]): XCustomFilterItem[] | undefined;
+    static isTableRowInserted(tableRow: any): boolean;
 }

package/lib/components/XUtils.js

@@ -265,11 +265,20 @@ var XUtils = /** @class */ (function () {
     // pomocna metodka pouzivajuca lazyDataTable service
     XUtils.fetchRows = function (entity, customFilter, sortField, fields) {
         return __awaiter(this, void 0, void 0, function () {
-            var findParam, rowList;
+            var multiSortMeta, findParam, rowList;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: sortField ? [{ field: sortField, order: 1 }] : undefined, fields: fields };
+                        multiSortMeta = undefined;
+                        if (sortField) {
+                            if (Array.isArray(sortField)) {
+                                multiSortMeta = sortField;
+                            }
+                            else {
+                                multiSortMeta = [{ field: sortField, order: 1 }];
+                            }
+                        }
+                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: multiSortMeta, fields: fields };
                         return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
                     case 1:
                         rowList = (_a.sent()).rowList;
@@ -493,6 +502,47 @@ var XUtils = /** @class */ (function () {
             }
         });
     };
+    // TODO - prehodit do XUtilsCommon
+    /**
+     * returns true, if param item is member of the array
+     * remark: null/undefined items in array are ignored, item = null/undefined is ignored
+     *
+     * @param array
+     * @param item
+     * @param idField
+     */
+    XUtils.arrayIncludes = function (array, item, idField) {
+        return item && array.some(function (arrayItem) { return arrayItem && arrayItem[idField] === item[idField]; });
+    };
+    // TODO - prehodit do XUtilsCommon
+    /**
+     * returns intersection of 2 row lists
+     * remark: null/undefined items in both array1 and array2 are ignored
+     *
+     * @param array1
+     * @param array2
+     * @param idField
+     */
+    XUtils.arrayIntersect = function (array1, array2, idField) {
+        var e_5, _a;
+        var array2IdSet = new Set();
+        try {
+            for (var array2_1 = __values(array2), array2_1_1 = array2_1.next(); !array2_1_1.done; array2_1_1 = array2_1.next()) {
+                var item = array2_1_1.value;
+                if (item) {
+                    array2IdSet.add(item[idField]);
+                }
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (array2_1_1 && !array2_1_1.done && (_a = array2_1.return)) _a.call(array2_1);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        return array1.filter(function (item) { return item && array2IdSet.has(item[idField]); });
+    };
     // helper
     XUtils.isReadOnly = function (path, readOnlyInit) {
         // ak mame path dlzky 2 a viac, field je vzdy readOnly
@@ -505,6 +555,35 @@ var XUtils = /** @class */ (function () {
         }
         return readOnly;
     };
+    // docasna funkcia, kym sa vsade nebude pouzivat XFormComponentDT a jej isReadOnly()
+    XUtils.isReadOnlyTableField = function (path, readOnly, object, tableRow) {
+        var isReadOnly;
+        if (path && !XUtilsCommon_1.XUtilsCommon.isSingleField(path)) {
+            // if the length of field is 2 or more, then readOnly
+            isReadOnly = true;
+        }
+        // formReadOnlyBase is called on the level XFormDataTable2
+        // else if (this.props.form.formReadOnlyBase("xxx")) {
+        //     isReadOnly = true;
+        // }
+        else if (typeof readOnly === 'boolean') {
+            isReadOnly = readOnly;
+        }
+        else if (typeof readOnly === 'function') {
+            // TODO - tazko povedat ci niekedy bude object === null (asi ano vid metodu getFilterBase)
+            if (object) {
+                isReadOnly = readOnly(object, tableRow);
+            }
+            else {
+                isReadOnly = true;
+            }
+        }
+        else {
+            // readOnly is undefined
+            isReadOnly = false;
+        }
+        return isReadOnly;
+    };
     XUtils.markNotNull = function (label) {
         return label + ' *';
     };
@@ -549,7 +628,7 @@ var XUtils = /** @class */ (function () {
     // pomocna metodka
     // ak nie su v xErrorMap ziadne chyby, vrati ""
     XUtils.getErrorMessages = function (xErrorMap) {
-        var e_5, _a;
+        var e_6, _a;
         var _b;
         var msg = "";
         try {
@@ -563,12 +642,12 @@ var XUtils = /** @class */ (function () {
                 }
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         return msg;
     };
@@ -617,7 +696,7 @@ var XUtils = /** @class */ (function () {
     };
     // pomocna metodka
     XUtils.filterAnd = function () {
-        var e_6, _a;
+        var e_7, _a;
         var filters = [];
         for (var _i = 0; _i < arguments.length; _i++) {
             filters[_i] = arguments[_i];
@@ -634,16 +713,21 @@ var XUtils = /** @class */ (function () {
                     }
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
                     if (filters_1_1 && !filters_1_1.done && (_a = filters_1.return)) _a.call(filters_1);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_7) throw e_7.error; }
             }
         }
         return customFilterItemsResult;
     };
+    // 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
+    };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela

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

@@ -21,6 +21,9 @@
         "expEncoding": "Encoding",
         "fileUploadSizeToBig": "Upload of file \"{fileName}\" was canceled: file size {fileSize} is more than maximum allowed size {maxFileSize}.",
         "fileUploadFailed": "Upload of file \"{fileName}\" failed.",
-        "fileDownloadFailed": "File download failed."
+        "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?"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",

package/XBrowse.d.ts

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

package/XBrowse.js

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