Merge pull request #801 from sanger/x1247-sample-bioRisk

X1247 sample bio risk
sanger · Nov 20, 2024 · 7037f2d · 7037f2d
2 parents 08eea58 + eac8fc6
commit 7037f2d
Show file tree

Hide file tree

Showing 9 changed files with 1,452 additions and 1,456 deletions.
diff --git a/cypress/e2e/pages/blockRegistration.cy.ts b/cypress/e2e/pages/blockRegistration.cy.ts
@@ -157,10 +157,6 @@ describe('Block Registration Page', () => {
         cy.findByLabelText('Labware Type').focus().blur();
         cy.findByText('Labware Type is a required field').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('submission', () => {

diff --git a/cypress/e2e/pages/originalSampleRegistration.cy.ts b/cypress/e2e/pages/originalSampleRegistration.cy.ts
@@ -274,6 +274,7 @@ function fillInForm() {
   cy.findByTestId('External Identifier').type('EXT_ID_1');
   selectOption('HuMFre', 'HuMFre1');
   selectOption('Tissue Type', 'Liver');
+  selectOption('bioRiskCode', 'bioRisk1');
   selectOption('Spatial Location', '3 - Surface central region');
   cy.findByTestId('Replicate Number').type('2');
   selectOption('Labware Type', 'Pot');

diff --git a/cypress/e2e/shared/registration.cy.ts b/cypress/e2e/shared/registration.cy.ts
@@ -68,6 +68,11 @@ export function shouldBehaveLikeARegistrationForm(registrationType: Registration
       }
     );
 
+    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');
+    });
+
     it('requires Replicate Number to be suitable', () => {
       cy.findByTestId('Replicate Number').type('1+1').blur();
       checkReplicateWarningIsVisible();

diff --git a/src/pages/BlockRegistration.tsx b/src/pages/BlockRegistration.tsx
@@ -245,7 +245,6 @@ function BlockRegistration() {
       successDisplayTableColumns={resultColumns}
       formatSuccessData={(registrationResult) => registrationResult.labware}
       isBlock={true}
-      withBioRiskOption={true}
     />
   );
 

diff --git a/src/pages/OriginalSampleRegistration.tsx b/src/pages/OriginalSampleRegistration.tsx
@@ -99,6 +99,7 @@ function buildRegistrationSchema(registrationInfo: GetRegistrationInfoQuery) {
           species: validation.species,
           hmdmc: validation.hmdmc,
           tissueType: validation.tissueType,
+          bioRiskCode: validation.bioRiskCode,
           sampleCollectionDate: validation.sampleCollectionDate,
           blocks: Yup.array()
             .min(1)
@@ -164,6 +165,7 @@ function OriginalSampleRegistration() {
               labwareType: block.labwareType.trim(),
               lifeStage: Object.values(LifeStage).includes(tissue.lifeStage) ? tissue.lifeStage : undefined,
               tissueType: tissue.tissueType.trim(),
+              bioRiskCode: tissue.bioRiskCode,
               spatialLocation: block.spatialLocation,
               replicateNumber: block.replicateNumber ?? undefined,
               fixative: block.fixative.trim(),

diff --git a/src/pages/registration/Registration.tsx b/src/pages/registration/Registration.tsx
@@ -20,8 +20,8 @@ import { motion } from 'framer-motion';
 import variants from '../../lib/motionVariants';
 import Heading from '../../components/Heading';
 import WorkNumberSelect from '../../components/WorkNumberSelect';
-import { FormikErrorMessage } from '../../components/forms';
 import PromptOnLeave from '../../components/notifications/PromptOnLeave';
+import { FormikErrorMessage } from '../../components/forms';
 
 /**
  * Expect form input interface
@@ -85,8 +85,6 @@ interface RegistrationParams<M, T, R extends Object> {
    */
   keywordsMap?: Map<TextType, string>;
   isBlock?: boolean;
-
-  withBioRiskOption?: boolean;
 }
 
 /**
@@ -107,8 +105,7 @@ function Registration<M, T extends TissueValues<B>, B, R extends Required<Labwar
   formatSuccessData,
   defaultFormTissueValues,
   keywordsMap,
-  isBlock = false,
-  withBioRiskOption = false
+  isBlock = false
 }: RegistrationParams<M, T, R>) {
   const registrationMachine = React.useMemo(() => {
     return createRegistrationMachine<FormInput<T>, M>(buildRegistrationInput, registrationService);
@@ -190,12 +187,15 @@ function Registration<M, T extends TissueValues<B>, B, R extends Required<Labwar
                             'tissues',
                             values.tissues.map((tissue) => ({ ...tissue, workNumber }))
                           );
+                          if ('workNumber' in defaultFormTissueValues) {
+                            defaultFormTissueValues.workNumber = workNumber;
+                          }
                         }}
                         workNumber={values.workNumbers}
                         multiple={isBlock}
                         emptyOption={false}
                       />
-                      {values.workNumbers.length <= 0 && <FormikErrorMessage name={'workNumbers'} />}
+                      {isBlock && values.workNumbers.length <= 0 && <FormikErrorMessage name={'workNumbers'} />}
                     </motion.div>
                   </motion.div>
 
@@ -204,7 +204,6 @@ function Registration<M, T extends TissueValues<B>, B, R extends Required<Labwar
                     availableLabwareTypes={availableLabwareTypes}
                     defaultFormTissueValues={defaultFormTissueValues}
                     keywordsMap={keywordsMap}
-                    withBioRiskOption={withBioRiskOption}
                   />
 
                   {current.matches('clashed') && registrationResult && (

diff --git a/src/pages/registration/RegistrationForm.tsx b/src/pages/registration/RegistrationForm.tsx
@@ -38,19 +38,13 @@ interface RegistrationFormParams<T> {
    * Change in default keywords to display
    */
   keywordsMap?: Map<TextType, string>;
-
-  /**
-   * boolean bio Risk Code option until we add the feature for rhe Original Sample Registration
-   * **/
-  withBioRiskOption?: boolean;
 }
 
 const RegistrationForm = <T extends TissueValues<B>, B>({
   registrationInfo,
   availableLabwareTypes,
   defaultFormTissueValues,
-  keywordsMap,
-  withBioRiskOption = false
+  keywordsMap
 }: RegistrationFormParams<T>) => {
   const [currentIndex, setCurrentIndex] = useState(0);
   const { setFieldValue, values, errors, touched, isSubmitting } = useFormikContext<RegistrationFormValues>();
@@ -156,17 +150,15 @@ const RegistrationForm = <T extends TissueValues<B>, B>({
                 options={selectOptionValues(registrationInfo.tissueTypes, 'name', 'name')}
                 value={values.tissues[currentIndex].tissueType}
               />
-              {withBioRiskOption && (
-                <CustomReactSelect
-                  label="Biological Risk Assessment Numbers"
-                  emptyOption
-                  name={`tissues.${currentIndex}.bioRiskCode`}
-                  className="mt-2"
-                  dataTestId="bioRiskCode"
-                  options={selectOptionValues(registrationInfo.bioRisks, 'code', 'code')}
-                  value={values.tissues[currentIndex].bioRiskCode}
-                />
-              )}
+              <CustomReactSelect
+                label="Biological Risk Assessment Numbers"
+                emptyOption
+                name={`tissues.${currentIndex}.bioRiskCode`}
+                className="mt-2"
+                dataTestId="bioRiskCode"
+                options={selectOptionValues(registrationInfo.bioRisks, 'code', 'code')}
+                value={values.tissues[currentIndex].bioRiskCode}
+              />
             </motion.div>
 
             <motion.div variants={variants.fadeInWithLift} className="space-y-4">