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

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/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/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,6 @@ import { XCustomFilter, XCustomFilterItem } from "../serverApi/FindParam";
 import { DataTableSortMeta } from "primereact/datatable";
 import { XObject } from "./XObject";
 import { XTableFieldReadOnlyProp } from "./XFormDataTable2";
-import { XFilterOrFunction } from "./XAutoCompleteBase";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -29,6 +28,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 +75,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 +109,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): {

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

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.23.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",