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

package/lib/serverApi/XUtilsConversions.js

@@ -27,7 +27,7 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertValueBase = exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
+exports.convertValueBase = exports.convertValue = exports.convertObject = exports.AsUIType = exports.booleanAsUIText = exports.intervalAsUI = exports.intervalFromUI = exports.datetimeFormatUI = exports.dateFormatCalendar = exports.dateFormatUI = exports.timeFromModel = exports.datetimeAsUI = exports.dateAsUI = exports.dateFromUI = exports.dateFromModel = exports.XDateScale = exports.numberFromString = exports.numberFromModel = exports.numberAsUI = exports.intFromUI = exports.stringAsDB = exports.stringAsUI = exports.stringFromUI = void 0;
 var XUtilsCommon_1 = require("./XUtilsCommon");
 var XLocale_1 = require("../components/XLocale");
 var XUtilsMetadataCommon_1 = require("./XUtilsMetadataCommon");
@@ -95,6 +95,23 @@ function numberFromModel(value) {
     return numberValue;
 }
 exports.numberFromModel = numberFromModel;
+// konvertuje hodnotu napr. 12.34
+function numberFromString(valueString) {
+    var numberValue = parseFloat(valueString);
+    if (isNaN(numberValue)) {
+        numberValue = null;
+    }
+    return numberValue;
+}
+exports.numberFromString = numberFromString;
+// upresnenie typu datumu - pouzivame typ number, lebo zneuzivame atribut scale v TypeORM na zadanie upresnenia
+var XDateScale;
+(function (XDateScale) {
+    XDateScale[XDateScale["Date"] = 1] = "Date";
+    XDateScale[XDateScale["Month"] = 2] = "Month";
+    XDateScale[XDateScale["Year"] = 3] = "Year"; // yyyy
+})(XDateScale = exports.XDateScale || (exports.XDateScale = {}));
+//export type XDateType = "month" | "year" | "date";
 // v modeli na klientovi by mal byt vzdy Date, teraz je tam niekedy string (z json-u zo servera) a niekedy Date (z komponentu)
 // provizorne zatial takato konverzia
 function dateFromModel(value) {
@@ -108,9 +125,10 @@ function dateFromModel(value) {
     return dateValue;
 }
 exports.dateFromModel = dateFromModel;
-function dateFromUI(valueString) {
+function dateFromUI(valueString, dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
     // converts valueString (e.g. 21.2.2024) into Date
-    // if stringValue is invalid, returns undefined
+    // if valueString is invalid, returns undefined
     var valueDate = undefined;
     if (valueString === '') {
         valueDate = null;
@@ -120,22 +138,46 @@ function dateFromUI(valueString) {
         var day = void 0;
         var month = null;
         var year = null;
-        var posDot = valueString.indexOf('.');
-        if (posDot === -1) {
-            day = intFromUI(valueString);
+        if (dateScale === XDateScale.Date) {
+            // format "dd.mm.yyyy"
+            var posDot = valueString.indexOf('.');
+            if (posDot === -1) {
+                day = intFromUI(valueString);
+            }
+            else {
+                day = intFromUI(valueString.substring(0, posDot));
+                var rest = valueString.substring(posDot + 1);
+                var posDot2 = rest.indexOf('.');
+                if (posDot2 === -1) {
+                    month = intFromUI(rest);
+                }
+                else {
+                    month = intFromUI(rest.substring(0, posDot2));
+                    year = intFromUI(rest.substring(posDot2 + 1));
+                }
+            }
         }
-        else {
-            day = intFromUI(valueString.substring(0, posDot));
-            var rest = valueString.substring(posDot + 1);
-            var posDot2 = rest.indexOf('.');
-            if (posDot2 === -1) {
-                month = intFromUI(rest);
+        else if (dateScale === XDateScale.Month) {
+            // format "mm.yyyy"
+            day = 1;
+            var posDot = valueString.indexOf('.');
+            if (posDot === -1) {
+                month = intFromUI(valueString);
             }
             else {
-                month = intFromUI(rest.substring(0, posDot2));
-                year = intFromUI(rest.substring(posDot2 + 1));
+                month = intFromUI(valueString.substring(0, posDot));
+                year = intFromUI(valueString.substring(posDot + 1));
             }
         }
+        else if (dateScale === XDateScale.Year) {
+            // format "yyyy"
+            day = 1;
+            month = 1;
+            year = intFromUI(valueString);
+        }
+        else {
+            throw "Unimplemented dateScale = " + dateScale;
+        }
         // doplnime mesiac a rok ak uzivatel nezadal (ak mame undefined, tak umyselne nedoplname)
         if (month === null) {
             month = XUtilsCommon_1.XUtilsCommon.today().getMonth() + 1; // o 1 mesiac viac (januar je 0)
@@ -163,9 +205,10 @@ function dateFromUI(valueString) {
     return valueDate;
 }
 exports.dateFromUI = dateFromUI;
-function dateAsUI(value) {
+function dateAsUI(value, dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
     if (value !== null) {
-        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI());
+        return (0, XUtilsCommon_1.dateFormat)(value, dateFormatUI(dateScale));
     }
     else {
         return "";
@@ -208,12 +251,40 @@ function timeFromModel(value) {
     return timeValue;
 }
 exports.timeFromModel = timeFromModel;
-function dateFormatUI() {
-    return "dd.mm.yyyy";
+function dateFormatUI(dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
+    var format;
+    if (dateScale === XDateScale.Date) {
+        format = "dd.mm.yyyy";
+    }
+    else if (dateScale === XDateScale.Month) {
+        format = "mm.yyyy";
+    }
+    else if (dateScale === XDateScale.Year) {
+        format = "yyyy";
+    }
+    else {
+        throw "Unimplemented dateScale = " + dateScale;
+    }
+    return format;
 }
 exports.dateFormatUI = dateFormatUI;
-function dateFormatCalendar() {
-    return "dd.mm.yy";
+function dateFormatCalendar(dateScale) {
+    if (dateScale === void 0) { dateScale = XDateScale.Date; }
+    var format;
+    if (dateScale === XDateScale.Date) {
+        format = "dd.mm.yy";
+    }
+    else if (dateScale === XDateScale.Month) {
+        format = "mm.yy";
+    }
+    else if (dateScale === XDateScale.Year) {
+        format = "yy";
+    }
+    else {
+        throw "Unimplemented dateScale = " + dateScale;
+    }
+    return format;
 }
 exports.dateFormatCalendar = dateFormatCalendar;
 function datetimeFormatUI() {
@@ -349,21 +420,21 @@ function convertValue(xField, value, fromModel, asUI) {
     return convertValueBase(xField.type, xField.scale, value, fromModel, asUI);
 }
 exports.convertValue = convertValue;
-function convertValueBase(fieldType, fractionDigits, value, fromModel, asUI) {
+function convertValueBase(fieldType, scale, value, fromModel, asUI) {
     if (fieldType === "decimal") {
         if (fromModel) {
             value = numberFromModel(value);
         }
         if (asUI && asUI !== AsUIType.Excel) {
-            value = numberAsUI(value, fractionDigits);
+            value = numberAsUI(value, scale);
         }
     }
     else if (fieldType === "date") {
         if (fromModel) {
             value = dateFromModel(value);
         }
-        if (asUI && asUI !== AsUIType.Excel) {
-            value = dateAsUI(value);
+        if (asUI && (asUI !== AsUIType.Excel || scale === XDateScale.Month || scale === XDateScale.Year)) {
+            value = dateAsUI(value, scale);
         }
     }
     else if (fieldType === "datetime") {

package/lib/serverApi/XUtilsMetadataCommon.d.ts

@@ -13,9 +13,12 @@ export declare class XUtilsMetadataCommon {
     static getXField(xEntity: XEntity, field: string): XField;
     static getXFieldByPathBase(xEntity: XEntity, path: string): XField | undefined;
     static getXFieldByPath(xEntity: XEntity, path: string): XField;
+    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

@@ -91,21 +91,44 @@ var XUtilsMetadataCommon = /** @class */ (function () {
             return XUtilsMetadataCommon.getXFieldByPath(xAssocEntity, restPath);
         }
     };
+    // returns true if path contains some toMany assoc
+    XUtilsMetadataCommon.hasPathToManyAssoc = function (xEntity, path) {
+        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
+        if (restPath === null) {
+            return false;
+        }
+        else {
+            var xAssoc = XUtilsMetadataCommon.getXAssoc(xEntity, field);
+            if (xAssoc.relationType === "one-to-many" || xAssoc.relationType === "many-to-many") {
+                return true;
+            }
+            else {
+                var xAssocEntity = XUtilsMetadataCommon.getXEntity(xAssoc.entityName);
+                return XUtilsMetadataCommon.hasPathToManyAssoc(xAssocEntity, restPath);
+            }
+        }
+    };
     XUtilsMetadataCommon.getXFieldByPathStr = function (entity, path) {
         return XUtilsMetadataCommon.getXFieldByPath(XUtilsMetadataCommon.getXEntity(entity), path);
     };
     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.21.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",