@michalrakus/x-react-web-lib 1.9.0 → 1.11.0

package/lib/components/XUtils.js

@@ -73,6 +73,15 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XUtils = exports.OperationType = void 0;
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
@@ -260,7 +269,7 @@ var XUtils = /** @class */ (function () {
             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, fields: fields };
+                        findParam = { resultType: FindParam_1.ResultType.AllRows, entity: entity, customFilterItems: XUtils.createCustomFilterItems(customFilter), multiSortMeta: sortField ? [{ field: sortField, order: 1 }] : undefined, fields: fields };
                         return [4 /*yield*/, XUtils.fetchOne('lazyDataTableFindRows', findParam)];
                     case 1:
                         rowList = (_a.sent()).rowList;
@@ -446,6 +455,7 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
+    // TODO - prehodit do XUtilsCommon
     XUtils.arrayMoveElement = function (array, position, offset) {
         var element = array[position];
         array.splice(position, 1);
@@ -460,7 +470,7 @@ var XUtils = /** @class */ (function () {
             array.splice(positionNew, 0, element);
         }
     };
-    // helper function
+    // TODO - prehodit do XUtilsCommon
     XUtils.arraySort = function (array, fieldOrStringFunction) {
         var stringFunction;
         if (typeof fieldOrStringFunction === 'string') {
@@ -483,6 +493,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
@@ -539,7 +590,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 {
@@ -553,12 +604,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;
     };
@@ -592,20 +643,47 @@ 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;
+    // pomocna metodka - konvertuje XCustomFilter -> XCustomFilterItem[]
+    XUtils.createCustomFilterItems = function (customFilter) {
+        var customFilterItems = undefined;
+        if (customFilter) {
+            if (Array.isArray(customFilter)) {
+                customFilterItems = customFilter;
+            }
+            else {
+                customFilterItems = [customFilter];
+            }
         }
-        else {
-            return undefined;
+        return customFilterItems;
+    };
+    // pomocna metodka
+    XUtils.filterAnd = function () {
+        var e_7, _a;
+        var filters = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            filters[_i] = arguments[_i];
+        }
+        var customFilterItemsResult = undefined;
+        if (filters.length > 0) {
+            customFilterItemsResult = [];
+            try {
+                for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
+                    var filter = filters_1_1.value;
+                    var customFilterItems = XUtils.createCustomFilterItems(filter);
+                    if (customFilterItems) {
+                        customFilterItemsResult.push.apply(customFilterItemsResult, __spreadArray([], __read(customFilterItems), false));
+                    }
+                }
+            }
+            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_7) throw e_7.error; }
+            }
         }
+        return customFilterItemsResult;
     };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;

package/lib/components/XUtilsConversions.d.ts

@@ -1,3 +1,4 @@
+import { IPostgresInterval } from "./XUtils";
 export declare function stringFromUI(stringValue: string): string | null;
 export declare function stringAsUI(value: string | null): string;
 export declare function numberFromUI(stringValue: string): number | null;
@@ -10,3 +11,5 @@ export declare function timeFromModel(value: any): Date | null;
 export declare function dateFormatUI(): string;
 export declare function dateFormatCalendar(): string;
 export declare function datetimeFormatUI(): string;
+export declare function intervalFromUI(valueString: string): IPostgresInterval | null | undefined;
+export declare function intervalAsUI(valueInterval: IPostgresInterval | null): string;

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.numberFromModel = exports.numberAsUI = exports.numberFromUI = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.intervalAsUI = exports.intervalFromUI = 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;
@@ -123,3 +123,55 @@ function datetimeFormatUI() {
     return "dd.mm.yyyy HH:MM:ss";
 }
 exports.datetimeFormatUI = datetimeFormatUI;
+function intervalFromUI(valueString) {
+    // convert e.target.value (e.g. 10:29) into IPostgresInterval (e.g. {hours: 10, minutes: 29})
+    // if stringValue is invalid, returns undefined
+    var valueInterval = undefined;
+    if (valueString === '') {
+        valueInterval = null;
+    }
+    else {
+        var posColon = valueString.indexOf(':');
+        if (posColon === -1) {
+            var minutes = parseInt(valueString);
+            if (!isNaN(minutes)) {
+                var hours = Math.floor(minutes / 60);
+                minutes = minutes - (hours * 60);
+                valueInterval = { hours: hours, minutes: minutes };
+            }
+        }
+        else {
+            var hours = parseInt(valueString.substring(0, posColon));
+            var minutes = parseInt(valueString.substring(posColon + 1));
+            if (!isNaN(hours) && !isNaN(minutes)) {
+                if (minutes >= 60) {
+                    var hoursFromMinutes = Math.floor(minutes / 60);
+                    hours += hoursFromMinutes;
+                    minutes = minutes - (hoursFromMinutes * 60);
+                }
+                valueInterval = { hours: hours, minutes: minutes };
+            }
+        }
+    }
+    return valueInterval;
+}
+exports.intervalFromUI = intervalFromUI;
+function intervalAsUI(valueInterval) {
+    var _a, _b;
+    // conversion e.g. {hours: 10, minutes: 29} => '10:29'
+    var valueString;
+    if (valueInterval !== null) {
+        var hours = (_a = valueInterval.hours) !== null && _a !== void 0 ? _a : 0;
+        var minutes = (_b = valueInterval.minutes) !== null && _b !== void 0 ? _b : 0;
+        //const seconds: number = value.seconds ?? 0;
+        if (valueInterval.days) {
+            hours += valueInterval.days * 24;
+        }
+        valueString = "".concat(hours.toString(), ":").concat(minutes.toString().padStart(2, '0'));
+    }
+    else {
+        valueString = ''; // null
+    }
+    return valueString;
+}
+exports.intervalAsUI = intervalAsUI;

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/lib/serverApi/ExportImportParam.d.ts

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

package/lib/serverApi/FindParam.d.ts

@@ -4,13 +4,14 @@ export declare enum ResultType {
     RowCountAndPagedRows = 1,
     AllRows = 2
 }
-export interface XCustomFilterValues {
+export interface XParams {
     [key: string]: any;
 }
-export interface XCustomFilter {
-    filter: string;
-    values: XCustomFilterValues;
+export interface XCustomFilterItem {
+    where: string;
+    params: XParams;
 }
+export type XCustomFilter = XCustomFilterItem | XCustomFilterItem[];
 export declare enum XAggregateType {
     Min = "MIN",
     Max = "MAX",
@@ -26,7 +27,7 @@ export interface FindParam {
     first?: number;
     rows?: number;
     filters?: DataTableFilterMeta;
-    customFilter?: XCustomFilter;
+    customFilterItems?: XCustomFilterItem[];
     multiSortMeta?: DataTableSortMeta[];
     entity: string;
     fields?: string[];

package/lib/serverApi/XUtilsCommon.d.ts

@@ -1,6 +1,7 @@
 export declare class XUtilsCommon {
     static newLine: string;
     static getValueByPath(object: any, path: string): any;
+    static getValueOrValueListByPath(object: any, path: string): any | any[];
     static getFieldListForPath(path: string): string[];
     static getFieldAndRestPath(path: string): [string, string | null];
     static getPathToAssoc(path: string): string;

package/lib/serverApi/XUtilsCommon.js

@@ -15,6 +15,26 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dateFormat = exports.XUtilsCommon = void 0;
 // funkcie spolocne pre Web i pre Server
@@ -38,6 +58,56 @@ var XUtilsCommon = /** @class */ (function () {
             }
         }
     };
+    // vseobecnejsia verzia, ktora funguje aj pre *toMany asociacie
+    // TODO - toto by sme mohli doplnit o kontrolu ak programator urobil preklep
+    XUtilsCommon.getValueOrValueListByPath = function (object, path) {
+        var e_1, _a;
+        var _b = __read(XUtilsCommon.getFieldAndRestPath(path), 2), field = _b[0], restPath = _b[1];
+        if (restPath === null) {
+            return object[field];
+        }
+        else {
+            var assocObject = object[field];
+            if (Array.isArray(assocObject)) {
+                // natrafili sme na pole (atribut "field" je *toMany asociacia), pozbierame hodnoty z pola
+                var resultValueList = [];
+                try {
+                    for (var assocObject_1 = __values(assocObject), assocObject_1_1 = assocObject_1.next(); !assocObject_1_1.done; assocObject_1_1 = assocObject_1.next()) {
+                        var assocObjectItem = assocObject_1_1.value;
+                        if (assocObjectItem !== null && assocObjectItem !== undefined) { // pre istotu, nemalo by nastat
+                            var itemValue = XUtilsCommon.getValueOrValueListByPath(assocObjectItem, restPath);
+                            if (Array.isArray(itemValue)) {
+                                resultValueList.push.apply(resultValueList, __spreadArray([], __read(itemValue), false));
+                            }
+                            else {
+                                resultValueList.push(itemValue);
+                            }
+                        }
+                        else {
+                            resultValueList.push(null);
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (assocObject_1_1 && !assocObject_1_1.done && (_a = assocObject_1.return)) _a.call(assocObject_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                return resultValueList;
+            }
+            else {
+                // pri vytvarani noveho riadku - assocObject neni v novom objekte ani ako null (je undefined)
+                if (assocObject !== null && assocObject !== undefined) {
+                    return XUtilsCommon.getValueOrValueListByPath(assocObject, restPath);
+                }
+                else {
+                    return null; // asociovany objekt je null, aj hodnota atributu bude null
+                }
+            }
+        }
+    };
     XUtilsCommon.getFieldListForPath = function (path) {
         return path.split('.');
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "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');