@kenyaemr/esm-patient-registration-app 4.3.0 → 4.4.0

package/src/patient-registration/section/section-wrapper.component.tsx

@@ -23,7 +23,7 @@ export const SectionWrapper = ({ sectionDefinition, index }: SectionWrapperProps
    * t('relationshipsSection', 'Relationships')
    */
   return (
-    <div id={sectionDefinition.id}>
+    <div id={sectionDefinition.id} style={{ scrollMarginTop: '4rem' }}>
       <h3 className={styles.productiveHeading02} style={{ color: '#161616' }}>
         {index + 1}. {t(`${sectionDefinition.id}Section`, sectionDefinition.name)}
       </h3>

package/src/root.component.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
 import { Grid, Row } from '@carbon/react';
-import { ExtensionSlot, navigate, useSession } from '@openmrs/esm-framework';
+import { ExtensionSlot, useSession } from '@openmrs/esm-framework';
 import {
   Resources,
   ResourcesContext,
@@ -30,10 +30,6 @@ export default function Root({ savePatientForm, isOffline }: RootProps) {
     fetchPatientIdentifierTypesWithSources,
   );
 
-  if (currentSession.sessionLocation === null) {
-    navigate({ to: `\${openmrsSpaBase}/login/location?returnToUrl=\${openmrsSpaBase}/patient-registration` });
-  }
-
   return (
     <main className={`omrs-main-content ${styles.root}`}>
       <Grid className={styles.grid}>

package/translations/en.json

@@ -3,7 +3,6 @@
   "address1": "Address line 1",
   "address2": "Address line 2",
   "addressHeader": "Address",
-  "age": "Age",
   "allFieldsRequiredText": "All fields are required unless marked optional",
   "autoGeneratedPlaceholderText": "Auto-generated",
   "birthdayNotInTheFuture": "Birthday cannot be in the future",
@@ -12,15 +11,11 @@
   "cancel": "Cancel",
   "causeOfDeathInputLabel": "Cause of Death",
   "cityVillage": "City",
-  "clientRegistryEmpty": "Create & Post Patient",
-  "clientVerificationWithClientRegistry": "Client verification with client registry",
   "configure": "Configure",
   "contactSection": "Contact Details",
-  "continue": "Continue",
   "country": "Country",
   "countyDistrict": "District",
   "createNew": "Create New",
-  "dateOfBirth": "Date of birth",
   "dateOfBirthLabelText": "Date of Birth",
   "deathDateInputLabel": "Date of Death",
   "deathdayNotInTheFuture": "Death day cannot be in the future",
@@ -43,7 +38,6 @@
   "female": "Female",
   "fieldErrorTitleMessage": "The following fields have errors:",
   "fullNameLabelText": "Full Name",
-  "gender": "Gender",
   "genderLabelText": "Sex",
   "genderRequired": "Gender is required",
   "genderUnspecified": "Gender is not specified",
@@ -60,7 +54,6 @@
   "male": "Male",
   "middleNameLabelText": "Middle Name",
   "months": "Months",
-  "nationalId": "National ID",
   "negativeMonths": "Negative months",
   "negativeYears": "Negative years",
   "no": "No",
@@ -69,12 +62,8 @@
   "optional": "optional",
   "other": "Other",
   "patient": "Patient",
-  "patientDetailsFound": "Patient information found in the registry, do you want to use the information to continue with registration?",
-  "patientName": "Patient name",
   "patientNameKnown": "Patient's Name is Known?",
-  "patientNotFound": "The patient records could not be found in Client registry, do you want to continue to create and post patient to registry",
   "postalCode": "Postcode",
-  "postToRegistry": "Post to registry",
   "registerPatient": "Register Patient",
   "registrationSuccessToastDescription": "The patient can now be found by searching for them using their name or ID number",
   "registrationSuccessToastTitle": "New Patient Created",
@@ -89,8 +78,6 @@
   "restoreRelationshipActionButton": "Undo",
   "searchAddress": "Search address",
   "selectAnOption": "Select an option",
-  "selectCountry": "Select country",
-  "selectIdentifierType": "Select identifier type",
   "sexFieldLabelText": "Sex",
   "stateProvince": "State",
   "stroke": "Stroke",
@@ -100,8 +87,6 @@
   "updatePatient": "Update Patient",
   "updationSuccessToastDescription": "The patient's information has been successfully updated",
   "updationSuccessToastTitle": "Patient Details Updated",
-  "useValues": "Use values",
-  "validate": "Validate",
   "years": "Years",
   "yearsEstimateRequired": "Years estimate required",
   "yes": "Yes"

package/src/patient-registration/input/custom-input/estimated-age/estimated-age-input.component.tsx

@@ -1,32 +0,0 @@
-import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useField } from 'formik';
-import dayjs from 'dayjs';
-import { Input } from '../../basic-input/input/input.component';
-import styles from './../../input.scss';
-
-interface EstimatedAgeInputProps {
-  yearsName: string;
-  monthsName: string;
-  setBirthdate(field: string, value: any, shouldValidate?: boolean): void;
-}
-
-export const EstimatedAgeInput: React.FC<EstimatedAgeInputProps> = ({ yearsName, monthsName, setBirthdate }) => {
-  const [yearsField] = useField(yearsName);
-  const [monthsField] = useField(monthsName);
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    setBirthdate(
-      'birthdate',
-      dayjs().subtract(yearsField.value, 'year').subtract(monthsField.value, 'month').toISOString().split('T')[0],
-    );
-  }, [yearsField.value, monthsField.value, setBirthdate]);
-
-  return (
-    <main className={styles.fieldRow}>
-      <Input id="number" labelText={t('years', 'Years')} name={yearsName} />
-      <Input id="number" labelText={t('months', 'Months')} name={monthsName} />
-    </main>
-  );
-};

package/src/patient-registration/input/custom-input/estimated-age/estimated-age-input.test.tsx

@@ -1,36 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { Formik, Form } from 'formik';
-import { EstimatedAgeInput } from './estimated-age-input.component';
-
-describe.skip('estimated age input', () => {
-  const mockSetBirthdate = jest.fn();
-
-  const setupInput = async () => {
-    render(
-      <Formik initialValues={{ years: 0, months: 0 }} onSubmit={null}>
-        <Form>
-          <EstimatedAgeInput yearsName="years" monthsName="months" setBirthdate={mockSetBirthdate} />
-        </Form>
-      </Formik>,
-    );
-    const years = screen.getByLabelText('years') as HTMLInputElement;
-    const months = screen.getByLabelText('months') as HTMLInputElement;
-
-    return {
-      years,
-      months,
-    };
-  };
-
-  it('exists', async () => {
-    const inputs = await setupInput();
-    expect(inputs.years.type).toEqual('number');
-    expect(inputs.months.type).toEqual('number');
-  });
-  it('calls setBirthdate', async () => {
-    mockSetBirthdate.mockReset();
-    await setupInput();
-    expect(mockSetBirthdate.mock.calls.length).toBe(1);
-  });
-});

package/src/patient-registration/input/custom-input/unidentified-patient/unidentified-patient-input.component.tsx

@@ -1,24 +0,0 @@
-import React, { useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useField } from 'formik';
-import { Input } from '../../basic-input/input/input.component';
-
-interface UnidentifiedPatientInputProps {
-  name: string;
-  setName(field: string, value: any, shouldValidate?: boolean): void;
-}
-
-export const UnidentifiedPatientInput: React.FC<UnidentifiedPatientInputProps> = ({ setName, name }) => {
-  const [field] = useField({ name });
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    if (field.value) {
-      setName('givenName', 'UNKNOWN');
-      setName('middleName', 'UNKNOWN');
-      setName('familyName', 'UNKNOWN');
-    }
-  }, [field.value, setName]);
-
-  return <Input id="checkbox" labelText={t('unidentifiedPatient', 'Unidentified Patient')} name={name} />;
-};

package/src/patient-registration/input/custom-input/unidentified-patient/unidentified-patient-input.test.tsx

@@ -1,39 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { Formik, Form } from 'formik';
-import { UnidentifiedPatientInput } from './unidentified-patient-input.component';
-
-describe.skip('unidentified patient input', () => {
-  const mockSetName = jest.fn();
-
-  const setupInput = async (unidentifiedPatient) => {
-    render(
-      <Formik initialValues={{ unidentifiedPatient: unidentifiedPatient }} onSubmit={null}>
-        <Form>
-          <UnidentifiedPatientInput name="unidentifiedPatient" setName={mockSetName} />
-        </Form>
-      </Formik>,
-    );
-    return screen.getByLabelText('Unidentified Patient') as HTMLInputElement;
-  };
-
-  it('exists', async () => {
-    const input = await setupInput(false);
-    expect(input.type).toEqual('checkbox');
-  });
-
-  it('sets givenName, middleName and familyName to "UNKNOWN" if patient is marked as unidentified', async () => {
-    mockSetName.mockReset();
-    await setupInput(true);
-    expect(mockSetName.mock.calls.length).toBe(3);
-    expect(mockSetName).toHaveBeenCalledWith('givenName', 'UNKNOWN');
-    expect(mockSetName).toHaveBeenCalledWith('middleName', 'UNKNOWN');
-    expect(mockSetName).toHaveBeenCalledWith('familyName', 'UNKNOWN');
-  });
-
-  it('does not override givenName, middleName and familyName if patient is identified', async () => {
-    mockSetName.mockReset();
-    await setupInput(false);
-    expect(mockSetName.mock.calls.length).toBe(0);
-  });
-});

package/src/patient-verification/assets/counties.json

@@ -1,236 +0,0 @@
-[
-    {
-        "name": "Mombasa",
-        "code": 1,
-        "capital": "Mombasa City"
-    },
-    {
-        "name": "Kwale",
-        "code": 2,
-        "capital": "Kwale"
-    },
-    {
-        "name": "Kilifi",
-        "code": 3,
-        "capital": "Kilifi"
-    },
-    {
-        "name": "Tana River",
-        "code": 4,
-        "capital": "Hola"
-    },
-    {
-        "name": "Lamu",
-        "code": 5,
-        "capital": "Lamu"
-    },
-    {
-        "name": "Taita taveta",
-        "code": 6,
-        "capital": "Voi"
-    },
-    {
-        "name": "Garissa",
-        "code": 7,
-        "capital": "Garissa"
-    },
-    {
-        "name": "Wajir",
-        "code": 8,
-        "capital": "Wajir"
-    },
-    {
-        "name": "Mandera",
-        "code": 9,
-        "capital": "Mandera"
-    },
-    {
-        "name": "Marsabit",
-        "code": 10,
-        "capital": "Marsabit"
-    },
-    {
-        "name": "Isiolo",
-        "code": 11,
-        "capital": "Isiolo"
-    },
-    {
-        "name": "Meru",
-        "code": 12,
-        "capital": "Meru"
-    },
-    {
-        "name": "Tharaka nithi",
-        "code": 13,
-        "capital": "Chuka"
-    },
-    {
-        "name": "Embu",
-        "code": 14,
-        "capital": "Embu"
-    },
-    {
-        "name": "Kitui",
-        "code": 15,
-        "capital": "Kitui"
-    },
-    {
-        "name": "Machakos",
-        "code": 16,
-        "capital": "Machakos"
-    },
-    {
-        "name": "Makueni",
-        "code": 17,
-        "capital": "Wote"
-    },
-    {
-        "name": "Nyandarua",
-        "code": 18,
-        "capital": "Ol Kalou"
-    },
-    {
-        "name": "Nyeri",
-        "code": 19,
-        "capital": "Nyeri"
-    },
-    {
-        "name": "Kirinyaga",
-        "code": 20,
-        "capital": "Kerugoya/Kutus"
-    },
-    {
-        "name": "Murang'a",
-        "code": 21,
-        "capital": "Murang'a"
-    },
-    {
-        "name": "Kiambu",
-        "code": 22,
-        "capital": "Kiambu"
-    },
-    {
-        "name": "Turkana",
-        "code": 23,
-        "capital": "Lodwar"
-    },
-    {
-        "name": "West pokot",
-        "code": 24,
-        "capital": "Kapenguria"
-    },
-    {
-        "name": "Samburu",
-        "code": 25,
-        "capital": "Maralal"
-    },
-    {
-        "name": "Trans nzoia",
-        "code": 26,
-        "capital": "Kitale"
-    },
-    {
-        "name": "Uasin gishu",
-        "code": 27,
-        "capital": "Eldoret"
-    },
-    {
-        "name": "Elgeyo marakwet",
-        "code": 28,
-        "capital": "Iten"
-    },
-    {
-        "name": "Nandi",
-        "code": 29,
-        "capital": "Kapsabet"
-    },
-    {
-        "name": "Baringo",
-        "code": 30,
-        "capital": "Kabarnet"
-    },
-    {
-        "name": "Laikipia",
-        "code": 31,
-        "capital": "Rumuruti"
-    },
-    {
-        "name": "Nakuru",
-        "code": 32,
-        "capital": "Nakuru"
-    },
-    {
-        "name": "Narok",
-        "code": 33,
-        "capital": "Narok"
-    },
-    {
-        "name": "Kajiado",
-        "code": 34
-    },
-    {
-        "name": "Kericho",
-        "code": 35,
-        "capital": "Kericho"
-    },
-    {
-        "name": "Bomet",
-        "code": 36,
-        "capital": "Bomet"
-    },
-    {
-        "name": "Kakamega",
-        "code": 37,
-        "capital": "Kakamega"
-    },
-    {
-        "name": "Vihiga",
-        "code": 38,
-        "capital": "Vihiga"
-    },
-    {
-        "name": "Bungoma",
-        "code": 39,
-        "capital": "Bungoma"
-    },
-    {
-        "name": "Busia",
-        "code": 40,
-        "capital": "Busia"
-    },
-    {
-        "name": "Siaya",
-        "code": 41,
-        "capital": "Siaya"
-    },
-    {
-        "name": "Kisumu",
-        "code": 42,
-        "capital": "Kisumu"
-    },
-    {
-        "name": "Homa bay",
-        "code": 43,
-        "capital": "Homa Bay"
-    },
-    {
-        "name": "Migori",
-        "code": 44,
-        "capital": "Migori"
-    },
-    {
-        "name": "Kisii",
-        "code": 45,
-        "capital": "Kisii"
-    },
-    {
-        "name": "Nyamira",
-        "code": 46,
-        "capital": "Nyamira"
-    },
-    {
-        "name": "Nairobi",
-        "code": 47,
-        "capital": "Nairobi City"
-    }
-]

package/src/patient-verification/assets/verification-assets.ts

@@ -1,11 +0,0 @@
-export const countries = [
-  { name: 'Kenya', initials: 'KE' },
-  { name: 'Uganda', initials: 'UG' },
-  { name: 'Tanzania', initials: 'TZ' },
-];
-
-export const verificationIdentifierTypes = [
-  { name: 'National ID', value: 'national-id' },
-  { name: 'Passport', value: 'passport' },
-  { name: 'Birth certificate number', value: 'birth-certificate-number' },
-];

package/src/patient-verification/patient-verification-hook.tsx

@@ -1,156 +0,0 @@
-import { FetchResponse, openmrsFetch, showNotification, showToast } from '@openmrs/esm-framework';
-import { ConceptAnswers, ConceptResponse, FormValues } from '../patient-registration/patient-registration-types';
-import { generateNUPIPayload, handleClientRegistryResponse } from './patient-verification-utils';
-import useSWR from 'swr';
-import useSWRImmutable from 'swr/immutable';
-
-export function searchClientRegistry(identifierType: string, searchTerm: string, token: string) {
-  const url = `https://afyakenyaapi.health.go.ke/partners/registry/search/KE/${identifierType}/${searchTerm}`;
-  return fetch(url, { headers: { Authorization: `Bearer ${token}` } }).then((r) => r.json());
-}
-
-export function savePatientToClientRegistry(formValues: FormValues) {
-  const createdRegistryPatient = generateNUPIPayload(formValues);
-  return fetch(`https://afyakenyaapi.health.go.ke/partners/registry`, {
-    headers: { Authorization: `Bearer ${formValues.token}`, 'Content-Type': 'application/json' },
-    method: 'POST',
-    body: JSON.stringify(createdRegistryPatient),
-  });
-}
-
-export async function handleSavePatientToClientRegistry(
-  formValues: FormValues,
-  setValues: (values: FormValues, shouldValidate?: boolean) => void,
-  inEditMode: boolean,
-) {
-  const mode = inEditMode ? 'edit' : 'new';
-  switch (mode) {
-    case 'edit': {
-      try {
-        const searchResponse = await searchClientRegistry(
-          'national-id',
-          formValues.identifiers['nationalId'].identifierValue,
-          formValues.token,
-        );
-
-        // if client does not exists post client to registry
-        if (searchResponse?.clientExists === false) {
-          postToRegistry(formValues, setValues);
-        }
-      } catch (error) {
-        showToast({
-          title: 'Client registry error',
-          description: `${error}`,
-          millis: 10000,
-          kind: 'error',
-          critical: true,
-        });
-      }
-      return;
-    }
-    case 'new': {
-      postToRegistry(formValues, setValues);
-    }
-  }
-}
-
-export function useConceptAnswers(conceptUuid: string): { data: Array<ConceptAnswers>; isLoading: boolean } {
-  const { data, error, isLoading } = useSWR<FetchResponse<ConceptResponse>, Error>(
-    `/ws/rest/v1/concept/${conceptUuid}`,
-    openmrsFetch,
-  );
-  if (error) {
-    showToast({
-      title: error.name,
-      description: error.message,
-      kind: 'error',
-    });
-  }
-  return { data: data?.data?.answers ?? [], isLoading };
-}
-
-const urlencoded = new URLSearchParams();
-urlencoded.append('client_id', 'palladium.partner.client');
-urlencoded.append('client_secret', '28f95b2a');
-urlencoded.append('grant_type', 'client_credentials');
-urlencoded.append('scope', 'DHP.Gateway DHP.Partners');
-
-const swrFetcher = async (url) => {
-  const res = await fetch(url, {
-    method: 'POST',
-    body: urlencoded,
-    redirect: 'follow',
-  });
-
-  // If the status code is not in the range 200-299,
-  // we still try to parse and throw it.
-  if (!res.ok) {
-    const error = new Error('An error occurred while fetching the data.') as any;
-    // Attach extra info to the error object.
-    error.info = await res.json();
-    error.status = res.status;
-    throw error;
-  }
-
-  return res.json();
-};
-
-export function useGlobalProperties() {
-  const { data, isLoading, error } = useSWRImmutable(
-    `https://afyakenyaidentityapi.health.go.ke/connect/token`,
-    swrFetcher,
-    { refreshInterval: 864000 },
-  );
-  return { data: data, isLoading, error };
-}
-
-async function postToRegistry(
-  formValues: FormValues,
-  setValues: (values: FormValues, shouldValidate?: boolean) => void,
-) {
-  try {
-    const clientRegistryResponse = await savePatientToClientRegistry(formValues);
-    if (clientRegistryResponse.ok) {
-      const savedValues = await clientRegistryResponse.json();
-      const nupiIdentifier = {
-        ['nationalUniquePatientIdentifier']: {
-          identifierTypeUuid: 'f85081e2-b4be-4e48-b3a4-7994b69bb101',
-          identifierName: 'National Unique patient identifier',
-          identifierValue: savedValues['clientNumber'],
-          initialValue: savedValues['clientNumber'],
-          identifierUuid: undefined,
-          selectedSource: { uuid: '', name: '' },
-          preferred: false,
-          required: false,
-        },
-      };
-      setValues({ ...formValues, identifiers: { ...formValues.identifiers, ...nupiIdentifier } });
-      showToast({
-        title: 'Posted patient to client registry successfully',
-        description: `The patient has been saved to client registry`,
-        kind: 'success',
-      });
-    } else {
-      const responseError = await clientRegistryResponse.json();
-      const errorMessage = Object.values(responseError.errors ?? {})
-        .map((error: any) => error.join())
-        .toString();
-      setValues({
-        ...formValues,
-        attributes: {
-          ...formValues.attributes,
-          ['869f623a-f78e-4ace-9202-0bed481822f5']: 'Failed validation',
-          ['752a0331-5293-4aa5-bf46-4d51aaf2cdc5']: 'Failed',
-        },
-      });
-      showNotification({
-        title: responseError.title,
-        description: errorMessage,
-        kind: 'warning',
-        millis: 150000,
-      });
-    }
-  } catch (error) {
-    showNotification({ kind: 'error', title: 'NUPI Post failed', description: JSON.stringify(error) });
-  }
-}