@michalrakus/x-react-web-lib 1.3.0 → 1.4.0

package/lib/components/XUtilsMetadata.js

@@ -127,7 +127,7 @@ var XUtilsMetadata = /** @class */ (function () {
             return XUtilsMetadata.getXField(xEntity, field);
         }
         else {
-            var xAssoc = XUtilsMetadata.getXAssocToOne(xEntity, field);
+            var xAssoc = XUtilsMetadata.getXAssoc(xEntity, field);
             var xAssocEntity = XUtilsMetadata.getXEntity(xAssoc.entityName);
             return XUtilsMetadata.getXFieldByPath(xAssocEntity, restPath);
         }
@@ -135,17 +135,33 @@ var XUtilsMetadata = /** @class */ (function () {
     XUtilsMetadata.getXFieldByPathStr = function (entity, path) {
         return XUtilsMetadata.getXFieldByPath(XUtilsMetadata.getXEntity(entity), path);
     };
+    XUtilsMetadata.getXAssocByPath = function (xEntity, path) {
+        var _a = __read(XUtilsCommon_1.XUtilsCommon.getFieldAndRestPath(path), 2), field = _a[0], restPath = _a[1];
+        if (restPath === null) {
+            return XUtilsMetadata.getXAssoc(xEntity, field);
+        }
+        else {
+            var xAssoc = XUtilsMetadata.getXAssoc(xEntity, field);
+            var xAssocEntity = XUtilsMetadata.getXEntity(xAssoc.entityName);
+            return XUtilsMetadata.getXAssocByPath(xAssocEntity, restPath);
+        }
+    };
+    // for path assoc1.assoc2.field returns assoc2 (last assoc before field)
+    XUtilsMetadata.getLastXAssocByPath = function (xEntity, path) {
+        var pathToAssoc = XUtilsCommon_1.XUtilsCommon.getPathToAssoc(path);
+        return XUtilsMetadata.getXAssocByPath(xEntity, pathToAssoc);
+    };
     XUtilsMetadata.getXAssocToOne = function (xEntity, assocField) {
-        return XUtilsMetadata.getXAssoc(xEntity, xEntity.assocToOneMap, assocField);
+        return XUtilsMetadata.getXAssoc(xEntity, assocField, ["many-to-one", "one-to-one"]);
     };
     XUtilsMetadata.getXAssocToMany = function (xEntity, assocField) {
-        return XUtilsMetadata.getXAssoc(xEntity, xEntity.assocToManyMap, assocField);
+        return XUtilsMetadata.getXAssoc(xEntity, assocField, ["one-to-many", "many-to-many"]);
     };
     XUtilsMetadata.getXAssocToOneByAssocEntity = function (xEntity, assocEntityName) {
-        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, xEntity.assocToOneMap, assocEntityName);
+        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, assocEntityName, ["many-to-one", "one-to-one"]);
     };
     XUtilsMetadata.getXAssocToManyByAssocEntity = function (xEntity, assocEntityName) {
-        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, xEntity.assocToManyMap, assocEntityName);
+        return XUtilsMetadata.getXAssocByAssocEntity(xEntity, assocEntityName, ["one-to-many", "many-to-many"]);
     };
     XUtilsMetadata.getXEntityForAssocToOne = function (xEntity, assocField) {
         return XUtilsMetadata.getXEntityForAssoc(XUtilsMetadata.getXAssocToOne(xEntity, assocField));
@@ -160,7 +176,7 @@ var XUtilsMetadata = /** @class */ (function () {
             for (var _b = __values(Object.entries(xEntity.fieldMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], xField = _d[1];
                 // assoc fieldy sa nachadzaju aj v xEntity.fieldMap ako typ number (netusim preco), preto ich vyfiltrujeme
-                if (xEntity.assocToOneMap[xField.name] === undefined) {
+                if (xEntity.assocMap[xField.name] === undefined) {
                     xFieldList.push(xField);
                 }
             }
@@ -174,6 +190,27 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return xFieldList;
     };
+    XUtilsMetadata.getXAssocList = function (xEntity, relationTypeList) {
+        var e_2, _a;
+        //const xAssocList: XAssoc[] = Array.from(xEntity.assocMap, (v: XAssoc, k: string) => v);
+        var xAssocList = [];
+        try {
+            for (var _b = __values(Object.entries(xEntity.assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), key = _d[0], xAssoc = _d[1];
+                if (relationTypeList === undefined || relationTypeList.includes(xAssoc.relationType)) {
+                    xAssocList.push(xAssoc);
+                }
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        return xAssocList;
+    };
     // docasne sem, kym nemame jednotny XInputDecimal/XInputDecimalDT
     XUtilsMetadata.getParamsForInputNumber = function (xField) {
         var useGrouping = true;
@@ -209,7 +246,7 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return { useGrouping: useGrouping, fractionDigits: fractionDigits, min: min, max: max, size: size };
     };
-    XUtilsMetadata.computeColumnWidth = function (xField, filterMenuInFilterRow, formColumnType, header, sortableButtonInHeader, filterButtonInHeader) {
+    XUtilsMetadata.computeColumnWidth = function (xField, betweenFilter, filterMenuInFilterRow, formColumnType, header, sortableButtonInHeader, filterButtonInHeader) {
         var width;
         if (formColumnType === undefined) {
             // lazy datatable (no inputs, no buttons, only text and padding)
@@ -221,10 +258,10 @@ var XUtilsMetadata = /** @class */ (function () {
                 width = XUtilsMetadata.computeColumnWidthBase(size, 0.5 + 0.5);
             }
             else if (xField.type === "date") {
-                width = XUtilsMetadata.computeColumnWidthBase(10, 0.5 + 0.5); // napr. 31.12.2021
+                width = XUtilsMetadata.computeColumnWidthBase(10, 0.25 + 1.25 + 0.25); // napr. 31.12.2021, 1.25 rem date picker button
             }
             else if (xField.type === "datetime") {
-                width = XUtilsMetadata.computeColumnWidthBase(10 + 9, 0.5 + 0.5); // napr. 31.12.2021 03:03:00
+                width = XUtilsMetadata.computeColumnWidthBase(10 + 9, 0.25 + 1.25 + 0.25); // napr. 31.12.2021 03:03:00
             }
             else if (xField.type === "boolean") {
                 width = 1.43 + 0.5 + 0.5; // checkbox ma sirku 20px
@@ -232,6 +269,9 @@ var XUtilsMetadata = /** @class */ (function () {
             else {
                 throw "XField ".concat(xField.name, ": unknown xField.type = ").concat(xField.type);
             }
+            if (betweenFilter === "row" && width) {
+                width *= 2;
+            }
         }
         else {
             // form datatable (formColumnType is defined)
@@ -243,12 +283,25 @@ var XUtilsMetadata = /** @class */ (function () {
                 else if (xField.type === "decimal" || xField.type === "number") {
                     var size = XUtilsMetadata.getParamsForInputNumber(xField).size;
                     width = XUtilsMetadata.computeColumnWidthBase(size, padding + padding);
+                    if (betweenFilter === "row" && width) {
+                        width *= 2; // not tested, only estimation
+                    }
                 }
                 else if (xField.type === "date") {
-                    width = 0.21 + 6 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    if (betweenFilter === "row") {
+                        width = (0.21 + 6 + 1.25 + 0.21) * 2; // not tested, only estimation
+                    }
+                    else {
+                        width = 0.21 + 6 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    }
                 }
                 else if (xField.type === "datetime") {
-                    width = 0.21 + 10 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    if (betweenFilter === "row") {
+                        width = (0.21 + 10 + 1.25 + 0.21) * 2; // not tested, only estimation
+                    }
+                    else {
+                        width = 0.21 + 10 + 2.36 + 0.21; // padding + input (also in App.css defined) + button + padding
+                    }
                 }
                 else if (xField.type === "boolean") {
                     width = 1.43 + 0.5 + 0.5; // checkbox ma sirku 20px
@@ -346,18 +399,22 @@ var XUtilsMetadata = /** @class */ (function () {
         }
         return key;
     };
-    XUtilsMetadata.getXAssoc = function (xEntity, assocMap, assocField) {
-        var xAssoc = assocMap[assocField];
+    XUtilsMetadata.getXAssoc = function (xEntity, assocField, relationTypeList) {
+        var xAssoc = xEntity.assocMap[assocField];
         if (xAssoc === undefined) {
             throw "Assoc ".concat(assocField, " was not found in entity = ").concat(xEntity.name);
         }
+        // relationTypeList is optional and is only for check (not to get some unwanted type of assoc)
+        if (relationTypeList !== undefined && !relationTypeList.includes(xAssoc.relationType)) {
+            throw "Assoc ".concat(assocField, " in entity ").concat(xEntity.name, " is of type ").concat(xAssoc.relationType, " and required type is ").concat(JSON.stringify(relationTypeList));
+        }
         return xAssoc;
     };
-    XUtilsMetadata.getXAssocByAssocEntity = function (xEntity, assocMap, assocEntityName) {
-        var e_2, _a;
+    XUtilsMetadata.getXAssocByAssocEntity = function (xEntity, assocEntityName, relationTypeList) {
+        var e_3, _a;
         var xAssocFound = undefined;
         try {
-            for (var _b = __values(Object.entries(assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(Object.entries(xEntity.assocMap)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], xAssoc = _d[1];
                 if (xAssoc.entityName === assocEntityName) {
                     if (xAssocFound === undefined) {
@@ -369,16 +426,20 @@ var XUtilsMetadata = /** @class */ (function () {
                 }
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         if (xAssocFound === undefined) {
             throw "Assoc for assocEntityName = ".concat(assocEntityName, " not found in entity ").concat(xEntity.name);
         }
+        // relationTypeList is optional and is only for check (not to get some unwanted type of assoc)
+        if (relationTypeList !== undefined && !relationTypeList.includes(xAssocFound.relationType)) {
+            throw "Assoc for assocEntityName = ".concat(assocEntityName, " in entity ").concat(xEntity.name, " is of type ").concat(xAssocFound.relationType, " and required type is ").concat(JSON.stringify(relationTypeList));
+        }
         return xAssocFound;
     };
     XUtilsMetadata.getXEntityForAssoc = function (xAssoc) {

package/lib/serverApi/XEntityMetadata.d.ts

@@ -5,8 +5,7 @@ export interface XEntity {
     name: string;
     idField: string;
     fieldMap: XFieldMap;
-    assocToOneMap: XAssocMap;
-    assocToManyMap: XAssocMap;
+    assocMap: XAssocMap;
 }
 export interface XFieldMap {
     [name: string]: XField;
@@ -23,7 +22,9 @@ export interface XField {
     scale?: number;
     width?: number;
 }
+export type XRelationType = "one-to-one" | "one-to-many" | "many-to-one" | "many-to-many";
 export interface XAssoc {
+    relationType: XRelationType;
     name: string;
     entityName: string;
     inverseAssocName?: string;

package/lib/serverApi/XUtilsCommon.d.ts

@@ -3,6 +3,7 @@ export declare class XUtilsCommon {
     static getValueByPath(object: any, path: string): any;
     static getFieldListForPath(path: string): string[];
     static getFieldAndRestPath(path: string): [string, string | null];
+    static getPathToAssoc(path: string): string;
     static isSingleField(path: string): boolean;
     static objectAsJSON(value: any): string;
     static getDayName(date: Date | null | undefined): string | undefined;

package/lib/serverApi/XUtilsCommon.js

@@ -52,6 +52,15 @@ var XUtilsCommon = /** @class */ (function () {
             return [assocField, restPath];
         }
     };
+    XUtilsCommon.getPathToAssoc = function (path) {
+        var posDot = path.lastIndexOf(".");
+        if (posDot === -1) {
+            throw "Path to assoc could not be retrieved. Path ".concat(path, " must have at least 2 items.");
+        }
+        else {
+            return path.substring(0, posDot);
+        }
+    };
     XUtilsCommon.isSingleField = function (path) {
         return path.indexOf(".") === -1;
     };

package/package.json

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