Merge pull request #248 from entando/ENG-4139-fix-duration-uuid-fields

ENG-4139 fix Duration and UUID fields from last JHipster's versions
entando · Jul 13, 2023 · aab5316 · aab5316
2 parents 744135a + c80029b
commit aab5316
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/generators/entity-microfrontend/lib/jhipster-type.mapper.js b/generators/entity-microfrontend/lib/jhipster-type.mapper.js
@@ -5,7 +5,20 @@
  */
 function getJHipsterType({ fieldType, fieldIsEnum, fieldTypeBlobContent }) {
   if (
-    ['String', 'Integer', 'Long', 'Float', 'Double', 'BigDecimal', 'LocalDate', 'Instant', 'ZonedDateTime', 'Boolean'].includes(fieldType)
+    [
+      'String',
+      'Integer',
+      'Long',
+      'Float',
+      'Double',
+      'BigDecimal',
+      'LocalDate',
+      'Instant',
+      'ZonedDateTime',
+      'Boolean',
+      'Duration',
+      'UUID',
+    ].includes(fieldType)
   ) {
     return fieldType;
   }

diff --git a/generators/entity-microfrontend/lib/yup.mapper.js b/generators/entity-microfrontend/lib/yup.mapper.js
@@ -21,6 +21,8 @@ function getYupType(field) {
     case 'ImageBlob':
     case 'BinaryFileBlob':
     case 'TextBlob':
+    case 'UUID':
+    case 'Duration':
       return ['string()'];
     default:
       return undefined;

diff --git a/test-integration/samples/.jhipster/BankAccount.json b/test-integration/samples/.jhipster/BankAccount.json
@@ -14,6 +14,7 @@
         { "fieldName": "agencyNumber", "fieldType": "Long" },
         { "fieldName": "lastOperationDuration", "fieldType": "Float" },
         { "fieldName": "meanOperationDuration", "fieldType": "Double" },
+        { "fieldName": "operationDuration", "fieldType": "Duration" },
         { "fieldName": "balance", "fieldType": "BigDecimal", "fieldValidateRules": ["required"] },
         { "fieldName": "openingDay", "fieldType": "LocalDate" },
         { "fieldName": "lastOperationDate", "fieldType": "Instant" },

diff --git a/test-integration/samples/.jhipster/Operation.json b/test-integration/samples/.jhipster/Operation.json
@@ -31,6 +31,10 @@
             "fieldName": "amount",
             "fieldType": "BigDecimal",
             "fieldValidateRules": ["required"]
+        },
+        {
+            "fieldName": "identifier",
+            "fieldType": "UUID"
         }
     ],
     "changelogDate": "20150805125055",