fw-5107, fix error messages for text array field (#179)

Co-authored-by: Guy McAuliffe <38873380+gmcauliffe@users.noreply.github.com>
First-Peoples-Cultural-Council · Oct 26, 2023 · 8700a27 · 8700a27
1 parent 3f86c78
commit 8700a27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/common/utils/stringHelpers.js b/src/common/utils/stringHelpers.js
@@ -353,8 +353,12 @@ export const safeJsonParse = (str) => {
 
 // Converts JSON to a string and removes curly brackets, square brackets, and double quotes
 export const convertJsonToReadableString = (json) => {
-  const message = JSON.stringify(json)
-  return message?.replace(/[{}[\]"]+/g, ' ') || ''
+  try {
+    const message = JSON.stringify(json)
+    return message?.replace(/[{}[\]"]+/g, ' ') || ''
+  } catch (e) {
+    return 'Error'
+  }
 }
 
 export const makeTypeSingular = (plural) => {

diff --git a/src/common/utils/validationHelpers.js b/src/common/utils/validationHelpers.js
@@ -40,7 +40,7 @@ export const definitions = {
       yup.object({
         text: stringWithMax(charCount).min(
           1,
-          'This field cannot be empty. Remove it if you do not want to inlcude it.',
+          'This field cannot be empty. Remove it if you do not want to include it.',
         ),
       }),
     ),

diff --git a/src/components/Form/TextArrayField.js b/src/components/Form/TextArrayField.js
@@ -58,7 +58,9 @@ function TextArrayField({
               </div>
               {errors?.[nameId]?.[index] && (
                 <div className="text-red-500">
-                  {convertJsonToReadableString(errors?.[nameId]?.[index])}
+                  {convertJsonToReadableString(
+                    errors?.[nameId]?.[index]?.text?.message,
+                  )}
                 </div>
               )}
             </li>