@michalrakus/x-react-web-lib 1.31.1 → 1.31.3

package/lib/components/XAutoCompleteDT.d.ts

@@ -16,6 +16,7 @@ export interface XAutoCompleteDTProps extends XFormComponentDTProps {
     suggestionsLoad?: XSuggestionsLoadProp;
     lazyLoadMaxRows?: number;
     splitQueryValue?: boolean;
+    addRowEnabled: boolean;
     minLength?: number;
     filter?: XTableFieldFilterProp;
     sortField?: string | DataTableSortMeta[];

package/lib/components/XAutoCompleteDT.js

@@ -68,7 +68,7 @@ var XAutoCompleteDT = /** @class */ (function (_super) {
         // TODO - size
         //const size = this.props.size ?? xDisplayField.length;
         // div className="col" nam zabezpeci aby XAutoCompleteBase nezaberal celu dlzku grid-u (ma nastaveny width=100% vdaka "formgroup-inline")
-        return (react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, itemTemplate: this.props.itemTemplate, searchBrowse: this.props.searchBrowse, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, readOnly: this.isReadOnly(), error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase, suggestions: this.props.suggestions, suggestionsLoad: this.props.suggestionsLoad, lazyLoadMaxRows: this.props.lazyLoadMaxRows, splitQueryValue: this.props.splitQueryValue, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, suggestionsQuery: { entity: this.xAssoc.entityName, filter: function () { return _this.getFilterBase(_this.props.filter); }, sortField: this.props.sortField, fields: this.props.fields }, inputClassName: this.props.inputClassName }));
+        return (react_1.default.createElement(XAutoCompleteBase_1.XAutoCompleteBase, { value: this.getValue(), onChange: this.onChangeAutoCompleteBase, field: this.props.displayField, itemTemplate: this.props.itemTemplate, searchBrowse: this.props.searchBrowse, valueForm: this.props.assocForm, idField: xEntityAssoc.idField, readOnly: this.isReadOnly(), error: this.getError(), onErrorChange: this.onErrorChangeAutoCompleteBase, suggestions: this.props.suggestions, suggestionsLoad: this.props.suggestionsLoad, lazyLoadMaxRows: this.props.lazyLoadMaxRows, splitQueryValue: this.props.splitQueryValue, addRowEnabled: this.props.addRowEnabled, minLength: this.props.minLength, scrollHeight: this.props.scrollHeight, suggestionsQuery: { entity: this.xAssoc.entityName, filter: function () { return _this.getFilterBase(_this.props.filter); }, sortField: this.props.sortField, fields: this.props.fields }, inputClassName: this.props.inputClassName }));
     };
     return XAutoCompleteDT;
 }(XFormComponentDT_1.XFormComponentDT));

package/lib/components/XDropdownDT.js

@@ -77,8 +77,9 @@ var XDropdownDT = function (props) {
     var findOptions = function () { return __awaiter(void 0, void 0, void 0, function () {
         var options, xAssoc_1;
         var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     options = props.dropdownOptionsMap[props.assocField];
                     if (!(options === undefined)) return [3 /*break*/, 2];
@@ -89,16 +90,16 @@ var XDropdownDT = function (props) {
                     // ak by tu tento riadok nebol, tak by sa options nacitavali tolkokrat, kolko je riadkov v tabulke
                     props.dropdownOptionsMap[props.assocField] = [];
                     xAssoc_1 = XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXAssocToOne(XUtilsMetadataCommon_1.XUtilsMetadataCommon.getXEntity(props.entity), props.assocField);
-                    return [4 /*yield*/, XUtils_1.XUtils.fetchRows(xAssoc_1.entityName, props.filter, (_a = props.sortField) !== null && _a !== void 0 ? _a : props.displayField)];
+                    return [4 /*yield*/, XUtils_1.XUtils.fetchRows(xAssoc_1.entityName, props.filter, (_b = props.sortField) !== null && _b !== void 0 ? _b : props.displayField)];
                 case 1:
                     //options = await XUtils.fetchMany('findRowsForAssoc', {entity: props.entity, assocField: props.assocField});
-                    options = _b.sent();
-                    options.splice(0, 0, {}); // null polozka (nepridavat pre not null atributy)
+                    options = _c.sent();
+                    options.splice(0, 0, (_a = {}, _a[idField] = null, _a[props.displayField] = "", _a)); // null polozka (nepridavat pre not null atributy)
                     props.dropdownOptionsMap[props.assocField] = options;
                     //console.log("XDropdownDT - findOptions - citali sme options pre field = " + props.assocField);
                     //console.log(props.dropdownOptionsMap);
                     props.onDropdownOptionsMapChange(props.dropdownOptionsMap); // vyrenderujeme nacitane hodnoty
-                    _b.label = 2;
+                    _c.label = 2;
                 case 2: return [2 /*return*/];
             }
         });
@@ -106,8 +107,8 @@ var XDropdownDT = function (props) {
     var onValueChange = function (assocField, rowData, newValue) {
         // zmenime hodnotu v modeli (odtial sa hodnota cita)
         var newValueOrNull;
-        // specialna null polozka nema ziadne atributy
-        if (Object.keys(newValue).length === 0) {
+        // specialna null polozka ma id === null
+        if (newValue[idField] === null) {
             newValueOrNull = null;
         }
         else {

package/lib/components/XDropdownForEntity.js

@@ -115,14 +115,15 @@ var XDropdownForEntity = /** @class */ (function (_super) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
             var options;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0: return [4 /*yield*/, XUtils_1.XUtils.fetchRows(this.props.entity, this.props.filter, (_a = this.props.sortField) !== null && _a !== void 0 ? _a : this.props.displayField)];
                     case 1:
-                        options = _b.sent();
+                        options = _c.sent();
                         if (this.props.isNotNull === undefined || !this.props.isNotNull) {
                             // pridame prazdnu polozku
-                            options.splice(0, 0, {}); // null polozka
+                            options.splice(0, 0, (_b = {}, _b[this.idField] = null, _b[this.props.displayField] = "", _b)); // null polozka
                         }
                         this.setState({ options: options });
                         return [2 /*return*/];
@@ -132,8 +133,8 @@ var XDropdownForEntity = /** @class */ (function (_super) {
     };
     XDropdownForEntity.prototype.onChange = function (e) {
         var value;
-        // specialna null polozka nema ziadne atributy
-        if (Object.keys(e.value).length === 0) {
+        // specialna null polozka id field null
+        if (e.value[this.idField] === null) {
             value = null;
         }
         else {

package/lib/components/XFormDataTable2.d.ts

@@ -116,6 +116,7 @@ export interface XFormAutoCompleteColumnProps extends XFormColumnBaseProps {
     displayField: string;
     searchBrowse?: JSX.Element;
     assocForm?: JSX.Element;
+    addRowEnabled: boolean;
     filter?: XTableFieldFilterProp;
     sortField?: string | DataTableSortMeta[];
     fields?: string[];
@@ -153,6 +154,7 @@ export declare const XFormAutoCompleteColumn: {
     (props: XFormAutoCompleteColumnProps): null;
     defaultProps: {
         type: string;
+        addRowEnabled: boolean;
         columnViewStatus: boolean;
     };
 };

package/lib/components/XFormDataTable2.js

@@ -404,7 +404,7 @@ var XFormDataTable2 = /** @class */ (function (_super) {
         }
         else if (columnProps.type === "autoComplete") {
             var columnPropsAutoComplete = columnProps;
-            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, filter: columnPropsAutoComplete.filter, sortField: columnPropsAutoComplete.sortField, fields: columnPropsAutoComplete.fields, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
+            body = react_1.default.createElement(XAutoCompleteDT_1.XAutoCompleteDT, { form: this.props.form, entity: this.getEntity(), assocField: columnPropsAutoComplete.assocField, displayField: columnPropsAutoComplete.displayField, searchBrowse: columnPropsAutoComplete.searchBrowse, assocForm: columnPropsAutoComplete.assocForm, addRowEnabled: columnPropsAutoComplete.addRowEnabled, filter: columnPropsAutoComplete.filter, sortField: columnPropsAutoComplete.sortField, fields: columnPropsAutoComplete.fields, suggestions: columnPropsAutoComplete.suggestions, rowData: rowData, readOnly: readOnly });
         }
         else if (columnProps.type === "searchButton") {
             var columnPropsSearchButton = columnProps;
@@ -737,7 +737,7 @@ var XFormAutoCompleteColumn = function (props) {
     return (null);
 };
 exports.XFormAutoCompleteColumn = XFormAutoCompleteColumn;
-exports.XFormAutoCompleteColumn.defaultProps = __assign(__assign({}, XFormColumnBase_defaultProps), { type: "autoComplete" });
+exports.XFormAutoCompleteColumn.defaultProps = __assign(__assign({}, XFormColumnBase_defaultProps), { type: "autoComplete", addRowEnabled: true });
 var XFormSearchButtonColumn = function (props) {
     // nevadi ze tu nic nevraciame, field a header vieme precitat a zvysok by sme aj tak zahodili lebo vytvarame novy element
     return (null);

package/lib/components/XLazyDataTable/XOcfDropdown.js

@@ -35,8 +35,8 @@ var dropdown_1 = require("primereact/dropdown");
 var XOcfDropdown = function (props) {
     var onChange = function (e) {
         var value;
-        // specialna null polozka nema ziadne atributy
-        if (Object.keys(e.value).length === 0) {
+        // specialna null polozka ma label === ""
+        if (e.value.label === "") {
             value = undefined;
         }
         else {
@@ -47,7 +47,7 @@ var XOcfDropdown = function (props) {
     // pridame prazdnu polozku
     // polozku pridavame do kopie zoznamu, lebo inac sa nam "polozka" v props.optionalCustomFilters "mnozi"
     var options = __spreadArray([], __read(props.optionalCustomFilters), false);
-    options.splice(0, 0, {});
+    options.splice(0, 0, { label: "" });
     return (react_1.default.createElement(dropdown_1.Dropdown, { options: options, optionLabel: "label", value: props.value, onChange: onChange, className: props.className }));
 };
 exports.XOcfDropdown = XOcfDropdown;

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

@@ -35,6 +35,7 @@
         "no": "no",
         "dateFrom": "Date from",
         "dateTo": "Date to",
-        "year": "Year"
+        "year": "Year",
+        "yearForAgeCalculation": "Year for age calculation"
     }
 }

package/package.json

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