@michalrakus/x-react-web-lib 1.15.0 → 1.16.0

package/lib/components/XAutoComplete.d.ts

@@ -12,6 +12,7 @@ export interface XAutoCompleteProps extends XFormComponentProps<XObject> {
     assocForm?: JSX.Element;
     filter?: XFilterProp;
     sortField?: string | DataTableSortMeta[];
+    fields?: string[];
     suggestions?: any[];
     lazy?: boolean;
     width?: string;

package/lib/components/XAutoComplete.js

@@ -89,7 +89,7 @@ var XAutoComplete = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         if (!(this.props.suggestions === undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, this.getFilterBase(this.props.filter), (_a = this.props.sortField) !== null && _a !== void 0 ? _a : this.props.displayField)];
+                        return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.xAssoc.entityName, this.getFilterBase(this.props.filter), (_a = this.props.sortField) !== null && _a !== void 0 ? _a : this.props.displayField, this.props.fields)];
                     case 1:
                         suggestions = _b.sent();
                         this.setState({ suggestions: suggestions }, setStateCallback);

package/lib/components/XCalendar.d.ts

@@ -5,5 +5,6 @@ export declare const XCalendar: (props: {
     onChange: (value: Date | null) => void;
     onBlur?: ((event: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
     readOnly?: boolean | undefined;
+    error?: string | undefined;
     datetime?: boolean | undefined;
 }) => JSX.Element;

package/lib/components/XCalendar.js

@@ -1,4 +1,15 @@
 "use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,6 +18,7 @@ exports.XCalendar = void 0;
 var react_1 = __importDefault(require("react"));
 var calendar_1 = require("primereact/calendar");
 var XUtilsConversions_1 = require("../serverApi/XUtilsConversions");
+var XUtils_1 = require("./XUtils");
 // wrapper for Calendar component, maybe better name would be XInputDateBase
 var XCalendar = function (props) {
     var _a;
@@ -22,6 +34,6 @@ var XCalendar = function (props) {
         }
     };
     var datetime = (_a = props.datetime) !== null && _a !== void 0 ? _a : false;
-    return (react_1.default.createElement(calendar_1.Calendar, { id: props.id, value: props.value, onChange: onChange, disabled: props.readOnly, showIcon: true, showOnFocus: false, dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(), showTime: datetime, showSeconds: datetime, inputClassName: datetime ? 'x-input-datetime' : 'x-input-date', onBlur: props.onBlur }));
+    return (react_1.default.createElement(calendar_1.Calendar, __assign({ id: props.id, value: props.value, onChange: onChange, disabled: props.readOnly, showIcon: true, showOnFocus: false, dateFormat: (0, XUtilsConversions_1.dateFormatCalendar)(), showTime: datetime, showSeconds: datetime, inputClassName: datetime ? 'x-input-datetime' : 'x-input-date', onBlur: props.onBlur }, XUtils_1.XUtils.createErrorProps(props.error))));
 };
 exports.XCalendar = XCalendar;

package/lib/components/XEnvVars.d.ts

@@ -1,6 +1,7 @@
 export declare enum XEnvVar {
     REACT_APP_BACKEND_URL = "REACT_APP_BACKEND_URL",
     REACT_APP_AUTH = "REACT_APP_AUTH",
+    REACT_APP_AUTH_OFF_USERNAME = "REACT_APP_AUTH_OFF_USERNAME",
     REACT_APP_AUTH0_DOMAIN = "REACT_APP_AUTH0_DOMAIN",
     REACT_APP_AUTH0_CLIENT_ID = "REACT_APP_AUTH0_CLIENT_ID",
     REACT_APP_AUTH0_AUDIENCE = "REACT_APP_AUTH0_AUDIENCE",
@@ -9,6 +10,7 @@ export declare enum XEnvVar {
     REACT_APP_MS_ENTRA_ID_BACKEND_SCOPE = "REACT_APP_MS_ENTRA_ID_BACKEND_SCOPE"
 }
 export declare enum XReactAppAuth {
+    OFF = "OFF",
     LOCAL = "LOCAL",
     AUTH0 = "AUTH0",
     MS_ENTRA_ID = "MS_ENTRA_ID"

package/lib/components/XEnvVars.js

@@ -6,6 +6,7 @@ var XEnvVar;
 (function (XEnvVar) {
     XEnvVar["REACT_APP_BACKEND_URL"] = "REACT_APP_BACKEND_URL";
     XEnvVar["REACT_APP_AUTH"] = "REACT_APP_AUTH";
+    XEnvVar["REACT_APP_AUTH_OFF_USERNAME"] = "REACT_APP_AUTH_OFF_USERNAME";
     XEnvVar["REACT_APP_AUTH0_DOMAIN"] = "REACT_APP_AUTH0_DOMAIN";
     XEnvVar["REACT_APP_AUTH0_CLIENT_ID"] = "REACT_APP_AUTH0_CLIENT_ID";
     XEnvVar["REACT_APP_AUTH0_AUDIENCE"] = "REACT_APP_AUTH0_AUDIENCE";
@@ -17,6 +18,7 @@ var XEnvVar;
 // enum for values of the environment variable REACT_APP_AUTH
 var XReactAppAuth;
 (function (XReactAppAuth) {
+    XReactAppAuth["OFF"] = "OFF";
     XReactAppAuth["LOCAL"] = "LOCAL";
     XReactAppAuth["AUTH0"] = "AUTH0";
     XReactAppAuth["MS_ENTRA_ID"] = "MS_ENTRA_ID";

package/lib/components/XFormBase.d.ts

@@ -55,15 +55,15 @@ export declare abstract class XFormBase extends Component<XFormProps> {
     formReadOnlyBase(field: string): boolean;
     onClickSave(): Promise<void>;
     onClickCancel(): void;
-    validateSave(): boolean;
-    validateForm(): XErrorMap;
+    validateSave(): Promise<boolean>;
+    validateForm(): Promise<XErrorMap>;
     fieldValidation(): XErrorMap;
     getErrorMessagesForAssoc(oneToManyAssoc: string): string;
     static saveErrorsIntoXRowTechData(row: any, xErrors: XErrors): void;
     formReadOnly(object: XObject, field: string): boolean;
     createNewObject(): XObject;
     preInitForm(object: XObject, operationType: OperationType.Insert | OperationType.Update): void;
-    validate(object: XObject): XErrors;
+    validate(object: XObject): Promise<XErrors>;
     preSave(object: XObject): void;
     saveRow(): Promise<any>;
 }

package/lib/components/XFormBase.js

@@ -383,9 +383,9 @@ var XFormBase = /** @class */ (function (_super) {
             var isAddRow, object, e_4;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        //console.log("zavolany onClickSave");
-                        if (!this.validateSave()) {
+                    case 0: return [4 /*yield*/, this.validateSave()];
+                    case 1:
+                        if (!(_a.sent())) {
                             return [2 /*return*/];
                         }
                         // docasne na testovanie
@@ -402,18 +402,18 @@ var XFormBase = /** @class */ (function (_super) {
                         // }
                         this.preSave(this.state.object);
                         isAddRow = this.isAddRow();
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.saveRow()];
+                        _a.label = 2;
                     case 2:
-                        object = _a.sent();
-                        return [3 /*break*/, 4];
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, this.saveRow()];
                     case 3:
+                        object = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
                         e_4 = _a.sent();
                         XUtils_1.XUtils.showErrorMessage("Save row failed.", e_4);
                         return [2 /*return*/]; // zostavame vo formulari
-                    case 4:
+                    case 5:
                         if (this.props.onSaveOrCancel !== undefined) {
                             // formular je zobrazeny v dialogu
                             this.props.onSaveOrCancel(object, isAddRow ? XUtils_1.OperationType.Insert : XUtils_1.OperationType.Update);
@@ -438,74 +438,90 @@ var XFormBase = /** @class */ (function (_super) {
         }
     };
     XFormBase.prototype.validateSave = function () {
-        var e_5, _a, e_6, _b;
-        var xErrorMap = this.validateForm();
-        // zatial takto jednoducho
-        var msg = XUtils_1.XUtils.getErrorMessages(xErrorMap);
-        try {
-            // este spracujeme editovatelne tabulky
-            for (var _c = __values(this.xFormDataTableList), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var xFormDataTable = _d.value;
-                //msg += xFormDataTable.getErrorMessages();
-                msg += this.getErrorMessagesForAssoc(xFormDataTable.props.assocField);
-            }
-        }
-        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; }
-        }
-        try {
-            // este spracujeme oneToMany asociacie, ktore boli explicitne uvedene, ze ich treba validovat
-            // (validaciu treba nakodit vo formulari, zavolat z metody validate() a ukoncit zavolanim XFormBase.saveErrorsIntoXRowTechData)
-            for (var _e = __values(this.assocToValidateList), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var assocToValidate = _f.value;
-                msg += this.getErrorMessagesForAssoc(assocToValidate);
-            }
-        }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-        finally {
-            try {
-                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-            }
-            finally { if (e_6) throw e_6.error; }
-        }
-        var ok = true;
-        if (msg !== "") {
-            alert(msg);
-            ok = false;
-        }
-        return ok;
+        return __awaiter(this, void 0, void 0, function () {
+            var xErrorMap, msg, _a, _b, xFormDataTable, _c, _d, assocToValidate, ok;
+            var e_5, _e, e_6, _f;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0: return [4 /*yield*/, this.validateForm()];
+                    case 1:
+                        xErrorMap = _g.sent();
+                        msg = XUtils_1.XUtils.getErrorMessages(xErrorMap);
+                        try {
+                            // este spracujeme editovatelne tabulky
+                            for (_a = __values(this.xFormDataTableList), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                xFormDataTable = _b.value;
+                                //msg += xFormDataTable.getErrorMessages();
+                                msg += this.getErrorMessagesForAssoc(xFormDataTable.props.assocField);
+                            }
+                        }
+                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                            }
+                            finally { if (e_5) throw e_5.error; }
+                        }
+                        try {
+                            // este spracujeme oneToMany asociacie, ktore boli explicitne uvedene, ze ich treba validovat
+                            // (validaciu treba nakodit vo formulari, zavolat z metody validate() a ukoncit zavolanim XFormBase.saveErrorsIntoXRowTechData)
+                            for (_c = __values(this.assocToValidateList), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                assocToValidate = _d.value;
+                                msg += this.getErrorMessagesForAssoc(assocToValidate);
+                            }
+                        }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        finally {
+                            try {
+                                if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                            }
+                            finally { if (e_6) throw e_6.error; }
+                        }
+                        ok = true;
+                        if (msg !== "") {
+                            alert(msg);
+                            ok = false;
+                        }
+                        return [2 /*return*/, ok];
+                }
+            });
+        });
     };
     XFormBase.prototype.validateForm = function () {
-        var e_7, _a;
-        var xErrorMap = this.fieldValidation();
-        // form validation
-        var xErrors = this.validate(this.getXObject());
-        try {
-            for (var _b = __values(Object.entries(xErrors)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), field = _d[0], error = _d[1];
-                if (error) {
-                    // skusime zistit label
-                    var xFormComponent = this.findXFormComponent(field);
-                    var fieldLabel = xFormComponent ? xFormComponent.getLabel() : undefined;
-                    xErrorMap[field] = __assign(__assign({}, xErrorMap[field]), { form: error, fieldLabel: fieldLabel });
+        return __awaiter(this, void 0, void 0, function () {
+            var xErrorMap, xErrors, _a, _b, _c, field, error, xFormComponent, fieldLabel;
+            var e_7, _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        xErrorMap = this.fieldValidation();
+                        return [4 /*yield*/, this.validate(this.getXObject())];
+                    case 1:
+                        xErrors = _e.sent();
+                        try {
+                            for (_a = __values(Object.entries(xErrors)), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                _c = __read(_b.value, 2), field = _c[0], error = _c[1];
+                                if (error) {
+                                    xFormComponent = this.findXFormComponent(field);
+                                    fieldLabel = xFormComponent ? xFormComponent.getLabel() : undefined;
+                                    xErrorMap[field] = __assign(__assign({}, xErrorMap[field]), { form: error, fieldLabel: fieldLabel });
+                                }
+                            }
+                        }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        finally {
+                            try {
+                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                            }
+                            finally { if (e_7) throw e_7.error; }
+                        }
+                        // TODO - optimalizacia - netreba setovat stav ak by sme sli prec z formulara (ak by zbehla validacia aj save a isli by sme naspet do browsu)
+                        // setujeme aj this.state.object, lebo mohli pribudnut/odbudnut chyby na rowData v editovatelnych tabulkach
+                        this.setState({ object: this.state.object, errorMap: xErrorMap });
+                        return [2 /*return*/, xErrorMap];
                 }
-            }
-        }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_7) throw e_7.error; }
-        }
-        // TODO - optimalizacia - netreba setovat stav ak by sme sli prec z formulara (ak by zbehla validacia aj save a isli by sme naspet do browsu)
-        // setujeme aj this.state.object, lebo mohli pribudnut/odbudnut chyby na rowData v editovatelnych tabulkach
-        this.setState({ object: this.state.object, errorMap: xErrorMap });
-        return xErrorMap;
+            });
+        });
     };
     XFormBase.prototype.fieldValidation = function () {
         var e_8, _a, e_9, _b;
@@ -603,7 +619,11 @@ var XFormBase = /** @class */ (function (_super) {
     };
     // this method can be overriden in subclass if needed (custom validation)
     XFormBase.prototype.validate = function (object) {
-        return {};
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, {}];
+            });
+        });
     };
     // this method can be overriden in subclass if needed (to modify object before save)
     XFormBase.prototype.preSave = function (object) {

package/lib/components/XFormRowCol/XFormRowCol.js

@@ -11,15 +11,17 @@ var XFormRowCol = function (props) {
         // ak chceme zmenit child element, tak treba bud vytvorit novy alebo vyklonovat
         // priklad je na https://soshace.com/building-react-components-using-children-props-and-context-api/
         childElemList = react_1.default.Children.map(props.children, function (child) {
+            // chceli by sme klonovat len nase X* komponenty (napr. XInputText)
+            // ak vyklonujeme cudziu komponentu (napr. div), funguje, ale prida do nej property labelstyle=[object Object]
+            // child.type.name vracia nazov komponenty (napr. XInputText) ale ked sa vytvori optimalizovany build, uz to nefunguje (uz je tam napr. "t")
+            // takze zatial klonujeme vzdy
             var _a, _b;
-            // klonujeme len nase X* komponenty (napr. XInputText), child.type.name vracia nazov komponenty (napr. XInputText)
-            // ak vyklonujeme cudziu komponentu, funguje, ale prida do nej property labelstyle=[object Object]
-            if (child.type.name && child.type.name.startsWith("X")) {
-                return react_1.default.cloneElement(child, { form: (_a = child.props.form) !== null && _a !== void 0 ? _a : props.form, labelStyle: (_b = child.props.labelStyle) !== null && _b !== void 0 ? _b : props.labelStyle });
-            }
-            else {
-                return child;
-            }
+            //if (child.type.name && child.type.name.startsWith("X")) {
+            return react_1.default.cloneElement(child, { form: (_a = child.props.form) !== null && _a !== void 0 ? _a : props.form, labelStyle: (_b = child.props.labelStyle) !== null && _b !== void 0 ? _b : props.labelStyle });
+            //}
+            //else {
+            //    return child;
+            //}
         });
     }
     else {

package/lib/components/XInputDate.js

@@ -56,7 +56,7 @@ var XInputDate = /** @class */ (function (_super) {
         // note: style overrides size (width of the input according to character count)
         return (react_1.default.createElement("div", { className: "field grid" },
             react_1.default.createElement("label", { htmlFor: this.props.field, className: "col-fixed", style: this.getLabelStyle() }, this.getLabel()),
-            react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), datetime: this.xField.type === 'datetime', onBlur: this.onBlur })));
+            react_1.default.createElement(XCalendar_1.XCalendar, { id: this.props.field, value: this.getValue(), onChange: this.onValueChange, readOnly: this.isReadOnly(), error: this.getError(), datetime: this.xField.type === 'datetime', onBlur: this.onBlur })));
     };
     return XInputDate;
 }(XInput_1.XInput));

package/lib/components/XUtilsMetadata.js

@@ -126,7 +126,7 @@ var XUtilsMetadata = /** @class */ (function () {
                 width = XUtilsMetadata.computeColumnWidthBase(size, 0.5 + 0.5);
             }
             else if (xField.type === "date") {
-                width = XUtilsMetadata.computeColumnWidthBase(10, 0.25 + 1.25 + 0.25); // napr. 31.12.2021, 1.25 rem date picker button
+                width = XUtilsMetadata.computeColumnWidthBase(11, 0.25 + 1.25 + 0.25); // napr. 31.12.2021 (poznamka: dal som 11 lebo vo filtri nebolo vidno cely datum), 1.25 rem date picker button
             }
             else if (xField.type === "datetime") {
                 width = XUtilsMetadata.computeColumnWidthBase(10 + 9, 0.25 + 1.25 + 0.25); // napr. 31.12.2021 03:03:00

package/lib/serverApi/XUtilsCommon.d.ts

@@ -10,5 +10,6 @@ export declare class XUtilsCommon {
     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;
+    static sqlMaxDateIfNull(sqlExp: string): string;
 }
 export declare const dateFormat: any;

package/lib/serverApi/XUtilsCommon.js

@@ -172,6 +172,10 @@ var XUtilsCommon = /** @class */ (function () {
         var match = pattern.exec(value);
         return match != null ? match[0] : null;
     };
+    // to be used in sql expressions
+    XUtilsCommon.sqlMaxDateIfNull = function (sqlExp) {
+        return "coalesce(".concat(sqlExp, ", '9999-12-31'::DATE)");
+    };
     XUtilsCommon.newLine = '\n';
     return XUtilsCommon;
 }());

package/package.json

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