fix: issue with undefined values bubbling up

bcgov · Dec 20, 2024 · db11a27 · db11a27
1 parent 101010a
commit db11a27
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/api/src/openapi/schemas/csv.ts b/api/src/openapi/schemas/csv.ts
@@ -8,7 +8,7 @@ export const CSVErrorSchema: OpenAPIV3.SchemaObject = {
   title: 'CSV validation error object',
   type: 'object',
   additionalProperties: false,
-  required: ['error', 'solution', 'row', 'cell', 'header'],
+  required: ['error', 'solution', 'values', 'cell', 'header', 'row'],
   properties: {
     error: {
       description: 'The error message',
@@ -34,7 +34,14 @@ export const CSVErrorSchema: OpenAPIV3.SchemaObject = {
     },
     cell: {
       description: 'The CSV cell value',
-      oneOf: [{ type: 'string' }, { type: 'number' }],
+      oneOf: [
+        {
+          type: 'string'
+        },
+        {
+          type: 'number'
+        }
+      ],
       nullable: true
     },
     header: {

diff --git a/api/src/utils/csv-utils/csv-config-validation.ts b/api/src/utils/csv-utils/csv-config-validation.ts
@@ -215,9 +215,9 @@ export const executeValidateCell = (
       mutableErrors.push({
         error: error.error,
         solution: error.solution,
-        values: error.values,
-        cell: error.cell === undefined ? params.cell : error.cell, // Use cell value if intentionally null
-        header: error.header === undefined ? params.header : error.header, // Use header value if intentionally null
+        values: error.values ?? [],
+        cell: (error.cell === undefined ? params.cell : error.cell) ?? null, // Use cell value if intentionally null
+        header: (error.header === undefined ? params.header : error.header) ?? null, // Use header value if intentionally null
         row: error.row ?? params.rowIndex + 2 // headers: 1, data row: 2
       });
     });

diff --git a/app/src/utils/file-utils.ts b/app/src/utils/file-utils.ts
@@ -6,7 +6,7 @@ export interface CSVError {
   header: string | null;
   cell: string | number | null;
   row: number;
-  values?: Array<string | number>;
+  values: Array<string | number>;
 }
 
 export interface CSVValidationError {