Feat: add zod to concepts (#903)

* delete unused file * fix validation for links * unecessary return * unfinished * delete unused folder * fix validation * fix double check on scopenote * fix: improve zod validation for concept * improve zod once again * add and reshape tests * fix test * add messages to notes and set title to red if scopenote too long * fix error messages for codelists --------- Co-authored-by: Emmanuel <[email protected]>
InseeFr · Sep 2, 2024 · 89caff6 · 89caff6
1 parent 09b92aa
commit 89caff6
Show file tree

Hide file tree

Showing 22 changed files with 381 additions and 1,360 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/.kubernetes/deployment.yml b/.kubernetes/deployment.yml
diff --git a/.kubernetes/ingress.yml b/.kubernetes/ingress.yml
diff --git a/.kubernetes/service.yml b/.kubernetes/service.yml
diff --git a/src/packages/components/note-edition/index.tsx b/src/packages/components/note-edition/index.tsx
@@ -1,45 +1,56 @@
 import NoteOneLangEdition from './note-one-lang-edition';
-import D from '../../deprecated-locales';
+import { ClientSideError } from '../errors-bloc';
 
 type NoteEditionTypes = {
-	noteLg1: string;
+	notes: any;
+	noteLg1Name: string;
+	noteLg2Name: string;
 	handleChangeLg1: (value: string) => void;
-	noteLg2: string;
 	handleChangeLg2: (value: string) => void;
 	maxLength: number;
+	errorMessage: { errorMessage: string[]; fields: any };
 };
 export const NoteEdition = ({
-	noteLg1,
+	notes,
+	noteLg1Name,
+	noteLg2Name,
 	handleChangeLg1,
-	noteLg2,
 	handleChangeLg2,
 	maxLength,
+	errorMessage,
 }: Readonly<NoteEditionTypes>) => {
+	const noteLg1 = notes[noteLg1Name];
+	const noteLg2 = notes[noteLg2Name];
 	return (
 		<div>
 			<div className="row">
 				<div className="col-md-6">
-					<NoteOneLangEdition
-						note={noteLg1}
-						handleChange={handleChangeLg1}
-						maxLength={maxLength}
-					/>
+					<>
+						<NoteOneLangEdition
+							note={noteLg1}
+							handleChange={handleChangeLg1}
+							maxLength={maxLength}
+						/>
+						<ClientSideError
+							id="note-lg1-error"
+							error={errorMessage?.fields[noteLg1Name]}
+						></ClientSideError>
+					</>
 				</div>
 				<div className="col-md-6">
-					<NoteOneLangEdition
-						note={noteLg2}
-						handleChange={handleChangeLg2}
-						maxLength={maxLength}
-					/>
+					<>
+						<NoteOneLangEdition
+							note={noteLg2}
+							handleChange={handleChangeLg2}
+							maxLength={maxLength}
+						/>
+						<ClientSideError
+							id="note-lg2-error"
+							error={errorMessage?.fields[noteLg2Name]}
+						></ClientSideError>
+					</>
 				</div>
 			</div>
-			{maxLength && (
-				<div className="row">
-					<div className="row text-center boldRed">
-						{maxLength} {D.scopeNoteChar}
-					</div>
-				</div>
-			)}
 		</div>
 	);
 };
diff --git a/src/packages/components/note-edition/note-edition.spec.tsx b/src/packages/components/note-edition/note-edition.spec.tsx
@@ -5,11 +5,20 @@ describe('note-edition', () => {
 	it('renders without crashing', () => {
 		render(
 			<NoteEdition
-				noteLg1="noteLg1"
-				noteLg2="noteLg2"
+				notes={{
+					scopeNoteLg1: 'scopeNote1',
+					scopeNoteLg2: 'scopeNote2',
+					definitionLg1: 'definitionLg1',
+				}}
+				noteLg1Name="noteLg1Name"
+				noteLg2Name="noteLg2Name"
 				handleChangeLg1={jest.fn()}
 				handleChangeLg2={jest.fn()}
 				maxLength={0}
+				errorMessage={{
+					errorMessage: ['error'],
+					fields: { field: 'error' },
+				}}
 			/>
 		);
 	});

diff --git a/src/packages/modules-codelists/i18n/dictionary.js b/src/packages/modules-codelists/i18n/dictionary.js
@@ -43,14 +43,26 @@ const dictionary = {
 		fr: 'Uri Liste : commence par http://rdf.insee.fr/codes/',
 		en: 'Uri Liste : starts with http://rdf.insee.fr/codes/',
 	},
+	lastListUriSegmentTitleShort: {
+		fr: 'Uri Liste',
+		en: 'Uri Liste',
+	},
 	lastCodeUriSegmentTitle: {
 		fr: "Uri des codes, singulier de l'URI de la liste : commence par http://rdf.insee.fr/codes/",
 		en: 'Uri of codes, singular from list URI : starts with http://rdf.insee.fr/codes/',
 	},
+	lastCodeUriSegmentTitleShort: {
+		fr: 'Uri des codes',
+		en: 'Uri of codes',
+	},
 	lastClassUriSegmentTitle: {
 		fr: 'Uri class owl : commence par http://rdf.insee.fr/codes/concept/',
 		en: 'Uri class owl : starts with http://rdf.insee.fr/codes/concept/',
 	},
+	lastClassUriSegmentTitleShort: {
+		fr: 'Uri class owl',
+		en: 'Uri class owl',
+	},
 	codelistsSearchTitle: {
 		fr: 'Listes de codes - Recherche',
 		en: 'Code lists - Search',

diff --git a/src/packages/modules-codelists/utils/index.js b/src/packages/modules-codelists/utils/index.js
@@ -11,22 +11,22 @@ export const formatLabel = (component) => {
 const CodesList = z.object({
 	lastListUriSegment: z
 		.string({
-			required_error: D.mandatoryProperty(D.lastListUriSegmentTitle),
+			required_error: D.mandatoryProperty(D.lastListUriSegmentTitleShort),
 		})
 		.trim()
-		.min(1, { message: D.mandatoryProperty(D.lastListUriSegmentTitle) }),
+		.min(1, { message: D.mandatoryProperty(D.lastListUriSegmentTitleShort) }),
 	lastCodeUriSegment: z
 		.string({
-			required_error: D.mandatoryProperty(D.lastCodeUriSegmentTitle),
+			required_error: D.mandatoryProperty(D.lastCodeUriSegmentTitleShort),
 		})
 		.trim()
-		.min(1, { message: D.mandatoryProperty(D.lastCodeUriSegmentTitle) }),
+		.min(1, { message: D.mandatoryProperty(D.lastCodeUriSegmentTitleShort) }),
 	lastClassUriSegment: z
 		.string({
-			required_error: D.mandatoryProperty(D.lastClassUriSegmentTitle),
+			required_error: D.mandatoryProperty(D.lastClassUriSegmentTitleShort),
 		})
 		.trim()
-		.min(1, { message: D.mandatoryProperty(D.lastClassUriSegmentTitle) }),
+		.min(1, { message: D.mandatoryProperty(D.lastClassUriSegmentTitleShort) }),
 	id: z
 		.string({ required_error: D.mandatoryProperty(D.idTitle) })
 		.trim()
@@ -105,9 +105,8 @@ const Code = (shouldCheckDuplicate, codes) =>
 			.trim()
 			.min(1, { message: D.mandatoryProperty(D.idTitle) })
 			.refine(
-				(value) => {
-					return !shouldCheckDuplicate || !codes.find((c) => c.code === value);
-				},
+				(value) =>
+					!shouldCheckDuplicate || !codes.find((c) => c.code === value),
 				{
 					message: D.ErrorDoubleCode,
 				}

diff --git a/src/packages/modules-codelists/utils/index.spec.js b/src/packages/modules-codelists/utils/index.spec.js
@@ -13,13 +13,13 @@ describe('validateCodelist', () => {
 		const result = validateCodelist(codelist);
 
 		expect(result.errorMessage).toContain(
-			D.mandatoryProperty(D.lastListUriSegmentTitle)
+			D.mandatoryProperty(D.lastListUriSegmentTitleShort)
 		);
 		expect(result.errorMessage).toContain(
-			D.mandatoryProperty(D.lastCodeUriSegmentTitle)
+			D.mandatoryProperty(D.lastCodeUriSegmentTitleShort)
 		);
 		expect(result.errorMessage).toContain(
-			D.mandatoryProperty(D.lastClassUriSegmentTitle)
+			D.mandatoryProperty(D.lastClassUriSegmentTitleShort)
 		);
 		expect(result.errorMessage).toContain(D.mandatoryProperty(D.idTitle));
 		expect(result.errorMessage).toContain(D.mandatoryProperty(D1.labelTitle));
@@ -30,13 +30,13 @@ describe('validateCodelist', () => {
 		);
 
 		expect(result.fields.lastListUriSegment).toBe(
-			D.mandatoryProperty(D.lastListUriSegmentTitle)
+			D.mandatoryProperty(D.lastListUriSegmentTitleShort)
 		);
 		expect(result.fields.lastCodeUriSegment).toBe(
-			D.mandatoryProperty(D.lastCodeUriSegmentTitle)
+			D.mandatoryProperty(D.lastCodeUriSegmentTitleShort)
 		);
 		expect(result.fields.lastClassUriSegment).toBe(
-			D.mandatoryProperty(D.lastClassUriSegmentTitle)
+			D.mandatoryProperty(D.lastClassUriSegmentTitleShort)
 		);
 		expect(result.fields.id).toBe(D.mandatoryProperty(D.idTitle));
 		expect(result.fields.labelLg1).toBe(D.mandatoryProperty(D1.labelTitle));