fix: handle empty other race options (#4513)

* fix: handle empty other race options * fix: clean up * fix: cleaner way to store * fix: improved csv formatting * fix: remove space
bloom-housing · Jan 2, 2025 · 1e1d8f3 · 1e1d8f3
1 parent c0d102d
commit 1e1d8f3
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/api/src/utilities/application-export-helpers.ts b/api/src/utilities/application-export-helpers.ts
@@ -541,11 +541,13 @@ export const getHouseholdCsvHeaders = (
  */
 export const convertDemographicRaceToReadable = (type: string): string => {
   const [rootKey, customValue = ''] = type.split(':');
+  //only show colon if user entered a custom value
+  const customValueFormatted = customValue ? `:${customValue}` : '';
   const typeMap = {
     americanIndianAlaskanNative: 'American Indian / Alaskan Native',
     asian: 'Asian',
     'asian-asianIndian': 'Asian[Asian Indian]',
-    'asian-otherAsian': `Asian[Other Asian:${customValue}]`,
+    'asian-otherAsian': `Asian[Other Asian${customValueFormatted}]`,
     blackAfricanAmerican: 'Black / African American',
     'asian-chinese': 'Asian[Chinese]',
     declineToRespond: 'Decline to Respond',
@@ -558,8 +560,8 @@ export const convertDemographicRaceToReadable = (type: string): string => {
       'Native Hawaiian / Other Pacific Islander[Native Hawaiian]',
     nativeHawaiianOtherPacificIslander:
       'Native Hawaiian / Other Pacific Islander',
-    otherMultiracial: `Other / Multiracial:${customValue}`,
-    'nativeHawaiianOtherPacificIslander-otherPacificIslander': `Native Hawaiian / Other Pacific Islander[Other Pacific Islander:${customValue}]`,
+    otherMultiracial: `Other / Multiracial${customValueFormatted}`,
+    'nativeHawaiianOtherPacificIslander-otherPacificIslander': `Native Hawaiian / Other Pacific Islander[Other Pacific Islander${customValueFormatted}]`,
     'nativeHawaiianOtherPacificIslander-samoan':
       'Native Hawaiian / Other Pacific Islander[Samoan]',
     'asian-vietnamese': 'Asian[Vietnamese]',

diff --git a/api/test/unit/utilities/application-export-helpers.spec.ts b/api/test/unit/utilities/application-export-helpers.spec.ts
@@ -297,6 +297,12 @@ describe('Testing application export helpers', () => {
       );
     });
 
+    it('tests convertDemographicRaceToReadable with valid type and empty custom value', () => {
+      expect(convertDemographicRaceToReadable('otherMultiracial')).toBe(
+        'Other / Multiracial',
+      );
+    });
+
     it('tests convertDemographicRaceToReadable with type not in typeMap', () => {
       const custom = 'This is a custom value';
       expect(convertDemographicRaceToReadable(custom)).toBe(custom);

diff --git a/shared-helpers/__tests__/formKeys.test.ts b/shared-helpers/__tests__/formKeys.test.ts
@@ -52,4 +52,15 @@ describe("formKeys helpers", () => {
     const expectedArray = ["A", "B", "C", "D: 1,2"]
     expect(fieldGroupObjectToArray(testObj, "root")).toStrictEqual(expectedArray)
   })
+
+  it("fieldGroupObjectToArray with empty additional inputs", () => {
+    const testObj = {
+      ["root-A"]: "A",
+      ["root-B"]: "B",
+      ["root-C"]: "C",
+      ["root-D"]: "",
+    }
+    const expectedArray = ["A", "B", "C", "D"]
+    expect(fieldGroupObjectToArray(testObj, "root")).toStrictEqual(expectedArray)
+  })
 })
diff --git a/shared-helpers/src/utilities/formKeys.ts b/shared-helpers/src/utilities/formKeys.ts
@@ -139,10 +139,17 @@ export const fieldGroupObjectToArray = (
   const modifiedArray: string[] = []
   const getValue = (elem: string) => {
     const formSubKey = elem.substring(elem.indexOf("-") + 1)
-    return formSubKey === formObject[elem] ? formSubKey : `${formSubKey}: ${formObject[elem]}`
+    return formSubKey === formObject[elem] || formObject[elem] === ""
+      ? formSubKey
+      : `${formSubKey}: ${formObject[elem]}`
   }
   Object.keys(formObject)
-    .filter((formValue) => formValue.split("-")[0] === rootKey && formObject[formValue])
+    .filter(
+      (formValue) =>
+        formValue.split("-")[0] === rootKey &&
+        //empty string handles selected checkbox fields with empty additionalText
+        (formObject[formValue] || formObject[formValue] === "")
+    )
     .forEach((elem) => {
       if (formObject[elem].isArray) {
         formObject[elem].forEach(() => {