@michalrakus/x-react-web-lib 1.22.0 → 1.24.0

package/lib/components/XMultiSelectBase.d.ts

@@ -0,0 +1,27 @@
+import React, { Component } from "react";
+import { XQuery } from "./XUtils";
+import { DataTableSortMeta } from "primereact/datatable";
+import { XDropdownForEntityProps } from "./XDropdownForEntity";
+export interface XMultiSelectBaseProps {
+    value: any[];
+    onChange: (value: any[]) => void;
+    optionsQuery?: XQuery;
+    displayField: string;
+    maxSelectedLabels?: number;
+    width?: string;
+    scrollHeight?: string;
+    readOnly?: boolean;
+    error?: string;
+}
+export declare class XMultiSelectBase extends Component<XMultiSelectBaseProps> {
+    static defaultProps: {};
+    protected idField: string;
+    state: {
+        options: any[];
+    };
+    constructor(props: XDropdownForEntityProps);
+    componentDidMount(): void;
+    loadOptions(): Promise<void>;
+    getSortField(): string | DataTableSortMeta[] | undefined;
+    render(): React.JSX.Element;
+}

package/lib/components/XMultiSelectBase.js

@@ -0,0 +1,145 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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 };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XMultiSelectBase = void 0;
+var react_1 = __importStar(require("react"));
+var XUtils_1 = require("./XUtils");
+var XUtilsMetadataCommon_1 = require("../serverApi/XUtilsMetadataCommon");
+var multiselect_1 = require("primereact/multiselect");
+var XMultiSelectBase = /** @class */ (function (_super) {
+    __extends(XMultiSelectBase, _super);
+    function XMultiSelectBase(props) {
+        var _this = _super.call(this, props) || this;
+        if (!_this.props.optionsQuery) {
+            throw "XMultiSelectBase.optionsQuery: unexpected error - prop optionsQuery is undefined";
+        }
+        _this.idField = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(_this.props.optionsQuery.entity).idField;
+        _this.state = {
+            options: []
+        };
+        return _this;
+    }
+    XMultiSelectBase.prototype.componentDidMount = function () {
+        this.loadOptions();
+    };
+    XMultiSelectBase.prototype.loadOptions = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var options;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.props.optionsQuery) {
+                            throw "XMultiSelectBase.optionsQuery: unexpected error - prop optionsQuery is undefined";
+                        }
+                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.props.optionsQuery.entity, XUtils_1.XUtils.evalFilter(this.props.optionsQuery.filter), this.getSortField(), this.props.optionsQuery.fields)];
+                    case 1:
+                        options = _a.sent();
+                        this.setState({ options: options });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    XMultiSelectBase.prototype.getSortField = function () {
+        var sortField = this.props.optionsQuery.sortField;
+        if (!sortField) {
+            // ako default pouzivame displayField
+            sortField = this.props.displayField;
+        }
+        return sortField;
+    };
+    XMultiSelectBase.prototype.render = function () {
+        var _this = this;
+        // propertiesy na Dropdown-e: readOnly vyseduje, disabled znemoznuje vyber polozky
+        return (react_1.default.createElement(multiselect_1.MultiSelect, __assign({ options: this.state.options, optionLabel: this.props.displayField, dataKey: this.idField, maxSelectedLabels: this.props.maxSelectedLabels, display: "chip", value: this.props.value, onChange: function (e) { return _this.props.onChange(e.value); }, readOnly: this.props.readOnly, disabled: this.props.readOnly }, XUtils_1.XUtils.createTooltipOrErrorProps(this.props.error))));
+    };
+    XMultiSelectBase.defaultProps = {
+    //scrollHeight: '15rem'   // primereact has 200px
+    };
+    return XMultiSelectBase;
+}(react_1.Component));
+exports.XMultiSelectBase = XMultiSelectBase;

package/lib/components/XSearchBrowseParams.d.ts

@@ -1,5 +1,5 @@
 import { DataTableFilterMetaData } from "primereact/datatable";
-import { XFilterOrFunction } from "./XAutoCompleteBase";
+import { XFilterOrFunction } from "./XUtils";
 export interface XFieldFilter {
     field: string;
     constraint: DataTableFilterMetaData;

package/lib/components/XSearchButton.d.ts

@@ -22,5 +22,5 @@ export declare class XSearchButton extends XFormComponent<XObject, XSearchButton
     constructor(props: XSearchButtonProps);
     getField(): string;
     isNotNull(): boolean;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/XSearchButton.js

@@ -214,7 +214,7 @@ var XSearchButton = /** @class */ (function (_super) {
             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, { 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*/))));
+            react_1.default.createElement(dialog_1.Dialog, { className: "x-dialog-without-header", 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,5 +1,5 @@
-/// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import React from "react";
 import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
 export declare const XSearchButtonDT: (props: {
     form: XFormBase;
@@ -10,4 +10,4 @@ export declare const XSearchButtonDT: (props: {
     assocForm?: JSX.Element | undefined;
     rowData: any;
     readOnly?: XTableFieldReadOnlyProp | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XSearchButtonDT.js

@@ -181,7 +181,7 @@ var XSearchButtonDT = function (props) {
         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, { icon: "pi pi-search", onClick: onClickSearch })),
-        react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchBrowse, {
+        react_1.default.createElement(dialog_1.Dialog, { className: "x-dialog-without-header", visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchBrowse, {
             searchBrowseParams: {
                 onChoose: onChoose,
                 displayFieldFilter: (inputChanged ? { field: props.displayField, constraint: { value: inputValueState, matchMode: "contains" } } : undefined),

package/lib/components/XSearchButtonOld.d.ts

@@ -10,4 +10,4 @@ export declare const XSearchButtonOld: (props: {
     readOnly?: boolean | undefined;
     size?: number | undefined;
     inputStyle?: React.CSSProperties | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XToOneAssocButton.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
 import { XFormBase } from "./XFormBase";
+import React from "react";
 export declare const XToOneAssocButton: (props: {
     form: XFormBase;
     assocField: string;
     assocForm: any;
     label?: string | undefined;
-}) => JSX.Element;
+}) => React.JSX.Element;

package/lib/components/XToken.d.ts

@@ -1,6 +1,6 @@
 export interface XToken {
     username?: string;
     password?: string;
-    accessToken?: string;
+    accessToken?: string | (() => Promise<string>);
     xUser?: any;
 }

package/lib/components/XUtils.d.ts

@@ -7,7 +7,7 @@ import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
 import { DataTableSortMeta } from "primereact/datatable";
 import { XObject } from "./XObject";
 import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
-import { XFilterOrFunction } from "./XAutoCompleteBase";
+import { SelectItem } from "primereact/selectitem";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -29,6 +29,13 @@ export interface IPostgresInterval {
     seconds?: number;
     milliseconds?: number;
 }
+export type XFilterOrFunction = XCustomFilter | (() => XCustomFilter | undefined);
+export interface XQuery {
+    entity: string;
+    filter?: XFilterOrFunction;
+    sortField?: string | DataTableSortMeta[];
+    fields?: string[];
+}
 export declare class XUtils {
     static dropdownEmptyOptionValue: string;
     static xBackendUrl: string | undefined;
@@ -69,6 +76,7 @@ export declare class XUtils {
     static fetchById(entity: string, fields: string[], id: number): Promise<any>;
     static setXToken(xToken: XToken | null): void;
     static getXToken(): XToken | null;
+    static getAccessToken(): Promise<string>;
     static getUsername(): string | undefined;
     static getXBackendUrl(): string;
     static setXBackendUrl(xBackendUrl: string | undefined): void;
@@ -102,7 +110,7 @@ export declare class XUtils {
     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): {};
+    static createTooltipOrErrorProps(error: string | undefined, tooltip?: string | undefined): object;
     static addClassName(props: {
         [key: string]: any;
     }, className: string): {
@@ -118,4 +126,5 @@ export declare class XUtils {
     static evalFilter(filter: XFilterOrFunction | undefined): XCustomFilter | undefined;
     static isTableRowInserted(tableRow: any): boolean;
     static xViewStatus(xViewStatusOrBoolean: XViewStatusOrBoolean): XViewStatus;
+    static options(valueStringList: string[]): SelectItem[];
 }

package/lib/components/XUtils.js

@@ -424,36 +424,26 @@ var XUtils = /** @class */ (function () {
     };
     XUtils.fetchBasic = function (path, headers, body, usePublicToken) {
         return __awaiter(this, void 0, void 0, function () {
-            var xToken, response, responseBody;
+            var accessToken, response, responseBody;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (typeof usePublicToken === 'object') {
-                            xToken = usePublicToken;
-                        }
-                        else if (usePublicToken) {
-                            xToken = XUtils.xTokenPublic; // public token vzdy
-                        }
-                        else {
-                            xToken = XUtils.getXToken();
-                            if (xToken === null) {
-                                xToken = XUtils.xTokenPublic; // ak nikto nie je prihlaseny, posleme public token
-                            }
-                        }
-                        headers = __assign(__assign({}, headers), { 'Authorization': "Bearer ".concat(xToken.accessToken) });
+                    case 0: return [4 /*yield*/, XUtils.getAccessToken()];
+                    case 1:
+                        accessToken = _a.sent();
+                        headers = __assign(__assign({}, headers), { 'Authorization': "Bearer ".concat(accessToken) });
                         return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
                                 method: 'POST',
                                 headers: headers,
                                 body: body
                             })];
-                    case 1:
+                    case 2:
                         response = _a.sent();
-                        if (!!response.ok) return [3 /*break*/, 3];
+                        if (!!response.ok) return [3 /*break*/, 4];
                         return [4 /*yield*/, response.json()];
-                    case 2:
+                    case 3:
                         responseBody = _a.sent();
                         throw new XResponseError_1.XResponseError(path, response.status, response.statusText, responseBody);
-                    case 3: return [2 /*return*/, response];
+                    case 4: return [2 /*return*/, response];
                 }
             });
         });
@@ -467,6 +457,34 @@ var XUtils = /** @class */ (function () {
     XUtils.getXToken = function () {
         return XUtils.xToken;
     };
+    XUtils.getAccessToken = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var xToken, accessToken;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        xToken = XUtils.getXToken();
+                        if (xToken === null) {
+                            throw "Unexpected error - XUtils.xToken is null (no user signed in)";
+                        }
+                        if (!(typeof xToken.accessToken === 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, xToken.accessToken()];
+                    case 1:
+                        accessToken = _a.sent(); // ziskame access token volanim getAccessTokenSilently (pripadne podobnym)
+                        return [3 /*break*/, 3];
+                    case 2:
+                        if (xToken.accessToken !== undefined) {
+                            accessToken = xToken.accessToken; // mame rovno access token
+                        }
+                        else {
+                            throw "Unexpected error - XUtils.xToken.accessToken is undefined";
+                        }
+                        _a.label = 3;
+                    case 3: return [2 /*return*/, accessToken];
+                }
+            });
+        });
+    };
     XUtils.getUsername = function () {
         var _a, _b;
         return (_b = (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.xUser) === null || _b === void 0 ? void 0 : _b.username;
@@ -653,8 +671,10 @@ var XUtils = /** @class */ (function () {
         alert(msg);
     };
     // pouziva sa hlavne na inputy
-    XUtils.createErrorProps = function (error) {
-        return error ? { className: "p-invalid", tooltip: error, tooltipOptions: { className: 'pink-tooltip', position: 'bottom' } } : {};
+    XUtils.createTooltipOrErrorProps = function (error, tooltip) {
+        // error ma prednost, ak nemame error, dame tooltip ak mame
+        return error ? { className: "p-invalid", tooltip: error, tooltipOptions: { className: 'pink-tooltip', position: 'bottom' } }
+            : (tooltip ? { tooltip: tooltip, tooltipOptions: { 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
@@ -821,6 +841,10 @@ var XUtils = /** @class */ (function () {
         }
         return xViewStatus;
     };
+    // plain string does not work in Dropdown, bug in Primereact?
+    XUtils.options = function (valueStringList) {
+        return valueStringList.map(function (valueString) { return { value: valueString, label: valueString }; });
+    };
     XUtils.dropdownEmptyOptionValue = " ";
     XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela

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

@@ -11,6 +11,7 @@
         "pleaseSelectRow": "Please select the row.",
         "removeRowConfirm": "Are you sure to remove the selected row?",
         "removeRowFailed": "Remove row failed.",
+        "newRow": "new row",
         "save": "Save",
         "cancel": "Cancel",
         "expRowCount": "Row count",

package/lib/serverApi/XUtilsMetadataCommon.d.ts

@@ -16,7 +16,9 @@ export declare class XUtilsMetadataCommon {
     static hasPathToManyAssoc(xEntity: XEntity, path: string): boolean;
     static getXFieldByPathStr(entity: string, path: string): XField;
     static getXAssocBase(xEntity: XEntity, assocField: string): XAssoc | undefined;
-    static getXAssocByPath(xEntity: XEntity, path: string): XAssoc;
+    static getXAssocToOneByPath(xEntity: XEntity, path: string): XAssoc;
+    static getXAssocToManyByPath(xEntity: XEntity, path: string): XAssoc;
+    static getXAssocByPath(xEntity: XEntity, path: string, relationTypeList?: XRelationType[]): XAssoc;
     static getLastXAssocByPath(xEntity: XEntity, path: string): XAssoc;
     static getXAssocToOne(xEntity: XEntity, assocField: string): XAssoc;
     static getXAssocToMany(xEntity: XEntity, assocField: string): XAssoc;

package/lib/serverApi/XUtilsMetadataCommon.js

@@ -114,15 +114,21 @@ var XUtilsMetadataCommon = /** @class */ (function () {
     XUtilsMetadataCommon.getXAssocBase = function (xEntity, assocField) {
         return xEntity.assocMap[assocField];
     };
-    XUtilsMetadataCommon.getXAssocByPath = function (xEntity, path) {
+    XUtilsMetadataCommon.getXAssocToOneByPath = function (xEntity, path) {
+        return XUtilsMetadataCommon.getXAssocByPath(xEntity, path, ["many-to-one", "one-to-one"]);
+    };
+    XUtilsMetadataCommon.getXAssocToManyByPath = function (xEntity, path) {
+        return XUtilsMetadataCommon.getXAssocByPath(xEntity, path, ["one-to-many", "many-to-many"]);
+    };
+    XUtilsMetadataCommon.getXAssocByPath = function (xEntity, path, relationTypeList) {
         var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
         if (restPath === null) {
             return XUtilsMetadataCommon.getXAssoc(xEntity, field);
         }
         else {
-            var xAssoc = XUtilsMetadataCommon.getXAssoc(xEntity, field);
+            var xAssoc = XUtilsMetadataCommon.getXAssoc(xEntity, field, relationTypeList);
             var xAssocEntity = XUtilsMetadataCommon.getXEntity(xAssoc.entityName);
-            return XUtilsMetadataCommon.getXAssocByPath(xAssocEntity, restPath);
+            return XUtilsMetadataCommon.getXAssocByPath(xAssocEntity, restPath, relationTypeList);
         }
     };
     // for path assoc1.assoc2.field returns assoc2 (last assoc before field)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "1.22.0",
+  "version": "1.24.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",
@@ -39,8 +39,8 @@
   },
   "peerDependencies": {
     "primeflex": "^3.3.1",
-    "primeicons": "^6.0.1",
-    "primereact": "~10.4.0",
+    "primeicons": "^7.0.0",
+    "primereact": "~10.6.5",
     "quill": "^1.3.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",