Service Validations: Returns error message as an array in faked exten…

…sions (#4792) * Returns error message as an array in faked extensions * Update title and individual message formatting * Need to preserve original error message behavior for non-Service Validation errors * Adds humanize-string dependency to api package
redwoodjs · Mar 17, 2022 · eb8503d · eb8503d
1 parent 84460eb
commit eb8503d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -33,6 +33,7 @@
     "@babel/runtime-corejs3": "7.16.7",
     "@prisma/client": "3.11.0",
     "crypto-js": "4.1.1",
+    "humanize-string": "2.1.0",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "2.0.5",
     "md5": "2.3.0",

diff --git a/packages/api/src/validations/errors.ts b/packages/api/src/validations/errors.ts
@@ -24,7 +24,7 @@ export class ServiceValidationError extends RedwoodError {
         code: 'BAD_USER_INPUT',
         properties: {
           messages: {
-            [String(value)]: errorMessage,
+            [String(value)]: [errorMessage],
           },
         },
       }

diff --git a/packages/forms/src/FormError.tsx b/packages/forms/src/FormError.tsx
@@ -58,7 +58,12 @@ const FormError = ({
     !!error.networkError && Object.keys(error.networkError).length > 0
 
   if (hasGraphQLError) {
-    rootMessage = error.graphQLErrors[0].message ?? 'Something went wrong.'
+    rootMessage = error.graphQLErrors[0].message ?? 'Something went wrong'
+
+    // override top-level message for ServiceValidation errorrs
+    if (error.graphQLErrors[0]?.extensions?.code === 'BAD_USER_INPUT') {
+      rootMessage = 'Errors prevented this form from being saved'
+    }
 
     const properties = error.graphQLErrors[0].extensions?.[
       'properties'
@@ -69,7 +74,7 @@ const FormError = ({
     if (propertyMessages) {
       for (const e in propertyMessages) {
         propertyMessages[e].forEach((fieldError: any) => {
-          messages.push(`${e} ${fieldError}`)
+          messages.push(fieldError)
         })
       }
     }

diff --git a/yarn.lock b/yarn.lock
@@ -5741,6 +5741,7 @@ __metadata:
     "@types/split2": 3.2.1
     aws-lambda: 1.0.7
     crypto-js: 4.1.1
+    humanize-string: 2.1.0
     jest: 27.5.1
     jsonwebtoken: 8.5.1
     jwks-rsa: 2.0.5