@michalrakus/x-react-web-lib 0.24.0 → 1.0.0

package/lib/components/XLoginForm.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -77,7 +77,7 @@ var react_1 = __importStar(require("react"));
 var password_1 = require("primereact/password");
 var button_1 = require("primereact/button");
 var XUtils_1 = require("./XUtils");
-var XLoginForm = function (props) {
+exports.XLoginForm = function (props) {
     var _a = __read(react_1.useState(""), 2), username = _a[0], setUsername = _a[1];
     var _b = __read(react_1.useState(""), 2), password = _b[0], setPassword = _b[1];
     var onClickLogIn = function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -98,7 +98,7 @@ var XLoginForm = function (props) {
                     _a.label = 3;
                 case 3:
                     // zatial si ulozime len username/password (koli http basic autentifikacii)
-                    props.setXToken({ username: username, password: password, customUser: customUser });
+                    props.setXToken({ username: username, password: password, xUser: customUser });
                     // metoda pouzivana v XLoginDialog
                     if (props.onLogin) {
                         props.onLogin();
@@ -111,7 +111,7 @@ var XLoginForm = function (props) {
             }
         });
     }); };
-    return (react_1.default.createElement("div", null,
+    return (react_1.default.createElement("div", { className: "flex flex-column align-items-center" },
         react_1.default.createElement("h2", null, "Please log in"),
         react_1.default.createElement("div", { className: "field grid" },
             react_1.default.createElement("label", { htmlFor: "userName", className: "col-fixed", style: { width: '10.5rem' } }, "Username"),
@@ -121,4 +121,3 @@ var XLoginForm = function (props) {
             react_1.default.createElement(password_1.Password, { id: "password", value: password, onChange: function (e) { return setPassword(e.target.value); }, feedback: false, maxLength: 64 })),
         react_1.default.createElement(button_1.Button, { label: "Log in", onClick: onClickLogIn })));
 };
-exports.XLoginForm = XLoginForm;

package/lib/components/XResponseError.js

@@ -3,12 +3,10 @@ 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]; };
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(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 __());

package/lib/components/XSearchButton.js

@@ -3,12 +3,10 @@ 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]; };
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(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 __());

package/lib/components/XSearchButtonDT.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -78,7 +78,7 @@ var inputtext_1 = require("primereact/inputtext");
 var button_1 = require("primereact/button");
 var dialog_1 = require("primereact/dialog");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
-var XSearchButtonDT = function (props) {
+exports.XSearchButtonDT = function (props) {
     var inputTextEl = react_1.useRef(null);
     var _a = __read(react_1.useState(false), 2), inputChanged = _a[0], setInputChanged = _a[1]; // priznak, ci uzivatel typovanim zmenil hodnotu v inpute
     var _b = __read(react_1.useState(null), 2), inputValueState = _b[0], setInputValueState = _b[1]; // pouzivane, len ak inputChanged === true, je tu zapisana zmenena hodnota v inpute
@@ -181,4 +181,3 @@ var XSearchButtonDT = function (props) {
             react_1.default.createElement(button_1.Button, { label: "...", onClick: onClickSearch })),
         react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchTable, { searchTableParams: { onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined) } }, props.searchTable.children))));
 };
-exports.XSearchButtonDT = XSearchButtonDT;

package/lib/components/XSearchButtonOld.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -78,7 +78,7 @@ var button_1 = require("primereact/button");
 var XUtils_1 = require("./XUtils");
 var dialog_1 = require("primereact/dialog");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
-var XSearchButtonOld = function (props) {
+exports.XSearchButtonOld = function (props) {
     var _a, _b, _c;
     props.form.addField(props.assocField + '.' + props.displayField);
     var xEntity = XUtilsMetadata_1.XUtilsMetadata.getXEntity(props.form.getEntity());
@@ -205,4 +205,3 @@ var XSearchButtonOld = function (props) {
         react_1.default.createElement(button_1.Button, { label: "...", onClick: onClickSearch }),
         react_1.default.createElement(dialog_1.Dialog, { visible: dialogOpened, onHide: onHide }, react_1.default.cloneElement(props.searchTable, { searchTableParams: { onChoose: onChoose, displayField: props.displayField, filter: (inputChanged ? inputValueState : undefined) } }, props.searchTable.children))));
 };
-exports.XSearchButtonOld = XSearchButtonOld;

package/lib/components/XToOneAssocButton.js

@@ -8,7 +8,7 @@ var react_1 = __importDefault(require("react"));
 var button_1 = require("primereact/button");
 var XUtilsMetadata_1 = require("./XUtilsMetadata");
 var XUtils_1 = require("./XUtils");
-var XToOneAssocButton = function (props) {
+exports.XToOneAssocButton = function (props) {
     // mozno lepsie by bolo sem dat xEntityAssoc.idField ale postaci aj *FAKE*
     props.form.addField(props.assocField + '.*FAKE*');
     var label = props.label !== undefined ? props.label : props.assocField;
@@ -27,4 +27,3 @@ var XToOneAssocButton = function (props) {
         react_1.default.createElement("label", { htmlFor: props.assocField, className: "col-fixed", style: { width: XUtils_1.XUtils.FIELD_LABEL_WIDTH } }, label),
         react_1.default.createElement(button_1.Button, { label: label, onClick: onClickButton, disabled: assocObject === null })));
 };
-exports.XToOneAssocButton = XToOneAssocButton;

package/lib/components/XToken.d.ts

@@ -1,5 +1,6 @@
 export interface XToken {
-    username: string;
-    password: string;
-    customUser?: any;
+    username?: string;
+    password?: string;
+    accessToken?: string;
+    xUser?: any;
 }

package/lib/components/XUtils.d.ts

@@ -1,6 +1,7 @@
 import { XToken } from "./XToken";
 import { CsvDecimalFormat, CsvSeparator, ExportType } from "../serverApi/ExportImportParam";
 import React from "react";
+import { XEnvVar } from "./XEnvVars";
 export declare enum OperationType {
     None = 0,
     Insert = 1,
@@ -9,7 +10,7 @@ export declare enum OperationType {
 }
 export declare class XUtils {
     static dropdownEmptyOptionValue: string;
-    static xServerUrl: string | null;
+    static xBackendUrl: string | undefined;
     static xToken: XToken | null;
     static xTokenPublic: XToken;
     private static appFormMap;
@@ -37,13 +38,19 @@ export declare class XUtils {
     static post(path: string, value: any): Promise<Response>;
     static fetchBasicJson(path: string, value: any, usePublicToken?: boolean | XToken): Promise<Response>;
     static fetchFile(path: string, jsonFieldValue: any, fileToPost: any): Promise<any>;
+    static fetchBasicAuthBasic(path: string, headers: any, body: any, usePublicToken?: boolean | XToken): Promise<Response>;
     static fetchBasic(path: string, headers: any, body: any, usePublicToken?: boolean | XToken): Promise<Response>;
     static fetchById(entity: string, fields: string[], id: number): Promise<any>;
     static setXToken(xToken: XToken | null): void;
     static getXToken(): XToken | null;
     static getUsername(): string | undefined;
-    static getXServerUrl(): string;
-    static setXServerUrl(xServerUrl: string): void;
+    static getXBackendUrl(): string;
+    static setXBackendUrl(xBackendUrl: string | undefined): void;
+    /**
+     * returns value of environment variable from configuration file .env
+     * @param envVar
+     */
+    static getEnvVarValue(envVarEnum: XEnvVar): string;
     static removeRow(entity: string, row: any): Promise<void>;
     static arrayMoveElement(array: any[], position: number, offset: number): void;
     static isReadOnly(path: string, readOnlyInit?: boolean): boolean;

package/lib/components/XUtils.js

@@ -90,7 +90,7 @@ var XUtils = /** @class */ (function () {
     function XUtils() {
     }
     XUtils.demo = function () {
-        return XUtils.getXServerUrl().indexOf('x-demo-server') !== -1;
+        return XUtils.getXBackendUrl().indexOf('x-demo-server') !== -1;
     };
     XUtils.isMobile = function () {
         // extra small displays (podla https://www.w3schools.com/howto/howto_css_media_query_breakpoints.asp)
@@ -306,7 +306,8 @@ var XUtils = /** @class */ (function () {
             });
         });
     };
-    XUtils.fetchBasic = function (path, headers, body, usePublicToken) {
+    // nepouzivana stara Basic autentifikacia
+    XUtils.fetchBasicAuthBasic = function (path, headers, body, usePublicToken) {
         return __awaiter(this, void 0, void 0, function () {
             var xToken, response, responseBody;
             return __generator(this, function (_a) {
@@ -325,7 +326,43 @@ var XUtils = /** @class */ (function () {
                             }
                         }
                         headers = __assign(__assign({}, headers), { 'Authorization': "Basic " + Buffer.from(xToken.username + ':' + xToken.password).toString('base64') });
-                        return [4 /*yield*/, fetch(XUtils.getXServerUrl() + path, {
+                        return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
+                                method: 'POST',
+                                headers: headers,
+                                body: body
+                            })];
+                    case 1:
+                        response = _a.sent();
+                        if (!!response.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, response.json()];
+                    case 2:
+                        responseBody = _a.sent();
+                        throw new XResponseError_1.XResponseError(path, response.status, response.statusText, responseBody);
+                    case 3: return [2 /*return*/, response];
+                }
+            });
+        });
+    };
+    XUtils.fetchBasic = function (path, headers, body, usePublicToken) {
+        return __awaiter(this, void 0, void 0, function () {
+            var xToken, 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 " + xToken.accessToken });
+                        return [4 /*yield*/, fetch(XUtils.getXBackendUrl() + path, {
                                 method: 'POST',
                                 headers: headers,
                                 body: body
@@ -352,17 +389,28 @@ var XUtils = /** @class */ (function () {
         return XUtils.xToken;
     };
     XUtils.getUsername = function () {
-        var _a;
-        return (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.username;
+        var _a, _b;
+        return (_b = (_a = XUtils.getXToken()) === null || _a === void 0 ? void 0 : _a.xUser) === null || _b === void 0 ? void 0 : _b.username;
     };
-    XUtils.getXServerUrl = function () {
-        if (XUtils.xServerUrl === null) {
-            throw "XUtils.xServerUrl is null";
+    XUtils.getXBackendUrl = function () {
+        if (XUtils.xBackendUrl === undefined) {
+            throw "XUtils.xBackendUrl is undefined";
         }
-        return XUtils.xServerUrl;
-    };
-    XUtils.setXServerUrl = function (xServerUrl) {
-        XUtils.xServerUrl = xServerUrl;
+        return XUtils.xBackendUrl;
+    };
+    XUtils.setXBackendUrl = function (xBackendUrl) {
+        XUtils.xBackendUrl = xBackendUrl;
+    };
+    /**
+     * returns value of environment variable from configuration file .env
+     * @param envVar
+     */
+    XUtils.getEnvVarValue = function (envVarEnum) {
+        var value = process.env[envVarEnum];
+        if (value === undefined) {
+            throw "Environment variable " + envVarEnum + " - value not found. Check configuration file .env*";
+        }
+        return value;
     };
     // funkcionalita ktoru by bolo dobre dat do servisov
     XUtils.removeRow = function (entity, row) {
@@ -434,7 +482,7 @@ var XUtils = /** @class */ (function () {
         return value;
     };
     XUtils.dropdownEmptyOptionValue = " ";
-    XUtils.xServerUrl = null;
+    XUtils.xBackendUrl = undefined;
     // nacachovany XToken - na rozlicnych miestach potrebujeme vediet uzivatela
     XUtils.xToken = null;
     // token pouzivany pre public stranky (napr. XLoginForm), meno/heslo natvrdo (lepsie ako nic)

package/lib/serverApi/XUser.d.ts

@@ -3,4 +3,5 @@ export interface XUser {
     username: string;
     password: string;
     name: string;
+    enabled: boolean;
 }

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@michalrakus/x-react-web-lib",
-  "version": "0.24.0",
+  "version": "1.0.0",
   "description": "",
   "scripts": {
     "clean": "rimraf lib",
     "compile": "tsc",
     "generateApi": "gulp generateApi",
-    "build": "npm run clean && npm run compile && npm run generateApi",
-    "linkDemo": "npm link && npm link ../DemoReactWebApp/node_modules/react",
-    "linkDemoRouter": "npm link && npm link ../demo-router-web-app/node_modules/react",
-    "linkKvm": "npm link && npm link ../kvm-web-app/node_modules/react",
-    "linkKvmNext": "npm link && npm link ../kvm-next-web-app/node_modules/react",
+    "build": "pnpm run clean && pnpm run compile && pnpm run generateApi",
+    "linkDemo": "pnpm link && pnpm link ../DemoReactWebApp/node_modules/react",
+    "linkDemoRouter": "pnpm link && pnpm link ../demo-router-web-app/node_modules/react",
+    "linkKvm": "pnpm link && pnpm link ../kvm-web-app/node_modules/react",
+    "linkKvmNext": "pnpm link && pnpm link ../kvm-next-web-app/node_modules/react",
     "test": "echo \"Error: no test specified\" && exit 1",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "pnpm run build",
+    "buildAndPack": "pnpm run build && pnpm pack",
+    "bp": "pnpm run buildAndPack",
+    "preinstall": "npx only-allow pnpm"
   },
   "author": "Michal Rakus",
   "license": "ISC",
@@ -30,9 +33,9 @@
     "@types/react-transition-group": "^4.2.4",
     "axios": "^0.19.0",
     "classnames": "^2.2.6",
-    "primeflex": "3.0.1",
-    "primeicons": "^4.1.0",
-    "primereact": "latest",
+    "primeflex": "^3.3.0",
+    "primeicons": "^6.0.1",
+    "primereact": "6.0.2",
     "lodash": "^4.17.21",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
@@ -40,7 +43,7 @@
     "react-transition-group": "^4.4.1",
     "gulp": "^4.0.2",
     "rimraf": "^3.0.2",
-    "typescript": "^4.2.4",
+    "typescript": "^3.2.1",
     "dateformat": "^4.4.1"
   },
   "files": [