@kenyaemr/esm-ward-app 8.1.1-pre.118 → 8.1.1-pre.121

package/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.test.tsx

@@ -1,15 +1,15 @@
-import { openmrsFetch, showSnackbar, useAppContext, useFeatureFlag, useSession } from '@openmrs/esm-framework';
+import { showSnackbar, useAppContext, useFeatureFlag, useSession } from '@openmrs/esm-framework';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { mockAdmissionLocation, mockLocationInpatientWard, mockPatientAlice } from '../../../../../__mocks__';
 import { renderWithSwr } from '../../../../../tools';
-import { mockWardPatientGroupDetails } from '../../../mock';
-import { useAdmissionLocation } from '../../hooks/useAdmissionLocation';
+import { mockWardPatientGroupDetails, mockWardViewContext } from '../../../mock';
+import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
-import { useInpatientRequest } from '../../hooks/useInpatientRequest';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { DispositionType } from '../../types';
+import type { DispositionType, WardViewContext } from '../../types';
+import { assignPatientToBed, createEncounter, removePatientFromBed } from '../../ward.resource';
 import AdmitPatientFormWorkspace from './admit-patient-form.workspace';
 import type { AdmitPatientFormWorkspaceProps } from './types';
 
@@ -33,14 +33,27 @@ jest.mock('../../hooks/useInpatientAdmission', () => ({
   useInpatientAdmission: jest.fn(),
 }));
 
+jest.mock('../../hooks/useAssignedBedByPatient', () => ({
+  useAssignedBedByPatient: jest.fn(),
+}));
+
+jest.mock('../../ward.resource', () => ({
+  createEncounter: jest.fn(),
+  assignPatientToBed: jest.fn(),
+  removePatientFromBed: jest.fn(),
+}));
+
 const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
 const mockedUseWardLocation = jest.mocked(useWardLocation);
-const mockedOpenmrsFetch = jest.mocked(openmrsFetch);
 const mockedUseFeatureFlag = jest.mocked(useFeatureFlag);
 const mockedShowSnackbar = jest.mocked(showSnackbar);
 const mockedUseSession = jest.mocked(useSession);
+const mockedUseAssignedBedByPatient = jest.mocked(useAssignedBedByPatient);
+const mockedAssignPatientToBed = jest.mocked(assignPatientToBed);
+const mockedCreateEncounter = jest.mocked(createEncounter);
+const mockedRemovePatientFromBed = jest.mocked(removePatientFromBed);
 
-jest.mocked(useAppContext).mockReturnValue(mockWardPatientGroupDetails());
+jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
 const mockWorkspaceProps: AdmitPatientFormWorkspaceProps = {
   patient: mockPatientAlice,
@@ -49,9 +62,6 @@ const mockWorkspaceProps: AdmitPatientFormWorkspaceProps = {
   promptBeforeClosing: jest.fn(),
   setTitle: jest.fn(),
   dispositionType: 'ADMIT',
-  setCancelTitle: jest.fn(),
-  setCancelMessage: jest.fn(),
-  setCancelConfirmText: jest.fn(),
 };
 
 function renderAdmissionForm(dispositionType: DispositionType = 'ADMIT') {
@@ -96,6 +106,39 @@ describe('Testing AdmitPatientForm', () => {
       isLoadingLocation: false,
       errorFetchingLocation: null,
     });
+    mockedUseAssignedBedByPatient.mockReturnValue({
+      data: {
+        data: {
+          results: [
+            {
+              bedId: 1,
+              bedNumber: 1,
+              bedType: null,
+              patients: [mockPatientAlice],
+              physicalLocation: mockLocationInpatientWard,
+            },
+          ],
+        },
+      },
+    } as ReturnType<typeof useAssignedBedByPatient>);
+
+    // @ts-ignore - we only need these two keys for now
+    mockedCreateEncounter.mockResolvedValue({
+      ok: true,
+      data: {
+        uuid: 'encounter-uuid',
+      },
+    });
+
+    // @ts-ignore - we only need the ok key for now
+    mockedAssignPatientToBed.mockResolvedValue({
+      ok: true,
+    });
+
+    // @ts-ignore - we only need the ok key for now
+    mockedRemovePatientFromBed.mockResolvedValue({
+      ok: true,
+    });
   });
 
   it('should render admit patient form', async () => {
@@ -157,13 +200,6 @@ describe('Testing AdmitPatientForm', () => {
   });
 
   it('should submit the form, create encounter and submit bed', async () => {
-    // @ts-ignore - we only need these two keys for now
-    mockedOpenmrsFetch.mockResolvedValue({
-      ok: true,
-      data: {
-        uuid: 'encounter-uuid',
-      },
-    });
     const user = userEvent.setup();
     renderAdmissionForm();
     const combobox = screen.getByRole('combobox', {
@@ -175,35 +211,19 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledTimes(2);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledWith('/ws/rest/v1/encounter', {
-      method: 'POST',
-      headers: {
-        'content-type': 'application/json',
-      },
-      body: {
-        patient: mockPatientAlice.uuid,
-        encounterType: 'admission-encounter-type-uuid',
-        location: mockAdmissionLocation.ward.uuid,
-        obs: [],
-        encounterProviders: [
-          {
-            provider: 'current-provider-uuid',
-            encounterRole: 'clinician-encounter-role-uuid',
-          },
-        ],
-      },
-    });
-    expect(mockedOpenmrsFetch).toHaveBeenCalledWith('/ws/rest/v1/beds/3', {
-      method: 'POST',
-      headers: {
-        'content-type': 'application/json',
-      },
-      body: {
-        patientUuid: mockPatientAlice.uuid,
-        encounterUuid: 'encounter-uuid',
-      },
+    expect(mockedCreateEncounter).toHaveBeenCalledWith({
+      patient: mockPatientAlice.uuid,
+      encounterType: 'admission-encounter-type-uuid',
+      location: mockAdmissionLocation.ward.uuid,
+      obs: [],
+      encounterProviders: [
+        {
+          provider: 'current-provider-uuid',
+          encounterRole: 'clinician-encounter-role-uuid',
+        },
+      ],
     });
+    expect(mockedAssignPatientToBed).toHaveBeenCalledWith(3, mockPatientAlice.uuid, 'encounter-uuid');
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',
       subtitle: '{{patientName}} has been successfully admitted and assigned to bed bed3',
@@ -212,7 +232,7 @@ describe('Testing AdmitPatientForm', () => {
   });
 
   it('should show snackbar if there was an issue creating an encounter', async () => {
-    mockedOpenmrsFetch.mockRejectedValue(new Error('Failed to create encounter'));
+    mockedCreateEncounter.mockRejectedValue(new Error('Failed to create encounter'));
     const user = userEvent.setup();
     renderAdmissionForm();
     const combobox = screen.getByRole('combobox', {
@@ -224,7 +244,6 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledTimes(1);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'error',
       title: 'Failed to admit patient',
@@ -233,18 +252,7 @@ describe('Testing AdmitPatientForm', () => {
   });
 
   it('should show warning snackbar if encounter was created and bed assignment was not successful', async () => {
-    // @ts-ignore - matching whole FetchResponse type is not necessary
-    mockedOpenmrsFetch.mockImplementation((url) => {
-      if (url.startsWith('/ws/rest/v1/beds')) {
-        return Promise.reject(new Error('Failed to assign bed'));
-      }
-      return Promise.resolve({
-        ok: true,
-        data: {
-          uuid: 'encounter-uuid',
-        },
-      });
-    });
+    mockedAssignPatientToBed.mockRejectedValue(new Error('Failed to assign bed'));
 
     const user = userEvent.setup();
     renderAdmissionForm();
@@ -257,7 +265,6 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledTimes(2);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'warning',
       title: 'Patient admitted successfully',
@@ -265,41 +272,25 @@ describe('Testing AdmitPatientForm', () => {
     });
   });
 
-  it('should admit patient if no beds are configured', async () => {
-    // @ts-ignore - we only need these two keys for now
-    mockedOpenmrsFetch.mockResolvedValue({
-      ok: true,
-      data: {
-        uuid: 'encounter-uuid',
-      },
-    });
+  it('should admit patient if no bed is selected', async () => {
     const user = userEvent.setup();
     renderAdmissionForm();
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledTimes(2);
-    expect(mockedOpenmrsFetch).toHaveBeenCalledWith('/ws/rest/v1/encounter', {
-      method: 'POST',
-      headers: {
-        'content-type': 'application/json',
-      },
-      body: {
-        patient: mockPatientAlice.uuid,
-        encounterType: 'admission-encounter-type-uuid',
-        location: mockAdmissionLocation.ward.uuid,
-        obs: [],
-        encounterProviders: [
-          {
-            provider: 'current-provider-uuid',
-            encounterRole: 'clinician-encounter-role-uuid',
-          },
-        ],
-      },
-    });
-    expect(mockedOpenmrsFetch).toHaveBeenCalledWith(`/ws/rest/v1/beds/1?patientUuid=${mockPatientAlice.uuid}`, {
-      method: 'DELETE',
+    expect(mockedCreateEncounter).toHaveBeenCalledWith({
+      patient: mockPatientAlice.uuid,
+      encounterType: 'admission-encounter-type-uuid',
+      location: mockAdmissionLocation.ward.uuid,
+      obs: [],
+      encounterProviders: [
+        {
+          provider: 'current-provider-uuid',
+          encounterRole: 'clinician-encounter-role-uuid',
+        },
+      ],
     });
+    expect(mockedRemovePatientFromBed).toHaveBeenCalledWith(1, mockPatientAlice.uuid);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',
       subtitle: 'Patient admitted successfully to Inpatient Ward',

package/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx

@@ -7,10 +7,11 @@ import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { BedLayout, WardPatientGroupDetails } from '../../types';
+import type { BedLayout, WardViewContext } from '../../types';
 import { assignPatientToBed, createEncounter, removePatientFromBed } from '../../ward.resource';
 import styles from './admit-patient-form.scss';
 import type { AdmitPatientFormWorkspaceProps } from './types';
+import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 
 const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
   patient,
@@ -25,11 +26,14 @@ const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
-  const wardPatientGrouping = useAppContext<WardPatientGroupDetails>('ward-patients-group');
-  const { isLoading, mutate: mutateAdmissionLocation } = wardPatientGrouping?.admissionLocationResponse ?? {};
-  const { mutate: mutateInpatientRequest } = wardPatientGrouping?.inpatientRequestResponse ?? {};
-  const { mutate: mutateInpatientAdmission } = wardPatientGrouping?.inpatientAdmissionResponse ?? {};
-  const beds = isLoading ? [] : wardPatientGrouping?.bedLayouts ?? [];
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { isLoading, mutate: mutateAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
+  const { mutate: mutateInpatientRequest } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
+  const { mutate: mutateInpatientAdmission } = wardPatientGroupDetails?.inpatientAdmissionResponse ?? {};
+  const { data: bedsAssignedToPatient, isLoading: isLoadingBedsAssignedToPatient } = useAssignedBedByPatient(
+    patient.uuid,
+  );
+  const beds = isLoading ? [] : wardPatientGroupDetails?.bedLayouts ?? [];
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
   const getBedRepresentation = useCallback((bedLayout: BedLayout) => {
     const bedNumber = bedLayout.bedNumber;
@@ -92,11 +96,9 @@ const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
               if (bedSelected) {
                 return assignPatientToBed(values.bedId, patient.uuid, response.data.uuid);
               } else {
-                const bed = wardPatientGrouping.bedLayouts.find((bedLayout) =>
-                  bedLayout.patients.some((p) => p.uuid == patient.uuid),
-                );
-                if (bed) {
-                  return removePatientFromBed(bed.bedId, patient.uuid);
+                const assignedBedId = bedsAssignedToPatient?.data?.results?.[0]?.bedId;
+                if (assignedBedId) {
+                  return removePatientFromBed(assignedBedId, patient.uuid);
                 }
                 return response;
               }
@@ -180,7 +182,7 @@ const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
     setIsSubmitting(false);
   }, []);
 
-  if (!wardPatientGrouping) return <></>;
+  if (!wardPatientGroupDetails) return <></>;
   return (
     <Form control={control} className={styles.form} onSubmit={handleSubmit(onSubmit, onError)}>
       <div className={styles.formContent}>
@@ -272,7 +274,13 @@ const AdmitPatientFormWorkspace: React.FC<AdmitPatientFormWorkspaceProps> = ({
         <Button
           type="submit"
           size="xl"
-          disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration}>
+          disabled={
+            isSubmitting ||
+            isLoadingEmrConfiguration ||
+            errorFetchingEmrConfiguration ||
+            isLoading ||
+            isLoadingBedsAssignedToPatient
+          }>
           {!isSubmitting ? t('admit', 'Admit') : t('admitting', 'Admitting...')}
         </Button>
       </ButtonSet>

package/src/ward-workspace/patient-banner/patient-banner.component.tsx

@@ -1,14 +1,11 @@
+import { useAppContext } from '@openmrs/esm-framework';
 import React from 'react';
-import type { WardPatient } from '../../types';
-import { WardPatientCardElement } from '../../ward-patient-card/ward-patient-card-element.component';
-import { useCurrentWardCardConfig } from '../../hooks/useCurrentWardCardConfig';
+import type { WardPatient, WardViewContext } from '../../types';
 import styles from './style.scss';
-import WardPatientBedNumber from '../../ward-patient-card/row-elements/ward-patient-bed-number';
-import WardPatientName from '../../ward-patient-card/row-elements/ward-patient-name';
 
 const WardPatientWorkspaceBanner = (wardPatient: WardPatient) => {
-  const { headerRowElements } = useCurrentWardCardConfig();
-  const { patient, bed } = wardPatient;
+  const { patient } = wardPatient;
+  const {WardPatientHeader} = useAppContext<WardViewContext>('ward-view-context') ?? {};
 
   if (!patient) {
     console.warn('Patient details were not received by the ward workspace');
@@ -17,11 +14,7 @@ const WardPatientWorkspaceBanner = (wardPatient: WardPatient) => {
 
   return (
     <div className={styles.patientBanner}>
-      {bed ? <WardPatientBedNumber bed={bed} /> : null}
-      <WardPatientName patient={patient} />
-      {headerRowElements.map((elementId, i) => (
-        <WardPatientCardElement key={`ward-card-${patient.uuid}-header-${i}`} elementId={elementId} {...wardPatient} />
-      ))}
+      {WardPatientHeader && <WardPatientHeader {...wardPatient} />}
     </div>
   );
 };

package/src/ward-workspace/patient-details/ward-patient-action-button.extension.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { UserAvatarIcon } from '@openmrs/esm-framework';
 import { ActionMenuButton, launchWorkspace } from '@openmrs/esm-framework';
-import { launchPatientWorkspace } from '../../ward-patient-card/ward-patient-resource';
+import type { WardPatientWorkspaceProps } from '../../types';
 
 export default function WardPatientActionButton() {
   const { t } = useTranslation();
@@ -12,7 +12,7 @@ export default function WardPatientActionButton() {
       getIcon={(props) => <UserAvatarIcon {...props} />}
       label={t('Patient', 'patient')}
       iconDescription={t('Patient', 'patient')}
-      handler={() => launchPatientWorkspace()}
+      handler={() =>  launchWorkspace<WardPatientWorkspaceProps>('ward-patient-workspace')}
       type={'ward'}
     />
   );

package/src/ward-workspace/patient-details/ward-patient.workspace.tsx

@@ -7,15 +7,22 @@ import { getGender } from '../../ward-patient-card/row-elements/ward-patient-gen
 
 attach('ward-patient-workspace-header-slot', 'patient-vitals-info');
 
-export default function WardPatientWorkspace({ setTitle, wardPatient: { patient } }: WardPatientWorkspaceProps) {
+export default function WardPatientWorkspace({ setTitle, wardPatient }: WardPatientWorkspaceProps) {
   useEffect(() => {
-    setTitle(patient.person.display, <PatientWorkspaceTitle key={patient.uuid} patient={patient} />);
-  }, [patient.uuid]);
+    if (wardPatient) {
+      const { patient } = wardPatient;
+      setTitle(patient.person.display, <PatientWorkspaceTitle key={patient.uuid} patient={patient} />);
+    }
+  }, [wardPatient]);
 
   return (
-    <div className={styles.workspaceContainer}>
-      <WardPatientWorkspaceView patient={patient} />
-    </div>
+    <>
+      {wardPatient && (
+        <div className={styles.workspaceContainer}>
+          <WardPatientWorkspaceView patient={wardPatient.patient} />
+        </div>
+      )}
+    </>
   );
 }
 

package/src/ward-workspace/patient-discharge/patient-discharge.workspace.tsx

@@ -5,7 +5,7 @@ import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
-import { type WardPatientGroupDetails, type WardPatientWorkspaceProps } from '../../types';
+import { type WardViewContext, type WardPatientWorkspaceProps } from '../../types';
 import { createEncounter, removePatientFromBed } from '../../ward.resource';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './patient-discharge.scss';
@@ -17,10 +17,10 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
   const { emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useEmrConfiguration();
-  const wardGroupingDetails = useAppContext<WardPatientGroupDetails>('ward-patients-group');
-  const { mutate: mutateAdmissionLocation } = wardGroupingDetails?.admissionLocationResponse ?? {};
-  const { mutate: mutateInpatientRequest } = wardGroupingDetails?.inpatientRequestResponse ?? {};
-  const { mutate: mutateInpatientAdmission } = wardGroupingDetails?.inpatientAdmissionResponse ?? {};
+  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { mutate: mutateAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
+  const { mutate: mutateInpatientRequest } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
+  const { mutate: mutateInpatientAdmission } = wardPatientGroupDetails?.inpatientAdmissionResponse ?? {};
 
   const submitDischarge = useCallback(() => {
     setIsSubmitting(true);
@@ -78,7 +78,7 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
     mutateInpatientAdmission,
   ]);
 
-  if (!wardGroupingDetails) return <></>;
+  if (!wardPatientGroupDetails) return <></>;
   return (
     <div className={styles.workspaceContent}>
       <div className={styles.patientWorkspaceBanner}>

package/src/ward-workspace/patient-transfer-bed-swap/patient-bed-swap-form.component.tsx

@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { BedLayout, WardPatientGroupDetails, WardPatientWorkspaceProps } from '../../types';
+import type { BedLayout, WardViewContext, WardPatientWorkspaceProps } from '../../types';
 import { assignPatientToBed, createEncounter } from '../../ward.resource';
 import styles from './patient-transfer-swap.scss';
 
@@ -32,10 +32,10 @@ export default function PatientBedSwapForm({
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { currentProvider } = useSession();
   const { location } = useWardLocation();
-  const wardGroupingDetails = useAppContext<WardPatientGroupDetails>('ward-patients-group');
-  const { isLoading, mutate: mutateAdmissionLocation } = wardGroupingDetails?.admissionLocationResponse ?? {};
-  const { mutate: mutateInpatientRequest } = wardGroupingDetails?.inpatientRequestResponse ?? {};
-  const { mutate: mutateInpatientAdmission } = wardGroupingDetails?.inpatientAdmissionResponse ?? {};
+  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { isLoading, mutate: mutateAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
+  const { mutate: mutateInpatientRequest } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
+  const { mutate: mutateInpatientAdmission } = wardPatientGroupDetails?.inpatientAdmissionResponse ?? {};
 
   const zodSchema = useMemo(
     () =>
@@ -70,7 +70,7 @@ export default function PatientBedSwapForm({
     [t],
   );
 
-  const beds = wardGroupingDetails?.bedLayouts ?? [];
+  const beds = wardPatientGroupDetails?.bedLayouts ?? [];
   const bedDetails = useMemo(
     () =>
       beds.map((bed) => {
@@ -145,7 +145,7 @@ export default function PatientBedSwapForm({
     setShowErrorNotifications(true);
   }, []);
 
-  if (!wardGroupingDetails) return <></>;
+  if (!wardPatientGroupDetails) return <></>;
   return (
     <Form
       onSubmit={handleSubmit(onSubmit, onError)}

package/src/ward-workspace/patient-transfer-bed-swap/patient-transfer-request-form.component.tsx

@@ -9,7 +9,7 @@ import { z } from 'zod';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
 import LocationSelector from '../../location-selector/location-selector.component';
-import type { ObsPayload, WardPatientGroupDetails, WardPatientWorkspaceProps } from '../../types';
+import type { ObsPayload, WardViewContext, WardPatientWorkspaceProps } from '../../types';
 import { createEncounter } from '../../ward.resource';
 import styles from './patient-transfer-swap.scss';
 
@@ -29,10 +29,10 @@ export default function PatientTransferForm({
     () => emrConfiguration?.dispositions.filter(({ type }) => type === 'TRANSFER'),
     [emrConfiguration],
   );
-  const wardGroupingDetails = useAppContext<WardPatientGroupDetails>('ward-patients-group');
-  const { mutate: mutateAdmissionLocation } = wardGroupingDetails?.admissionLocationResponse ?? {};
-  const { mutate: mutateInpatientAdmission } = wardGroupingDetails?.inpatientAdmissionResponse ?? {};
-  const { mutate: mutateInpatientRequest } = wardGroupingDetails?.inpatientRequestResponse ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { mutate: mutateAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
+  const { mutate: mutateInpatientAdmission } = wardPatientGroupDetails?.inpatientAdmissionResponse ?? {};
+  const { mutate: mutateInpatientRequest } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
 
   const zodSchema = useMemo(
     () =>
@@ -157,7 +157,7 @@ export default function PatientTransferForm({
     setShowErrorNotifications(true);
   }, []);
 
-  if (!wardGroupingDetails) return <></>;
+  if (!wardPatientGroupDetails) return <></>;
   return (
     <Form
       onSubmit={handleSubmit(onSubmit, onError)}

package/translations/en.json

@@ -14,16 +14,22 @@
   "chooseAnOption": "Choose an option",
   "clinicalForms": "Clinical forms",
   "clinicalNoteLabel": "Write your notes",
+  "countItems_one": "{{count}} {{item}}",
+  "countItems_other": "{{count}} {{item}}",
   "discharge": "Discharge",
   "empty": "Empty",
   "emptyBed": "Empty bed",
   "emptyText": "Empty",
   "encounterDisplay": "{{encounterType}} {{encounterDate}}",
   "errorAssigningBedToPatient": "Error assigning bed to patient",
+  "errorConfiguringPatientCard": "Error configuring patient card",
+  "errorConfiguringPatientCardMessage": "Unable to find configuration for {{elementType}}, id: {{id}}",
   "errorCreatingEncounter": "Failed to admit patient",
   "errorCreatingTransferRequest": "Error creating transfer request",
   "errorDischargingPatient": "Error discharging patient",
   "errorLoadingBedDetails": "Error loading bed details",
+  "errorLoadingChildren": "Error loading children info",
+  "errorLoadingMother": "Error loading mother info",
   "errorLoadingPatientAdmissionRequests": "Error loading patient admission requests",
   "errorLoadingPatients": "Error loading admitted patients",
   "errorLoadingWardLocation": "Error loading ward location",
@@ -33,11 +39,11 @@
   "freeBeds": "Free beds",
   "freeBedsMetricValue": "{{ metricValue }}",
   "inpatientNotesWorkspaceTitle": "In-patient notes",
-  "invalidElementIdCopy": "The configuration provided is invalid. It contains the following unknown element ID:",
   "invalidLocationSpecified": "Invalid location specified",
   "invalidWardLocation": "Invalid ward location: {{location}}",
   "male": "Male",
   "manage": "Manage",
+  "motherChildBedShare": "Mother / Child",
   "nextPage": "Next page",
   "noBedsConfigured": "No beds configured for this location",
   "noBedsConfiguredForLocation": "No beds configured for {{location}} location",