Merge pull request #69 from PiusKariuki/chore/autopopulate-gender-on-…

…edit-SJT-75 Gender autopopulation during edit SJT-75
IntelliSOFT-Consulting · Aug 27, 2024 · f78952b · f78952b
2 parents 7a10a1d + 4c432bb
commit f78952b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/packages/esm-patient-registration-app/package.json b/packages/esm-patient-registration-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sjthc/esm-patient-registration-app",
-  "version": "5.3.6",
+  "version": "5.4.3",
   "description": "Patient registration microfrontend for O3",
   "browser": "dist/sjthc-esm-patient-registration-app.js",
   "main": "src/index.ts",
@@ -54,5 +54,5 @@
   "devDependencies": {
     "webpack": "^5.74.0"
   },
-  "gitHead": "7a9851e74b1c8e8aaf17272d09597748186880ea"
+  "gitHead": "4f4cdebe35e80399ec4e52fcbe222a1fe383706e"
 }
diff --git a/packages/esm-patient-registration-app/src/config-schema.ts b/packages/esm-patient-registration-app/src/config-schema.ts
@@ -232,7 +232,7 @@ export const esmPatientRegistrationSchema = {
           _type: Type.String,
           _description:
             'Value that will be sent to the server. Limited to FHIR-supported values for Administrative Gender',
-          _validators: [validators.oneOf(['male', 'female', 'other', 'unknown'])],
+          _validators: [validators.oneOf(['male', 'female'])],
         },
         label: {
           _type: Type.String,
@@ -248,12 +248,6 @@ export const esmPatientRegistrationSchema = {
         {
           value: 'female',
         },
-        {
-          value: 'other',
-        },
-        {
-          value: 'unknown',
-        },
       ],
       _description:
         'The options for sex selection during patient registration. This is Administrative Gender as it is called by FHIR (Possible options are limited to those defined in FHIR Administrative Gender, see https://hl7.org/fhir/R4/valueset-administrative-gender.html).',

diff --git a/...patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx b/...patient-registration-app/src/patient-registration/field/gender/gender-field.component.tsx
@@ -1,4 +1,4 @@
-import React, {useContext, useEffect} from 'react';
+import React, {useContext} from 'react';
 import { RadioButton, RadioButtonGroup } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { PatientRegistrationContext } from '../../patient-registration-context';
@@ -25,22 +25,13 @@ export const GenderField: React.FC = () => {
    * t('unknown', 'Unknown')
    */
 
-  /**
-   * Initialize the gender field each time the page is loaded
-   * This is useful for edit scenarios
-   *
-   */
-  useEffect(() => {
-    if(field?.value)
-      setGender(field?.value);
-  }, [field?.value]);
-
   return (
     <div className={styles.halfWidthInDesktopView}>
       <h4 className={styles.productiveHeading02Light}>{t('sexFieldLabelText', 'Sex')}</h4>
       <div className={styles.sexField}>
         <p className="cds--label">{t('genderLabelText', 'Sex')}</p>
-        <RadioButtonGroup name="gender" orientation="vertical" onChange={setGender} valueSelected={field.value}>
+        <RadioButtonGroup name="gender" orientation="vertical" onChange={setGender} valueSelected={field.value} defaultSelected={field.value}
+        >
           {fieldConfigs.map((option) => (
             <RadioButton
               key={option.label ?? option.value}