Undo change with multiple config being validated at once

beyondessential · Aug 28, 2024 · b3f5feb · b3f5feb
1 parent a0de58c
commit b3f5feb
Showing 1 changed file with 5 additions and 23 deletions.
diff --git a/packages/central-server/src/apiV2/import/importSurveys/Validator/JsonFieldValidator.js b/packages/central-server/src/apiV2/import/importSurveys/Validator/JsonFieldValidator.js
@@ -1,4 +1,4 @@
-import { isNotPresent, MultiValidationError, ObjectValidator } from '@tupaia/utils';
+import { isNotPresent, ObjectValidator } from '@tupaia/utils';
 import { convertCellToJson } from '../utilities';
 import { BaseValidator } from './BaseValidator';
 
@@ -14,29 +14,11 @@ export class JsonFieldValidator extends BaseValidator {
 
     const fieldValidators = this.getFieldValidators(rowIndex);
     const otherFieldValidators = this.getOtherFieldValidators();
-    const errors = [];
 
-    // Validate fields one at a time so that we can collect all errors and return them all at once
-    for (const [fieldKey, currentFieldValidators] of Object.entries(fieldValidators)) {
-      try {
-        await new ObjectValidator(
-          { [fieldKey]: currentFieldValidators },
-          otherFieldValidators,
-        ).validate({ [fieldKey]: config[fieldKey] }, constructError);
-      } catch (error) {
-        errors.push(error);
-      }
-    }
-
-    if (errors.length > 0) {
-      throw new MultiValidationError(
-        `Errors in ${this.getFieldName()} field`,
-        errors.map(({ message, extraFields }) => ({
-          message,
-          extraFields,
-        })),
-      );
-    }
+    await new ObjectValidator(fieldValidators, otherFieldValidators).validate(
+      config,
+      constructError,
+    );
 
     return true;
   }