@michalrakus/x-react-web-lib 1.5.0 → 1.5.1

package/XButtonIconMedium.d.ts

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

package/XButtonIconMedium.js

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

package/gulpfile.js

@@ -18,6 +18,7 @@ function generateApi(cb) {
         "./lib/components/XAutoCompleteBase",
         "./lib/components/XBrowse",
         "./lib/components/XButton",
+        "./lib/components/XButtonIconMedium",
         "./lib/components/XButtonIconNarrow",
         "./lib/components/XButtonIconSmall",
         "./lib/components/XCalendar",

package/lib/components/XButtonIconMedium.d.ts

@@ -0,0 +1,9 @@
+import React from "react";
+import { ButtonProps } from "primereact/button";
+import { IconType } from "primereact/utils";
+export declare const XButtonIconMedium: (props: {
+    icon: IconType<ButtonProps>;
+    onClick: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+    disabled?: boolean | undefined;
+    tooltip?: any;
+}) => JSX.Element;

package/lib/components/XButtonIconMedium.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XButtonIconMedium = void 0;
+var react_1 = __importDefault(require("react"));
+var button_1 = require("primereact/button");
+// button trochu mensi (priblizne 30px x 30px) od klasickeho Button, pri pouziti v datatable nastavuje v TD malicky padding (cez css) -> nezvecsuje vysku riadku
+var XButtonIconMedium = function (props) {
+    return (react_1.default.createElement(button_1.Button, { icon: props.icon, onClick: props.onClick, disabled: props.disabled, className: 'x-button-icon-medium p-button-sm', tooltip: props.tooltip }));
+};
+exports.XButtonIconMedium = XButtonIconMedium;

package/lib/components/XDropdown.d.ts

@@ -5,6 +5,7 @@ import { XObject } from "./XObject";
 export interface XDropdownProps extends XFormComponentProps<XObject> {
     assocField: string;
     displayField: string;
+    sortField?: string;
     filter?: XFilterProp;
 }
 export declare class XDropdown extends XFormComponent<XObject, XDropdownProps> {

package/lib/components/XDropdown.js

@@ -50,7 +50,7 @@ var XDropdown = /** @class */ (function (_super) {
         // planuje sa to riesit bud zavedenim cache pre options alebo vytiahnutim options na uroven XFormBase
         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(XDropdownForEntity_1.XDropdownForEntity, { id: this.props.assocField, entity: this.xAssoc.entityName, displayField: this.props.displayField, value: this.getValue(), onChange: function (value) { return _this.onValueChangeBase(value, _this.props.onChange); }, readOnly: this.isReadOnly(), isNotNull: this.isNotNull(), error: this.getError(), filter: this.getFilterBase(this.props.filter) })));
+            react_1.default.createElement(XDropdownForEntity_1.XDropdownForEntity, { id: this.props.assocField, entity: this.xAssoc.entityName, displayField: this.props.displayField, sortField: this.props.sortField, value: this.getValue(), onChange: function (value) { return _this.onValueChangeBase(value, _this.props.onChange); }, readOnly: this.isReadOnly(), isNotNull: this.isNotNull(), error: this.getError(), filter: this.getFilterBase(this.props.filter) })));
     };
     return XDropdown;
 }(XFormComponent_1.XFormComponent));

package/lib/components/XDropdownForEntity.d.ts

@@ -5,6 +5,7 @@ export interface XDropdownForEntityProps {
     id?: string;
     entity: string;
     displayField: string;
+    sortField?: string;
     value: any | null;
     onChange: (value: any | null) => void;
     readOnly?: boolean;

package/lib/components/XDropdownForEntity.js

@@ -110,13 +110,14 @@ var XDropdownForEntity = /** @class */ (function (_super) {
         this.loadOptions();
     };
     XDropdownForEntity.prototype.loadOptions = function () {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var options;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.props.entity, this.props.filter, this.props.displayField)];
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.props.entity, this.props.filter, (_a = this.props.sortField) !== null && _a !== void 0 ? _a : this.props.displayField)];
                     case 1:
-                        options = _a.sent();
+                        options = _b.sent();
                         if (this.props.isNotNull === undefined || !this.props.isNotNull) {
                             // pridame prazdnu polozku
                             options.splice(0, 0, {}); // null polozka

package/lib/components/XFormDataTable2.d.ts

@@ -24,12 +24,14 @@ export interface XFormDataTableProps {
     rows?: number;
     filterDisplay: "menu" | "row" | "none";
     sortable: boolean;
+    sortField?: string;
     scrollable: boolean;
     scrollWidth?: string;
     scrollHeight?: string;
     shrinkWidth: boolean;
     label?: string;
     readOnly?: boolean;
+    showAddRemoveButtons?: boolean;
     onClickAddRow?: () => void;
     onClickRemoveRow?: (row: any) => void;
     removeButtonInRow: boolean;
@@ -48,6 +50,7 @@ export declare class XFormDataTable2 extends Component<XFormDataTableProps> {
         scrollWidth: string;
         scrollHeight: string;
         shrinkWidth: boolean;
+        showAddRemoveButtons: boolean;
         removeButtonInRow: boolean;
         addRowLabel: string;
         removeRowLabel: string;

package/lib/components/XFormDataTable2.js

@@ -612,7 +612,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
             // }
             return react_1.default.createElement(column_1.Column, { field: field, header: header, filter: thisLocal.props.filterDisplay !== "none", sortable: thisLocal.props.sortable, filterElement: filterElement, showFilterMenu: showFilterMenu, showClearButton: showClearButton, headerStyle: headerStyle, align: align, body: function (rowData) { return thisLocal.bodyTemplate(childColumnProps, readOnly, rowData, xEntity); } });
         });
-        if (this.props.removeButtonInRow) {
+        if (this.props.showAddRemoveButtons && this.props.removeButtonInRow) {
             // je dolezite nastavit sirku header-a, lebo inac ma stlpec sirku 0 a nevidno ho
             columnElemList.push(react_1.default.createElement(column_1.Column, { key: "removeButton", headerStyle: { width: '2rem' }, body: function (rowData) { return react_1.default.createElement(XButtonIconNarrow_1.XButtonIconNarrow, { icon: "pi pi-times", onClick: function () { return _this.removeRow(rowData); }, disabled: readOnly, addMargin: false }); } }));
         }
@@ -620,10 +620,12 @@ var XFormDataTable2 = /** @class */ (function (_super) {
             react_1.default.createElement("div", { className: "flex justify-content-center" },
                 react_1.default.createElement("label", null, label)),
             react_1.default.createElement("div", { className: "flex justify-content-center" },
-                react_1.default.createElement(datatable_1.DataTable, { ref: function (el) { return _this.dt = el; }, value: valueList, dataKey: this.dataKey, paginator: paginator, rows: rows, totalRecords: valueList.length, filterDisplay: filterDisplay, filters: this.state.filters, onFilter: this.onFilter, sortMode: "multiple", removableSort: true, selectionMode: "single", selection: this.state.selectedRow, onSelectionChange: this.onSelectionChange, className: "p-datatable-sm x-form-datatable", resizableColumns: true, columnResizeMode: "expand", tableStyle: tableStyle, scrollable: this.props.scrollable, scrollHeight: scrollHeight, style: style }, columnElemList)),
-            react_1.default.createElement("div", { className: "flex justify-content-center" },
-                react_1.default.createElement(XButton_1.XButton, { icon: this.props.addRowIcon, label: this.props.addRowLabel, onClick: this.onClickAddRow, disabled: readOnly }),
-                this.props.removeButtonInRow ? undefined : react_1.default.createElement(XButton_1.XButton, { icon: this.props.removeRowIcon, label: this.props.removeRowLabel, onClick: this.onClickRemoveRowBySelection, disabled: readOnly }))));
+                react_1.default.createElement(datatable_1.DataTable, { ref: function (el) { return _this.dt = el; }, value: valueList, dataKey: this.dataKey, paginator: paginator, rows: rows, totalRecords: valueList.length, filterDisplay: filterDisplay, filters: this.state.filters, onFilter: this.onFilter, sortMode: "multiple", removableSort: true, multiSortMeta: this.props.sortField !== undefined ? [{ field: this.props.sortField, order: 1 }] : undefined, selectionMode: "single", selection: this.state.selectedRow, onSelectionChange: this.onSelectionChange, className: "p-datatable-sm x-form-datatable", resizableColumns: true, columnResizeMode: "expand", tableStyle: tableStyle, scrollable: this.props.scrollable, scrollHeight: scrollHeight, style: style }, columnElemList)),
+            this.props.showAddRemoveButtons ?
+                react_1.default.createElement("div", { className: "flex justify-content-center" },
+                    react_1.default.createElement(XButton_1.XButton, { icon: this.props.addRowIcon, label: this.props.addRowLabel, onClick: this.onClickAddRow, disabled: readOnly }),
+                    this.props.removeButtonInRow ? undefined : react_1.default.createElement(XButton_1.XButton, { icon: this.props.removeRowIcon, label: this.props.removeRowLabel, onClick: this.onClickRemoveRowBySelection, disabled: readOnly }))
+                : undefined));
     };
     XFormDataTable2.defaultProps = {
         filterDisplay: "row",
@@ -633,6 +635,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         scrollHeight: '200vh',
         // tym ze pouzivame 200vh (max-height pre body), tak realne scrollovanie sa zapne az pri velmi vela riadkoch
         shrinkWidth: true,
+        showAddRemoveButtons: true,
         removeButtonInRow: false,
         addRowLabel: 'Add row',
         removeRowLabel: 'Remove row'

package/lib/components/XLazyDataTable.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactChild } from 'react';
-import { DataTableFilterMetaData, DataTableOperatorFilterMetaData } from 'primereact/datatable';
+import { DataTableFilterMeta, DataTableFilterMetaData, DataTableOperatorFilterMetaData } from 'primereact/datatable';
 import { ColumnBodyOptions, ColumnFilterElementTemplateOptions } from 'primereact/column';
 import { SearchTableParams } from "./SearchTableParams";
 import { XAggregateType, XCustomFilter } from "../serverApi/FindParam";
@@ -32,8 +32,9 @@ export interface XLazyDataTableProps {
     removeRow?: ((selectedRow: any) => Promise<boolean>) | boolean;
     onRemoveRow?: XOnSaveOrCancelProp;
     appButtons?: any;
+    filters?: DataTableFilterMeta;
     customFilter?: XCustomFilter;
-    initSortField?: string;
+    sortField?: string;
     searchTableParams?: SearchTableParams;
     width?: string;
     dataLoadedState?: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
@@ -54,8 +55,14 @@ export declare const XLazyDataTable: {
         shrinkWidth: boolean;
     };
 };
+export type XGetFilterItem = (field: string) => DataTableFilterMetaData | DataTableOperatorFilterMetaData;
 export type XSetFilterItem = (field: string, filterItem: DataTableFilterMetaData | DataTableOperatorFilterMetaData) => void;
-export type XFilterElementProp = (setFilterItem: XSetFilterItem, options: ColumnFilterElementTemplateOptions) => React.ReactNode;
+export type XFilterElementParams = {
+    getFilterItem: XGetFilterItem;
+    setFilterItem: XSetFilterItem;
+    options: ColumnFilterElementTemplateOptions;
+};
+export type XFilterElementProp = (params: XFilterElementParams) => React.ReactNode;
 export interface XLazyColumnProps {
     field: string;
     header?: any;

package/lib/components/XLazyDataTable.js

@@ -204,6 +204,9 @@ var XLazyDataTable = function (props) {
     var _d = __read((0, react_1.useState)(0), 2), first = _d[0], setFirst = _d[1];
     var _e = __read((0, react_1.useState)(props.paginator ? props.rows : undefined), 2), rows = _e[0], setRows = _e[1];
     var filtersInit = createInitFilters();
+    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 (displayFieldFilter !== undefined) {
@@ -213,7 +216,7 @@ var XLazyDataTable = function (props) {
         customFilter = XUtils_1.XUtils.filterAnd(customFilter, props.searchTableParams.customFilter);
     }
     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.initSortField ? [{ field: props.initSortField, order: 1 }] : []), 2), multiSortMeta = _g[0], setMultiSortMeta = _g[1];
+    var _g = __read((0, react_1.useState)(props.sortField ? [{ field: props.sortField, order: 1 }] : []), 2), multiSortMeta = _g[0], setMultiSortMeta = _g[1];
     var _h = __read((0, react_1.useState)(null), 2), selectedRow = _h[0], setSelectedRow = _h[1];
     var _j = __read((_a = props.dataLoadedState) !== null && _a !== void 0 ? _a : (0, react_1.useState)(false), 2), dataLoaded = _j[0], setDataLoaded = _j[1]; // priznak kde si zapiseme, ci uz sme nacitali data
     var _k = __read((0, react_1.useState)(false), 2), exportRowsDialogOpened = _k[0], setExportRowsDialogOpened = _k[1];
@@ -271,6 +274,11 @@ var XLazyDataTable = function (props) {
         //console.log("zavolany onClickFilter");
         loadData();
     };
+    var onClickClearFilter = function () {
+        // najjednoduchsi sposob - pomeni aj pripadne nastavene matchMode hodnoty
+        var filtersInit = createInitFilters();
+        setFilters(filtersInit);
+    };
     var loadData = function () {
         loadDataBase({ resultType: FindParam_1.ResultType.RowCountAndPagedRows, first: first, rows: rows, filters: filters, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), aggregateItems: aggregateItems });
     };
@@ -522,6 +530,10 @@ var XLazyDataTable = function (props) {
         var filtersCloned = __assign({}, filters);
         setFilters(filtersCloned);
     };
+    // vseobecna specialna metodka pouzvana pri custom filtri (XLazyColumn.filterElement)
+    var getFilterItem = function (field) {
+        return filters[field];
+    };
     // vseobecna metodka - nastavi hodnotu do filtra
     // ak je matchMode === undefined, tak zachova povodnu hodnotu matchMode
     var setFilterValue = function (field, value, matchMode) {
@@ -750,8 +762,8 @@ var XLazyDataTable = function (props) {
         var filterElement;
         if (childColumn.props.filterElement !== undefined) {
             filterElement = function (options) {
-                // compilator sa stazoval ze childColumn.props.filterElement muze byt undefined, preto som pridal "!"
-                return childColumn.props.filterElement(setFilterItem, options);
+                // compilator sa stazoval ze childColumn.props.filterElement moze byt undefined, preto som pridal "!"
+                return childColumn.props.filterElement({ getFilterItem: getFilterItem, setFilterItem: setFilterItem, options: options });
             };
         }
         else {
@@ -872,7 +884,8 @@ var XLazyDataTable = function (props) {
     });
     return (react_1.default.createElement("div", null,
         react_1.default.createElement("div", { className: "flex justify-content-center" },
-            react_1.default.createElement(XButton_1.XButton, { label: "Filter", onClick: onClickFilter })),
+            react_1.default.createElement(XButton_1.XButton, { label: "Filter", onClick: onClickFilter }),
+            react_1.default.createElement(XButton_1.XButton, { label: "Clear filter", onClick: onClickClearFilter })),
         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" },

package/package.json

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