@kenyaemr/esm-patient-registration-app 8.1.1-pre.124 → 8.1.2-pre.152

package/src/patient-registration/field/person-attributes/custom-person-attribute-field.component.tsx

@@ -1,19 +1,43 @@
-import React from 'react';
-import { Field } from 'formik';
+import React, { useContext, useEffect } from 'react';
+import { Field, type FieldProps } from 'formik';
 import { Layer, Select, SelectItem } from '@carbon/react';
-import { type PersonAttributeTypeResponse } from '../../patient-registration.types';
 import { useTranslation } from 'react-i18next';
-import styles from './../field.scss';
 import classNames from 'classnames';
+import { PatientRegistrationContext } from '../../patient-registration-context';
+import styles from './../field.scss';
+import { ResourcesContext } from '../../../offline.resources';
+import useUpdateIdentifierRequirement from './useUpdateIdentifierRequirement';
 
-type CustomPersonAttributeFieldProps = {
+interface PersonAttributeTypeResponse {
+  uuid: string;
+  display?: string;
+}
+
+interface ConceptAnswer {
+  uuid?: string;
+  name?: string;
+  label?: string;
+  showServiceExpression?: {
+    attributeTypeUuid: string;
+    value: string;
+  };
+}
+
+interface CustomPersonAttributeFieldProps {
   id: string;
   personAttributeType: PersonAttributeTypeResponse;
   answerConceptSetUuid: string;
   label?: string;
-  customConceptAnswers: Array<{ uuid: string; label?: string }>;
+  customConceptAnswers: ConceptAnswer[];
   required: boolean;
-};
+}
+
+interface PatientRegistrationContextType {
+  setFieldValue: (field: string, value: any) => void;
+  values: {
+    attributes?: Record<string, string>;
+  };
+}
 
 const CustomPersonAttributeField: React.FC<CustomPersonAttributeFieldProps> = ({
   personAttributeType,
@@ -24,30 +48,55 @@ const CustomPersonAttributeField: React.FC<CustomPersonAttributeFieldProps> = ({
 }) => {
   const { t } = useTranslation();
   const fieldName = `attributes.${personAttributeType.uuid}`;
+  const { setFieldValue, values } = useContext(PatientRegistrationContext);
+  useUpdateIdentifierRequirement(setFieldValue, values);
+  // TODO: Improve this logic
+  const filteredCustomConceptAnswers = customConceptAnswers.filter((answer) => {
+    const showExpression = answer.showServiceExpression;
+    if (!showExpression) return true;
+
+    const attributeValue = values?.attributes?.[showExpression.attributeTypeUuid];
+    const answerCadreId = answer.name;
+
+    if (answerCadreId == null) return true;
+
+    return showExpression.value.toLowerCase() === attributeValue?.toLowerCase();
+  });
+
+  useEffect(() => {
+    return () => {
+      setFieldValue(fieldName, '');
+    };
+  }, [fieldName, setFieldValue]);
+
+  const renderSelect = ({ field, form: { touched, errors } }: FieldProps) => {
+    const hasError = errors[fieldName] && touched[fieldName];
+    const displayLabel = label ?? personAttributeType?.display ?? '';
+
+    return (
+      <Select
+        id={id}
+        name={`person-attribute-${personAttributeType.uuid}`}
+        labelText={displayLabel}
+        invalid={Boolean(hasError)}
+        required={required}
+        {...field}>
+        <SelectItem value="" text={t('selectAnOption', 'Select an option')} />
+        {filteredCustomConceptAnswers.map((answer) => (
+          <SelectItem
+            key={answer.uuid ?? answer.name}
+            value={answer.uuid ?? answer.name ?? ''}
+            text={answer.label ?? answer.uuid ?? answer.name ?? ''}
+          />
+        ))}
+      </Select>
+    );
+  };
 
   return (
     <div className={classNames(styles.customField, styles.halfWidthInDesktopView)}>
       <Layer>
-        <Field name={fieldName}>
-          {({ field, form: { touched, errors }, meta }) => {
-            return (
-              <>
-                <Select
-                  id={id}
-                  name={`person-attribute-${personAttributeType.uuid}`}
-                  labelText={label ?? personAttributeType?.display}
-                  invalid={errors[fieldName] && touched[fieldName]}
-                  required={required}
-                  {...field}>
-                  <SelectItem value={''} text={t('selectAnOption', 'Select an option')} />
-                  {customConceptAnswers.map((answer) => (
-                    <SelectItem key={answer.uuid} value={answer.uuid} text={answer.uuid} />
-                  ))}
-                </Select>
-              </>
-            );
-          }}
-        </Field>
+        <Field name={fieldName}>{renderSelect}</Field>
       </Layer>
     </div>
   );

package/src/patient-registration/field/person-attributes/location-person-attribute-field.component.tsx

@@ -25,7 +25,7 @@ export function LocationPersonAttributeField({
   const { t } = useTranslation();
   const fieldName = `attributes.${personAttributeType.uuid}`;
   const [field, meta, { setValue }] = useField(`attributes.${personAttributeType.uuid}`);
-  const [searchQuery, setSearchQuery] = useState<string>('');
+  const [searchQuery, setSearchQuery] = useState('');
   const { locations, isLoading, loadingNewData } = useLocations(locationTag || null, searchQuery);
   const prevLocationOptions = useRef([]);
 

package/src/patient-registration/field/person-attributes/person-attribute-field.test.tsx

@@ -1,13 +1,20 @@
 import React from 'react';
 import { Form, Formik } from 'formik';
 import { render, screen } from '@testing-library/react';
+import { type FieldDefinition } from '../../../config-schema';
 import { usePersonAttributeType } from './person-attributes.resource';
 import { useConceptAnswers } from '../field.resource';
-import { type FieldDefinition } from '../../../config-schema';
 import { PersonAttributeField } from './person-attribute-field.component';
 
-jest.mock('./person-attributes.resource');
-jest.mock('../field.resource');
+jest.mock('./person-attributes.resource', () => ({
+  ...jest.requireActual('./person-attributes.resource'),
+  usePersonAttributeType: jest.fn(),
+}));
+
+jest.mock('../field.resource', () => ({
+  ...jest.requireActual('../field.resource'),
+  useConceptAnswers: jest.fn(),
+}));
 
 const mockUsePersonAttributeType = jest.mocked(usePersonAttributeType);
 const mockUseConceptAnswers = jest.mocked(useConceptAnswers);
@@ -92,6 +99,7 @@ describe('PersonAttributeField', () => {
         { uuid: '1', display: 'Option 1' },
         { uuid: '2', display: 'Option 2' },
       ],
+      error: null,
       isLoading: false,
     });
 
@@ -180,6 +188,6 @@ describe('PersonAttributeField', () => {
     );
 
     await screen.findByRole('heading', { name: /attribute/i });
-    expect(screen.queryByLabelText(/Referred by/i)).not.toBeInTheDocument();
+    expect(screen.queryByLabelText(/referred by/i)).not.toBeInTheDocument();
   });
 });

package/src/patient-registration/field/person-attributes/useUpdateIdentifierRequirement.tsx

@@ -0,0 +1,83 @@
+import { useEffect, useCallback, useRef, useMemo, useContext } from 'react';
+import { deleteIdentifierType, initializeIdentifier } from '../id/id-field.component';
+import { ResourcesContext } from '../../../offline.resources';
+
+const useUpdateIdentifierRequirement = (setFieldValue, values) => {
+  const { identifierTypes = [] } = useContext(ResourcesContext);
+  const previousAttributes = useRef(values.attributes);
+  const previousIdentifiers = useRef(values.identifiers);
+
+  const publicationNumberIdentifier = useMemo(
+    () => identifierTypes?.find((identifier) => identifier.name === 'Publication Number'),
+    [identifierTypes],
+  );
+
+  // Memoize the civilian check
+  const isCivilian = useMemo(() => Object.values(values.attributes ?? {}).includes('Civilian'), [values.attributes]);
+
+  // Memoize the identifier initialization logic
+  const initializePublicationIdentifier = useCallback(
+    (currentIdentifiers) => {
+      if (!publicationNumberIdentifier) {
+        console.warn('Publication Number identifier type not found');
+        return null;
+      }
+
+      const initializedIdentifier = initializeIdentifier(
+        publicationNumberIdentifier,
+        currentIdentifiers[publicationNumberIdentifier.uuid],
+      );
+
+      return initializedIdentifier;
+    },
+    [publicationNumberIdentifier],
+  );
+  // Only run the effect if isCivilian is true
+  useEffect(() => {
+    // Skip if we don't have the required data
+    if (!values.attributes || !publicationNumberIdentifier) {
+      return;
+    }
+
+    // Check if relevant values have actually changed
+    const attributesChanged = previousAttributes.current !== values.attributes;
+    const identifiersChanged = previousIdentifiers.current !== values.identifiers;
+
+    if (!attributesChanged && !identifiersChanged) {
+      return;
+    }
+
+    // Update refs
+    previousAttributes.current = values.attributes;
+    previousIdentifiers.current = values.identifiers;
+    const isDependant = Object.values(values.attributes ?? {}).includes('Dependant');
+    // Only proceed if the user is a civilian
+    if (isCivilian && isDependant) {
+      const initializedIdentifier = initializePublicationIdentifier(values.identifiers);
+
+      // check if values.identifiers already has the publication number identifier
+      const hasPublicationNumberIdentifier = values.identifiers[publicationNumberIdentifier.fieldName];
+
+      if (initializedIdentifier && !hasPublicationNumberIdentifier) {
+        setFieldValue('identifiers', {
+          ...values.identifiers,
+          [publicationNumberIdentifier.fieldName]: { ...initializedIdentifier, required: true },
+        });
+      }
+    } else {
+      // Before deleting the publication number identifier, check if it exists
+      if (values.identifiers[publicationNumberIdentifier.fieldName]) {
+        setFieldValue('identifiers', deleteIdentifierType(values.identifiers, publicationNumberIdentifier.fieldName));
+      }
+    }
+  }, [
+    values.attributes,
+    values.identifiers,
+    isCivilian,
+    publicationNumberIdentifier,
+    initializePublicationIdentifier,
+    setFieldValue,
+  ]);
+};
+
+export default useUpdateIdentifierRequirement;

package/src/patient-registration/form-manager.test.ts

@@ -2,7 +2,10 @@ import { FormManager } from './form-manager';
 import { type FormValues } from './patient-registration.types';
 import { generateIdentifier } from './patient-registration.resource';
 
-jest.mock('./patient-registration.resource');
+jest.mock('./patient-registration.resource', () => ({
+  ...jest.requireActual('./patient-registration.resource'),
+  generateIdentifier: jest.fn(),
+}));
 
 const mockGenerateIdentifier = generateIdentifier as jest.Mock;
 

package/src/patient-registration/form-manager.ts

@@ -35,7 +35,6 @@ import {
   updateRelationship,
 } from './patient-registration.resource';
 import { type RegistrationConfig } from '../config-schema';
-import dayjs from 'dayjs';
 
 export type SavePatientForm = (
   isNewPatient: boolean,

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

@@ -1,7 +1,7 @@
 import React from 'react';
-import { BrowserRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+import { renderWithRouter } from 'tools';
 import { Autosuggest } from './autosuggest.component';
 
 const mockPersons = [
@@ -33,18 +33,16 @@ const mockHandleSuggestionSelected = jest.fn((field, value) => [field, value]);
 
 describe('Autosuggest', () => {
   it('renders a search box', () => {
-    render(
-      <BrowserRouter>
-        <Autosuggest
-          getSearchResults={mockGetSearchResults}
-          getDisplayValue={(item) => item.display}
-          getFieldValue={(item) => item.uuid}
-          id="person"
-          labelText=""
-          onSuggestionSelected={mockHandleSuggestionSelected}
-          placeholder="Find Person"
-        />
-      </BrowserRouter>,
+    renderWithRouter(
+      <Autosuggest
+        getSearchResults={mockGetSearchResults}
+        getDisplayValue={(item) => item.display}
+        getFieldValue={(item) => item.uuid}
+        id="person"
+        labelText=""
+        onSuggestionSelected={mockHandleSuggestionSelected}
+        placeholder="Find Person"
+      />,
     );
 
     expect(screen.getByRole('searchbox')).toBeInTheDocument();
@@ -54,18 +52,16 @@ describe('Autosuggest', () => {
   it('renders matching search results in a list when the user types a query', async () => {
     const user = userEvent.setup();
 
-    render(
-      <BrowserRouter>
-        <Autosuggest
-          getSearchResults={mockGetSearchResults}
-          getDisplayValue={(item) => item.display}
-          getFieldValue={(item) => item.uuid}
-          id="person"
-          labelText=""
-          onSuggestionSelected={mockHandleSuggestionSelected}
-          placeholder="Find Person"
-        />
-      </BrowserRouter>,
+    renderWithRouter(
+      <Autosuggest
+        getSearchResults={mockGetSearchResults}
+        getDisplayValue={(item) => item.display}
+        getFieldValue={(item) => item.uuid}
+        id="person"
+        labelText=""
+        onSuggestionSelected={mockHandleSuggestionSelected}
+        placeholder="Find Person"
+      />,
     );
 
     const searchbox = screen.getByRole('searchbox');
@@ -82,18 +78,16 @@ describe('Autosuggest', () => {
   it('clears the list of suggestions when a suggestion is selected', async () => {
     const user = userEvent.setup();
 
-    render(
-      <BrowserRouter>
-        <Autosuggest
-          getSearchResults={mockGetSearchResults}
-          getDisplayValue={(item) => item.display}
-          getFieldValue={(item) => item.uuid}
-          id="person"
-          labelText=""
-          onSuggestionSelected={mockHandleSuggestionSelected}
-          placeholder="Find Person"
-        />
-      </BrowserRouter>,
+    renderWithRouter(
+      <Autosuggest
+        getSearchResults={mockGetSearchResults}
+        getDisplayValue={(item) => item.display}
+        getFieldValue={(item) => item.uuid}
+        id="person"
+        labelText=""
+        onSuggestionSelected={mockHandleSuggestionSelected}
+        placeholder="Find Person"
+      />,
     );
 
     let list = screen.queryByRole('list');
@@ -117,18 +111,16 @@ describe('Autosuggest', () => {
   it('changes suggestions when a search input is changed', async () => {
     const user = userEvent.setup();
 
-    render(
-      <BrowserRouter>
-        <Autosuggest
-          getSearchResults={mockGetSearchResults}
-          getDisplayValue={(item) => item.display}
-          getFieldValue={(item) => item.uuid}
-          id="person"
-          labelText=""
-          onSuggestionSelected={mockHandleSuggestionSelected}
-          placeholder="Find Person"
-        />
-      </BrowserRouter>,
+    renderWithRouter(
+      <Autosuggest
+        getSearchResults={mockGetSearchResults}
+        getDisplayValue={(item) => item.display}
+        getFieldValue={(item) => item.uuid}
+        id="person"
+        labelText=""
+        onSuggestionSelected={mockHandleSuggestionSelected}
+        placeholder="Find Person"
+      />,
     );
 
     let list = screen.queryByRole('list');
@@ -149,18 +141,16 @@ describe('Autosuggest', () => {
   it('hides the list of suggestions when the user clicks outside of the component', async () => {
     const user = userEvent.setup();
 
-    render(
-      <BrowserRouter>
-        <Autosuggest
-          getSearchResults={mockGetSearchResults}
-          getDisplayValue={(item) => item.display}
-          getFieldValue={(item) => item.uuid}
-          id="person"
-          labelText=""
-          onSuggestionSelected={mockHandleSuggestionSelected}
-          placeholder="Find Person"
-        />
-      </BrowserRouter>,
+    renderWithRouter(
+      <Autosuggest
+        getSearchResults={mockGetSearchResults}
+        getDisplayValue={(item) => item.display}
+        getFieldValue={(item) => item.uuid}
+        id="person"
+        labelText=""
+        onSuggestionSelected={mockHandleSuggestionSelected}
+        placeholder="Find Person"
+      />,
     );
 
     const input = screen.getByRole('searchbox');

package/src/patient-registration/mpi/mpi-patient.resource.ts

@@ -0,0 +1,21 @@
+import useSWR from 'swr';
+
+const fetcher = (url: string) => {
+  const headers = new Headers();
+  headers.append('Content-Type', 'application/json');
+  headers.append('Authorization', `Basic ${btoa('kemr:password')}`);
+  return fetch(url, { headers }).then((res) => res.json());
+};
+
+export function useMpiPatient(patientId: string) {
+  const url = `https://hiedhs.intellisoftkenya.com/fhir/Patient?_id=${patientId}`;
+
+  const { data: patient, error: error, isLoading: isLoading } = useSWR<{ data: fhir.Bundle }, Error>(url, fetcher);
+  const patientInfo = patient?.['entry']?.[0]?.resource;
+
+  return {
+    isLoading,
+    patient: patientInfo,
+    error,
+  };
+}

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

@@ -1,15 +1,16 @@
+import { type Dispatch, useEffect, useMemo, useState } from 'react';
 import {
   type FetchResponse,
+  type OpenmrsResource,
   getSynchronizationItems,
   openmrsFetch,
-  type OpenmrsResource,
   restBaseUrl,
   useConfig,
   usePatient,
 } from '@openmrs/esm-framework';
 import last from 'lodash-es/last';
 import camelCase from 'lodash-es/camelCase';
-import { type Dispatch, useEffect, useMemo, useState } from 'react';
+import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { v4 } from 'uuid';
 import { type RegistrationConfig } from '../config-schema';
@@ -31,15 +32,25 @@ import {
 import {
   getAddressFieldValuesFromFhirPatient,
   getFormValuesFromFhirPatient,
+  getIdentifierFieldValuesFromFhirPatient,
   getPatientUuidMapFromFhirPatient,
   getPhonePersonAttributeValueFromFhirPatient,
   latestFirstEncounter,
 } from './patient-registration-utils';
 import { useInitialPatientRelationships } from './section/patient-relationships/relationships.resource';
-import dayjs from 'dayjs';
+import { useMpiPatient } from './mpi/mpi-patient.resource';
+
+interface DeathInfoResults {
+  uuid: string;
+  display: string;
+  causeOfDeath: OpenmrsResource | null;
+  dead: boolean;
+  deathDate: string;
+  causeOfDeathNonCoded: string | null;
+}
 
-export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
-  const { freeTextFieldConceptUuid } = useConfig<RegistrationConfig>();
+export function useInitialFormValuesLocal(patientUuid: string): [FormValues, Dispatch<FormValues>] {
+  const { freeTextFieldConceptUuid, fieldConfigurations } = useConfig<RegistrationConfig>()
   const { martialStatus, education, occupation, educationLoad } = useConcepts();
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
   const { data: deathInfo, isLoading: isLoadingDeathInfo } = useInitialPersonDeathInfo(patientUuid);
@@ -89,7 +100,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
           ...initialFormValues,
           ...getFormValuesFromFhirPatient(patientToEdit),
           address: getAddressFieldValuesFromFhirPatient(patientToEdit),
-          ...getPhonePersonAttributeValueFromFhirPatient(patientToEdit),
+          ...getPhonePersonAttributeValueFromFhirPatient(patientToEdit, fieldConfigurations.phone.personAttributeUuid),
           birthdateEstimated: !/^\d{4}-\d{2}-\d{2}$/.test(patientToEdit.birthDate),
           yearsEstimated,
           monthsEstimated,
@@ -107,7 +118,13 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         setInitialFormValues(registration._patientRegistrationData.formValues);
       }
     })();
-  }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
+  }, [
+    initialFormValues,
+    isLoadingPatientToEdit,
+    patientToEdit,
+    patientUuid,
+    fieldConfigurations.phone.personAttributeUuid,
+  ]);
 
   // Set initial patient death info
   useEffect(() => {
@@ -126,9 +143,9 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         nonCodedCauseOfDeath: deathInfo.causeOfDeathNonCoded,
       }));
     }
-  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues]);
-  // Setting authentication token
+  }, [isLoadingDeathInfo, deathInfo, setInitialFormValues, freeTextFieldConceptUuid]);
 
+  // Setting authentication token
   useEffect(() => {
     if (!isLoadingToken && token) {
       setInitialFormValues((initialFormValues) => ({ ...initialFormValues, token: String(token.access_token) }));
@@ -179,7 +196,7 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
     if (!isLoadingObs) {
       setInitialFormValues((initialFormValues) => ({ ...initialFormValues, obs: obs, observation: observations }));
     }
-  }, [isLoadingObs]);
+  }, [isLoadingObs, obs, observations]);
 
   // Set Initial encounter
 
@@ -190,11 +207,68 @@ export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch
         concepts: [...occupation, ...martialStatus, ...education],
       }));
     }
-  }, [educationLoad]);
+  }, [educationLoad, martialStatus, education, occupation]);
 
   return [initialFormValues, setInitialFormValues];
 }
 
+export function useMpiInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
+  const { fieldConfigurations } = useConfig<RegistrationConfig>();
+  const { isLoading: isLoadingMpiPatient, patient: mpiPatient } = useMpiPatient(patientUuid);
+
+  const [initialMPIFormValues, setInitialMPIFormValues] = useState<FormValues>({
+    patientUuid: v4(),
+    givenName: '',
+    middleName: '',
+    familyName: '',
+    additionalGivenName: '',
+    additionalMiddleName: '',
+    additionalFamilyName: '',
+    addNameInLocalLanguage: false,
+    gender: '',
+    birthdate: null,
+    yearsEstimated: 0,
+    monthsEstimated: 0,
+    birthdateEstimated: false,
+    telephoneNumber: '',
+    isDead: false,
+    deathDate: undefined,
+    deathTime: undefined,
+    deathTimeFormat: 'AM',
+    deathCause: '',
+    nonCodedCauseOfDeath: '',
+    relationships: [],
+    identifiers: {},
+    address: {},
+  });
+
+  useEffect(() => {
+    (async () => {
+      if (mpiPatient) {
+        // const identifiers = await getIdentifierFieldValuesFromFhirPatient(
+        //   mpiPatient.data,
+        //   fieldConfigurations.identifier,
+        // );
+
+        const values = {
+          ...initialMPIFormValues,
+          ...getFormValuesFromFhirPatient(mpiPatient),
+          address: getAddressFieldValuesFromFhirPatient(mpiPatient),
+          attributes: getPhonePersonAttributeValueFromFhirPatient(
+            mpiPatient,
+            fieldConfigurations.phone.personAttributeUuid,
+          ),
+        };
+        setInitialMPIFormValues(values);
+      }
+    })();
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [mpiPatient, isLoadingMpiPatient]);
+
+  return [initialMPIFormValues, setInitialMPIFormValues];
+}
+
 export function useInitialAddressFieldValues(patientUuid: string, fallback = {}): [object, Dispatch<object>] {
   const { isLoading, patient } = usePatient(patientUuid);
   const [initialAddressFieldValues, setInitialAddressFieldValues] = useState<object>(fallback);
@@ -211,7 +285,7 @@ export function useInitialAddressFieldValues(patientUuid: string, fallback = {})
         setInitialAddressFieldValues(registration?._patientRegistrationData.initialAddressFieldValues ?? fallback);
       }
     })();
-  }, [isLoading, patient, patientUuid]);
+  }, [fallback, initialAddressFieldValues, isLoading, patient, patientUuid]);
 
   return [initialAddressFieldValues, setInitialAddressFieldValues];
 }
@@ -232,7 +306,7 @@ export function usePatientUuidMap(
         setPatientUuidMap(registration?._patientRegistrationData.initialAddressFieldValues ?? fallback),
       );
     }
-  }, [isLoadingPatientToEdit, patientToEdit, patientUuid]);
+  }, [fallback, isLoadingPatientToEdit, patientToEdit, patientUuid, patientUuidMap]);
 
   useEffect(() => {
     if (attributes) {
@@ -287,7 +361,7 @@ export function useInitialPatientIdentifiers(patientUuid: string): {
       data: identifiers,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data?.results, isLoading]);
 
   return result;
 }
@@ -323,19 +397,10 @@ function useInitialPersonAttributes(personUuid: string) {
       data: data?.data?.results,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data?.results, isLoading]);
   return result;
 }
 
-interface DeathInfoResults {
-  uuid: string;
-  display: string;
-  causeOfDeath: OpenmrsResource | null;
-  dead: boolean;
-  deathDate: string;
-  causeOfDeathNonCoded: string | null;
-}
-
 function useInitialPersonDeathInfo(personUuid: string) {
   const { data, error, isLoading } = useSWR<FetchResponse<DeathInfoResults>, Error>(
     !!personUuid
@@ -349,7 +414,7 @@ function useInitialPersonDeathInfo(personUuid: string) {
       data: data?.data,
       isLoading,
     };
-  }, [data, error]);
+  }, [data?.data, isLoading]);
   return result;
 }