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

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/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/package.json

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