Merge branch 'dev' into BHBC-1303

bcgov · Aug 26, 2021 · 16ae8b9 · 16ae8b9
2 parents 1a27a58 + d2e4241
commit 16ae8b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/api/src/utils/media/csv/csv-file.ts b/api/src/utils/media/csv/csv-file.ts
@@ -296,7 +296,12 @@ export type IHeaderErrorCode =
   | 'Missing Recommended Header'
   | 'Miscellaneous';
 
-export type IRowErrorCode = 'Missing Required Field' | 'Unexpected Formats' | 'Out of Range' | 'Miscellaneous';
+export type IRowErrorCode =
+  | 'Missing Required Field'
+  | 'Unexpected Formats'
+  | 'Out of Range'
+  | 'Invalid Value'
+  | 'Miscellaneous';
 export interface IHeaderError {
   errorCode: IHeaderErrorCode;
   message: string;

diff --git a/api/src/utils/media/csv/validation/csv-row-validator.test.ts b/api/src/utils/media/csv/validation/csv-row-validator.test.ts
@@ -126,7 +126,7 @@ describe('getCodeValueFieldsValidator', () => {
     expect(csvWorkSheet.csvValidation.rowErrors).to.eql([
       {
         col: 'Header1',
-        errorCode: 'Missing Required Field',
+        errorCode: 'Invalid Value',
         message: 'Invalid value: invalidCode. Must be one of [Code1, Code2], for column',
         row: 2
       }

diff --git a/api/src/utils/media/csv/validation/csv-row-validator.ts b/api/src/utils/media/csv/validation/csv-row-validator.ts
@@ -95,7 +95,7 @@ export const getCodeValueFieldsValidator = (requiredCodeValuesByHeader?: ICodeVa
         if (!codeValuesByHeader.codeValues.includes(rowValueForColumn)) {
           csvWorksheet.csvValidation.addRowErrors([
             {
-              errorCode: 'Missing Required Field',
+              errorCode: 'Invalid Value',
               message: `Invalid value: ${rowValueForColumn}. Must be one of [${codeValuesByHeader.codeValues.join(
                 ', '
               )}], for column`,

diff --git a/app/src/features/surveys/view/SurveyObservations.tsx b/app/src/features/surveys/view/SurveyObservations.tsx
@@ -199,6 +199,10 @@ const SurveyObservations = () => {
       type: ['Missing Required Field', 'Missing Required Header'],
       label: 'Mandatory fields have not been filled out in your file'
     },
+    value_not_from_list: {
+      type: ['Invalid Value'],
+      label: "Values have not been selected from the field's dropdown list"
+    },
     unsupported_header: {
       type: ['Unknown Header'],
       label: 'Column headers in your file are not supported'

diff --git a/database/src/migrations/release.0.23/populate_submission_message_type.sql b/database/src/migrations/release.0.23/populate_submission_message_type.sql
@@ -13,3 +13,5 @@ insert into submission_message_type (name, record_effective_date, description, s
 insert into submission_message_type (name, record_effective_date, description, submission_message_class_id) values ('Missing Required Field', now(), 'A required field was not detected.', (select submission_message_class_id from submission_message_class where name = 'Error'));
 insert into submission_message_type (name, record_effective_date, description, submission_message_class_id) values ('Unexpected Format', now(), 'A field with an unexpected format was detected.', (select submission_message_class_id from submission_message_class where name = 'Error'));
 insert into submission_message_type (name, record_effective_date, description, submission_message_class_id) values ('Out of Range', now(), 'A field with an out of range value was detected.', (select submission_message_class_id from submission_message_class where name = 'Error'));
+insert into submission_message_type (name, record_effective_date, description, submission_message_class_id) values ('Invalid Value', now(), 'A field with a value not from the prescribed list.', (select submission_message_class_id from submission_message_class where name = 'Error'));
+