Skip to content

Commit

Permalink
fix: several issues in data-tools addon #825
Browse files Browse the repository at this point in the history 
affects: @haulmont/jmix-addon-data-tools, @haulmont/jmix-front-generator, @haulmont/jmix-react-core,
@haulmont/jmix-react-web
  • Loading branch information
Roman Karandashov committed Dec 2, 2021
1 parent 2962999 commit c261dc8
Show file tree
Hide file tree
Showing 10 changed files with 202 additions and 73 deletions.
117 changes: 78 additions & 39 deletions example-react-app/src/jmix/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "manufacturer",
Expand Down Expand Up @@ -216,7 +217,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "createdBy",
Expand All @@ -229,7 +231,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": false,
"transient": false
"transient": false,
"traitAttribute": "createdBy"
},
{
"name": "createdDate",
Expand All @@ -242,7 +245,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": false,
"transient": false
"transient": false,
"traitAttribute": "createdDate"
},
{
"name": "lastModifiedBy",
Expand All @@ -255,7 +259,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": false,
"transient": false
"transient": false,
"traitAttribute": "lastModifiedBy"
},
{
"name": "lastModifiedDate",
Expand All @@ -268,7 +273,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": false,
"transient": false
"transient": false,
"traitAttribute": "lastModifiedDate"
},
{
"name": "photo",
Expand Down Expand Up @@ -302,7 +308,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "manufacturer",
Expand Down Expand Up @@ -362,7 +369,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "car",
Expand Down Expand Up @@ -437,7 +445,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "car",
Expand Down Expand Up @@ -501,7 +510,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -550,7 +560,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -584,7 +595,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "notNull",
Expand Down Expand Up @@ -687,7 +699,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "cars",
Expand Down Expand Up @@ -831,7 +844,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "firstName",
Expand Down Expand Up @@ -893,7 +907,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -942,7 +957,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "certNumber",
Expand Down Expand Up @@ -991,7 +1007,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "version",
Expand All @@ -1004,7 +1021,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "username",
Expand Down Expand Up @@ -1116,7 +1134,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -1163,7 +1182,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "date",
Expand Down Expand Up @@ -1240,7 +1260,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "product",
Expand Down Expand Up @@ -1304,7 +1325,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "car",
Expand Down Expand Up @@ -1366,7 +1388,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "datatypesTestEntities",
Expand Down Expand Up @@ -1415,7 +1438,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -1449,7 +1473,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "datatypesTestEntity",
Expand Down Expand Up @@ -1498,7 +1523,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "datatypesTestEntity",
Expand Down Expand Up @@ -1666,7 +1692,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "uuid",
Expand Down Expand Up @@ -1700,7 +1727,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "datatypesTestEntity",
Expand Down Expand Up @@ -1777,7 +1805,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -1839,7 +1868,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "bigDecimalAttr",
Expand Down Expand Up @@ -2272,7 +2302,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "datatypesTestEntityAttr",
Expand Down Expand Up @@ -2368,7 +2399,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "datatypesTestEntityAttr",
Expand Down Expand Up @@ -2477,7 +2509,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -2526,7 +2559,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "uuid"
},
{
"name": "name",
Expand Down Expand Up @@ -2679,7 +2713,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "datatypesTestEntity3",
Expand Down Expand Up @@ -2834,7 +2869,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "datatypesTestEntity3",
Expand Down Expand Up @@ -3002,7 +3038,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "datatypesTestEntity",
Expand Down Expand Up @@ -3170,7 +3207,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": true,
"transient": false
"transient": false,
"traitAttribute": "version"
},
{
"name": "datatypesTestEntity3",
Expand Down Expand Up @@ -3240,7 +3278,8 @@
"mappingType": "DATATYPE",
"readOnly": false,
"mandatory": false,
"transient": false
"transient": false,
"traitAttribute": "uuid"
}
]
}
Expand Down
Loading

0 comments on commit c261dc8

Please sign in to comment.