Handle sample form (WIP)

Author: jrivals

frontend/src/views/SampleView/SampleFormStep1.tsx

@@ -152,6 +152,7 @@ const SampleFormStep1 = ({}: Props) => {
             />
           </div>
         )}
+        <hr className={cx('fr-mt-3w', 'fr-mx-0')} />
 
         <div className={cx('fr-col-12')}>
           <Button data-testid="submit-button" onClick={submit}>

frontend/src/views/SampleView/SampleFormStep2.tsx

@@ -41,6 +41,7 @@ const SampleFormStep2 = ({ sample }: Props) => {
     sample.temperatureMaintenance
   );
   const [expiryDate, setExpiryDate] = useState(sample.expiryDate);
+  const [locationSiret, setLocationSiret] = useState(sample.locationSiret);
   const [sealId, setSealId] = useState(sample.sealId);
 
   const [updateSample] = useUpdateSampleMutation();
@@ -62,6 +63,7 @@ const SampleFormStep2 = ({ sample }: Props) => {
     sampleCount,
     temperatureMaintenance,
     expiryDate,
+    locationSiret,
     sealId,
   });
 
@@ -93,6 +95,7 @@ const SampleFormStep2 = ({ sample }: Props) => {
         sampleCount,
         temperatureMaintenance,
         expiryDate,
+        locationSiret,
         sealId,
       },
     });
@@ -281,6 +284,18 @@ const SampleFormStep2 = ({ sample }: Props) => {
       </div>
       <hr className={cx('fr-mt-3w', 'fr-mx-0')} />
       <div className={cx('fr-grid-row', 'fr-grid-row--gutters')}>
+        <div className={cx('fr-col-12', 'fr-col-sm-4')}>
+          <AppTextInput<FormShape>
+            defaultValue={locationSiret ?? ''}
+            onChange={(e) => setLocationSiret(e.target.value)}
+            inputForm={form}
+            inputKey="locationSiret"
+            whenValid="SIRET valide"
+            data-testid="locationSiret-input"
+            label="SIRET (obligatoire)"
+            required
+          />
+        </div>
         <div className={cx('fr-col-12', 'fr-col-sm-4')}>
           <AppTextInput<FormShape>
             type="number"

frontend/src/views/SampleView/SampleFormStep3.tsx

@@ -1,32 +1,50 @@
-import ButtonsGroup from '@codegouvfr/react-dsfr/ButtonsGroup';
-import { cx } from '@codegouvfr/react-dsfr/fr/cx';
-import { PartialSample, SampleUpdate } from 'shared/schema/Sample';
+import Button from '@codegouvfr/react-dsfr/Button';
+import { PartialSample } from 'shared/schema/Sample';
 
 interface Props {
   sample: PartialSample;
 }
 
 const SampleFormStep3 = ({ sample }: Props) => {
-  const Form = SampleUpdate;
-
-  type FormShape = typeof Form.shape;
-
   const submit = async (e: React.MouseEvent<HTMLElement>) => {};
 
   return (
-    <form data-testid="draft_sample_3_form">
-      <div className={cx('fr-col-12')}>
-        <ButtonsGroup
-          inlineLayoutWhen="md and up"
-          buttons={[
-            {
-              children: 'Valider le prélèvement',
-              onClick: submit,
-            },
-          ]}
-        />
-      </div>
-    </form>
+    <div>
+      <p>
+        Vérifiez que les informations saisies sont correctes avant de valider
+        l'envoi de votre prélèvement.
+      </p>
+      <ul>
+        <li>
+          <strong>Numéro de résytal :</strong> {sample.resytalId}
+        </li>
+        <li>
+          <strong>Contexte du prélèvement :</strong> {sample.context}
+        </li>
+        <li>
+          <strong>Département :</strong> {sample.department}
+        </li>
+        <li>
+          <strong>Matrice :</strong> {sample.matrix}
+        </li>
+        <li>
+          <strong>Partie du végétal :</strong> {sample.matrixPart}
+        </li>
+        <li>
+          <strong>Stade du végétal :</strong> {sample.stage}
+        </li>
+        <li>
+          <strong>Quantité :</strong> {sample.quantity} {sample.quantityUnit}
+        </li>
+        <li>
+          <strong>Nombre de prélèvements :</strong> {sample.sampleCount}
+        </li>
+        <li>
+          <strong>Numéro de scellé :</strong> {sample.sealId}
+        </li>
+      </ul>
+      <Button data-testid="submit-button">Envoyer le prélèvement</Button>
+    </div>
   );
 };
 

shared/schema/Sample.ts

@@ -30,7 +30,11 @@ export const Sample = z.object({
   createdBy: z.string(),
   context: SampleContext,
   userLocation: UserLocation,
-  locationSiret: z.string().optional().nullable(),
+  locationSiret: z
+    .string({
+      required_error: 'Veuillez renseigner le SIRET du lieu de prélèvement.',
+    })
+    .regex(/^[0-9]{14}$/g, 'SIRET invalide.'),
   locationName: z.string().optional().nullable(),
   locationAddress: z.string().optional().nullable(),
   matrixKind: z.string({
@@ -97,6 +101,7 @@ export const SampleUpdate = Sample.pick({
   sampleCount: true,
   temperatureMaintenance: true,
   expiryDate: true,
+  locationSiret: true,
   sealId: true,
 });