Merge pull request #794 from sanger/x1246-section-reg-bioRisk

X1246 section reg bio risk
sanger · Nov 18, 2024 · 641cd82 · 641cd82
2 parents b9fff11 + 4b6c8f7
commit 641cd82
Show file tree

Hide file tree

Showing 4 changed files with 1,557 additions and 1,532 deletions.
diff --git a/cypress/e2e/pages/sectionRegistration.cy.ts b/cypress/e2e/pages/sectionRegistration.cy.ts
@@ -139,6 +139,11 @@ describe('Section Registration Page', () => {
           'Section External Identifier contains invalid characters. Only letters, numbers, hyphens, and underscores are permitted'
         ).should('be.visible');
       });
+
+      it('requires Biological Risk Assessment Numbers ', () => {
+        cy.findByLabelText('Biological Risk Assessment Numbers').focus().blur();
+        cy.findByText('Biological Risk Assessment Numbers is a required field').should('be.visible');
+      });
     });
 
     describe('Initialisation', () => {
@@ -342,6 +347,7 @@ function fillInForm() {
   selectOption('Tissue Type', 'Liver');
   selectOption('Spatial Location', '3 - Surface central region');
   cy.findByLabelText('Replicate Number').clear().type('2');
+  selectOption('bioRiskCode', 'bioRisk1');
   cy.findByLabelText('Section External Identifier').clear().type('S_EXT_ID_1');
   cy.findByLabelText('Sectioned Date').clear().type('2024-07-07');
   cy.findByLabelText('Section Number').clear().type('5');

diff --git a/src/pages/SectionRegistration.tsx b/src/pages/SectionRegistration.tsx
@@ -53,6 +53,7 @@ type SectionRegistrationFormSection = {
   sectionThickness: number;
   region?: string;
   dateSectioned?: Date;
+  bioRiskCode: string;
 };
 
 type SectionRegistrationFormLabware = {
@@ -93,7 +94,8 @@ function buildSectionRegisterRequest(values: SectionRegistrationFormValues): Sec
             species: sample.species.trim(),
             tissueType: sample.tissueType.trim(),
             region: sample.region,
-            dateSectioned: sample.dateSectioned?.toString()
+            dateSectioned: sample.dateSectioned?.toString(),
+            bioRiskCode: sample.bioRiskCode
           }));
         })
       };
@@ -135,7 +137,8 @@ function buildSample(): SectionRegistrationFormSection {
     sectionNumber: 0,
     sectionThickness: 0,
     region: '',
-    dateSectioned: undefined
+    dateSectioned: undefined,
+    bioRiskCode: ''
   };
 }
 
@@ -166,7 +169,8 @@ function buildValidationSchema(registrationInfo: GetRegistrationInfoQuery) {
                     sectionNumber: validation.sectionNumber,
                     sectionThickness: validation.sectionThickness,
                     region: validation.region,
-                    dateSectioned: validation.dateSectioned
+                    dateSectioned: validation.dateSectioned,
+                    bioRiskCode: validation.bioRiskCode
                   })
                 )
               )

diff --git a/src/pages/registration/SectionForm.tsx b/src/pages/registration/SectionForm.tsx
@@ -178,6 +178,19 @@ export default function SectionForm({
         name={`labwares.${currentIndex}.slots.${slotAddress}.${sectionIndex}.replicateNumber`}
       />
 
+      <CustomReactSelect
+        label="Biological Risk Assessment Numbers"
+        dataTestId="bioRiskCode"
+        name={`labwares.${currentIndex}.slots.${slotAddress}.${sectionIndex}.bioRiskCode`}
+        value={values.labwares[currentIndex].slots[slotAddress][sectionIndex].bioRiskCode}
+        options={registrationInfo.bioRisks.map((bioRisk) => {
+          return {
+            label: bioRisk.code,
+            value: bioRisk.code
+          };
+        })}
+      />
+
       <Heading level={4}>Section Information</Heading>
 
       <FormikInput