fix extra mandatory fields

InseeFr · Feb 12, 2024 · a469dea · a469dea
1 parent a2df018
commit a469dea
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/app/src/js/applications/operations/series/edition/validation.js b/app/src/js/applications/operations/series/edition/validation.js
@@ -3,31 +3,35 @@ import { formatValidation } from 'js/utils/validation';
 import { z } from 'zod';
 
 const listOfExtraMandatoryFields = (process.env.REACT_APP_VALIDATION_OPERATION_SERIES_EXTRA_MANDATORY_FIELDS ?? "").split(',');
+
+const fieldToTitleMapping = {
+	typeCode: D1.operationType,
+	accrualPeriodicityCode: D1.dataCollectFrequency
+};
+
 export const isMandatoryField = fieldName => listOfExtraMandatoryFields.indexOf(fieldName) >= 0;
 
-const Serie = z.object({
+let Serie = z.object({
 	prefLabelLg1: z.string().min(1, {message: D.mandatoryProperty(D1.title)}),
 	prefLabelLg2: z.string().min(1, {message: D.mandatoryProperty(D2.title)}),
 	creators: z.string({
 		required_error: D.mandatoryProperty(D.creatorTitle)
 	}).array().nonempty({
 		message: D.mandatoryProperty(D.creatorTitle)
 	}),
-	typeCode: z.string({
-		required_error: D.mandatoryProperty(D1.operationType)
-	}).min(1, {
-		message: D.mandatoryProperty(D1.operationType)
-	}),
-	accrualPeriodicityCode: z.string({
-		required_error: D.mandatoryProperty(D1.dataCollectFrequency)
-	}).min(1, {
-		message: D.mandatoryProperty(D1.dataCollectFrequency)
-	}),
 	family: z.object({
 		id: z.string(),
 	}, {
 		required_error: D.mandatoryProperty(D1.familyTitle)
 	}),
 });
 
+listOfExtraMandatoryFields.forEach(extraMandatoryField => {
+	Serie = Serie.setKey(extraMandatoryField, z.string({
+		required_error: D.mandatoryProperty(fieldToTitleMapping[extraMandatoryField] ?? "")
+	}).min(1, {
+		message: D.mandatoryProperty(fieldToTitleMapping[extraMandatoryField] ?? "")
+	}))
+})
+
 export const validate = formatValidation(Serie)