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

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","hasOwnSidebar":true,"sidebarFamily":"ward-patient","width":"wider"}],"version":"8.1.1-pre.121"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle","sidebarFamily":"ward-patient","hasOwnSidebar":true},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward Patient","width":"extra-wide","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge","hasOwnSidebar":true,"sidebarFamily":"ward-patient"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","hasOwnSidebar":true,"sidebarFamily":"ward-patient","width":"wider"}],"version":"8.1.1-pre.124"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-ward-app",
-  "version": "8.1.1-pre.121",
+  "version": "8.1.1-pre.124",
   "description": "Ward and bed management module for O3",
   "browser": "dist/kenyaemr-esm-ward-app.js",
   "main": "src/index.ts",

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

@@ -1,26 +1,37 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
 import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
-import { configSchema, type WardConfigObject } from '../config-schema';
+import { render, screen } from '@testing-library/react';
+import React from 'react';
 import {
   mockAdmissionLocation,
   mockLocationInpatientWard,
   mockPatientAlice,
   mockPatientBrian,
 } from '../../../../__mocks__';
-import { bedLayoutToBed, filterBeds } from '../ward-view/ward-view.resource';
+import { configSchema, type WardConfigObject } from '../config-schema';
+import { useObs } from '../hooks/useObs';
 import useWardLocation from '../hooks/useWardLocation';
-import WardBed from './ward-bed.component';
 import { type WardPatient } from '../types';
 import DefaultWardPatientCard from '../ward-view/default-ward/default-ward-patient-card.component';
+import { bedLayoutToBed, filterBeds } from '../ward-view/ward-view.resource';
+import WardBed from './ward-bed.component';
 
 const defaultConfig: WardConfigObject = getDefaultsFromConfigSchema(configSchema);
 
 jest.mocked(useConfig).mockReturnValue(defaultConfig);
+jest.mock('../hooks/useObs', () => ({
+  useObs: jest.fn(),
+}));
+jest.mock('../ward-patient-card/row-elements/ward-patient-obs.resource', () => ({
+  useConceptToTagColorMap: jest.fn(),
+}));
 
 const mockBedLayouts = filterBeds(mockAdmissionLocation);
 
 jest.mock('../hooks/useWardLocation', () => jest.fn());
+//@ts-ignore
+jest.mocked(useObs).mockReturnValue({
+  data: [],
+});
 
 const mockedUseWardLocation = useWardLocation as jest.Mock;
 mockedUseWardLocation.mockReturnValue({

package/src/hooks/useWardPatientGrouping.ts

@@ -23,5 +23,10 @@ export function useWardPatientGrouping() {
     inpatientRequestResponse,
     isLoading:
       admissionLocationResponse.isLoading || inpatientAdmissionResponse.isLoading || inpatientRequestResponse.isLoading,
+    mutate() {
+      admissionLocationResponse?.mutate();
+      inpatientAdmissionResponse?.mutate();
+      inpatientRequestResponse?.mutate();
+    },
   };
 }

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

@@ -7,14 +7,25 @@ import { mockInpatientAdmissionAlice } from '../../../../../__mocks__/inpatient-
 import { mockWardBeds } from '../../../../../__mocks__/wardBeds.mock';
 import { mockWardViewContext } from '../../../mock';
 import { configSchema, type WardConfigObject } from '../../config-schema';
+import { useObs } from '../../hooks/useObs';
 import { type WardPatient, type WardViewContext } from '../../types';
 import MaternalWardPatientCard from './maternal-ward-patient-card.component';
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
+jest.mock('../../hooks/useObs', () => ({
+  useObs: jest.fn(),
+}));
+jest.mock('../../ward-patient-card/row-elements/ward-patient-obs.resource', () => ({
+  useConceptToTagColorMap: jest.fn(),
+}));
 
 const defaultConfig: WardConfigObject = getDefaultsFromConfigSchema(configSchema);
 
 jest.mocked(useConfig).mockReturnValue(defaultConfig);
+//@ts-ignore
+jest.mocked(useObs).mockReturnValue({
+  data: [],
+});
 
 describe('MaternalWardPatientCard', () => {
   it('renders a patient with no child', () => {

package/src/ward-view/ward-view.scss

@@ -1,5 +1,5 @@
 @use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .wardView {
   background-color: #e4e4e4;

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

@@ -11,6 +11,7 @@ import { useParams } from 'react-router-dom';
 import { renderWithSwr } from 'tools';
 import { mockWardPatientGroupDetails, mockWardViewContext } from '../../mock';
 import { configSchema } from '../config-schema';
+import { useObs } from '../hooks/useObs';
 import useWardLocation from '../hooks/useWardLocation';
 import { type WardViewContext } from '../types';
 import DefaultWardView from './default-ward/default-ward-view.component';
@@ -30,6 +31,9 @@ jest.mock('../hooks/useWardLocation', () =>
     invalidLocation: false,
   }),
 );
+jest.mock('../hooks/useObs', () => ({
+  useObs: jest.fn(),
+}));
 
 const mockUseWardLocation = jest.mocked(useWardLocation);
 
@@ -40,6 +44,10 @@ jest.mock('react-router-dom', () => ({
 const mockUseParams = useParams as jest.Mock;
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
+//@ts-ignore
+jest.mocked(useObs).mockReturnValue({
+  data: [],
+});
 
 const intersectionObserverMock = () => ({
   observe: () => null,

package/src/ward-view-header/ward-metric.scss

@@ -1,9 +1,9 @@
-@use '@carbon/styles/scss/spacing';
+@use '@carbon/layout';
 @use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .metric {
-  margin-left: spacing.$spacing-05;
+  margin-left: layout.$spacing-05;
   display: flex;
   align-items: end;
   gap: 5px;
@@ -20,6 +20,6 @@
 }
 
 .skeleton {
-  height: 15px;
-  width: 15px;
+  height: layout.$spacing-05;
+  width: layout.$spacing-05;
 }

package/src/ward-view-header/ward-metrics.scss

@@ -1,5 +1,4 @@
-@use '@carbon/styles/scss/spacing';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 
 .metricsContainer {
   display: flex;

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

@@ -1,8 +1,18 @@
 import { Button } from '@carbon/react';
-import { ArrowRightIcon, launchWorkspace, useAppContext, useLayoutType } from '@openmrs/esm-framework';
-import React, { useCallback } from 'react';
+import {
+  ArrowRightIcon,
+  launchWorkspace,
+  showSnackbar,
+  useAppContext,
+  useFeatureFlag,
+  useLayoutType,
+} from '@openmrs/esm-framework';
+import React, { useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
-import type { WardPatientWorkspaceProps, WardPatientCardType, WardViewContext } from '../../types';
+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 styles from './admission-request-card.scss';
 
@@ -10,8 +20,10 @@ const AdmissionRequestCardActions: WardPatientCardType = (wardPatient) => {
   const { patient, inpatientRequest } = wardPatient;
   const { dispositionType } = inpatientRequest;
   const { t } = useTranslation();
+  const { location } = useWardLocation();
   const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
-  const {WardPatientHeader} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { WardPatientHeader, wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { admitPatient, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useAdmitPatient();
 
   const launchPatientAdmissionForm = useCallback(
     () => launchWorkspace<AdmitPatientFormWorkspaceProps>('admit-patient-form-workspace', { patient, dispositionType }),
@@ -21,16 +33,57 @@ const AdmissionRequestCardActions: WardPatientCardType = (wardPatient) => {
   const launchPatientTransferForm = useCallback(() => {
     launchWorkspace<WardPatientWorkspaceProps>('patient-transfer-request-workspace', {
       wardPatient,
-      WardPatientHeader
+      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();
+        });
+    }
+  };
 
   return (
     <div className={styles.admissionRequestActionBar}>
       <Button kind="ghost" size={responsiveSize} onClick={launchPatientTransferForm}>
         {t('transferElsewhere', 'Transfer elsewhere')}
       </Button>
-      <Button kind="ghost" renderIcon={ArrowRightIcon} size={responsiveSize} onClick={launchPatientAdmissionForm}>
+      <Button
+        kind="ghost"
+        renderIcon={ArrowRightIcon}
+        size={responsiveSize}
+        disabled={isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
+        onClick={onAdmit}>
         {t('admitPatient', 'Admit patient')}
       </Button>
     </div>

package/src/ward-workspace/admission-request-workspace/admission-requests-workspace.test.tsx

@@ -3,12 +3,16 @@ import { screen } from '@testing-library/react';
 import React from 'react';
 import { renderWithSwr } from '../../../../../tools';
 import { mockWardViewContext } from '../../../mock';
+import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import { type WardViewContext } from '../../types';
 import DefaultWardPendingPatients from '../../ward-view/default-ward/default-ward-pending-patients.component';
 import AdmissionRequestsWorkspace, { type AdmissionRequestsWorkspaceProps } from './admission-requests.workspace';
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
+jest.mock('../../hooks/useEmrConfiguration', () => jest.fn());
+const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
+
 const workspaceProps: AdmissionRequestsWorkspaceProps = {
   closeWorkspace: jest.fn(),
   promptBeforeClosing: jest.fn(),
@@ -18,9 +22,49 @@ const workspaceProps: AdmissionRequestsWorkspaceProps = {
 };
 
 describe('Admission Requests Workspace', () => {
-  it('should render a admission request card', () => {
+  beforeEach(() => {
+    mockedUseEmrConfiguration.mockReturnValue({
+      isLoadingEmrConfiguration: false,
+      errorFetchingEmrConfiguration: null,
+      // @ts-ignore - we only need these keys for now
+      emrConfiguration: {
+        admissionEncounterType: {
+          uuid: 'admission-encounter-type-uuid',
+          display: 'Admission Encounter',
+        },
+        transferWithinHospitalEncounterType: {
+          uuid: 'transfer-within-hospital-encounter-type-uuid',
+          display: 'Transfer Within Hospital Encounter Type',
+        },
+        clinicianEncounterRole: {
+          uuid: 'clinician-encounter-role-uuid',
+        },
+      },
+      mutateEmrConfiguration: jest.fn(),
+    });
+  });
+
+  it('should render an admission request card', () => {
     renderWithSwr(<AdmissionRequestsWorkspace {...workspaceProps} />);
     const alice = mockWardViewContext.wardPatientGroupDetails.inpatientRequestResponse.inpatientRequests[0].patient;
     expect(screen.getByText(alice.person?.preferredName?.display as string)).toBeInTheDocument();
   });
+
+  it('should render an admission request card with disabled "admit patient" button when emr config fails to load', () => {
+    mockedUseEmrConfiguration.mockReturnValue({
+      isLoadingEmrConfiguration: false,
+      errorFetchingEmrConfiguration: true,
+      emrConfiguration: null,
+      mutateEmrConfiguration: jest.fn(),
+    });
+
+    renderWithSwr(<AdmissionRequestsWorkspace {...workspaceProps} />);
+    expect(screen.getByText("Some parts of the form didn't load")).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        'Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.',
+      ),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('button', { name: /Admit patient/i })).toBeDisabled();
+  });
 });

package/src/ward-workspace/admission-request-workspace/admission-requests.workspace.tsx

@@ -1,18 +1,24 @@
-import { Search } from '@carbon/react';
+import { InlineNotification, Search } from '@carbon/react';
 import { type DefaultWorkspaceProps } from '@openmrs/esm-framework';
-import React, { type ReactNode } from 'react';
+import React, { createContext, type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
+import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import styles from './admission-requests-workspace.scss';
 
 export interface AdmissionRequestsWorkspaceProps extends DefaultWorkspaceProps {
   wardPendingPatients: ReactNode;
 }
-const AdmissionRequestsWorkspace: React.FC<AdmissionRequestsWorkspaceProps> = ({ wardPendingPatients }) => {
+
+export const AdmissionRequestsWorkspaceContext = createContext<AdmissionRequestsWorkspaceProps>(null);
+
+const AdmissionRequestsWorkspace: React.FC<AdmissionRequestsWorkspaceProps> = (props) => {
+  const { wardPendingPatients } = props;
   const { t } = useTranslation();
   const [searchTerm, setSearchTerm] = React.useState('');
   const handleSearch = (event: React.ChangeEvent<HTMLInputElement>) => {
     setSearchTerm(event.target.value);
   };
+  const { errorFetchingEmrConfiguration } = useEmrConfiguration();
 
   return (
     <div className={styles.admissionRequestsWorkspaceContainer}>
@@ -24,8 +30,23 @@ const AdmissionRequestsWorkspace: React.FC<AdmissionRequestsWorkspaceProps> = ({
         placeholder={t('searchForPatient', 'Search for a patient')}
         disabled
       />
-
-      <div className={styles.content}>{wardPendingPatients}</div>
+      {errorFetchingEmrConfiguration && (
+        <div className={styles.formError}>
+          <InlineNotification
+            kind="error"
+            title={t('somePartsOfTheFormDidntLoad', "Some parts of the form didn't load")}
+            subtitle={t(
+              'fetchingEmrConfigurationFailed',
+              'Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.',
+            )}
+            lowContrast
+            hideCloseButton
+          />
+        </div>
+      )}
+      <AdmissionRequestsWorkspaceContext.Provider value={props}>
+        <div className={styles.content}>{wardPendingPatients}</div>
+      </AdmissionRequestsWorkspaceContext.Provider>
     </div>
   );
 };

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

@@ -2,14 +2,13 @@ import { showSnackbar, useAppContext, useFeatureFlag, useSession } from '@openmr
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { mockAdmissionLocation, mockLocationInpatientWard, mockPatientAlice } from '../../../../../__mocks__';
+import { mockLocationInpatientWard, mockPatientAlice } from '../../../../../__mocks__';
 import { renderWithSwr } from '../../../../../tools';
 import { mockWardPatientGroupDetails, mockWardViewContext } from '../../../mock';
 import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
-import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import useWardLocation from '../../hooks/useWardLocation';
 import type { DispositionType, WardViewContext } from '../../types';
-import { assignPatientToBed, createEncounter, removePatientFromBed } from '../../ward.resource';
+import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
 import AdmitPatientFormWorkspace from './admit-patient-form.workspace';
 import type { AdmitPatientFormWorkspaceProps } from './types';
 
@@ -19,8 +18,6 @@ jest.mock('../../hooks/useAdmissionLocation', () => ({
 
 jest.mock('../../hooks/useWardLocation', () => jest.fn());
 
-jest.mock('../../hooks/useEmrConfiguration', () => jest.fn());
-
 jest.mock('../../hooks/useInpatientRequest', () => ({
   useInpatientRequest: jest.fn(),
 }));
@@ -39,22 +36,30 @@ jest.mock('../../hooks/useAssignedBedByPatient', () => ({
 
 jest.mock('../../ward.resource', () => ({
   createEncounter: jest.fn(),
+  useAdmitPatient: jest.fn(),
   assignPatientToBed: jest.fn(),
   removePatientFromBed: jest.fn(),
 }));
 
-const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
 const mockedUseWardLocation = jest.mocked(useWardLocation);
 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);
+const mockedUseAdmitPatient = jest.mocked(useAdmitPatient);
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
+const mockUseAdmitPatientObj: ReturnType<typeof useAdmitPatient> = {
+  admitPatient: jest.fn(),
+  isLoadingEmrConfiguration: false,
+  errorFetchingEmrConfiguration: false,
+};
+jest.mocked(useAdmitPatient).mockReturnValue(mockUseAdmitPatientObj);
+const mockedAdmitPatient = mockUseAdmitPatientObj.admitPatient;
+
 const mockWorkspaceProps: AdmitPatientFormWorkspaceProps = {
   patient: mockPatientAlice,
   closeWorkspace: jest.fn(),
@@ -81,31 +86,15 @@ describe('Testing AdmitPatientForm', () => {
       sessionId: 'session-id',
     });
     mockedUseFeatureFlag.mockReturnValue(true);
-    mockedUseEmrConfiguration.mockReturnValue({
-      isLoadingEmrConfiguration: false,
-      errorFetchingEmrConfiguration: null,
-      // @ts-ignore - we only need these two keys for now
-      emrConfiguration: {
-        admissionEncounterType: {
-          uuid: 'admission-encounter-type-uuid',
-          display: 'Admission Encounter',
-        },
-        transferWithinHospitalEncounterType: {
-          uuid: 'transfer-within-hospital-encounter-type-uuid',
-          display: 'Transfer Within Hospital Encounter Type',
-        },
-        clinicianEncounterRole: {
-          uuid: 'clinician-encounter-role-uuid',
-        },
-      },
-      mutateEmrConfiguration: jest.fn(),
-    });
+
     mockedUseWardLocation.mockReturnValue({
       location: mockLocationInpatientWard,
       invalidLocation: false,
       isLoadingLocation: false,
       errorFetchingLocation: null,
     });
+
+    // @ts-ignore - we don't need to mock the entire object
     mockedUseAssignedBedByPatient.mockReturnValue({
       data: {
         data: {
@@ -120,10 +109,10 @@ describe('Testing AdmitPatientForm', () => {
           ],
         },
       },
-    } as ReturnType<typeof useAssignedBedByPatient>);
+    });
 
     // @ts-ignore - we only need these two keys for now
-    mockedCreateEncounter.mockResolvedValue({
+    mockedAdmitPatient.mockResolvedValue({
       ok: true,
       data: {
         uuid: 'encounter-uuid',
@@ -151,43 +140,24 @@ describe('Testing AdmitPatientForm', () => {
     });
     screen.getByText('Admit');
     expect(screen.getByText('Select a bed')).toBeInTheDocument();
-    await user.click(
-      screen.getByRole('combobox', {
-        name: 'Choose an option',
-      }),
-    );
-    expect(screen.getByText('bed1 · Alice Johnson')).toBeInTheDocument();
-    expect(screen.getByText('bed2 · Empty')).toBeInTheDocument();
-    expect(screen.getByText('bed3 · Empty')).toBeInTheDocument();
-    expect(screen.getByText('bed4 · Empty')).toBeInTheDocument();
+
+    expect(screen.getByRole('radio', { name: 'bed1 · Alice Johnson' })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: 'bed2 · Empty' })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: 'bed3 · Empty' })).toBeInTheDocument();
+    expect(screen.getByRole('radio', { name: 'bed4 · Empty' })).toBeInTheDocument();
   });
 
   it('should block the form if emr configuration is not fetched properly', () => {
-    mockedUseEmrConfiguration.mockReturnValue({
+    mockedUseAdmitPatient.mockReturnValueOnce({
+      admitPatient: mockedAdmitPatient,
       isLoadingEmrConfiguration: false,
       errorFetchingEmrConfiguration: true,
-      emrConfiguration: null,
-      mutateEmrConfiguration: jest.fn(),
     });
 
     renderAdmissionForm();
 
     const admitButton = screen.getByText('Admit');
     expect(admitButton).toBeDisabled();
-    expect(screen.getByText("Some parts of the form didn't load")).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        'Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.',
-      ),
-    ).toBeInTheDocument();
-  });
-
-  it('should render admit patient form if bed management module is not present', () => {
-    mockedUseFeatureFlag.mockReturnValue(false);
-    renderAdmissionForm();
-    expect(screen.getByText('Select a bed')).toBeInTheDocument();
-    expect(screen.getByText('Unable to select beds')).toBeInTheDocument();
-    expect(screen.getByText('Bed management module is not present to allow bed selection')).toBeInTheDocument();
   });
 
   it('should render admit patient form if bed management module is present, but no beds are configured', () => {
@@ -202,27 +172,12 @@ describe('Testing AdmitPatientForm', () => {
   it('should submit the form, create encounter and submit bed', async () => {
     const user = userEvent.setup();
     renderAdmissionForm();
-    const combobox = screen.getByRole('combobox', {
-      name: 'Choose an option',
-    });
-    await user.click(combobox);
-    const bedOption = screen.getByText('bed3 · Empty');
+    const bedOption = screen.getByRole('radio', { name: 'bed3 · Empty' });
     await user.click(bedOption);
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    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(mockedAdmitPatient).toHaveBeenCalledWith(mockPatientAlice, 'ADMIT');
     expect(mockedAssignPatientToBed).toHaveBeenCalledWith(3, mockPatientAlice.uuid, 'encounter-uuid');
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',
@@ -232,14 +187,10 @@ describe('Testing AdmitPatientForm', () => {
   });
 
   it('should show snackbar if there was an issue creating an encounter', async () => {
-    mockedCreateEncounter.mockRejectedValue(new Error('Failed to create encounter'));
+    mockedAdmitPatient.mockRejectedValue(new Error('Failed to create encounter'));
     const user = userEvent.setup();
     renderAdmissionForm();
-    const combobox = screen.getByRole('combobox', {
-      name: 'Choose an option',
-    });
-    await user.click(combobox);
-    const bedOption = screen.getByText('bed3 · Empty');
+    const bedOption = screen.getByRole('radio', { name: 'bed3 · Empty' });
     await user.click(bedOption);
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
@@ -256,11 +207,7 @@ describe('Testing AdmitPatientForm', () => {
 
     const user = userEvent.setup();
     renderAdmissionForm();
-    const combobox = screen.getByRole('combobox', {
-      name: 'Choose an option',
-    });
-    await user.click(combobox);
-    const bedOption = screen.getByText('bed3 · Empty');
+    const bedOption = screen.getByRole('radio', { name: 'bed3 · Empty' });
     await user.click(bedOption);
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
@@ -278,18 +225,7 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    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(mockedAdmitPatient).toHaveBeenCalledWith(mockPatientAlice, 'ADMIT');
     expect(mockedRemovePatientFromBed).toHaveBeenCalledWith(1, mockPatientAlice.uuid);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',