@openmrs/esm-ward-app 9.2.1-pre.7254 → 9.2.1-pre.7261

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

@@ -1,167 +1,17 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button, ButtonSet, Form, InlineNotification, TextArea } from '@carbon/react';
-import classNames from 'classnames';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Controller, useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { z } from 'zod';
-import { getCoreTranslation, ResponsiveWrapper, showSnackbar, useAppContext } from '@openmrs/esm-framework';
-import type { ObsPayload, WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { useCreateEncounter } from '../../ward.resource';
-import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
-import styles from './cancel-admission-request.scss';
-
-export default function CancelAdmissionRequestWorkspace({
-  closeWorkspaceWithSavedChanges,
-  wardPatient,
-  promptBeforeClosing,
-}: WardPatientWorkspaceProps) {
-  const { patient, visit } = wardPatient ?? {};
-  const { t } = useTranslation();
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
-    useCreateEncounter();
-  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
-
-  const zodSchema = useMemo(
-    () =>
-      z.object({
-        note: z
-          .string()
-          .trim()
-          .min(1, {
-            message: t(
-              'notesRequiredForCancellingRequest',
-              'Notes required for cancelling admission or transfer request',
-            ),
-          }),
-      }),
-    [t],
-  );
-
-  type FormValues = z.infer<typeof zodSchema>;
-
-  const {
-    formState: { errors, isDirty },
-    control,
-    handleSubmit,
-  } = useForm<FormValues>({
-    resolver: zodResolver(zodSchema),
-    defaultValues: { note: '' },
-  });
-
-  useEffect(() => {
-    promptBeforeClosing(() => isDirty);
-    return () => promptBeforeClosing(null);
-  }, [isDirty, promptBeforeClosing]);
-
-  const onSubmit = useCallback(
-    (values: FormValues) => {
-      setIsSubmitting(true);
-      const obs: Array<ObsPayload> = [
-        {
-          concept: emrConfiguration?.consultFreeTextCommentsConcept?.uuid,
-          value: values.note,
-        },
-        {
-          concept: emrConfiguration?.admissionDecisionConcept?.uuid,
-          value: {
-            uuid: emrConfiguration?.denyAdmissionConcept?.uuid,
-          },
-        },
-      ];
-
-      createEncounter(patient, emrConfiguration?.cancelADTRequestEncounterType, visit?.uuid, obs)
-        .then(() => {
-          showSnackbar({
-            title: t('admissionRequestCancelled', 'Admission request cancelled.'),
-            kind: 'success',
-          });
-        })
-        .catch((err: Error) => {
-          showSnackbar({
-            title: t('errorCancellingAdmissionRequest', 'Error cancelling admission request'),
-            subtitle: err.message,
-            kind: 'error',
-          });
-        })
-        .finally(() => {
-          setIsSubmitting(false);
-          closeWorkspaceWithSavedChanges();
-          wardPatientGroupDetails.mutate();
-        });
-    },
-    [
-      emrConfiguration?.consultFreeTextCommentsConcept?.uuid,
-      emrConfiguration?.admissionDecisionConcept?.uuid,
-      emrConfiguration?.denyAdmissionConcept?.uuid,
-      emrConfiguration?.cancelADTRequestEncounterType,
-      createEncounter,
-      patient,
-      t,
-      closeWorkspaceWithSavedChanges,
-      wardPatientGroupDetails,
-      visit?.uuid,
-    ],
-  );
-
-  const onError = useCallback(() => {
-    setIsSubmitting(false);
-  }, []);
-
-  if (!wardPatientGroupDetails) return null;
-
-  return (
-    <div className={styles.flexWrapper}>
-      <WardPatientWorkspaceBanner wardPatient={wardPatient} />
-      <Form
-        onSubmit={handleSubmit(onSubmit, onError)}
-        className={classNames(styles.formContainer, styles.workspaceContent)}>
-        <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>
-          )}
-          <div className={styles.field}>
-            <Controller
-              name="note"
-              control={control}
-              render={({ field, fieldState: { error } }) => (
-                <ResponsiveWrapper>
-                  <TextArea
-                    {...field}
-                    id="clinical-notes"
-                    labelText={t('clinicalNotes', 'Clinical notes')}
-                    invalid={!!error}
-                    invalidText={error?.message}
-                  />
-                </ResponsiveWrapper>
-              )}
-            />
-          </div>
-        </div>
-        <ButtonSet className={styles.buttonSet}>
-          <Button size="xl" kind="secondary" onClick={closeWorkspaceWithSavedChanges}>
-            {getCoreTranslation('cancel')}
-          </Button>
-          <Button
-            type="submit"
-            size="xl"
-            disabled={isLoadingEmrConfiguration || isSubmitting || errorFetchingEmrConfiguration || !patient}>
-            {getCoreTranslation('save')}
-          </Button>
-        </ButtonSet>
-      </Form>
-    </div>
-  );
-}
+import React from 'react';
+import type { WardPatientWorkspaceProps } from '../../types';
+import CancelAdmissionRequest from './cancel-admission-request.component';
+import { type Workspace2DefinitionProps } from '@openmrs/esm-framework/src';
+
+/**
+ * This is the workspace that is rendered when clicking on the 'Cancel' button on a AdmissionRequestCard
+ * for a patient with a pending admission / transfer request to the current location
+ */
+const CancelAdmissionRequestWorkspace: React.FC<Workspace2DefinitionProps<WardPatientWorkspaceProps, {}, {}>> = ({
+  closeWorkspace,
+  workspaceProps: { wardPatient },
+}) => {
+  return <CancelAdmissionRequest closeWorkspace={closeWorkspace} wardPatient={wardPatient} />;
+};
+
+export default CancelAdmissionRequestWorkspace;

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import type { WardPatientWorkspaceDefinition } from '../../types';
+import CancelAdmissionRequest from './cancel-admission-request.component';
+
+/**
+ * This is the workspace that is rendered when clicking on the 'X' button on a Patient Card
+ * for a patient with a pending transfer request to a different location
+ */
+const WardPatientCancelAdmissionRequestWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
+  closeWorkspace,
+  groupProps: { wardPatient },
+}) => {
+  return <CancelAdmissionRequest closeWorkspace={closeWorkspace} wardPatient={wardPatient} />;
+};
+
+export default WardPatientCancelAdmissionRequestWorkspace;

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

@@ -1,44 +1,33 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ActionMenuButton, AddIcon, launchWorkspace } from '@openmrs/esm-framework';
-import { type CreateAdmissionEncounterWorkspaceProps } from './create-admission-encounter.workspace';
+import { ActionMenuButton2, AddIcon, type Workspace2DefinitionProps } from '@openmrs/esm-framework';
 
 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} />}
+    <ActionMenuButton2
+      icon={(props) => <AddIcon {...props} />}
       label={t('addPatientToWard', 'Add patient to ward')}
-      iconDescription={t('addPatientToWard', 'Add patient to ward')}
-      handler={launchSearchWorkspace}
-      type={'patient-search-workspace'}
+      workspaceToLaunch={{
+        workspaceName: 'ward-app-patient-search-workspace',
+        workspaceProps: {
+          workspaceTitle: t('addPatientToQueue', 'Add patient to queue'),
+          onPatientSelected(
+            patientUuid: string,
+            patient: fhir.Patient,
+            launchChildWorkspace: Workspace2DefinitionProps['launchChildWorkspace'],
+            closeWorkspace: Workspace2DefinitionProps['launchChildWorkspace'],
+          ) {
+            launchChildWorkspace('create-admission-encounter-workspace', {
+              selectedPatientUuid: patient.id,
+            });
+          },
+        },
+        windowProps: {
+          startVisitWorkspaceName: 'ward-app-start-visit-workspace',
+        },
+      }}
     />
   );
 }

package/src/ward-workspace/create-admission-encounter/create-admission-encounter.test.tsx

@@ -231,11 +231,16 @@ describe('CreateAdmissionEncounterWorkspace', () => {
 function renderCreateAdmissionEncounterWorkspace(patentUuid: string) {
   renderWithSwr(
     <CreateAdmissionEncounterWorkspace
-      patientUuid={patentUuid}
       closeWorkspace={jest.fn()}
-      promptBeforeClosing={jest.fn()}
-      closeWorkspaceWithSavedChanges={jest.fn()}
-      setTitle={jest.fn()}
+      launchChildWorkspace={jest.fn()}
+      workspaceProps={{
+        selectedPatientUuid: patentUuid,
+      }}
+      windowProps={{
+        startVisitWorkspaceName: '',
+      }}
+      groupProps={undefined}
+      workspaceName={''}
     />,
   );
 }

package/src/ward-workspace/create-admission-encounter/create-admission-encounter.workspace.tsx

@@ -1,7 +1,14 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, InlineNotification, SkeletonText } from '@carbon/react';
-import { ArrowLeftIcon, type DefaultWorkspaceProps, useVisit } from '@openmrs/esm-framework';
+import {
+  ArrowLeftIcon,
+  closeWorkspaceGroup2,
+  type DefaultWorkspaceProps,
+  useVisit,
+  Workspace2,
+  type Workspace2DefinitionProps,
+} from '@openmrs/esm-framework';
 import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
 import { useInpatientAdmissionByPatients } from '../../hooks/useInpatientAdmissionByPatients';
 import { useInpatientRequestByPatients } from '../../hooks/useInpatientRequestByPatients';
@@ -12,8 +19,7 @@ import AdmitPatientButton from '../admit-patient-button.component';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 
 export interface CreateAdmissionEncounterWorkspaceProps {
-  patientUuid: string;
-  handleReturnToSearchList?: () => void;
+  selectedPatientUuid: string;
 }
 
 /**
@@ -21,36 +27,45 @@ export interface CreateAdmissionEncounterWorkspaceProps {
  * from the workspace triggered by the "Add patient to ward" button.
  * It directly admits them to the current ward locations
  */
-const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorkspaceProps & DefaultWorkspaceProps> = ({
-  patientUuid,
-  handleReturnToSearchList,
-  closeWorkspaceWithSavedChanges,
-}) => {
+const CreateAdmissionEncounterWorkspace: React.FC<
+  Workspace2DefinitionProps<
+    CreateAdmissionEncounterWorkspaceProps,
+    {
+      startVisitWorkspaceName: string;
+    },
+    {}
+  >
+> = ({ closeWorkspace, workspaceProps: { selectedPatientUuid } }) => {
   const { location } = useWardLocation();
-  const { patient, isLoading: isLoadingPatient, error: errorLoadingPatient } = useRestPatient(patientUuid);
-  const { activeVisit, isLoading: isLoadingVisit, error: errorLoadingVisit } = useVisit(patientUuid);
+  const { patient, isLoading: isLoadingPatient, error: errorLoadingPatient } = useRestPatient(selectedPatientUuid);
+  const { activeVisit, isLoading: isLoadingVisit, error: errorLoadingVisit } = useVisit(selectedPatientUuid);
   const { t } = useTranslation();
-  const { data: bedData, isLoading: isLoadingBed, error: errorLoadingBed } = useAssignedBedByPatient(patientUuid);
+  const {
+    data: bedData,
+    isLoading: isLoadingBed,
+    error: errorLoadingBed,
+  } = useAssignedBedByPatient(selectedPatientUuid);
   const {
     data: inpatientAdmissions,
     isLoading: isLoadingInpatientAdmission,
     error: errorInpatientAdmission,
-  } = useInpatientAdmissionByPatients([patientUuid]);
+  } = useInpatientAdmissionByPatients([selectedPatientUuid]);
   const {
     inpatientRequests,
     isLoading: isLoadingInpatientRequest,
     error: errorInpatientRequests,
-  } = useInpatientRequestByPatients([patientUuid]);
+  } = useInpatientRequestByPatients([selectedPatientUuid]);
 
   const isLoading =
     isLoadingPatient || isLoadingVisit || isLoadingBed || isLoadingInpatientAdmission || isLoadingInpatientRequest;
   const hasError =
     errorLoadingPatient || errorLoadingVisit || errorLoadingBed || errorInpatientAdmission || errorInpatientRequests;
 
+  let content: JSX.Element = null;
   if (isLoading) {
-    return <SkeletonText />;
+    content = <SkeletonText />;
   } else if (hasError) {
-    return (
+    content = (
       <div>
         <InlineNotification
           kind="error"
@@ -62,7 +77,7 @@ const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorksp
           renderIcon={(props) => <ArrowLeftIcon size={24} {...props} />}
           iconDescription={t('backToSearchResults', 'Back to search results')}
           size="sm"
-          onClick={() => handleReturnToSearchList?.()}>
+          onClick={() => closeWorkspace()}>
           <span>{t('backToSearchResults', 'Back to search results')}</span>
         </Button>
       </div>
@@ -86,7 +101,7 @@ const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorksp
       inpatientAdmission: inpatientAdmissions[0],
       inpatientRequest: null,
     };
-    return (
+    content = (
       <div>
         <WardPatientWorkspaceBanner wardPatient={wardPatient} />
         {activeVisit ? (
@@ -126,7 +141,10 @@ const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorksp
             <AdmitPatientButton
               wardPatient={wardPatient}
               dispositionType={inpatientAdmissions[0] ? 'TRANSFER' : 'ADMIT'}
-              onAdmitPatientSuccess={() => closeWorkspaceWithSavedChanges()}
+              onAdmitPatientSuccess={async () => {
+                await closeWorkspace({ discardUnsavedChanges: true });
+                closeWorkspaceGroup2();
+              }}
               disabled={isAdmittedToCurrentLocation}
             />
           </div>
@@ -141,12 +159,14 @@ const CreateAdmissionEncounterWorkspace: React.FC<CreateAdmissionEncounterWorksp
           renderIcon={(props) => <ArrowLeftIcon size={24} {...props} />}
           iconDescription={t('backToSearchResults', 'Back to search results')}
           size="sm"
-          onClick={() => handleReturnToSearchList?.()}>
+          onClick={() => closeWorkspace()}>
           <span>{t('backToSearchResults', 'Back to search results')}</span>
         </Button>
       </div>
     );
   }
+
+  return <Workspace2 title={t('admitPatient', 'Admit patient')}>{content}</Workspace2>;
 };
 
 export default CreateAdmissionEncounterWorkspace;

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { ActionMenuButton2, UserAvatarIcon } from '@openmrs/esm-framework';
+
+export default function WardPatientActionButton() {
+  const { t } = useTranslation();
+
+  return (
+    <ActionMenuButton2
+      icon={(props) => <UserAvatarIcon {...props} />}
+      label={t('Patient', 'patient')}
+      workspaceToLaunch={{
+        workspaceName: 'ward-patient-workspace',
+      }}
+    />
+  );
+}

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

@@ -1,20 +1,40 @@
-import { attach, ExtensionSlot, useConfig } from '@openmrs/esm-framework';
+import { attach, ExtensionSlot, useConfig, Workspace2 } from '@openmrs/esm-framework';
 import React from 'react';
-import { type WardPatientWorkspaceProps } from '../../types';
+import { type WardPatientWorkspaceDefinition } from '../../types';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './ward-patient.style.scss';
 import { type WardConfigObject } from '../../config-schema';
 import classNames from 'classnames';
+import { useTranslation } from 'react-i18next';
 
 attach('ward-patient-workspace-header-slot', 'patient-vitals-info');
 
-export default function WardPatientWorkspace({ wardPatient }: WardPatientWorkspaceProps) {
-  const { patient } = wardPatient ?? {};
+export default function WardPatientWorkspace({
+  groupProps: { wardPatient },
+  launchChildWorkspace,
+}: WardPatientWorkspaceDefinition) {
+  const { t } = useTranslation();
+  const { patient, visit } = wardPatient ?? {};
   const { hideWorkspaceVitalsLinks } = useConfig<WardConfigObject>();
-  const extensionSlotState = { patient, patientUuid: patient?.uuid, hideLinks: hideWorkspaceVitalsLinks };
+  const extensionSlotState = {
+    patient,
+    patientUuid: patient?.uuid,
+    hideLinks: hideWorkspaceVitalsLinks,
+    visitContext: visit,
+    launchCustomVitalsForm: () => {
+      launchChildWorkspace('ward-patient-vitals-workspace', {
+        patientUuid: patient.uuid,
+        patient: {
+          id: patient.uuid,
+          birthDate: patient.person?.birthdate,
+        } as fhir.Patient,
+        visitContext: visit,
+      });
+    },
+  };
 
   return (
-    <>
+    <Workspace2 title={t('wardPatient', 'Ward patient')}>
       {wardPatient && (
         <div className={classNames(styles.workspaceContainer, styles.patientWorkspace)}>
           <WardPatientWorkspaceBanner {...{ wardPatient }} />
@@ -26,6 +46,6 @@ export default function WardPatientWorkspace({ wardPatient }: WardPatientWorkspa
           />
         </div>
       )}
-    </>
+    </Workspace2>
   );
 }

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

@@ -2,14 +2,16 @@ import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ButtonSet, InlineNotification } from '@carbon/react';
 import { Exit } from '@carbon/react/icons';
-import { ExtensionSlot, showSnackbar, useAppContext } from '@openmrs/esm-framework';
-import { type WardPatientWorkspaceProps, type WardViewContext } from '../../types';
+import { closeWorkspaceGroup2, ExtensionSlot, showSnackbar, useAppContext, Workspace2 } from '@openmrs/esm-framework';
+import { type WardPatientWorkspaceDefinition, type WardPatientWorkspaceProps, type WardViewContext } from '../../types';
 import { removePatientFromBed, useCreateEncounter } from '../../ward.resource';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
 import styles from './patient-discharge.scss';
 
-export default function PatientDischargeWorkspace(props: WardPatientWorkspaceProps) {
-  const { wardPatient, closeWorkspaceWithSavedChanges } = props;
+export default function PatientDischargeWorkspace({
+  groupProps: { wardPatient },
+  closeWorkspace,
+}: WardPatientWorkspaceDefinition) {
   const { t } = useTranslation();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
@@ -34,6 +36,9 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
             title: t('patientWasDischarged', 'Patient was discharged'),
             kind: 'success',
           });
+
+          closeWorkspace({ discardUnsavedChanges: true });
+          closeWorkspaceGroup2();
         }
       })
       .catch((err: Error) => {
@@ -45,51 +50,52 @@ export default function PatientDischargeWorkspace(props: WardPatientWorkspacePro
       })
       .finally(() => {
         setIsSubmitting(false);
-        closeWorkspaceWithSavedChanges();
         wardPatientGroupDetails?.mutate?.();
       });
-  }, [createEncounter, wardPatient, emrConfiguration, t, closeWorkspaceWithSavedChanges, wardPatientGroupDetails]);
+  }, [createEncounter, wardPatient, emrConfiguration, t, closeWorkspace, wardPatientGroupDetails]);
 
   if (!wardPatientGroupDetails) {
     return null;
   }
 
   return (
-    <div className={styles.workspaceContent}>
-      <div className={styles.patientWorkspaceBanner}>
-        <WardPatientWorkspaceBanner wardPatient={props?.wardPatient} />
-      </div>
-      <div className={styles.workspaceForm}>
-        <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>
-          )}
+    <Workspace2 title={t('discharge', 'Discharge')}>
+      <div className={styles.workspaceContent}>
+        <div className={styles.patientWorkspaceBanner}>
+          <WardPatientWorkspaceBanner wardPatient={wardPatient} />
+        </div>
+        <div className={styles.workspaceForm}>
+          <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>
+            )}
+          </div>
+          <ExtensionSlot name="ward-patient-discharge-slot" />
+          <ButtonSet className={styles.buttonSet}>
+            <Button
+              size="sm"
+              kind="ghost"
+              renderIcon={(props) => <Exit size={16} {...props} />}
+              disabled={
+                isLoadingEmrConfiguration || isSubmitting || errorFetchingEmrConfiguration || !wardPatient?.patient
+              }
+              onClick={submitDischarge}>
+              {t('proceedWithPatientDischarge', 'Proceed with patient discharge')}
+            </Button>
+          </ButtonSet>
         </div>
-        <ExtensionSlot name="ward-patient-discharge-slot" />
-        <ButtonSet className={styles.buttonSet}>
-          <Button
-            size="sm"
-            kind="ghost"
-            renderIcon={(props) => <Exit size={16} {...props} />}
-            disabled={
-              isLoadingEmrConfiguration || isSubmitting || errorFetchingEmrConfiguration || !wardPatient?.patient
-            }
-            onClick={submitDischarge}>
-            {t('proceedWithPatientDischarge', 'Proceed with patient discharge')}
-          </Button>
-        </ButtonSet>
       </div>
-    </div>
+    </Workspace2>
   );
 }