@michalrakus/x-react-web-lib 1.6.0 → 1.7.1

package/ExportImportParam.d.ts

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

package/ExportImportParam.js

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

package/XExportRowsDialog.d.ts

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

package/XExportRowsDialog.js

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

package/gulpfile.js

@@ -13,6 +13,11 @@ function generateApi(cb) {
     const fs = require('fs');
 
     const apiFileList = [
+        "./lib/administration/XUserBrowse",
+        "./lib/administration/XUserForm",
+        "./lib/administration/XBrowseMetaBrowse",
+        "./lib/administration/XBrowseMetaForm",
+
         "./lib/components/useXToken",
         "./lib/components/XAutoComplete",
         "./lib/components/XAutoCompleteBase",
@@ -28,6 +33,7 @@ function generateApi(cb) {
         "./lib/components/XDropdownForEntity",
         "./lib/components/XEnvVars",
         "./lib/components/XErrors",
+        "./lib/components/XExportRowsDialog",
         "./lib/components/XFieldChangeEvent",
         "./lib/components/XFormBase",
         "./lib/components/XFormBaseModif",
@@ -52,13 +58,9 @@ function generateApi(cb) {
         "./lib/components/XUtilsConversions",
         "./lib/components/XUtilsMetadata",
 
+        "./lib/serverApi/ExportImportParam",
         "./lib/serverApi/FindParam",
-        "./lib/serverApi/XUtilsCommon",
-
-        "./lib/administration/XUserBrowse",
-        "./lib/administration/XUserForm",
-        "./lib/administration/XBrowseMetaBrowse",
-        "./lib/administration/XBrowseMetaForm"
+        "./lib/serverApi/XUtilsCommon"
     ];
 
     for (const apiFile of apiFileList) {

package/lib/components/XExportRowsDialog.d.ts

@@ -1,7 +1,15 @@
 /// <reference types="react" />
-import { CsvParam, ExportType } from "../serverApi/ExportImportParam";
+import { ExportType, LazyDataTableQueryParam } from "../serverApi/ExportImportParam";
+export interface XExportParams {
+    path: string;
+    queryParam: LazyDataTableQueryParam | any;
+    headers?: string[];
+    fileName: string;
+}
 export declare const XExportRowsDialog: (props: {
     dialogOpened: boolean;
-    rowCount?: number | undefined;
-    onHideDialog: (ok: boolean, exportType: ExportType | undefined, csvParam: CsvParam | undefined) => void;
+    hideDialog: () => void;
+    rowCount?: number;
+    exportTypeOptions?: ExportType[];
+    exportParams: XExportParams | (() => XExportParams);
 }) => JSX.Element;

package/lib/components/XExportRowsDialog.js

@@ -22,6 +22,42 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        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;
@@ -50,22 +86,68 @@ var XButton_1 = require("./XButton");
 var XUtils_1 = require("./XUtils");
 var XUtilsConversions_1 = require("./XUtilsConversions");
 var XExportRowsDialog = function (props) {
-    var _a;
-    var _b = __read((0, react_1.useState)(ExportImportParam_1.ExportType.Csv), 2), exportType = _b[0], setExportType = _b[1];
-    var _c = __read((0, react_1.useState)(true), 2), createHeaderLine = _c[0], setCreateHeaderLine = _c[1];
-    var _d = __read((0, react_1.useState)(ExportImportParam_1.CsvSeparator.Semicolon), 2), csvSeparator = _d[0], setCsvSeparator = _d[1];
-    var _e = __read((0, react_1.useState)(ExportImportParam_1.CsvDecimalFormat.Comma), 2), decimalFormat = _e[0], setDecimalFormat = _e[1];
+    var _a, _b;
+    var _c = __read((0, react_1.useState)(ExportImportParam_1.ExportType.Csv), 2), exportType = _c[0], setExportType = _c[1];
+    var _d = __read((0, react_1.useState)(true), 2), createHeaderLine = _d[0], setCreateHeaderLine = _d[1];
+    var _e = __read((0, react_1.useState)(ExportImportParam_1.CsvSeparator.Semicolon), 2), csvSeparator = _e[0], setCsvSeparator = _e[1];
+    var _f = __read((0, react_1.useState)(ExportImportParam_1.CsvDecimalFormat.Comma), 2), decimalFormat = _f[0], setDecimalFormat = _f[1];
+    var _g = __read((0, react_1.useState)(ExportImportParam_1.CsvEncoding.Win1250), 2), csvEncoding = _g[0], setCsvEncoding = _g[1];
     // bez tejto metody by pri opetovnom otvoreni dialogu ponechal povodne hodnoty
     var onShow = function () {
         setExportType(ExportImportParam_1.ExportType.Csv);
         setCreateHeaderLine(true); // excel hadze hlasky koli prvemu riadku header-ov
         setCsvSeparator(ExportImportParam_1.CsvSeparator.Semicolon);
         setDecimalFormat(ExportImportParam_1.CsvDecimalFormat.Comma);
+        setCsvEncoding(ExportImportParam_1.CsvEncoding.Win1250);
     };
-    var onExport = function () {
-        // export vykoname az po zatvoreni dialogu - moze dlho trvat a pobezi asynchronne (user zatial moze pracovat s aplikaciou)
-        props.onHideDialog(true, exportType, { useHeaderLine: createHeaderLine, csvSeparator: csvSeparator, csvDecimalFormat: decimalFormat });
-    };
+    var onExport = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var exportParams, csvParam, exportParam, response, e_1, fileExt, fileName, respBlob, url, a;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    // export vykoname az po zatvoreni dialogu - moze dlho trvat a pobezi asynchronne (user zatial moze pracovat s aplikaciou)
+                    // zavrieme dialog
+                    props.hideDialog();
+                    if (typeof props.exportParams === 'function') {
+                        exportParams = props.exportParams();
+                    }
+                    else {
+                        exportParams = props.exportParams;
+                    }
+                    csvParam = undefined;
+                    if (exportType === ExportImportParam_1.ExportType.Csv) {
+                        csvParam = { useHeaderLine: createHeaderLine, csvSeparator: csvSeparator, csvDecimalFormat: decimalFormat, csvEncoding: csvEncoding };
+                        if (csvParam.useHeaderLine) {
+                            csvParam.headers = exportParams.headers;
+                        }
+                    }
+                    exportParam = { exportType: exportType, csvParam: csvParam, queryParam: exportParams.queryParam };
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, XUtils_1.XUtils.fetchBasicJson(exportParams.path, exportParam)];
+                case 2:
+                    response = _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _a.sent();
+                    XUtils_1.XUtils.showErrorMessage("Export failed.", e_1);
+                    return [2 /*return*/];
+                case 4:
+                    fileExt = exportType;
+                    fileName = "".concat(exportParams.fileName, ".").concat(fileExt);
+                    return [4 /*yield*/, response.blob()];
+                case 5:
+                    respBlob = _a.sent();
+                    url = window.URL.createObjectURL(respBlob);
+                    a = document.createElement('a');
+                    a.href = url;
+                    a.download = fileName;
+                    a.click();
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     var elem = null;
     if (props.dialogOpened) {
         if (exportType === ExportImportParam_1.ExportType.Csv) {
@@ -78,17 +160,22 @@ var XExportRowsDialog = function (props) {
                     react_1.default.createElement(dropdown_1.Dropdown, { value: csvSeparator, options: XUtils_1.XUtils.csvSeparatorOptions, onChange: function (e) { return setCsvSeparator(e.value); } })),
                 react_1.default.createElement("div", { className: "field grid" },
                     react_1.default.createElement("label", { className: "col-fixed", style: { width: '9.3rem' } }, "Decimal format"),
-                    react_1.default.createElement(dropdown_1.Dropdown, { value: decimalFormat, options: XUtils_1.XUtils.decimalFormatOptions, onChange: function (e) { return setDecimalFormat(e.value); } })));
+                    react_1.default.createElement(dropdown_1.Dropdown, { value: decimalFormat, options: XUtils_1.XUtils.decimalFormatOptions, onChange: function (e) { return setDecimalFormat(e.value); } })),
+                react_1.default.createElement("div", { className: "field grid" },
+                    react_1.default.createElement("label", { className: "col-fixed", style: { width: '9.3rem' } }, "Encoding"),
+                    react_1.default.createElement(dropdown_1.Dropdown, { value: csvEncoding, options: XUtils_1.XUtils.csvEncodingOptions, onChange: function (e) { return setCsvEncoding(e.value); } })));
         }
     }
     // poznamka: renderovanie vnutornych komponentov Dialogu sa zavola az po otvoreni dialogu
-    return (react_1.default.createElement(dialog_1.Dialog, { visible: props.dialogOpened, onShow: onShow, onHide: function () { return props.onHideDialog(false, undefined, undefined); } },
-        react_1.default.createElement("div", { className: "field grid" },
-            react_1.default.createElement("label", { className: "col-fixed", style: { width: '9.3rem' } }, "Row count"),
-            react_1.default.createElement(inputtext_1.InputText, { value: (0, XUtilsConversions_1.numberAsUI)((_a = props.rowCount) !== null && _a !== void 0 ? _a : null), readOnly: true })),
+    return (react_1.default.createElement(dialog_1.Dialog, { visible: props.dialogOpened, onShow: onShow, onHide: function () { return props.hideDialog(); } },
+        props.rowCount ?
+            react_1.default.createElement("div", { className: "field grid" },
+                react_1.default.createElement("label", { className: "col-fixed", style: { width: '9.3rem' } }, "Row count"),
+                react_1.default.createElement(inputtext_1.InputText, { value: (0, XUtilsConversions_1.numberAsUI)((_a = props.rowCount) !== null && _a !== void 0 ? _a : null, 0), readOnly: true }))
+            : null,
         react_1.default.createElement("div", { className: "field grid" },
             react_1.default.createElement("label", { className: "col-fixed", style: { width: '9.3rem' } }, "Export type"),
-            react_1.default.createElement(dropdown_1.Dropdown, { value: exportType, options: XUtils_1.XUtils.exportTypeOptions, onChange: function (e) { return setExportType(e.value); } })),
+            react_1.default.createElement(dropdown_1.Dropdown, { value: exportType, options: (_b = props.exportTypeOptions) !== null && _b !== void 0 ? _b : XUtils_1.XUtils.exportTypeOptions, onChange: function (e) { return setExportType(e.value); } })),
         elem,
         react_1.default.createElement("div", { className: "flex justify-content-center" },
             react_1.default.createElement(XButton_1.XButton, { label: "Export", onClick: onExport }))));

package/lib/components/XFormFooter.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+export declare const xSaveButtonId: string;
 export declare const XFormFooter: (props: {
     form: XFormBase;
 }) => JSX.Element;

package/lib/components/XFormFooter.js

@@ -3,13 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XFormFooter = void 0;
+exports.XFormFooter = exports.xSaveButtonId = void 0;
 var react_1 = __importDefault(require("react"));
 var XButton_1 = require("./XButton");
+// constant to be used in method formReadOnly to identify save button
+exports.xSaveButtonId = "x-save-button-id";
 // helper wrapper
 var XFormFooter = function (props) {
+    var readOnly = props.form.formReadOnlyBase(exports.xSaveButtonId);
     return (react_1.default.createElement("div", { className: "flex justify-content-center" },
-        react_1.default.createElement(XButton_1.XButton, { label: "Save", onClick: props.form.onClickSave }),
+        react_1.default.createElement(XButton_1.XButton, { label: "Save", onClick: props.form.onClickSave, disabled: readOnly }),
         react_1.default.createElement(XButton_1.XButton, { label: "Cancel", onClick: props.form.onClickCancel })));
 };
 exports.XFormFooter = XFormFooter;

package/lib/components/XLazyDataTable.js

@@ -459,47 +459,15 @@ var XLazyDataTable = function (props) {
             }
         });
     }); };
-    var exportRowsDialogOnHide = function (ok, exportType, csvParam) { return __awaiter(void 0, void 0, void 0, function () {
-        var path, exportParam, response, e_7, fileExt, fileName, respBlob, url, a;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!ok || exportType === undefined) {
-                        setExportRowsDialogOpened(false);
-                        return [2 /*return*/];
-                    }
-                    setExportRowsDialogOpened(false);
-                    path = 'lazyDataTableExport';
-                    if (csvParam && csvParam.useHeaderLine) {
-                        csvParam.headers = getHeaders();
-                    }
-                    exportParam = { exportType: exportType, filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields(), csvParam: csvParam };
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, XUtils_1.XUtils.fetchBasicJson(path, exportParam)];
-                case 2:
-                    response = _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    e_7 = _a.sent();
-                    XUtils_1.XUtils.showErrorMessage("Export failed.", e_7);
-                    return [2 /*return*/];
-                case 4:
-                    fileExt = exportType;
-                    fileName = "".concat(props.entity, ".").concat(fileExt);
-                    return [4 /*yield*/, response.blob()];
-                case 5:
-                    respBlob = _a.sent();
-                    url = window.URL.createObjectURL(respBlob);
-                    a = document.createElement('a');
-                    a.href = url;
-                    a.download = fileName;
-                    a.click();
-                    return [2 /*return*/];
-            }
-        });
-    }); };
+    var createExportParams = function () {
+        var queryParam = { filters: filtersAfterFiltering, customFilter: customFilter, multiSortMeta: multiSortMeta, entity: props.entity, fields: getFields() };
+        return {
+            path: "x-lazy-data-table-export",
+            queryParam: queryParam,
+            headers: getHeaders(),
+            fileName: "".concat(props.entity)
+        };
+    };
     var onClickChoose = function () {
         //console.log("zavolany onClickChoose");
         if (selectedRow !== null) {
@@ -895,7 +863,7 @@ var XLazyDataTable = function (props) {
             exportRows ? react_1.default.createElement(XButton_1.XButton, { label: "Export rows", onClick: onClickExport }) : null,
             props.appButtons,
             props.searchTableParams !== undefined ? react_1.default.createElement(XButton_1.XButton, { label: "Choose", onClick: onClickChoose }) : null,
-            exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { dialogOpened: exportRowsDialogOpened, rowCount: exportRowsDialogRowCount, onHideDialog: exportRowsDialogOnHide }) : null)));
+            exportRows ? react_1.default.createElement(XExportRowsDialog_1.XExportRowsDialog, { dialogOpened: exportRowsDialogOpened, hideDialog: function () { return setExportRowsDialogOpened(false); }, rowCount: exportRowsDialogRowCount, exportParams: createExportParams }) : null)));
 };
 exports.XLazyDataTable = XLazyDataTable;
 exports.XLazyDataTable.defaultProps = {

package/lib/components/XUtils.d.ts

@@ -1,5 +1,5 @@
 import { XToken } from "./XToken";
-import { CsvDecimalFormat, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
+import { CsvDecimalFormat, CsvEncoding, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
 import { XError, XErrorMap } from "./XErrors";
@@ -19,6 +19,7 @@ export declare class XUtils {
     static exportTypeOptions: ExportType[];
     static csvSeparatorOptions: CsvSeparator[];
     static decimalFormatOptions: CsvDecimalFormat[];
+    static csvEncodingOptions: CsvEncoding[];
     static remSize: number | null;
     static FIELD_LABEL_WIDTH: string;
     static demo(): boolean;

package/lib/components/XUtils.js

@@ -618,6 +618,7 @@ var XUtils = /** @class */ (function () {
     XUtils.exportTypeOptions = [ExportImportParam_1.ExportType.Csv, ExportImportParam_1.ExportType.Json];
     XUtils.csvSeparatorOptions = [ExportImportParam_1.CsvSeparator.Semicolon, ExportImportParam_1.CsvSeparator.Comma];
     XUtils.decimalFormatOptions = [ExportImportParam_1.CsvDecimalFormat.Comma, ExportImportParam_1.CsvDecimalFormat.Dot];
+    XUtils.csvEncodingOptions = [ExportImportParam_1.CsvEncoding.Utf8, ExportImportParam_1.CsvEncoding.Win1250];
     XUtils.remSize = null;
     // konstanty (zatial takto jednoducho)
     XUtils.FIELD_LABEL_WIDTH = '10.5rem';

package/lib/serverApi/ExportImportParam.d.ts

@@ -6,12 +6,15 @@ export declare enum ExportType {
 }
 export interface ExportParam {
     exportType: ExportType;
+    csvParam?: CsvParam;
+    queryParam: LazyDataTableQueryParam | any;
+}
+export interface LazyDataTableQueryParam {
     filters: DataTableFilterMeta;
     customFilter?: XCustomFilter;
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];
-    csvParam?: CsvParam;
 }
 export declare enum CsvSeparator {
     Semicolon = ";",
@@ -21,11 +24,16 @@ export declare enum CsvDecimalFormat {
     Comma = "123456,78",
     Dot = "123456.78"
 }
+export declare enum CsvEncoding {
+    Utf8 = "utf-8",
+    Win1250 = "win1250"
+}
 export interface CsvParam {
     useHeaderLine: boolean;
     headers?: string[];
     csvSeparator: CsvSeparator;
     csvDecimalFormat: CsvDecimalFormat;
+    csvEncoding: CsvEncoding;
 }
 export declare enum ImportType {
     Csv = "csv",

package/lib/serverApi/ExportImportParam.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportType = exports.CsvDecimalFormat = exports.CsvSeparator = exports.ExportType = void 0;
+exports.ImportType = exports.CsvEncoding = exports.CsvDecimalFormat = exports.CsvSeparator = exports.ExportType = void 0;
 var ExportType;
 (function (ExportType) {
     ExportType["Csv"] = "csv";
@@ -19,6 +19,14 @@ var CsvDecimalFormat;
     CsvDecimalFormat["Comma"] = "123456,78";
     CsvDecimalFormat["Dot"] = "123456.78";
 })(CsvDecimalFormat = exports.CsvDecimalFormat || (exports.CsvDecimalFormat = {}));
+// zatial len tieto 2, ak bude treba, tak pridat napr. win1252 (Western Europe)
+// win1250 pouzivame ako default, lebo Excel automaticky predpoklada kodovanie win1250
+// konstanty sa pouzivaju priamo v kniznici iconv-lite
+var CsvEncoding;
+(function (CsvEncoding) {
+    CsvEncoding["Utf8"] = "utf-8";
+    CsvEncoding["Win1250"] = "win1250";
+})(CsvEncoding = exports.CsvEncoding || (exports.CsvEncoding = {}));
 var ImportType;
 (function (ImportType) {
     ImportType["Csv"] = "csv";

package/package.json

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