@kenyaemr/esm-ward-app 8.1.1-pre.129 → 8.1.2-pre.154

package/src/ward-view/default-ward/default-ward-patient-card.component.tsx

@@ -6,12 +6,12 @@ import WardPatientCard from '../../ward-patient-card/ward-patient-card.component
 import styles from '../../ward-patient-card/ward-patient-card.scss';
 import DefaultWardPatientCardHeader from './default-ward-patient-card-header.component';
 
-const DefaultWardPatientCard: WardPatientCardType = (wardPatient) => {
+const DefaultWardPatientCard: WardPatientCardType = ({ wardPatient }) => {
   const { bed } = wardPatient;
 
   const card = (
     <WardPatientCard wardPatient={wardPatient}>
-      <DefaultWardPatientCardHeader {...wardPatient} />
+      <DefaultWardPatientCardHeader {...{ wardPatient }} />
       <PendingItemsRow id={'pending-items'} wardPatient={wardPatient} />
       <AdmissionRequestNoteRow id={'admission-request-note'} wardPatient={wardPatient} />
     </WardPatientCard>

package/src/ward-view/default-ward/default-ward-unassigned-patients.component.tsx

@@ -8,13 +8,13 @@ import DefaultWardPatientCard from './default-ward-patient-card.component';
  * @returns
  */
 function DefaultWardUnassignedPatients() {
-  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { wardUnassignedPatientsList } = wardPatientGroupDetails ?? {};
 
   const wardUnassignedPatients = wardUnassignedPatientsList?.map((inpatientAdmission) => {
     return (
       <DefaultWardPatientCard
-        {...{
+        wardPatient={{
           patient: inpatientAdmission.patient,
           visit: inpatientAdmission.visit,
           bed: null,

package/src/ward-view/materal-ward/maternal-ward-beds.component.tsx

@@ -6,7 +6,7 @@ import { bedLayoutToBed } from '../ward-view.resource';
 import MaternalWardPatientCard from './maternal-ward-patient-card.component';
 
 const MaternalWardBeds: React.FC<MotherChildRelationships> = (motherChildRelationships) => {
-  const { motherByChildUuid } = motherChildRelationships ?? {};
+  const { motherByChildUuid, isLoading: isLoadingMotherChildRelationships } = motherChildRelationships ?? {};
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { bedLayouts, wardAdmittedPatientsWithBed } = wardPatientGroupDetails ?? {};
 
@@ -56,7 +56,14 @@ const MaternalWardBeds: React.FC<MotherChildRelationships> = (motherChildRelatio
       />
     ));
 
-    return <WardBed key={bed.uuid} bed={bed} patientCards={patientCards} />;
+    return (
+      <WardBed
+        key={bed.uuid}
+        bed={bed}
+        patientCards={patientCards}
+        isLoadingDivider={isLoadingMotherChildRelationships}
+      />
+    );
   });
 
   return <>{wardBeds}</>;

package/src/ward-view/materal-ward/maternal-ward-patient-card-header.component.tsx

@@ -10,7 +10,7 @@ import WardPatientObs from '../../ward-patient-card/row-elements/ward-patient-ob
 import WardPatientTimeSinceAdmission from '../../ward-patient-card/row-elements/ward-patient-time-since-admission';
 import styles from '../../ward-patient-card/ward-patient-card.scss';
 
-const MaternalWardPatientCardHeader: WardPatientCardType = (wardPatient) => {
+const MaternalWardPatientCardHeader: WardPatientCardType = ({ wardPatient }) => {
   const { patient, bed, visit, inpatientAdmission } = wardPatient;
   const { firstAdmissionOrTransferEncounter } = inpatientAdmission ?? {};
 

package/src/ward-view/materal-ward/maternal-ward-patient-card.component.tsx

@@ -43,7 +43,7 @@ const MaternalWardPatientCard: React.FC<MaternalWardPatientCardProps> = (props)
   const card = (
     <>
       <WardPatientCard wardPatient={wardPatient}>
-        <MaternalWardPatientCardHeader {...wardPatient} />
+        <MaternalWardPatientCardHeader {...{ wardPatient }} />
         <div className={classNames(styles.wardPatientCardRow, styles.dotSeparatedChildren)}>
           <WardPatientTimeOnWard
             encounterAssigningToCurrentInpatientLocation={encounterAssigningToCurrentInpatientLocation}
@@ -59,7 +59,7 @@ const MaternalWardPatientCard: React.FC<MaternalWardPatientCardProps> = (props)
           <React.Fragment key={childWardPatient.patient.uuid}>
             <MotherChildBedShareDivider />
             <WardPatientCard wardPatient={childWardPatient}>
-              <MaternalWardPatientCardHeader {...childWardPatient} />
+              <MaternalWardPatientCardHeader wardPatient={childWardPatient} />
               <PendingItemsRow id={'pending-items'} wardPatient={childWardPatient} />
             </WardPatientCard>
           </React.Fragment>

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

@@ -2,12 +2,15 @@ import { showNotification } from '@openmrs/esm-framework';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMotherAndChildren, type MothersAndChildrenSearchCriteria } from '../../hooks/useMotherAndChildren';
-import { type PatientAndAdmission } from '../../types';
+import { type MotherChildRelationships, type PatientAndAdmission } from '../../types';
 
 const motherAndChildrenRep =
   'custom:(childAdmission,mother:(person,identifiers:full,uuid),child:(person,identifiers:full,uuid),motherAdmission)';
 
-export function useMotherChildrenRelationshipsByPatient(allWardPatientUuids: string[], fetch: boolean) {
+export function useMotherChildrenRelationshipsByPatient(
+  allWardPatientUuids: string[],
+  fetch: boolean,
+): MotherChildRelationships {
   const { t } = useTranslation();
 
   const getChildrenRequestParams: MothersAndChildrenSearchCriteria = {
@@ -53,12 +56,9 @@ export function useMotherChildrenRelationshipsByPatient(allWardPatientUuids: str
   }
 
   const relationships = useMemo(() => {
-    if (isLoadingChildrenData || isLoadingMotherData) {
-      return null;
-    }
-
     const motherByChildUuid = new Map<string, PatientAndAdmission>();
     const childrenByMotherUuid = new Map<string, PatientAndAdmission[]>();
+    const isLoading = isLoadingChildrenData || isLoadingMotherData;
 
     for (const { child, childAdmission, mother, motherAdmission } of motherData ?? []) {
       motherByChildUuid.set(child.uuid, { patient: mother, currentAdmission: motherAdmission });
@@ -82,7 +82,7 @@ export function useMotherChildrenRelationshipsByPatient(allWardPatientUuids: str
       }
     }
 
-    return { motherByChildUuid, childrenByMotherUuid };
+    return { motherByChildUuid, childrenByMotherUuid, isLoading };
   }, [childrenData, motherData, isLoadingChildrenData, isLoadingMotherData]);
 
   return relationships;

package/src/ward-view/ward-view.component.tsx

@@ -13,7 +13,6 @@ const WardView: React.FC<{}> = () => {
   const { t } = useTranslation();
 
   const locationUuid = location?.uuid;
-  const isVertical = useFeatureFlag('ward-view-vertical-tiling');
   const wardConfig = useWardConfig(locationUuid);
 
   if (isLoadingLocation) {
@@ -27,7 +26,7 @@ const WardView: React.FC<{}> = () => {
   const wardId = wardConfig.id;
 
   return (
-    <div className={classNames(styles.wardView, { [styles.verticalTiling]: isVertical })}>
+    <div className={classNames(styles.wardView, styles.verticalTiling)}>
       <ExtensionSlot name={wardId} />
     </div>
   );

package/src/ward-view/ward.component.tsx

@@ -1,22 +1,21 @@
-import { InlineNotification } from '@carbon/react';
-import { useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
-import classNames from 'classnames';
 import React, { useEffect, useRef, type ReactNode } from 'react';
+import classNames from 'classnames';
+import { InlineNotification } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
-import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
-import useWardLocation from '../hooks/useWardLocation';
+import { useAppContext, useFeatureFlag } from '@openmrs/esm-framework';
 import { type WardViewContext } from '../types';
+import useWardLocation from '../hooks/useWardLocation';
+import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
 import styles from './ward-view.scss';
 
 const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardUnassignedPatients: ReactNode }) => {
   const { location } = useWardLocation();
   const { t } = useTranslation();
-  const isVertical = useFeatureFlag('ward-view-vertical-tiling');
 
-  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { bedLayouts } = wardPatientGroupDetails ?? {};
   const { isLoading: isLoadingAdmissionLocation, error: errorLoadingAdmissionLocation } =
-  wardPatientGroupDetails?.admissionLocationResponse ?? {};
+    wardPatientGroupDetails?.admissionLocationResponse ?? {};
   const {
     isLoading: isLoadingInpatientAdmissions,
     error: errorLoadingInpatientAdmissions,
@@ -44,19 +43,28 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
       if (scrollToLoadMoreTrigger.current) {
         observer.observe(scrollToLoadMoreTrigger.current);
       }
+
       return () => {
         if (scrollToLoadMoreTrigger.current) {
+          // TODO: Fix this more meaningfully
+          // eslint-disable-next-line react-hooks/exhaustive-deps
           observer.unobserve(scrollToLoadMoreTrigger.current);
         }
       };
     },
-    [scrollToLoadMoreTrigger, hasMoreInpatientAdmissions, errorLoadingInpatientAdmissions, loadMoreInpatientAdmissions],
+    [
+      errorLoadingInpatientAdmissions,
+      hasMoreInpatientAdmissions,
+      isLoadingInpatientAdmissions,
+      loadMoreInpatientAdmissions,
+      scrollToLoadMoreTrigger,
+    ],
   );
 
   if (!wardPatientGroupDetails) return <></>;
 
   return (
-    <div className={classNames(styles.wardViewMain, { [styles.verticalTiling]: isVertical })}>
+    <div className={classNames(styles.wardViewMain, styles.verticalTiling)}>
       {wardBeds}
       {bedLayouts?.length == 0 && isBedManagementModuleInstalled && (
         <InlineNotification
@@ -103,4 +111,4 @@ const EmptyBeds = () => {
   );
 };
 
-export default Ward;
+export default Ward;

package/src/ward-view-header/admission-requests-bar.component.tsx

@@ -16,7 +16,7 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
   const { t } = useTranslation();
   const layout = useLayoutType();
 
-  if (isLoading || !inpatientRequests?.length) {
+  if (isLoading || !inpatientRequests) {
     return null;
   }
 
@@ -31,7 +31,9 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
   }
 
   return (
-    <div className={styles.admissionRequestsContainer}>
+    <div className={`${styles.admissionRequestsContainer} ${
+      inpatientRequests?.length ? styles.blackBackground : styles.lightBlueBackground
+    }`}>
       <Movement className={styles.movementIcon} size="24" />
       <span className={styles.content}>
         {t('admissionRequestsCount', '{{count}} admission request', {

package/src/ward-view-header/admission-requests.scss

@@ -30,8 +30,18 @@
   margin-right: layout.$spacing-03;
 }
 
+.blackBackground {
+  background-color: #393939;
+  color: white;
+}
+
+.lightBlueBackground {
+  background-color: $color-blue-10;
+  border-left: 4px solid $color-blue-60-2;
+  color: #393939;
+}
+
 .content {
   @include type.type-style('heading-compact-01');
-  color: $ui-02;
   margin-right: layout.$spacing-03;
 }

package/src/ward-view-header/ward-metrics.test.tsx

@@ -1,19 +1,11 @@
+import { useAppContext } from '@openmrs/esm-framework';
+import { screen } from '@testing-library/react';
 import React from 'react';
-import WardMetrics from './ward-metrics.component';
 import { renderWithSwr } from '../../../../tools/test-utils';
-import {
-  createAndGetWardPatientGrouping,
-  getInpatientAdmissionsUuidMap,
-  getWardMetrics,
-} from '../ward-view/ward-view.resource';
-import { useAdmissionLocation } from '../hooks/useAdmissionLocation';
-import { mockAdmissionLocation, mockInpatientAdmissions, mockInpatientRequest } from '__mocks__';
-import { useInpatientAdmission } from '../hooks/useInpatientAdmission';
-import useWardLocation from '../hooks/useWardLocation';
-import { screen } from '@testing-library/react';
-import { useAppContext } from '@openmrs/esm-framework';
-import { type WardViewContext } from '../types';
 import { mockWardViewContext } from '../../mock';
+import { type WardViewContext } from '../types';
+import { getWardMetrics } from '../ward-view/ward-view.resource';
+import WardMetrics from './ward-metrics.component';
 
 const wardMetrics = [
   { name: 'patients', key: 'patients', defaultTranslation: 'Patients' },

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

@@ -1,34 +1,17 @@
 import { Button } from '@carbon/react';
-import {
-  ArrowRightIcon,
-  launchWorkspace,
-  showSnackbar,
-  useAppContext,
-  useFeatureFlag,
-  useLayoutType,
-} from '@openmrs/esm-framework';
+import { launchWorkspace, useAppContext, useLayoutType } from '@openmrs/esm-framework';
 import React, { useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
-import useWardLocation from '../../hooks/useWardLocation';
 import type { WardPatientCardType, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { useAdmitPatient } from '../../ward.resource';
 import { AdmissionRequestsWorkspaceContext } from '../admission-request-workspace/admission-requests.workspace';
-import type { AdmitPatientFormWorkspaceProps } from '../admit-patient-form-workspace/types';
+import AdmissionPatientButton from '../admit-patient-button.component';
 import styles from './admission-request-card.scss';
 
-const AdmissionRequestCardActions: WardPatientCardType = (wardPatient) => {
-  const { patient, inpatientRequest } = wardPatient;
-  const { dispositionType } = inpatientRequest;
+const AdmissionRequestCardActions: WardPatientCardType = ({ wardPatient }) => {
   const { t } = useTranslation();
-  const { location } = useWardLocation();
   const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
-  const { WardPatientHeader, wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
-  const { admitPatient, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useAdmitPatient();
-
-  const launchPatientAdmissionForm = useCallback(
-    () => launchWorkspace<AdmitPatientFormWorkspaceProps>('admit-patient-form-workspace', { patient, dispositionType }),
-    [],
-  );
+  const { WardPatientHeader } = useAppContext<WardViewContext>('ward-view-context') ?? {};
 
   const launchPatientTransferForm = useCallback(() => {
     launchWorkspace<WardPatientWorkspaceProps>('patient-transfer-request-workspace', {
@@ -36,56 +19,28 @@ const AdmissionRequestCardActions: WardPatientCardType = (wardPatient) => {
       WardPatientHeader,
     });
   }, [wardPatient, WardPatientHeader]);
-  const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
-  const { closeWorkspaceWithSavedChanges } = useContext(AdmissionRequestsWorkspaceContext);
 
-  // If bed management module is installed, open the next form
-  // for bed selection. If not, admit patient directly
-  const onAdmit = () => {
-    if (isBedManagementModuleInstalled) {
-      launchPatientAdmissionForm();
-    } else {
-      admitPatient(patient, dispositionType)
-        .then(
-          (response) => {
-            if (response && response?.ok) {
-              showSnackbar({
-                kind: 'success',
-                title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
-                subtitle: t('patientAdmittedWoBed', 'Patient admitted successfully to {{location}}', {
-                  location: location?.display,
-                }),
-              });
-            }
-          },
-          (err: Error) => {
-            showSnackbar({
-              kind: 'error',
-              title: t('errorCreatingEncounter', 'Failed to admit patient'),
-              subtitle: err.message,
-            });
-          },
-        )
-        .finally(() => {
-          wardPatientGroupDetails?.mutate?.();
-          closeWorkspaceWithSavedChanges();
-        });
-    }
+  const launchCancelAdmissionForm = () => {
+    launchWorkspace<WardPatientWorkspaceProps>('cancel-admission-request-workspace', {
+      wardPatient,
+      WardPatientHeader,
+    });
   };
 
+  const { closeWorkspaceWithSavedChanges } = useContext(AdmissionRequestsWorkspaceContext);
+
   return (
     <div className={styles.admissionRequestActionBar}>
       <Button kind="ghost" size={responsiveSize} onClick={launchPatientTransferForm}>
         {t('transferElsewhere', 'Transfer elsewhere')}
       </Button>
-      <Button
-        kind="ghost"
-        renderIcon={ArrowRightIcon}
-        size={responsiveSize}
-        disabled={isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
-        onClick={onAdmit}>
-        {t('admitPatient', 'Admit patient')}
+      <Button kind="ghost" size={responsiveSize} onClick={launchCancelAdmissionForm}>
+        {t('cancel', 'Cancel')}
       </Button>
+      <AdmissionPatientButton
+        wardPatient={wardPatient}
+        onAdmitPatientSuccess={() => closeWorkspaceWithSavedChanges()}
+      />
     </div>
   );
 };

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

@@ -8,7 +8,7 @@ import WardPatientIdentifier from '../../ward-patient-card/row-elements/ward-pat
 import WardPatientName from '../../ward-patient-card/row-elements/ward-patient-name';
 import styles from './admission-request-card.scss';
 
-const AdmissionRequestCardHeader: WardPatientCardType = (wardPatient) => {
+const AdmissionRequestCardHeader: WardPatientCardType = ({ wardPatient }) => {
   const { inpatientRequest } = wardPatient;
   const { dispositionEncounter } = inpatientRequest;
   const { patient } = wardPatient;

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

@@ -12,9 +12,9 @@ interface AdmissionRequestCardProps {
 const AdmissionRequestCard: React.FC<AdmissionRequestCardProps> = ({ wardPatient, children }) => {
   return (
     <div className={styles.admissionRequestCard}>
-      <AdmissionRequestCardHeader {...wardPatient} />
+      <AdmissionRequestCardHeader {...{ wardPatient }} />
       {children}
-      <AdmissionRequestCardActions {...wardPatient} />
+      <AdmissionRequestCardActions {...{ wardPatient }} />
     </div>
   );
 };

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

@@ -0,0 +1,82 @@
+import { Button } from '@carbon/react';
+import {
+  ArrowRightIcon,
+  launchWorkspace,
+  showSnackbar,
+  useAppContext,
+  useFeatureFlag,
+  useLayoutType,
+} from '@openmrs/esm-framework';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import useWardLocation from '../hooks/useWardLocation';
+import type { WardPatient, WardPatientWorkspaceProps, WardViewContext } from '../types';
+import { useAdmitPatient } from '../ward.resource';
+
+interface AdmissionPatientButtonProps {
+  wardPatient: WardPatient;
+  onAdmitPatientSuccess();
+}
+
+const AdmissionPatientButton: React.FC<AdmissionPatientButtonProps> = ({ wardPatient, onAdmitPatientSuccess }) => {
+  const { patient, inpatientRequest, bed } = wardPatient ?? {};
+  const dispositionType = inpatientRequest?.dispositionType ?? 'ADMIT';
+  const { t } = useTranslation();
+  const { location } = useWardLocation();
+  const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
+  const { WardPatientHeader, wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { admitPatient, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useAdmitPatient();
+
+  const launchPatientAdmissionForm = () =>
+    launchWorkspace<WardPatientWorkspaceProps>('admit-patient-form-workspace', { wardPatient, WardPatientHeader });
+
+  const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
+
+  // If bed management module is installed and the patient does not currently assigned a bed,
+  // open the next form for bed selection. If not, admit patient directly
+  // (Note that it is possible, albeit an edge case, for a patient to have a bed assigned while not admitted)
+  const onAdmit = () => {
+    if (isBedManagementModuleInstalled && !bed) {
+      launchPatientAdmissionForm();
+    } else {
+      admitPatient(patient, dispositionType)
+        .then(
+          (response) => {
+            if (response && response?.ok) {
+              showSnackbar({
+                kind: 'success',
+                title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
+                subtitle: t('patientAdmittedWoBed', 'Patient admitted successfully to {{location}}', {
+                  location: location?.display,
+                }),
+              });
+            }
+          },
+          (err: Error) => {
+            showSnackbar({
+              kind: 'error',
+              title: t('errorCreatingEncounter', 'Failed to admit patient'),
+              subtitle: err.message,
+            });
+          },
+        )
+        .finally(() => {
+          wardPatientGroupDetails?.mutate?.();
+          onAdmitPatientSuccess();
+        });
+    }
+  };
+
+  return (
+    <Button
+      kind="ghost"
+      renderIcon={ArrowRightIcon}
+      size={responsiveSize}
+      disabled={isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
+      onClick={onAdmit}>
+      {t('admitPatient', 'Admit patient')}
+    </Button>
+  );
+};
+
+export default AdmissionPatientButton;

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

@@ -2,6 +2,13 @@
 @use '@carbon/layout';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
+.flexWrapper {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  color: #393939;
+}
+
 .form {
   display: flex;
   height: 100%;

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

@@ -1,16 +1,22 @@
-import { showSnackbar, useAppContext, useFeatureFlag, useSession } from '@openmrs/esm-framework';
+import {
+  CloseWorkspaceOptions,
+  type DefaultWorkspaceProps,
+  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 { mockLocationInpatientWard, mockPatientAlice } from '../../../../../__mocks__';
+import { mockInpatientRequestAlice, mockLocationInpatientWard, mockPatientAlice } from '../../../../../__mocks__';
 import { renderWithSwr } from '../../../../../tools';
 import { mockWardPatientGroupDetails, mockWardViewContext } from '../../../mock';
 import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 import useWardLocation from '../../hooks/useWardLocation';
-import type { DispositionType, WardViewContext } from '../../types';
+import type { DispositionType, WardPatient, WardViewContext } from '../../types';
 import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
 import AdmitPatientFormWorkspace from './admit-patient-form.workspace';
-import type { AdmitPatientFormWorkspaceProps } from './types';
 
 jest.mock('../../hooks/useAdmissionLocation', () => ({
   useAdmissionLocation: jest.fn(),
@@ -35,7 +41,6 @@ jest.mock('../../hooks/useAssignedBedByPatient', () => ({
 }));
 
 jest.mock('../../ward.resource', () => ({
-  createEncounter: jest.fn(),
   useAdmitPatient: jest.fn(),
   assignPatientToBed: jest.fn(),
   removePatientFromBed: jest.fn(),
@@ -52,25 +57,35 @@ const mockedUseAdmitPatient = jest.mocked(useAdmitPatient);
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
+const mockedAdmitPatient = jest.fn();
 const mockUseAdmitPatientObj: ReturnType<typeof useAdmitPatient> = {
-  admitPatient: jest.fn(),
+  admitPatient: mockedAdmitPatient,
   isLoadingEmrConfiguration: false,
   errorFetchingEmrConfiguration: false,
 };
 jest.mocked(useAdmitPatient).mockReturnValue(mockUseAdmitPatientObj);
-const mockedAdmitPatient = mockUseAdmitPatientObj.admitPatient;
 
-const mockWorkspaceProps: AdmitPatientFormWorkspaceProps = {
-  patient: mockPatientAlice,
-  closeWorkspace: jest.fn(),
+const mockWorkspaceProps: DefaultWorkspaceProps = {
   closeWorkspaceWithSavedChanges: jest.fn(),
   promptBeforeClosing: jest.fn(),
   setTitle: jest.fn(),
-  dispositionType: 'ADMIT',
+  closeWorkspace: jest.fn(),
+};
+
+const mockWardPatientAliceProps: WardPatient = {
+  visit: mockInpatientRequestAlice.visit,
+  patient: mockPatientAlice,
+  bed: null,
+  inpatientAdmission: null,
+  inpatientRequest: mockInpatientRequestAlice,
 };
 
-function renderAdmissionForm(dispositionType: DispositionType = 'ADMIT') {
-  renderWithSwr(<AdmitPatientFormWorkspace {...{ ...mockWorkspaceProps, dispositionType }} />);
+function renderAdmissionForm() {
+  renderWithSwr(
+    <AdmitPatientFormWorkspace
+      {...{ ...mockWorkspaceProps, wardPatient: mockWardPatientAliceProps, WardPatientHeader: jest.fn() }}
+    />,
+  );
 }
 
 describe('Testing AdmitPatientForm', () => {