Use transformValue instead of dataType in scaffold form

callingmedic911 · Jul 21, 2021 · 9e2c4ea · 9e2c4ea
1 parent 407641e
commit 9e2c4ea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap b/packages/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffold.test.js.snap
@@ -170,7 +170,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Float\\"
+          transformValue=\\"Float\\"
         />
         <FieldError name=\\"rating\\" className=\\"rw-field-error\\" />
 
@@ -203,7 +203,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Json\\"
+          transformValue=\\"Json\\"
         />
         <FieldError name=\\"metadata\\" className=\\"rw-field-error\\" />
 
@@ -1257,7 +1257,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Float\\"
+          transformValue=\\"Float\\"
         />
         <FieldError name=\\"rating\\" className=\\"rw-field-error\\" />
 
@@ -1290,7 +1290,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Json\\"
+          transformValue=\\"Json\\"
         />
         <FieldError name=\\"metadata\\" className=\\"rw-field-error\\" />
 

diff --git a/...es/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap b/...es/cli/src/commands/generate/scaffold/__tests__/__snapshots__/scaffoldNoNest.test.js.snap
@@ -170,7 +170,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Float\\"
+          transformValue=\\"Float\\"
         />
         <FieldError name=\\"rating\\" className=\\"rw-field-error\\" />
 
@@ -203,7 +203,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Json\\"
+          transformValue=\\"Json\\"
         />
         <FieldError name=\\"metadata\\" className=\\"rw-field-error\\" />
 
@@ -1217,7 +1217,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Float\\"
+          transformValue=\\"Float\\"
         />
         <FieldError name=\\"rating\\" className=\\"rw-field-error\\" />
 
@@ -1250,7 +1250,7 @@ const PostForm = (props) => {
           className=\\"rw-input\\"
           errorClassName=\\"rw-input rw-input-error\\"
           validation={{ required: true }}
-          dataType=\\"Json\\"
+          transformValue=\\"Json\\"
         />
         <FieldError name=\\"metadata\\" className=\\"rw-field-error\\" />
 

diff --git a/packages/cli/src/commands/generate/scaffold/scaffold.js b/packages/cli/src/commands/generate/scaffold/scaffold.js
@@ -315,13 +315,13 @@ const componentFiles = async (
     },
     Json: {
       componentName: 'TextAreaField',
-      dataType: 'Json',
+      transformValue: 'Json',
       displayFunction: 'jsonDisplay',
       listDisplayFunction: 'jsonTruncate',
       deserilizeFunction: 'JSON.stringify',
     },
     Float: {
-      dataType: 'Float',
+      transformValue: 'Float',
     },
     default: {
       componentName: 'TextField',
@@ -330,7 +330,7 @@ const componentFiles = async (
       validation: '{{ required: true }}',
       displayFunction: undefined,
       listDisplayFunction: 'truncate',
-      dataType: undefined,
+      transformValue: undefined,
     },
   }
   const columns = model.fields
@@ -356,9 +356,9 @@ const componentFiles = async (
       displayFunction:
         componentMetadata[column.type]?.displayFunction ||
         componentMetadata.default.displayFunction,
-      dataType:
-        componentMetadata[column.type]?.dataType ||
-        componentMetadata.default.dataType,
+      transformValue:
+        componentMetadata[column.type]?.transformValue ||
+        componentMetadata.default.transformValue,
     }))
   const editableColumns = columns.filter((column) => {
     return NON_EDITABLE_COLUMNS.indexOf(column.name) === -1

diff --git a/packages/cli/src/commands/generate/scaffold/templates/components/NameForm.js.template b/packages/cli/src/commands/generate/scaffold/templates/components/NameForm.js.template
@@ -40,8 +40,8 @@ const ${singularPascalName}Form = (props) => {
           ${column.defaultProp}={${column.deserilizeFunction && column.deserilizeFunction + '('}props.${singularCamelName}?.<%= column.name %>${column.deserilizeFunction && ')'}}
           className="rw-input"
           errorClassName="rw-input rw-input-error"<%= !column.validation ? '' : `
-          validation=${column.validation}` %><%= !column.dataType ? '' : `
-          dataType="${column.dataType}"` %>
+          validation=${column.validation}` %><%= !column.transformValue ? '' : `
+          transformValue="${column.transformValue}"` %>
         />
         <FieldError name="${column.name}" className="rw-field-error" />
 <% }) %>