@michalrakus/x-react-web-lib 1.1.0 → 1.3.0

package/lib/components/XUtils.d.ts

@@ -2,7 +2,8 @@ import { XToken } from "./XToken";
 import { CsvDecimalFormat, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
 import React from "react";
 import { XEnvVar } from "./XEnvVars";
-import { XError } from "./XErrors";
+import { XError, XErrorMap } from "./XErrors";
+import { XCustomFilter } from "../serverApi/FindParam";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -33,6 +34,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): 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>;
@@ -54,10 +56,18 @@ export declare class XUtils {
     static getEnvVarValue(envVarEnum: XEnvVar): string;
     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[];
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;
     static markNotNull(label: string): string;
     static showErrorMessage(message: string, e: unknown): void;
     static createErrorProps(error: string | undefined): {};
-    static getXErrorMessage(xError: XError): string | undefined;
+    static addClassName(props: {
+        [key: string]: any;
+    }, className: string): {
+        [key: string]: any;
+    };
+    static getErrorMessages(xErrorMap: XErrorMap): string;
+    static getErrorMessage(xError: XError): string | undefined;
     static normalizeString(value: string): string;
+    static filterAnd(filter1: XCustomFilter | undefined, filter2: XCustomFilter | undefined): XCustomFilter | undefined;
 }

package/lib/components/XUtils.js

@@ -79,6 +79,7 @@ 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 OperationType;
 (function (OperationType) {
     OperationType[OperationType["None"] = 0] = "None";
@@ -252,6 +253,22 @@ var XUtils = /** @class */ (function () {
     XUtils.fetchMany = function (path, value, usePublicToken) {
         return XUtils.fetch(path, value, usePublicToken);
     };
+    // pomocna metodka pouzivajuca lazyDataTable service
+    XUtils.fetchRows = function (entity, customFilter, sortField) {
+        return __awaiter(this, void 0, void 0, function () {
+            var findParam, rowList;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilter: customFilter, multiSortMeta: sortField ? [{ field: sortField, order: 1 }] : undefined };
+                        return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
+                    case 1:
+                        rowList = (_a.sent()).rowList;
+                        return [2 /*return*/, rowList];
+                }
+            });
+        });
+    };
     XUtils.fetchOne = function (path, value, usePublicToken) {
         return XUtils.fetch(path, value, usePublicToken);
     };
@@ -443,6 +460,29 @@ var XUtils = /** @class */ (function () {
             array.splice(positionNew, 0, element);
         }
     };
+    // helper function
+    XUtils.arraySort = function (array, fieldOrStringFunction) {
+        var stringFunction;
+        if (typeof fieldOrStringFunction === 'string') {
+            stringFunction = function (item) { return item[fieldOrStringFunction]; };
+        }
+        else {
+            stringFunction = fieldOrStringFunction;
+        }
+        return array.sort(function (suggestion1, suggestion2) {
+            var value1 = stringFunction(suggestion1);
+            var value2 = stringFunction(suggestion2);
+            if (value1 > value2) {
+                return 1;
+            }
+            else if (value1 < value2) {
+                return -1;
+            }
+            else {
+                return 0;
+            }
+        });
+    };
     // helper
     XUtils.isReadOnly = function (path, readOnlyInit) {
         // ak mame path dlzky 2 a viac, field je vzdy readOnly
@@ -477,8 +517,46 @@ var XUtils = /** @class */ (function () {
     XUtils.createErrorProps = function (error) {
         return error ? { className: "p-invalid", tooltip: error, tooltipOptions: { className: 'pink-tooltip', position: 'bottom' } } : {};
     };
+    // pomocna metodka - prida className do props, ak uz className v props existuje tak len pripoji dalsiu hodnotu
+    // pouzivame ju, lebo XUtils.createErrorProps nam prebijal className
+    XUtils.addClassName = function (props, className) {
+        var propsClassName = props.className;
+        if (propsClassName !== undefined) {
+            propsClassName += " " + className;
+        }
+        else {
+            propsClassName = className;
+        }
+        props.className = propsClassName;
+        return props;
+    };
     // pomocna metodka
-    XUtils.getXErrorMessage = function (xError) {
+    // ak nie su v xErrorMap ziadne chyby, vrati ""
+    XUtils.getErrorMessages = function (xErrorMap) {
+        var e_5, _a;
+        var _b;
+        var msg = "";
+        try {
+            for (var _c = __values(Object.entries(xErrorMap)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), field = _e[0], xError = _e[1];
+                if (xError) {
+                    var errorMessage = XUtils.getErrorMessage(xError);
+                    if (errorMessage) {
+                        msg += "".concat((_b = xError.fieldLabel) !== null && _b !== void 0 ? _b : field, ": ").concat(errorMessage).concat(XUtilsCommon_1.XUtilsCommon.newLine);
+                    }
+                }
+            }
+        }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+            }
+            finally { if (e_5) throw e_5.error; }
+        }
+        return msg;
+    };
+    XUtils.getErrorMessage = function (xError) {
         if (xError.onChange || xError.onBlur || xError.form) {
             var message = '';
             if (xError.onChange) {
@@ -508,6 +586,21 @@ var XUtils = /** @class */ (function () {
         }
         return value;
     };
+    // pomocna metodka
+    XUtils.filterAnd = function (filter1, filter2) {
+        if (filter1 && filter2) {
+            return { filter: "(".concat(filter1.filter, ") AND (").concat(filter2.filter, ")"), values: __assign(__assign({}, filter1.values), filter2.values) };
+        }
+        else if (filter1 && filter2 === undefined) {
+            return filter1;
+        }
+        else if (filter1 === undefined && filter2) {
+            return filter2;
+        }
+        else {
+            return undefined;
+        }
+    };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela

package/lib/components/XUtilsConversions.d.ts

@@ -2,6 +2,7 @@ export declare function stringFromUI(stringValue: string): string | null;
 export declare function stringAsUI(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;
 export declare function dateFromModel(value: any): Date | null;
 export declare function dateAsUI(value: Date | null): string;
 export declare function datetimeAsUI(value: Date | null): string;

package/lib/components/XUtilsConversions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromModel = exports.numberAsUI = exports.numberFromUI = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.numberFromUI = exports.stringAsUI = exports.stringFromUI = void 0;
 var XUtilsCommon_1 = require("../serverApi/XUtilsCommon");
 function stringFromUI(stringValue) {
     var value;
@@ -40,6 +40,19 @@ function numberAsUI(value, fractionDigits) {
     }
 }
 exports.numberAsUI = numberAsUI;
+// v modeli na klientovi by mal byt vzdy number, teraz je tam niekedy string (z json-u zo servera) a niekedy number (z komponentu)
+// provizorne zatial takato konverzia
+function numberFromModel(value) {
+    var numberValue = null;
+    if (typeof value === 'string') {
+        numberValue = parseFloat(value);
+    }
+    else if (typeof value === 'number') {
+        numberValue = value;
+    }
+    return numberValue;
+}
+exports.numberFromModel = numberFromModel;
 // v modeli na klientovi by mal byt vzdy Date, teraz je tam niekedy string (z json-u zo servera) a niekedy Date (z komponentu)
 // provizorne zatial takato konverzia
 function dateFromModel(value) {

package/lib/components/XUtilsMetadata.d.ts

@@ -11,6 +11,8 @@ export declare class XUtilsMetadata {
     static getXFieldByPathStr(entity: string, path: string): XField;
     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[];
@@ -22,11 +24,12 @@ export declare class XUtilsMetadata {
         size?: number;
     };
     static CHAR_SIZE: number;
-    static computeColumnWidth(xField: XField, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, filterButtonInHeader: boolean): string | undefined;
+    static computeColumnWidth(xField: XField, filterMenuInFilterRow: boolean, formColumnType: string | undefined, header: string | undefined, sortableButtonInHeader: boolean, filterButtonInHeader: boolean): string | undefined;
     static computeColumnWidthBase(charSize?: number, paddingAndOther?: number): number | undefined;
     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

@@ -141,6 +141,12 @@ var XUtilsMetadata = /** @class */ (function () {
     XUtilsMetadata.getXAssocToMany = function (xEntity, assocField) {
         return XUtilsMetadata.getXAssoc(xEntity, xEntity.assocToManyMap, assocField);
     };
+    XUtilsMetadata.getXAssocToOneByAssocEntity = function (xEntity, assocEntityName) {
+        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, xEntity.assocToOneMap, assocEntityName);
+    };
+    XUtilsMetadata.getXAssocToManyByAssocEntity = function (xEntity, assocEntityName) {
+        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, xEntity.assocToManyMap, assocEntityName);
+    };
     XUtilsMetadata.getXEntityForAssocToOne = function (xEntity, assocField) {
         return XUtilsMetadata.getXEntityForAssoc(XUtilsMetadata.getXAssocToOne(xEntity, assocField));
     };
@@ -203,7 +209,7 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return { useGrouping: useGrouping, fractionDigits: fractionDigits, min: min, max: max, size: size };
     };
-    XUtilsMetadata.computeColumnWidth = function (xField, filterMenuInFilterRow, formColumnType, header, filterButtonInHeader) {
+    XUtilsMetadata.computeColumnWidth = function (xField, filterMenuInFilterRow, formColumnType, header, sortableButtonInHeader, filterButtonInHeader) {
         var width;
         if (formColumnType === undefined) {
             // lazy datatable (no inputs, no buttons, only text and padding)
@@ -251,7 +257,7 @@ var XUtilsMetadata = /** @class */ (function () {
                     throw "XField ".concat(xField.name, ": unknown xField.type = ").concat(xField.type);
                 }
             }
-            else if (formColumnType === "dropdown" || formColumnType === "searchButton" || formColumnType === "autoComplete") {
+            else if (formColumnType === "dropdown" || formColumnType === "autoComplete" || formColumnType === "searchButton") {
                 // vyratame sirku inputu
                 var padding = 0.21 + 0.07 + 0.5; // padding is 2.94px + 1px border + 7px padding in input
                 if (xField.type === "string") {
@@ -268,7 +274,7 @@ var XUtilsMetadata = /** @class */ (function () {
                     width = XUtilsMetadata.computeColumnWidthBase(10 + 9, padding + padding); // napr. 31.12.2021 03:03:00
                 }
                 else {
-                    throw "XField ".concat(xField.name, ": xField.type = ").concat(xField.type, " not implemented for dropdown/searchButton/autoComplete");
+                    throw "XField ".concat(xField.name, ": xField.type = ").concat(xField.type, " not implemented for dropdown/autoComplete/searchButton");
                 }
                 // pridame sirku buttonu
                 if (formColumnType === "dropdown") {
@@ -276,14 +282,16 @@ var XUtilsMetadata = /** @class */ (function () {
                         width += 2; // button for dropdown
                     }
                 }
+                else if (formColumnType === "autoComplete") {
+                    if (width !== undefined) {
+                        width += 1.56; // button for auto complete
+                    }
+                }
                 else if (formColumnType === "searchButton") {
                     if (width !== undefined) {
                         width += 2.18; // button for search button
                     }
                 }
-                else if (formColumnType === "autoComplete") {
-                    throw "XField ".concat(xField.name, ": computing button width not implemented for autoComplete");
-                }
             }
             else {
                 throw "Unknown prop type = " + formColumnType;
@@ -297,7 +305,10 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         // ak je label dlhsi ako sirka stlpca, tak sirka stlpca bude podla label-u
         if (header !== undefined) {
-            var widthHeader = XUtilsMetadata.computeColumnWidthBase(header.length, 0.5 + 0.5 + 1.28); // padding (7px) + space (7px) + sort icon (18px)
+            var widthHeader = XUtilsMetadata.computeColumnWidthBase(header.length, 0.5); // padding (7px)
+            if (sortableButtonInHeader && widthHeader !== undefined) {
+                widthHeader += 0.5 + 1.28; // sort icon (25px = 7px (space/margin) + 18px (icon body))
+            }
             if (filterButtonInHeader && widthHeader !== undefined) {
                 widthHeader += 1.5; // filter icon (21px = 14px (icon body) + 7px (right padding))
             }
@@ -342,6 +353,34 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return xAssoc;
     };
+    XUtilsMetadata.getXAssocByAssocEntity = function (xEntity, assocMap, assocEntityName) {
+        var e_2, _a;
+        var xAssocFound = undefined;
+        try {
+            for (var _b = __values(Object.entries(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_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; }
+        }
+        if (xAssocFound === undefined) {
+            throw "Assoc for assocEntityName = ".concat(assocEntityName, " not found in entity ").concat(xEntity.name);
+        }
+        return xAssocFound;
+    };
     XUtilsMetadata.getXEntityForAssoc = function (xAssoc) {
         return XUtilsMetadata.getXEntity(xAssoc.entityName);
     };

package/lib/serverApi/ExportImportParam.d.ts

@@ -1,4 +1,5 @@
 import { DataTableFilterMeta, DataTableSortMeta } from "primereact/datatable";
+import { XCustomFilter } from "./FindParam";
 export declare enum ExportType {
     Csv = "csv",
     Json = "json"
@@ -6,6 +7,7 @@ export declare enum ExportType {
 export interface ExportParam {
     exportType: ExportType;
     filters: DataTableFilterMeta;
+    customFilter?: XCustomFilter;
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields: string[];

package/lib/serverApi/FindParam.d.ts

@@ -4,12 +4,20 @@ export declare enum ResultType {
     RowCountAndPagedRows = 1,
     AllRows = 2
 }
+export interface XCustomFilterValues {
+    [key: string]: any;
+}
+export interface XCustomFilter {
+    filter: string;
+    values: XCustomFilterValues;
+}
 export interface FindParam {
     resultType: ResultType;
     first?: number;
     rows?: number;
-    filters: DataTableFilterMeta;
+    filters?: DataTableFilterMeta;
+    customFilter?: XCustomFilter;
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
-    fields: string[];
+    fields?: string[];
 }

package/lib/serverApi/XUtilsCommon.d.ts

@@ -7,5 +7,6 @@ export declare class XUtilsCommon {
     static objectAsJSON(value: any): string;
     static getDayName(date: Date | null | undefined): string | undefined;
     static dateAddDays(date: Date | null, days: number): Date | null;
+    static findFirstMatch(pattern: RegExp, value: string): string | null;
 }
 export declare const dateFormat: any;

package/lib/serverApi/XUtilsCommon.js

@@ -89,6 +89,10 @@ var XUtilsCommon = /** @class */ (function () {
         }
         return result;
     };
+    XUtilsCommon.findFirstMatch = function (pattern, value) {
+        var match = pattern.exec(value);
+        return match != null ? match[0] : null;
+    };
     XUtilsCommon.newLine = '\n';
     return XUtilsCommon;
 }());

package/package.json

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