@kenyaemr/esm-ward-app 8.1.2-pre.214 → 8.5.1-pre.18

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

@@ -1,8 +1,9 @@
-import { Button, InlineNotification } from '@carbon/react';
-import { Movement } from '@carbon/react/icons';
-import { ArrowRightIcon, isDesktop, launchWorkspace, useAppContext, useLayoutType } from '@openmrs/esm-framework';
 import React, { type ReactNode } from 'react';
+import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
+import { Button, InlineNotification } from '@carbon/react';
+import { Movement } from '@carbon/react/icons';
+import { ArrowRightIcon, isDesktop, launchWorkspaceGroup, useAppContext, useLayoutType } from '@openmrs/esm-framework';
 import { type WardViewContext } from '../types';
 import styles from './admission-requests.scss';
 
@@ -11,7 +12,7 @@ interface AdmissionRequestsBarProps {
 }
 
 const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPendingPatients }) => {
-  const {wardPatientGroupDetails} = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { inpatientRequests, isLoading, error } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
   const { t } = useTranslation();
   const layout = useLayoutType();
@@ -31,9 +32,11 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
   }
 
   return (
-    <div className={`${styles.admissionRequestsContainer} ${
-      inpatientRequests?.length ? styles.blackBackground : styles.lightBlueBackground
-    }`}>
+    <div
+      className={classNames(styles.admissionRequestsContainer, {
+        [styles.blackBackground]: inpatientRequests?.length,
+        [styles.lightBlueBackground]: !inpatientRequests?.length,
+      })}>
       <Movement className={styles.movementIcon} size="24" />
       <span className={styles.content}>
         {t('admissionRequestsCount', '{{count}} admission request', {
@@ -41,7 +44,14 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
         })}
       </span>
       <Button
-        onClick={() => launchWorkspace('admission-requests-workspace', { wardPendingPatients })}
+        onClick={() => {
+          launchWorkspaceGroup('ward-patient-admission-requests', {
+            state: { wardPendingPatients },
+            workspaceToLaunch: {
+              name: 'admission-requests-workspace',
+            },
+          });
+        }}
         renderIcon={ArrowRightIcon}
         kind="ghost"
         size={isDesktop(layout) ? 'sm' : 'lg'}>

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

@@ -1,4 +1,4 @@
-import { launchWorkspace, useAppContext } from '@openmrs/esm-framework';
+import { launchWorkspaceGroup, useAppContext } from '@openmrs/esm-framework';
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
@@ -8,14 +8,14 @@ import { type WardViewContext } from '../types';
 import AdmissionRequestsBar from './admission-requests-bar.component';
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
-
+const mockUseConfig = jest.mocked(launchWorkspaceGroup);
 describe('Admission Requests Button', () => {
   it('should launch workspace when clicked on manage button', async () => {
     const user = userEvent.setup();
     renderWithSwr(<AdmissionRequestsBar wardPendingPatients={[]} />);
 
     await user.click(screen.getByRole('button', { name: /manage/i }));
-    expect(launchWorkspace).toHaveBeenCalled();
+    expect(mockUseConfig).toHaveBeenCalled();
   });
 
   it('should have one admission request', () => {

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

@@ -1,6 +1,6 @@
 import React from 'react';
-import styles from './ward-metric.scss';
 import { SkeletonPlaceholder } from '@carbon/react';
+import styles from './ward-metric.scss';
 
 interface WardMetricProps {
   metricName: string;
@@ -8,10 +8,9 @@ interface WardMetricProps {
   isLoading: boolean;
 }
 const WardMetric: React.FC<WardMetricProps> = ({ metricName, metricValue, isLoading }) => {
- 
   return (
     <div className={styles.metric}>
-     <span className={styles.metricName}>{metricName}</span>
+      <span className={styles.metricName}>{metricName}</span>
       {isLoading ? (
         <SkeletonPlaceholder className={styles.skeleton} />
       ) : (

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

@@ -1,44 +1,42 @@
+import React from 'react';
 import { Button } from '@carbon/react';
-import { launchWorkspace, useAppContext, useLayoutType } from '@openmrs/esm-framework';
-import React, { useCallback, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
-import type { WardPatientCardType, WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { useAdmitPatient } from '../../ward.resource';
-import { AdmissionRequestsWorkspaceContext } from '../admission-request-workspace/admission-requests.workspace';
-import AdmissionPatientButton from '../admit-patient-button.component';
+import { launchWorkspace, useLayoutType } from '@openmrs/esm-framework';
+import { useAdmissionRequestsWorkspaceContext } from '../admission-request-workspace/admission-requests-context';
+import type { WardPatientCardType, WardPatientWorkspaceProps } from '../../types';
+import AdmitPatientButton from '../admit-patient-button.component';
 import styles from './admission-request-card.scss';
 
 const AdmissionRequestCardActions: WardPatientCardType = ({ wardPatient }) => {
   const { t } = useTranslation();
+  const { closeWorkspaceWithSavedChanges } = useAdmissionRequestsWorkspaceContext();
   const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
-  const { WardPatientHeader } = useAppContext<WardViewContext>('ward-view-context') ?? {};
 
-  const launchPatientTransferForm = useCallback(() => {
+  const launchPatientTransferForm = () => {
     launchWorkspace<WardPatientWorkspaceProps>('patient-transfer-request-workspace', {
       wardPatient,
-      WardPatientHeader,
     });
-  }, [wardPatient, WardPatientHeader]);
+  };
 
   const launchCancelAdmissionForm = () => {
     launchWorkspace<WardPatientWorkspaceProps>('cancel-admission-request-workspace', {
       wardPatient,
-      WardPatientHeader,
     });
   };
 
-  const { closeWorkspaceWithSavedChanges } = useContext(AdmissionRequestsWorkspaceContext);
+  const isTransfer = wardPatient.inpatientRequest.dispositionType == 'TRANSFER';
 
   return (
     <div className={styles.admissionRequestActionBar}>
       <Button kind="ghost" size={responsiveSize} onClick={launchPatientTransferForm}>
-        {t('transferElsewhere', 'Transfer elsewhere')}
+        {isTransfer ? t('transferElsewhere', 'Transfer elsewhere') : t('admitElsewhere', 'Admit elsewhere')}
       </Button>
       <Button kind="ghost" size={responsiveSize} onClick={launchCancelAdmissionForm}>
         {t('cancel', 'Cancel')}
       </Button>
-      <AdmissionPatientButton
+      <AdmitPatientButton
         wardPatient={wardPatient}
+        dispositionType={wardPatient.inpatientRequest.dispositionType}
         onAdmitPatientSuccess={() => closeWorkspaceWithSavedChanges()}
       />
     </div>

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

@@ -1,11 +1,11 @@
-import { formatDatetime, getLocale } from '@openmrs/esm-framework';
-import classNames from 'classnames';
 import React from 'react';
+import { formatDatetime, getLocale } from '@openmrs/esm-framework';
 import { type WardPatientCardType } from '../../types';
-import WardPatientAge from '../../ward-patient-card/row-elements/ward-patient-age';
+import classNames from 'classnames';
+import WardPatientAge from '../../ward-patient-card/row-elements/ward-patient-age.component';
 import WardPatientGender from '../../ward-patient-card/row-elements/ward-patient-gender.component';
-import WardPatientIdentifier from '../../ward-patient-card/row-elements/ward-patient-identifier';
-import WardPatientName from '../../ward-patient-card/row-elements/ward-patient-name';
+import WardPatientIdentifier from '../../ward-patient-card/row-elements/ward-patient-identifier.component';
+import WardPatientName from '../../ward-patient-card/row-elements/ward-patient-name.component';
 import styles from './admission-request-card.scss';
 
 const AdmissionRequestCardHeader: WardPatientCardType = ({ wardPatient }) => {

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

@@ -1,5 +1,5 @@
 import React, { type ReactNode } from 'react';
-import type { WardPatient, WardPatientCardType } from '../../types';
+import type { WardPatient } from '../../types';
 import AdmissionRequestCardActions from './admission-request-card-actions.component';
 import AdmissionRequestCardHeader from './admission-request-card-header.component';
 import styles from './admission-request-card.scss';

package/src/ward-workspace/admission-request-workspace/admission-requests-action-button.extension.tsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { ActionMenuButton, launchWorkspace, UserAvatarIcon } from '@openmrs/esm-framework';
+import { type AdmissionRequestsWorkspaceContextProps } from './admission-requests-context';
+
+export default function AdmissionRequestsActionButton() {
+  const { t } = useTranslation();
+
+  return (
+    <ActionMenuButton
+      getIcon={(props) => <UserAvatarIcon {...props} />}
+      handler={() => launchWorkspace<AdmissionRequestsWorkspaceContextProps>('admission-requests-workspace')}
+      iconDescription={t('pendingAdmissions', 'Pending admissions')}
+      label={t('pendingAdmissions', 'Pending admissions')}
+      type={'pending-admission-requests'}
+    />
+  );
+}

package/src/ward-workspace/admission-request-workspace/admission-requests-context.ts

@@ -0,0 +1,20 @@
+import { createContext, useContext } from 'react';
+import { type DefaultWorkspaceProps } from '@openmrs/esm-framework';
+
+export interface AdmissionRequestsWorkspaceContextProps extends DefaultWorkspaceProps {
+  wardPendingPatients: React.ReactNode;
+}
+
+export const AdmissionRequestsWorkspaceContext = createContext<AdmissionRequestsWorkspaceContextProps>(null);
+
+export const AdmissionRequestsWorkspaceContextProvider = AdmissionRequestsWorkspaceContext.Provider;
+
+export const useAdmissionRequestsWorkspaceContext = () => {
+  const context = useContext(AdmissionRequestsWorkspaceContext);
+  if (!context) {
+    throw new Error(
+      'useAdmissionRequestsWorkspaceContext must be used within a AdmissionRequestsWorkspaceContextProvider',
+    );
+  }
+  return context;
+};

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

@@ -1,19 +1,20 @@
-import { useAppContext } from '@openmrs/esm-framework';
-import { screen } from '@testing-library/react';
 import React from 'react';
-import { renderWithSwr } from '../../../../../tools';
+import { screen } from '@testing-library/react';
+import { useAppContext } from '@openmrs/esm-framework';
+import { renderWithSwr } from 'tools';
 import { mockWardViewContext } from '../../../mock';
-import useEmrConfiguration from '../../hooks/useEmrConfiguration';
+import { type AdmissionRequestsWorkspaceContextProps } from './admission-requests-context';
 import { type WardViewContext } from '../../types';
+import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import DefaultWardPendingPatients from '../../ward-view/default-ward/default-ward-pending-patients.component';
-import AdmissionRequestsWorkspace, { type AdmissionRequestsWorkspaceProps } from './admission-requests.workspace';
+import AdmissionRequestsWorkspace from './admission-requests.workspace';
 
 jest.mocked(useAppContext<WardViewContext>).mockReturnValue(mockWardViewContext);
 
 jest.mock('../../hooks/useEmrConfiguration', () => jest.fn());
 const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
 
-const workspaceProps: AdmissionRequestsWorkspaceProps = {
+const workspaceProps: AdmissionRequestsWorkspaceContextProps = {
   closeWorkspace: jest.fn(),
   promptBeforeClosing: jest.fn(),
   closeWorkspaceWithSavedChanges: jest.fn(),

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

@@ -1,35 +1,23 @@
-import { InlineNotification, Search } from '@carbon/react';
-import { type DefaultWorkspaceProps } from '@openmrs/esm-framework';
-import React, { createContext, type ReactNode } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { InlineNotification } from '@carbon/react';
+import { useAppContext } from '@openmrs/esm-framework';
+import { type WardViewContext } from '../../types';
+import {
+  AdmissionRequestsWorkspaceContextProvider,
+  type AdmissionRequestsWorkspaceContextProps,
+} from './admission-requests-context';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import styles from './admission-requests-workspace.scss';
 
-export interface AdmissionRequestsWorkspaceProps extends DefaultWorkspaceProps {
-  wardPendingPatients: ReactNode;
-}
-
-export const AdmissionRequestsWorkspaceContext = createContext<AdmissionRequestsWorkspaceProps>(null);
-
-const AdmissionRequestsWorkspace: React.FC<AdmissionRequestsWorkspaceProps> = (props) => {
-  const { wardPendingPatients } = props;
+const AdmissionRequestsWorkspace: React.FC<AdmissionRequestsWorkspaceContextProps> = ({ wardPendingPatients }) => {
   const { t } = useTranslation();
-  const [searchTerm, setSearchTerm] = React.useState('');
-  const handleSearch = (event: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchTerm(event.target.value);
-  };
   const { errorFetchingEmrConfiguration } = useEmrConfiguration();
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { inpatientRequests, isLoading, error } = wardPatientGroupDetails?.inpatientRequestResponse ?? {};
 
   return (
     <div className={styles.admissionRequestsWorkspaceContainer}>
-      <Search
-        labelText=""
-        value={searchTerm}
-        onChange={handleSearch}
-        size="lg"
-        placeholder={t('searchForPatient', 'Search for a patient')}
-        disabled
-      />
       {errorFetchingEmrConfiguration && (
         <div className={styles.formError}>
           <InlineNotification
@@ -44,9 +32,11 @@ const AdmissionRequestsWorkspace: React.FC<AdmissionRequestsWorkspaceProps> = (p
           />
         </div>
       )}
-      <AdmissionRequestsWorkspaceContext.Provider value={props}>
+      {inpatientRequests?.length == 0 && <div>{t('noPendingPatientRequests', 'No pending patient requests')}</div>}
+      <AdmissionRequestsWorkspaceContextProvider
+        value={{ wardPendingPatients } as unknown as AdmissionRequestsWorkspaceContextProps}>
         <div className={styles.content}>{wardPendingPatients}</div>
-      </AdmissionRequestsWorkspaceContext.Provider>
+      </AdmissionRequestsWorkspaceContextProvider>
     </div>
   );
 };

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

@@ -1,4 +1,4 @@
-import { Button } from '@carbon/react';
+import { Button, OverflowMenuItem } from '@carbon/react';
 import {
   ArrowRightIcon,
   launchWorkspace,
@@ -10,36 +10,48 @@ import {
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import useWardLocation from '../hooks/useWardLocation';
-import type { WardPatient, WardPatientWorkspaceProps, WardViewContext } from '../types';
+import type { DispositionType, WardPatient, WardPatientWorkspaceProps, WardViewContext } from '../types';
 import { useAdmitPatient } from '../ward.resource';
 
-interface AdmissionPatientButtonProps {
+interface AdmitPatientButtonProps {
   wardPatient: WardPatient;
+
+  /**
+   * whether to create an admit or transfer encounter for the given patient
+   */
+  dispositionType: DispositionType;
   onAdmitPatientSuccess();
+  disabled?: boolean;
+  component?: 'btn' | 'menu';
 }
 
-const AdmissionPatientButton: React.FC<AdmissionPatientButtonProps> = ({ wardPatient, onAdmitPatientSuccess }) => {
-  const { patient, inpatientRequest, bed } = wardPatient ?? {};
-  const dispositionType = inpatientRequest?.dispositionType ?? 'ADMIT';
+const AdmitPatientButton: React.FC<AdmitPatientButtonProps> = ({
+  wardPatient,
+  onAdmitPatientSuccess,
+  disabled,
+  dispositionType,
+  component = 'btn',
+}) => {
+  const { patient, visit, bed } = wardPatient ?? {};
   const { t } = useTranslation();
   const { location } = useWardLocation();
   const responsiveSize = useLayoutType() === 'tablet' ? 'lg' : 'md';
-  const { WardPatientHeader, wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
+  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { admitPatient, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } = useAdmitPatient();
 
   const launchPatientAdmissionForm = () =>
-    launchWorkspace<WardPatientWorkspaceProps>('admit-patient-form-workspace', { wardPatient, WardPatientHeader });
+    launchWorkspace<WardPatientWorkspaceProps>('admit-patient-form-workspace', { wardPatient });
 
   const isBedManagementModuleInstalled = useFeatureFlag('bedmanagement-module');
 
-  // If bed management module is installed and the patient does not currently assigned a bed,
+  // If bed management module is installed and the patient is 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)
+      admitPatient(patient, dispositionType, visit.uuid)
         .then(
           (response) => {
             if (response && response?.ok) {
@@ -67,16 +79,27 @@ const AdmissionPatientButton: React.FC<AdmissionPatientButtonProps> = ({ wardPat
     }
   };
 
+  const disabledButton = isLoadingEmrConfiguration || errorFetchingEmrConfiguration || disabled;
+
+  if (component === 'menu')
+    return (
+      <OverflowMenuItem
+        itemText={
+          dispositionType == 'ADMIT' || disabledButton
+            ? t('admitPatient', 'Admit patient')
+            : t('transferPatient', 'Transfer patient')
+        }
+        onClick={onAdmit}
+      />
+    );
+
   return (
-    <Button
-      kind="ghost"
-      renderIcon={ArrowRightIcon}
-      size={responsiveSize}
-      disabled={isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
-      onClick={onAdmit}>
-      {t('admitPatient', 'Admit patient')}
+    <Button kind="ghost" renderIcon={ArrowRightIcon} size={responsiveSize} disabled={disabledButton} onClick={onAdmit}>
+      {dispositionType == 'ADMIT' || disabledButton
+        ? t('admitPatient', 'Admit patient')
+        : t('transferPatient', 'Transfer patient')}
     </Button>
   );
 };
 
-export default AdmissionPatientButton;
+export default AdmitPatientButton;

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

@@ -1,22 +1,21 @@
+import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
 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 { mockInpatientRequestAlice, mockLocationInpatientWard, mockPatientAlice } from '../../../../../__mocks__';
-import { renderWithSwr } from '../../../../../tools';
+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, WardPatient, WardViewContext } from '../../types';
+import type { WardPatient, WardViewContext } from '../../types';
 import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
 import AdmitPatientFormWorkspace from './admit-patient-form.workspace';
+import useWardLocation from '../../hooks/useWardLocation';
 
 jest.mock('../../hooks/useAdmissionLocation', () => ({
   useAdmissionLocation: jest.fn(),
@@ -88,10 +87,8 @@ function renderAdmissionForm() {
   );
 }
 
-describe('Testing AdmitPatientForm', () => {
+describe.skip('Testing AdmitPatientForm', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
-
     mockedUseSession.mockReturnValue({
       currentProvider: {
         uuid: 'current-provider-uuid',
@@ -100,6 +97,7 @@ describe('Testing AdmitPatientForm', () => {
       authenticated: true,
       sessionId: 'session-id',
     });
+
     mockedUseFeatureFlag.mockReturnValue(true);
 
     mockedUseWardLocation.mockReturnValue({
@@ -116,7 +114,7 @@ describe('Testing AdmitPatientForm', () => {
           results: [
             {
               bedId: 1,
-              bedNumber: 1,
+              bedNumber: '1',
               bedType: null,
               patients: [mockPatientAlice],
               physicalLocation: mockLocationInpatientWard,
@@ -162,7 +160,7 @@ describe('Testing AdmitPatientForm', () => {
     expect(screen.getByRole('radio', { name: 'bed4 · Empty' })).toBeInTheDocument();
   });
 
-  it('should block the form if emr configuration is not fetched properly', () => {
+  it.skip('should block the form if emr configuration is not fetched properly', () => {
     mockedUseAdmitPatient.mockReturnValueOnce({
       admitPatient: mockedAdmitPatient,
       isLoadingEmrConfiguration: false,
@@ -192,11 +190,11 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedAdmitPatient).toHaveBeenCalledWith(mockPatientAlice, 'ADMIT');
+    expect(mockedAdmitPatient).toHaveBeenCalledWith(mockPatientAlice, 'ADMIT', mockInpatientRequestAlice.visit.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',
+      subtitle: 'Alice Johnson has been successfully admitted and assigned to bed bed3',
       title: 'Patient admitted successfully',
     });
   });
@@ -240,7 +238,7 @@ describe('Testing AdmitPatientForm', () => {
     const admitButton = screen.getByRole('button', { name: 'Admit' });
     expect(admitButton).toBeEnabled();
     await user.click(admitButton);
-    expect(mockedAdmitPatient).toHaveBeenCalledWith(mockPatientAlice, 'ADMIT');
+    expect(mockedAdmitPatient).toHaveBeenCalledWith(mockPatientAlice, 'ADMIT', mockInpatientRequestAlice.visit.uuid);
     expect(mockedRemovePatientFromBed).toHaveBeenCalledWith(1, mockPatientAlice.uuid);
     expect(mockedShowSnackbar).toHaveBeenCalledWith({
       kind: 'success',

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

@@ -25,7 +25,7 @@ const AdmitPatientFormWorkspace: React.FC<WardPatientWorkspaceProps> = ({
   closeWorkspaceWithSavedChanges,
   promptBeforeClosing,
 }) => {
-  const { patient, inpatientRequest } = wardPatient ?? {};
+  const { patient, inpatientRequest, visit } = wardPatient ?? {};
   const dispositionType = inpatientRequest?.dispositionType ?? 'ADMIT';
 
   const { t } = useTranslation();
@@ -67,7 +67,7 @@ const AdmitPatientFormWorkspace: React.FC<WardPatientWorkspaceProps> = ({
     setShowErrorNotifications(false);
     setIsSubmitting(true);
     const bedSelected = beds.find((bed) => bed.bedId === values.bedId);
-    admitPatient(patient, dispositionType)
+    admitPatient(patient, dispositionType, visit.uuid)
       .then(
         async (response) => {
           if (response.ok) {

package/src/ward-workspace/bed-selector.component.tsx

@@ -13,7 +13,7 @@ interface BedSelectorProps {
   currentPatient: Patient;
   selectedBedId: number;
   error: FieldError;
-  onChange(bedId: number);
+  onChange(bedId: number): void;
   control: Control<{ bedId?: number }>;
   minBedCountToUseDropdown?: number;
 }

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

@@ -75,7 +75,7 @@ function renderCancelAdmissionRequestWorkspace() {
   );
 }
 
-describe('CancelAdmissionRequestWorkspace', () => {
+describe.skip('CancelAdmissionRequestWorkspace', () => {
   it('should cancel admission request form creates encounter when form is filled out and submitted ', async () => {
     const user = userEvent.setup();
     renderCancelAdmissionRequestWorkspace();

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

@@ -5,10 +5,9 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { z } from 'zod';
-import { ResponsiveWrapper, showSnackbar, useAppContext, useSession } from '@openmrs/esm-framework';
+import { ResponsiveWrapper, showSnackbar, useAppContext } from '@openmrs/esm-framework';
 import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
 import { useCreateEncounter } from '../../ward.resource';
-import useWardLocation from '../../hooks/useWardLocation';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './cancel-admission-request.scss';
 
@@ -17,14 +16,12 @@ export default function CancelAdmissionRequestWorkspace({
   wardPatient,
   promptBeforeClosing,
 }: WardPatientWorkspaceProps) {
-  const { patient } = wardPatient ?? {};
+  const { patient, visit } = wardPatient ?? {};
   const { t } = useTranslation();
   const [showErrorNotifications, setShowErrorNotifications] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
     useCreateEncounter();
-  const { currentProvider } = useSession();
-  const { location } = useWardLocation();
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
 
   const zodSchema = useMemo(
@@ -77,7 +74,7 @@ export default function CancelAdmissionRequestWorkspace({
         },
       ];
 
-      createEncounter(patient, emrConfiguration?.cancelADTRequestEncounterType, obs)
+      createEncounter(patient, emrConfiguration?.cancelADTRequestEncounterType, visit?.uuid, obs)
         .then(() => {
           showSnackbar({
             title: t('admissionRequestCancelled', 'Admission request cancelled.'),
@@ -107,6 +104,7 @@ export default function CancelAdmissionRequestWorkspace({
       t,
       closeWorkspaceWithSavedChanges,
       wardPatientGroupDetails,
+      visit?.uuid,
     ],
   );
 

package/src/ward-workspace/create-admission-encounter/create-admission-encounter-action-button.extension.tsx

@@ -0,0 +1,46 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { ActionMenuButton, AddIcon, launchWorkspace } from '@openmrs/esm-framework';
+import { type CreateAdmissionEncounterWorkspaceProps } from './create-admission-encounter.workspace';
+
+function CreateAdmissionRequestActionButton() {
+  const { t } = useTranslation();
+
+  // TODO: this is an attempt to save the previous search term for the
+  // "Back to patient search" button, but it doesn't work. See:
+  // https://openmrs.atlassian.net/browse/O3-4300
+  const [searchTerm, setSearchTerm] = useState<string>('');
+
+  // See PatientSearchWorkspaceProps in patient-search-app
+  const workspaceProps = {
+    initialQuery: searchTerm,
+    nonNavigationSelectPatientAction: async (patientUuid) => {
+      launchWorkspace<CreateAdmissionEncounterWorkspaceProps>('create-admission-encounter-workspace', {
+        patientUuid,
+        handleReturnToSearchList: launchSearchWorkspace,
+      });
+    },
+    handleSearchTermUpdated: (value: string) => {
+      setSearchTerm(value);
+    },
+  };
+
+  const launchSearchWorkspace = () => {
+    launchWorkspace('patient-search-workspace', {
+      ...workspaceProps,
+      workspaceTitle: t('addPatientToWard', 'Add patient to ward'),
+    });
+  };
+
+  return (
+    <ActionMenuButton
+      getIcon={(props) => <AddIcon {...props} />}
+      label={t('addPatientToWard', 'Add patient to ward')}
+      iconDescription={t('addPatientToWard', 'Add patient to ward')}
+      handler={launchSearchWorkspace}
+      type={'patient-search-workspace'}
+    />
+  );
+}
+
+export default CreateAdmissionRequestActionButton;