@openmrs/esm-ward-app 10.0.2 → 10.0.3-pre.2

package/src/action-menu-buttons/order-basket-action-button.component.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ActionMenuButton2, AddIcon, ShoppingCartIcon } from '@openmrs/esm-framework';
+import { ActionMenuButton2, AddIcon, ShoppingCartIcon, usePatient } from '@openmrs/esm-framework';
 import { type WardPatientWorkspaceDefinition } from '../types';
 
 /**
@@ -8,6 +8,7 @@ import { type WardPatientWorkspaceDefinition } from '../types';
  */
 function WardPatientOrderBasketActionButton({ groupProps: { wardPatient } }: WardPatientWorkspaceDefinition) {
   const { t } = useTranslation();
+  const { patient: fhirPatient } = usePatient(wardPatient.patient.uuid);
 
   return (
     <ActionMenuButton2
@@ -17,7 +18,7 @@ function WardPatientOrderBasketActionButton({ groupProps: { wardPatient } }: War
         workspaceName: 'ward-patient-order-basket-workspace',
         windowProps: {
           patientUuid: wardPatient.patient.uuid,
-          patient: wardPatient.patient,
+          patient: fhirPatient,
           visitContext: wardPatient.visit,
           drugOrderWorkspaceName: 'ward-patient-order-basket-add-drug-order-workspace',
           labOrderWorkspaceName: 'ward-patient-order-basket-add-lab-order-workspace',

package/src/beds/empty-bed.component.tsx

@@ -12,7 +12,7 @@ const EmptyBed: React.FC<EmptyBedProps> = ({ bed }) => {
   const { t } = useTranslation();
 
   return (
-    <div className={styles.emptyBed}>
+    <div id={`bed-${bed.bedNumber}`} className={styles.emptyBed}>
       <span className={`${wardPatientCardStyles.wardPatientBedNumber} ${wardPatientCardStyles.empty}`}>
         {bed.bedNumber}
       </span>

package/src/beds/ward-bed.component.tsx

@@ -15,7 +15,7 @@ const WardBed: React.FC<WardBedProps> = (props) => {
   return patientCards?.length > 0 ? <OccupiedBed {...props} /> : <EmptyBed bed={bed} />;
 };
 
-const OccupiedBed: React.FC<WardBedProps> = ({ patientCards, isLoadingDivider }) => {
+const OccupiedBed: React.FC<WardBedProps> = ({ patientCards, isLoadingDivider, bed }) => {
   // interlace patient card with bed dividers between each of them
   const patientCardsWithDividers = patientCards.flatMap((patientCard, index) => {
     if (index == 0) {
@@ -25,7 +25,11 @@ const OccupiedBed: React.FC<WardBedProps> = ({ patientCards, isLoadingDivider })
     }
   });
 
-  return <div className={styles.occupiedBed}>{patientCardsWithDividers}</div>;
+  return (
+    <div id={`bed-${bed.bedNumber}`} className={styles.occupiedBed}>
+      {patientCardsWithDividers}
+    </div>
+  );
 };
 
 export default WardBed;

package/src/ward-patient-card/card-rows/mother-child-row.component.tsx

@@ -1,14 +1,8 @@
 import React from 'react';
-import classNames from 'classnames';
-import { BabyIcon, MotherIcon, type Patient, useAppContext } from '@openmrs/esm-framework';
-import { type InpatientAdmission, type MaternalWardViewContext } from '../../types';
+import { useAppContext } from '@openmrs/esm-framework';
+import { type MaternalWardViewContext } from '../../types';
 import { type MaternalWardPatientCardProps } from '../../ward-view/maternal-ward/maternal-ward-patient-card.component';
-import WardPatientAge from '../row-elements/ward-patient-age.component';
-import WardPatientIdentifier from '../row-elements/ward-patient-identifier.component';
-import WardPatientLocation from '../row-elements/ward-patient-location.component';
-import WardPatientName from '../row-elements/ward-patient-name.component';
-import wardPatientCardStyles from '../ward-patient-card.scss';
-import styles from './mother-child-row.scss';
+import MotherOrChild from '../row-elements/ward-mother-or-child.component';
 
 /**
  * This component displays the mother or children of the patient in the patient card. The patient's child is
@@ -51,34 +45,4 @@ const MotherChildRow: React.FC<MaternalWardPatientCardProps> = ({ wardPatient, c
   );
 };
 
-interface MotherOrChildProp {
-  otherPatient: Patient;
-  otherPatientAdmission: InpatientAdmission;
-  isOtherPatientTheMother: boolean;
-}
-
-const MotherOrChild: React.FC<MotherOrChildProp> = ({
-  otherPatient,
-  otherPatientAdmission,
-  isOtherPatientTheMother,
-}) => {
-  const Icon = isOtherPatientTheMother ? MotherIcon : BabyIcon;
-
-  return (
-    <div
-      key={otherPatient.uuid}
-      className={classNames(styles.motherOrBabyRow, wardPatientCardStyles.wardPatientCardRow)}>
-      <div className={styles.motherOrBabyIconDiv}>
-        <Icon className={styles.motherOrBabyIcon} size={24} />
-      </div>
-      <div className={classNames(styles.motherOrBabyRowElementsDiv, wardPatientCardStyles.dotSeparatedChildren)}>
-        <WardPatientName patient={otherPatient} />
-        <WardPatientIdentifier id="patient-identifier" patient={otherPatient} />
-        <WardPatientAge patient={otherPatient} />
-        <WardPatientLocation inpatientAdmission={otherPatientAdmission} />
-      </div>
-    </div>
-  );
-};
-
 export default MotherChildRow;

package/src/ward-patient-card/row-elements/ward-mother-or-child.component.tsx

@@ -0,0 +1,50 @@
+import React from 'react';
+import classNames from 'classnames';
+import { BabyIcon, MotherIcon, type Patient } from '@openmrs/esm-framework';
+import WardPatientAge from '../row-elements/ward-patient-age.component';
+import WardPatientIdentifier from '../row-elements/ward-patient-identifier.component';
+import WardPatientLocation from '../row-elements/ward-patient-location.component';
+import WardPatientName from '../row-elements/ward-patient-name.component';
+import { type InpatientAdmission } from '../../types';
+import styles from './ward-mother-or-child.scss';
+import wardPatientCardStyles from '../ward-patient-card.scss';
+
+interface MotherOrChildProp {
+  otherPatient: Patient;
+  otherPatientAdmission: InpatientAdmission;
+  isOtherPatientTheMother: boolean;
+  children?: React.ReactNode;
+}
+
+/**
+ * A row element that displays a related patient (otherPatient) to the ward patient. The related patient
+ * can either be the mother or child of the ward patient.
+ * @returns
+ */
+const MotherOrChild: React.FC<MotherOrChildProp> = ({
+  otherPatient,
+  otherPatientAdmission,
+  isOtherPatientTheMother,
+  children,
+}) => {
+  const Icon = isOtherPatientTheMother ? MotherIcon : BabyIcon;
+
+  return (
+    <div key={otherPatient.uuid} className={wardPatientCardStyles.wardPatientCardRow}>
+      {children}
+      <div className={styles.motherOrBabyRow}>
+        <div className={styles.motherOrBabyIconDiv}>
+          <Icon className={styles.motherOrBabyIcon} size={24} />
+        </div>
+        <div className={classNames(styles.motherOrBabyRowElementsDiv, wardPatientCardStyles.dotSeparatedChildren)}>
+          <WardPatientName patient={otherPatient} />
+          <WardPatientIdentifier id="patient-identifier" patient={otherPatient} />
+          <WardPatientAge patient={otherPatient} />
+          <WardPatientLocation inpatientAdmission={otherPatientAdmission} />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default MotherOrChild;

package/src/ward-view/maternal-ward/maternal-ward-pending-patients.component.tsx

@@ -6,7 +6,7 @@ import AdmissionRequestNoteRow from '../../ward-patient-card/card-rows/admission
 import CodedObsTagsRow from '../../ward-patient-card/card-rows/coded-obs-tags-row.component';
 import MotherChildRow from '../../ward-patient-card/card-rows/mother-child-row.component';
 import WardPatientSkeletonText from '../../ward-patient-card/row-elements/ward-patient-skeleton-text.component';
-import AdmissionRequestCard from '../../ward-workspace/admission-request-card/admission-request-card.component';
+import MaternalAdmissionRequestCard from '../../ward-workspace/admission-request-card/maternal-admission-request-card.component';
 
 function MaternalWardPendingPatients() {
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
@@ -18,6 +18,15 @@ function MaternalWardPendingPatients() {
     error: errorFetchingInpatientRequests,
   } = inpatientRequestResponse ?? {};
 
+  const inpatientRequestsOfWardByPatientUuid = inpatientRequests?.reduce(
+    (map, inpatientRequest) => {
+      const patientUuid = inpatientRequest.patient.uuid;
+      map[patientUuid] = inpatientRequest;
+      return map;
+    },
+    {} as Record<string, InpatientRequest>,
+  );
+
   return isLoadingInpatientRequests ? (
     <WardPatientSkeletonText />
   ) : errorFetchingInpatientRequests ? (
@@ -34,11 +43,10 @@ function MaternalWardPendingPatients() {
         };
 
         return (
-          <AdmissionRequestCard key={`admission-request-card-${i}`} wardPatient={wardPatient}>
-            <CodedObsTagsRow id="pregnancy-complications" {...wardPatient} />
-            <MotherChildRow wardPatient={wardPatient} childrenOfWardPatientInSameBed={[]} />
-            <AdmissionRequestNoteRow id={'admission-request-note'} wardPatient={wardPatient} />
-          </AdmissionRequestCard>
+          <MaternalAdmissionRequestCard
+            key={`admission-request-card-${i}`}
+            wardPatient={wardPatient}
+            inpatientRequestsOfWardByPatientUuid={inpatientRequestsOfWardByPatientUuid}></MaternalAdmissionRequestCard>
         );
       })}
     </>

package/src/ward-view/maternal-ward/maternal-ward-view.resource.ts

@@ -17,14 +17,14 @@ export function useMotherChildrenRelationshipsByPatient(
     mothers: allWardPatientUuids,
     requireMotherHasActiveVisit: true,
     requireChildHasActiveVisit: true,
-    requireChildBornDuringMothersActiveVisit: true,
+    requireChildBornDuringMothersActiveVisit: false,
   };
 
   const getMotherRequestParams: MothersAndChildrenSearchCriteria = {
     children: allWardPatientUuids,
     requireMotherHasActiveVisit: true,
     requireChildHasActiveVisit: true,
-    requireChildBornDuringMothersActiveVisit: true,
+    requireChildBornDuringMothersActiveVisit: false,
   };
 
   const {

package/src/ward-workspace/admission-request-card/admission-request-card-actions.component.tsx

@@ -1,22 +1,30 @@
 import React from 'react';
 import { Button } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import { closeWorkspaceGroup2, launchWorkspace2, useLayoutType, useWorkspace2Context } from '@openmrs/esm-framework';
-import type { WardPatientCardType, WardPatientWorkspaceProps } from '../../types';
+import { closeWorkspaceGroup2, useLayoutType, useWorkspace2Context } from '@openmrs/esm-framework';
+import type { WardPatient } from '../../types';
 import AdmitPatientButton from '../admit-patient-button.component';
 import styles from './admission-request-card.scss';
 
-const AdmissionRequestCardActions: WardPatientCardType = ({ wardPatient }) => {
+interface AdmissionRequestCardActionsProps {
+  wardPatient: WardPatient;
+  relatedTransferPatients?: WardPatient[];
+}
+
+const AdmissionRequestCardActions: React.FC<AdmissionRequestCardActionsProps> = ({
+  wardPatient,
+  relatedTransferPatients,
+}) => {
   const { t } = useTranslation();
   const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
   const { closeWorkspace, launchChildWorkspace } = useWorkspace2Context();
 
   const launchPatientTransferForm = () => {
-    launchChildWorkspace('transfer-elsewhere-workspace', { wardPatient });
+    launchChildWorkspace('transfer-elsewhere-workspace', { wardPatient, relatedTransferPatients });
   };
 
   const launchCancelAdmissionForm = () => {
-    launchChildWorkspace('cancel-admission-request-workspace', { wardPatient });
+    launchChildWorkspace('cancel-admission-request-workspace', { wardPatient, relatedTransferPatients });
   };
 
   const isTransfer = wardPatient.inpatientRequest.dispositionType == 'TRANSFER';
@@ -31,6 +39,7 @@ const AdmissionRequestCardActions: WardPatientCardType = ({ wardPatient }) => {
       </Button>
       <AdmitPatientButton
         wardPatient={wardPatient}
+        relatedTransferPatients={relatedTransferPatients}
         dispositionType={wardPatient.inpatientRequest.dispositionType}
         onAdmitPatientSuccess={async () => {
           await closeWorkspace({ discardUnsavedChanges: true });

package/src/ward-workspace/admission-request-card/maternal-admission-request-card.component.tsx

@@ -0,0 +1,136 @@
+import React, { useMemo, useState, type ReactNode } from 'react';
+import { Checkbox, CheckboxGroup } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
+import { useAppContext } from '@openmrs/esm-framework';
+import { makeWardPatient } from './maternal-admission-request-card.resource';
+import type { InpatientRequest, MaternalWardViewContext, WardPatient } from '../../types';
+import AdmissionRequestCardActions from './admission-request-card-actions.component';
+import AdmissionRequestCardHeader from './admission-request-card-header.component';
+import AdmissionRequestNoteRow from '../../ward-patient-card/card-rows/admission-request-note-row.component';
+import CodedObsTagsRow from '../../ward-patient-card/card-rows/coded-obs-tags-row.component';
+import MotherOrChild from '../../ward-patient-card/row-elements/ward-mother-or-child.component';
+import styles from './admission-request-card.scss';
+
+interface MaternalAdmissionRequestCardProps {
+  wardPatient: WardPatient;
+  children?: ReactNode;
+  inpatientRequestsOfWardByPatientUuid: Record<string, InpatientRequest>;
+}
+
+const MaternalAdmissionRequestCard: React.FC<MaternalAdmissionRequestCardProps> = ({
+  wardPatient,
+  children,
+  inpatientRequestsOfWardByPatientUuid,
+}) => {
+  const { motherChildRelationships } = useAppContext<MaternalWardViewContext>('maternal-ward-view-context') ?? {};
+  const [selectedRelatedPatient, setCheckedRelatedPatient] = useState<string[]>([]);
+  const { t } = useTranslation();
+
+  const { childrenByMotherUuid, motherByChildUuid } = motherChildRelationships ?? {};
+
+  const motherOfPatient = useMemo(
+    () => motherByChildUuid?.get(wardPatient.patient.uuid) ?? null,
+    [motherByChildUuid, wardPatient.patient.uuid],
+  );
+
+  const childrenOfPatient = useMemo(
+    () => childrenByMotherUuid?.get(wardPatient.patient.uuid) ?? [],
+    [childrenByMotherUuid, wardPatient.patient.uuid],
+  );
+
+  const relatedPendingWardMother: WardPatient | null = useMemo(() => {
+    if (!motherOfPatient) return null;
+    const request = inpatientRequestsOfWardByPatientUuid[motherOfPatient.patient.uuid];
+    return request ? makeWardPatient(request) : null;
+  }, [motherOfPatient, inpatientRequestsOfWardByPatientUuid]);
+
+  const relatedPendingWardChildren: WardPatient[] = useMemo(() => {
+    const wardPatients: WardPatient[] = [];
+    for (const child of childrenOfPatient ?? []) {
+      const request = inpatientRequestsOfWardByPatientUuid[child.patient.uuid];
+      if (request) wardPatients.push(makeWardPatient(request));
+    }
+    return wardPatients;
+  }, [childrenOfPatient, inpatientRequestsOfWardByPatientUuid]);
+
+  const selectedRelatedWardPatients = useMemo(
+    () =>
+      [...(relatedPendingWardMother ? [relatedPendingWardMother] : []), ...relatedPendingWardChildren].filter((wp) =>
+        selectedRelatedPatient.includes(wp.patient.uuid),
+      ),
+    [relatedPendingWardMother, relatedPendingWardChildren, selectedRelatedPatient],
+  );
+
+  return (
+    <div className={styles.admissionRequestCard}>
+      <AdmissionRequestCardHeader {...{ wardPatient }} />
+      <CodedObsTagsRow id="pregnancy-complications" {...wardPatient} />
+      {motherOfPatient && (
+        <MotherOrChild
+          otherPatient={motherOfPatient.patient}
+          otherPatientAdmission={motherOfPatient.currentAdmission}
+          isOtherPatientTheMother={true}>
+          {relatedPendingWardMother && (
+            <div>
+              <CheckboxGroup legendText={''}>
+                <Checkbox
+                  checked={selectedRelatedPatient.includes(motherOfPatient.patient.uuid)}
+                  className={styles.checkbox}
+                  id={motherOfPatient.patient.uuid}
+                  key={'also-transfer-' + motherOfPatient.patient.uuid}
+                  labelText={
+                    relatedPendingWardMother.inpatientRequest.dispositionType === 'ADMIT'
+                      ? t('alsoAdmitOrCancel', 'Also admit / cancel:')
+                      : t('alsoTransferOrCancel', 'Also transfer / cancel:')
+                  }
+                  onChange={(_, { checked, id }) => {
+                    const currentValue = selectedRelatedPatient;
+                    setCheckedRelatedPatient(
+                      checked ? [...currentValue, id] : currentValue.filter((item) => item !== id),
+                    );
+                  }}
+                />
+              </CheckboxGroup>
+            </div>
+          )}
+        </MotherOrChild>
+      )}
+      {childrenOfPatient?.map((childOfPatient) => (
+        <MotherOrChild
+          key={childOfPatient.patient.uuid}
+          otherPatient={childOfPatient.patient}
+          otherPatientAdmission={childOfPatient.currentAdmission}
+          isOtherPatientTheMother={false}>
+          {relatedPendingWardChildren.some((wp) => wp.patient.uuid === childOfPatient.patient.uuid) && (
+            <div>
+              <CheckboxGroup legendText={''}>
+                <Checkbox
+                  checked={selectedRelatedPatient.includes(childOfPatient.patient.uuid)}
+                  className={styles.checkbox}
+                  id={childOfPatient.patient.uuid}
+                  key={'also-transfer-' + childOfPatient.patient.uuid}
+                  labelText={
+                    relatedPendingWardChildren.find((wp) => wp.patient.uuid === childOfPatient.patient.uuid)
+                      ?.inpatientRequest.dispositionType === 'ADMIT'
+                      ? t('alsoAdmitOrCancel', 'Also admit / cancel:')
+                      : t('alsoTransferOrCancel', 'Also transfer / cancel:')
+                  }
+                  onChange={(_, { checked, id }) => {
+                    const currentValue = selectedRelatedPatient;
+                    setCheckedRelatedPatient(
+                      checked ? [...currentValue, id] : currentValue.filter((item) => item !== id),
+                    );
+                  }}
+                />
+              </CheckboxGroup>
+            </div>
+          )}
+        </MotherOrChild>
+      ))}
+      <AdmissionRequestNoteRow id={'admission-request-note'} wardPatient={wardPatient} />
+      <AdmissionRequestCardActions wardPatient={wardPatient} relatedTransferPatients={selectedRelatedWardPatients} />
+    </div>
+  );
+};
+
+export default MaternalAdmissionRequestCard;

package/src/ward-workspace/admission-request-card/maternal-admission-request-card.resource.ts

@@ -0,0 +1,11 @@
+import { type InpatientRequest, type WardPatient } from '../../types';
+
+export function makeWardPatient(request: InpatientRequest): WardPatient {
+  return {
+    patient: request.patient,
+    visit: request.visit,
+    bed: null,
+    inpatientAdmission: null,
+    inpatientRequest: request,
+  };
+}

package/src/ward-workspace/admit-patient-button.component.tsx

@@ -16,6 +16,8 @@ import { useAdmitPatient } from '../ward.resource';
 interface AdmitPatientButtonProps {
   wardPatient: WardPatient;
 
+  relatedTransferPatients?: WardPatient[];
+
   /**
    * whether to create an admit or transfer encounter for the given patient
    */
@@ -26,6 +28,7 @@ interface AdmitPatientButtonProps {
 
 const AdmitPatientButton: React.FC<AdmitPatientButtonProps> = ({
   wardPatient,
+  relatedTransferPatients,
   onAdmitPatientSuccess,
   disabled,
   dispositionType,
@@ -39,7 +42,8 @@ const AdmitPatientButton: React.FC<AdmitPatientButtonProps> = ({
   const [isAdmitting, setIsAdmitting] = useState(false);
   const { launchChildWorkspace } = useWorkspace2Context();
 
-  const launchPatientAdmissionForm = () => launchChildWorkspace('admit-patient-form-workspace', { wardPatient });
+  const launchPatientAdmissionForm = () =>
+    launchChildWorkspace('admit-patient-form-workspace', { wardPatient, relatedTransferPatients });
 
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
 
@@ -51,45 +55,59 @@ const AdmitPatientButton: React.FC<AdmitPatientButtonProps> = ({
       launchPatientAdmissionForm();
     } else {
       setIsAdmitting(true);
-      try {
-        const response = await admitPatient(patient, dispositionType, visit.uuid);
-        await wardPatientGroupDetails?.mutate?.();
-        if (response && response?.ok) {
+      const allPatientsToAdmit = [wardPatient, ...(relatedTransferPatients ?? [])];
+      const results = await Promise.allSettled(
+        allPatientsToAdmit.map((wp) =>
+          admitPatient(wp.patient, wp.inpatientRequest?.dispositionType ?? dispositionType, wp.visit.uuid),
+        ),
+      );
+      await wardPatientGroupDetails?.mutate?.();
+
+      results.forEach((result, i) => {
+        const wp = allPatientsToAdmit[i];
+        const patientName = wp.patient.person.preferredName.display;
+        const wpDispositionType = wp.inpatientRequest?.dispositionType ?? dispositionType;
+        if (result.status === 'fulfilled') {
           showSnackbar({
             kind: 'success',
             title:
-              dispositionType === 'ADMIT'
+              wpDispositionType === 'ADMIT'
                 ? t('patientAdmittedSuccessfully', 'Patient admitted successfully')
                 : t('patientTransferredSuccessfully', 'Patient transferred successfully'),
             subtitle:
-              dispositionType === 'ADMIT'
-                ? t('patientAdmittedToLocation', 'Patient admitted successfully to {{location}}', {
+              wpDispositionType === 'ADMIT'
+                ? t('patientAdmittedToLocation', '{{patientName}} admitted successfully to {{location}}', {
+                    patientName,
                     location: location?.display,
                   })
-                : t('patientTransferredToLocation', 'Patient transferred successfully to {{location}}', {
+                : t('patientTransferredToLocation', '{{patientName}} transferred successfully to {{location}}', {
+                    patientName,
                     location: location?.display,
                   }),
           });
+        } else {
+          // TODO: better way to handle / display error messages
+          // https://openmrs.atlassian.net/browse/O3-5423
+          const err = result.reason;
+          const errorMessage =
+            err?.responseBody?.error?.globalErrors?.[0]?.message ??
+            err?.message ??
+            t('unknownError', 'An unknown error occurred');
+          showSnackbar({
+            kind: 'error',
+            title:
+              wpDispositionType === 'ADMIT'
+                ? t('errorAdmittingPatient', 'Failed to admit {{patientName}}', { patientName })
+                : t('errorTransferringPatient', 'Failed to transfer {{patientName}}', { patientName }),
+            subtitle: errorMessage,
+          });
         }
+      });
+
+      if (results.some((r) => r.status === 'fulfilled')) {
         onAdmitPatientSuccess();
-      } catch (err) {
-        // TODO: better way to handle / display error messages
-        // https://openmrs.atlassian.net/browse/O3-5423
-        const errorMessage =
-          err?.responseBody?.error?.globalErrors?.[0]?.message ??
-          err.message ??
-          t('unknownError', 'An unknown error occurred');
-        showSnackbar({
-          kind: 'error',
-          title:
-            dispositionType === 'ADMIT'
-              ? t('errrorAdmitingPatient', 'Failed to admit patient')
-              : t('errorTransferringPatient', 'Failed to transfer patient'),
-          subtitle: errorMessage,
-        });
-      } finally {
-        setIsAdmitting(false);
       }
+      setIsAdmitting(false);
     }
   };
 

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

@@ -13,7 +13,12 @@ import { renderWithSwr } from 'tools';
 import { mockWardPatientGroupDetails, mockWardViewContext } from '../../../mock';
 import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 import type { WardPatient, WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
+import {
+  assignPatientToBed,
+  getAssignedBedByPatient,
+  removePatientFromBed,
+  useAdmitPatient,
+} from '../../ward.resource';
 import AdmitPatientFormWorkspace from './admit-patient-form.workspace';
 import useWardLocation from '../../hooks/useWardLocation';
 
@@ -43,6 +48,7 @@ jest.mock('../../ward.resource', () => ({
   useAdmitPatient: jest.fn(),
   assignPatientToBed: jest.fn(),
   removePatientFromBed: jest.fn(),
+  getAssignedBedByPatient: jest.fn(),
 }));
 
 const mockedUseWardLocation = jest.mocked(useWardLocation);
@@ -53,6 +59,7 @@ const mockedUseAssignedBedByPatient = jest.mocked(useAssignedBedByPatient);
 const mockedAssignPatientToBed = jest.mocked(assignPatientToBed);
 const mockedRemovePatientFromBed = jest.mocked(removePatientFromBed);
 const mockedUseAdmitPatient = jest.mocked(useAdmitPatient);
+const mockedGetAssignedBedByPatient = jest.mocked(getAssignedBedByPatient);
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
@@ -83,6 +90,7 @@ const mockWorkspaceProps: Workspace2DefinitionProps<WardPatientWorkspaceProps, {
   workspaceName: '',
   windowName: '',
   isRootWorkspace: false,
+  showActionMenu: false,
 };
 
 function renderAdmissionForm() {
@@ -146,6 +154,13 @@ describe('Testing AdmitPatientForm', () => {
     mockedRemovePatientFromBed.mockResolvedValue({
       ok: true,
     });
+
+    // @ts-ignore - we only need the data key for now
+    mockedGetAssignedBedByPatient.mockResolvedValue({
+      data: {
+        results: [{ bedId: 1 }],
+      },
+    });
   });
 
   it('should render admit patient form', async () => {
@@ -213,7 +228,7 @@ describe('Testing AdmitPatientForm', () => {
     await user.click(admitButton);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'error',
-      title: 'Failed to admit patient',
+      title: 'Failed to admit Alice Johnson',
       subtitle: 'Failed to create encounter',
     });
   });
@@ -231,7 +246,7 @@ describe('Testing AdmitPatientForm', () => {
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'warning',
       title: 'Patient admitted successfully',
-      subtitle: 'Patient admitted successfully but fail to assign bed to patient',
+      subtitle: 'Alice Johnson admitted successfully but failed to assign bed',
     });
   });
 
@@ -245,7 +260,7 @@ describe('Testing AdmitPatientForm', () => {
     expect(mockedRemovePatientFromBed).toHaveBeenCalledWith(1, mockPatientAlice.uuid);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',
-      subtitle: 'Patient admitted successfully to Inpatient Ward',
+      subtitle: 'Alice Johnson admitted successfully to Inpatient Ward',
       title: 'Patient admitted successfully',
     });
   });