@kenyaemr/esm-patient-registration-app 4.5.3 → 4.5.5

package/src/patient-registration/input/custom-input/identifier/utils.test.ts

@@ -0,0 +1,81 @@
+import { isUniqueIdentifierTypeForOffline, shouldBlockPatientIdentifierInOfflineMode } from './utils';
+
+interface IdentifierTypeOptions {
+  uniquenessBehavior?: 'UNIQUE' | 'LOCATION' | 'NON_UNIQUE';
+  manualEntryEnabled?: boolean;
+  automaticGenerationEnabled?: boolean;
+}
+
+function createIdentifierType(options: IdentifierTypeOptions) {
+  return {
+    uniquenessBehavior: options.uniquenessBehavior,
+    identifierSources: [
+      {
+        uuid: 'identifier-source-uuid',
+        name: 'Identifier Source Name',
+        autoGenerationOption: {
+          manualEntryEnabled: options.manualEntryEnabled,
+          automaticGenerationEnabled: options.automaticGenerationEnabled,
+        },
+      },
+    ],
+    name: 'Identifier Type Name',
+    required: true,
+    uuid: 'identifier-type-uuid',
+    fieldName: 'identifierFieldName',
+    format: 'identifierFormat',
+    isPrimary: true,
+  };
+}
+
+describe('shouldBlockPatientIdentifierInOfflineMode function', () => {
+  it('should return false if identifierType is not unique', () => {
+    const identifierType = createIdentifierType({ uniquenessBehavior: null });
+
+    const result = shouldBlockPatientIdentifierInOfflineMode(identifierType);
+
+    expect(result).toBe(false);
+  });
+
+  it('should return false if identifierType is unique and no manual entry is enabled', () => {
+    const identifierType = createIdentifierType({ uniquenessBehavior: null });
+
+    const result = shouldBlockPatientIdentifierInOfflineMode(identifierType);
+
+    expect(result).toBe(false);
+  });
+
+  it('should return true if identifierType is unique and manual entry is enabled', () => {
+    const identifierType = createIdentifierType({ manualEntryEnabled: true, uniquenessBehavior: 'UNIQUE' });
+
+    const result = shouldBlockPatientIdentifierInOfflineMode(identifierType);
+
+    expect(result).toBe(true);
+  });
+});
+
+describe('isUniqueIdentifierTypeForOffline function', () => {
+  it('should return true if uniquenessBehavior is UNIQUE', () => {
+    const identifierType = createIdentifierType({ uniquenessBehavior: 'UNIQUE' });
+
+    const result = isUniqueIdentifierTypeForOffline(identifierType);
+
+    expect(result).toBe(true);
+  });
+
+  it('should return true if uniquenessBehavior is LOCATION', () => {
+    const identifierType = createIdentifierType({ uniquenessBehavior: 'LOCATION' });
+
+    const result = isUniqueIdentifierTypeForOffline(identifierType);
+
+    expect(result).toBe(true);
+  });
+
+  it('should return false for other uniqueness behaviors', () => {
+    const identifierType = createIdentifierType({ uniquenessBehavior: null });
+
+    const result = isUniqueIdentifierTypeForOffline(identifierType);
+
+    expect(result).toBe(false);
+  });
+});

package/src/patient-registration/input/custom-input/identifier/utils.ts

@@ -1,4 +1,4 @@
-import { FetchedPatientIdentifierType, PatientIdentifierType } from '../../../patient-registration-types';
+import { FetchedPatientIdentifierType, PatientIdentifierType } from '../../../patient-registration.types';
 
 export function shouldBlockPatientIdentifierInOfflineMode(identifierType: PatientIdentifierType) {
   // Patient Identifiers which are unique and can be manually entered are prohibited while offline because

package/src/patient-registration/input/dummy-data/dummy-data-input.component.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { v4 } from 'uuid';
-import { FormValues } from '../../patient-registration-types';
+import { FormValues } from '../../patient-registration.types';
 import styles from './../input.scss';
 
 interface DummyDataInputProps {
@@ -12,7 +12,6 @@ export const dummyFormValues: FormValues = {
   givenName: 'John',
   middleName: '',
   familyName: 'Smith',
-  unidentifiedPatient: false,
   additionalGivenName: 'Joey',
   additionalMiddleName: '',
   additionalFamilyName: 'Smitty',

package/src/patient-registration/patient-registration-context.ts

@@ -1,7 +1,7 @@
 import { useConfig } from '@openmrs/esm-framework';
 import { createContext, SetStateAction } from 'react';
 import { RegistrationConfig } from '../config-schema';
-import { FormValues, CapturePhotoProps } from './patient-registration-types';
+import { FormValues, CapturePhotoProps } from './patient-registration.types';
 
 export interface PatientRegistrationContextProps {
   identifierTypes: Array<any>;

package/src/patient-registration/patient-registration-hooks.ts

@@ -16,7 +16,7 @@ import {
   ObsResponse,
   ConceptAnswers,
   Encounter,
-} from './patient-registration-types';
+} from './patient-registration.types';
 import {
   getAddressFieldValuesFromFhirPatient,
   getFormValuesFromFhirPatient,
@@ -25,6 +25,7 @@ import {
   latestFirstEncounter,
 } from './patient-registration-utils';
 import { useInitialPatientRelationships } from './section/patient-relationships/relationships.resource';
+import dayjs from 'dayjs';
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
   const { martialStatus, education, occupation, educationLoad, loadingStatus } = useConcepts();
@@ -39,7 +40,6 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     givenName: '',
     middleName: '',
     familyName: '',
-    unidentifiedPatient: false,
     additionalGivenName: '',
     additionalMiddleName: '',
     additionalFamilyName: '',
@@ -61,11 +61,22 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
   useEffect(() => {
     (async () => {
       if (patientToEdit) {
+        const birthdateEstimated = !/^\d{4}-\d{2}-\d{2}$/.test(patientToEdit.birthDate);
+        const [years = 0, months = 0] = patientToEdit.birthDate.split('-').map((val) => parseInt(val));
+        // Please refer: https://github.com/openmrs/openmrs-esm-patient-management/pull/697#issuecomment-1562706118
+        const estimatedMonthsAvailable = patientToEdit.birthDate.split('-').length > 1;
+        const yearsEstimated = birthdateEstimated ? Math.floor(dayjs().diff(patientToEdit.birthDate, 'month') / 12) : 0;
+        const monthsEstimated =
+          birthdateEstimated && estimatedMonthsAvailable ? dayjs().diff(patientToEdit.birthDate, 'month') % 12 : 0;
+
         setInitialFormValues({
           ...initialFormValues,
           ...getFormValuesFromFhirPatient(patientToEdit),
           address: getAddressFieldValuesFromFhirPatient(patientToEdit),
           ...getPhonePersonAttributeValueFromFhirPatient(patientToEdit),
+          birthdateEstimated: !/^\d{4}-\d{2}-\d{2}$/.test(patientToEdit.birthDate),
+          yearsEstimated,
+          monthsEstimated,
         });
       } else if (!isLoadingPatientToEdit && patientUuid) {
         const registration = await getPatientRegistration(patientUuid);
@@ -120,6 +131,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
             ? attribute.value?.uuid
             : attribute.value;
       });
+
       setInitialFormValues((initialFormValues) => ({
         ...initialFormValues,
         attributes: personAttributes,

package/src/patient-registration/patient-registration-utils.ts

@@ -6,7 +6,7 @@ import {
   PatientUuidMapType,
   PatientIdentifierValue,
   Encounter,
-} from './patient-registration-types';
+} from './patient-registration.types';
 import { parseDate } from '@openmrs/esm-framework';
 import camelCase from 'lodash-es/camelCase';
 import capitalize from 'lodash-es/capitalize';
@@ -115,9 +115,6 @@ export function getFormValuesFromFhirPatient(patient: fhir.Patient) {
   result.givenName = patientName?.given[0];
   result.middleName = patientName?.given[1];
   result.familyName = patientName?.family;
-  result.unidentifiedPatient =
-    patientName.given[0] === 'UNKNOWN' && patientName.family === 'unknown' ? true : undefined;
-
   result.addNameInLocalLanguage = !!additionalPatientName ? true : undefined;
   result.additionalGivenName = additionalPatientName?.given[0];
   result.additionalMiddleName = additionalPatientName?.given[1];

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

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Formik, Form, FormikHelpers } from 'formik';
 import { createErrorHandler, showToast, useConfig, interpolateUrl, usePatient } from '@openmrs/esm-framework';
 import { validationSchema as initialSchema } from './validation/patient-registration-validation';
-import { FormValues, CapturePhotoProps, PatientIdentifierValue } from './patient-registration-types';
+import { FormValues, CapturePhotoProps, PatientIdentifierValue } from './patient-registration.types';
 import { PatientRegistrationContext } from './patient-registration-context';
 import { SavePatientForm, SavePatientTransactionManager } from './form-manager';
 import { usePatientPhoto } from './patient-registration.resource';
@@ -75,17 +75,6 @@ export const PatientRegistration: React.FC<PatientRegistrationProps> = ({ savePa
       .filter((s) => s);
   }, [config.sections, config.sectionDefinitions]);
 
-  useEffect(() => {
-    if (addressTemplate) {
-      const addressTemplateXml = addressTemplate?.results[0].value;
-      if (!addressTemplateXml) {
-        return;
-      }
-      const { addressValidationSchema } = parseAddressTemplateXml(addressTemplateXml);
-      setValidationSchema((validationSchema) => validationSchema.concat(addressValidationSchema));
-    }
-  }, [inEditMode, addressTemplate, initialAddressFieldValues]);
-
   const onFormSubmit = async (values: FormValues, helpers: FormikHelpers<FormValues>) => {
     const abortController = new AbortController();
     helpers.setSubmitting(true);

package/src/patient-registration/patient-registration.resource.tsx

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import useSWR from 'swr';
 import useSWRImmutable from 'swr/immutable';
 import { FetchResponse, openmrsFetch, useConfig } from '@openmrs/esm-framework';
-import { Patient, Relationship, PatientIdentifier, Encounter } from './patient-registration-types';
+import { Patient, Relationship, PatientIdentifier, Encounter } from './patient-registration.types';
 
 export const uuidIdentifier = '05a29f94-c0ed-11e2-94be-8c13b969e334';
 export const uuidTelephoneNumber = '14d4f066-15f5-102d-96e4-000c29c2a5d7';
@@ -223,74 +223,3 @@ export async function deletePatientIdentifier(patientUuid: string, patientIdenti
     signal: abortController.signal,
   });
 }
-
-export function useAddressHierarchy(
-  searchString,
-  separator,
-): {
-  addresses: Array<string>;
-  isLoading: boolean;
-  error: Error;
-} {
-  const { data, error, isLoading } = useSWRImmutable<
-    FetchResponse<
-      Array<{
-        address: string;
-      }>
-    >,
-    Error
-  >(
-    searchString
-      ? `/module/addresshierarchy/ajax/getPossibleFullAddresses.form?separator=${separator}&searchString=${searchString}`
-      : null,
-    openmrsFetch,
-  );
-
-  const results = useMemo(
-    () => ({
-      addresses: data?.data?.map((address) => address.address) ?? [],
-      error,
-      isLoading,
-    }),
-    [data?.data, error, isLoading],
-  );
-  return results;
-}
-
-export function useAdressHierarchyWithParentSearch(
-  addressField,
-  parentid,
-  query,
-): {
-  error: Error;
-  isLoading: boolean;
-  addresses: Array<{
-    uuid: string;
-    name: string;
-  }>;
-} {
-  const { data, error, isLoading } = useSWRImmutable<
-    FetchResponse<
-      Array<{
-        uuid: string;
-        name: string;
-      }>
-    >
-  >(
-    query
-      ? `/module/addresshierarchy/ajax/getPossibleAddressHierarchyEntriesWithParents.form?addressField=${addressField}&limit=20&searchString=${query}&parentUuid=${parentid}`
-      : null,
-    openmrsFetch,
-  );
-
-  const results = useMemo(
-    () => ({
-      error: error,
-      isLoading,
-      addresses: data?.data ?? [],
-    }),
-    [data?.data, error, isLoading],
-  );
-
-  return results;
-}