@openmrs/esm-patient-chart-app 11.3.1-patch.9064 → 11.3.1-patch.9310

package/src/visit/visit-history-table/visit-actions-cell.component.tsx

@@ -4,14 +4,15 @@ import styles from './visit-actions-cell.scss';
 
 interface Props {
   visit: Visit;
+  patient: fhir.Patient;
 }
 
-const VisitActionsCell: React.FC<Props> = ({ visit }) => {
+const VisitActionsCell: React.FC<Props> = ({ visit, patient }) => {
   return (
     <ExtensionSlot
       name="visit-detail-overview-actions"
       className={styles.visitActions}
-      state={{ patientUuid: visit.patient.uuid, visit, compact: true }}
+      state={{ patientUuid: visit.patient.uuid, patient, visit, compact: true }}
     />
   );
 };

package/src/visit/visit-history-table/visit-date-cell.component.tsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 
 interface Props {
   visit: Visit;
+  patient: fhir.Patient;
 }
 
 const VisitDateCell: React.FC<Props> = ({ visit }) => {

package/src/visit/visit-history-table/visit-diagnoses-cell.component.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 
 interface Props {
   visit: Visit;
+  patient: fhir.Patient;
 }
 
 const VisitDiagnosisCell: React.FC<Props> = ({ visit }) => {

package/src/visit/visit-history-table/visit-history-table.component.tsx

@@ -27,12 +27,13 @@ import styles from './visit-history-table.scss';
 
 interface VisitHistoryTableProps {
   patientUuid: string;
+  patient: fhir.Patient;
 }
 
 /**
  * This show a list of visit histories in the visit tab in patient chart
  */
-const VisitHistoryTable: React.FC<VisitHistoryTableProps> = ({ patientUuid }) => {
+const VisitHistoryTable: React.FC<VisitHistoryTableProps> = ({ patientUuid, patient }) => {
   const defaultPageSize = 10;
   const [pageSize, setPageSize] = useState(defaultPageSize);
   const pageSizes = [10, 20, 30, 40, 50];
@@ -54,7 +55,7 @@ const VisitHistoryTable: React.FC<VisitHistoryTableProps> = ({ patientUuid }) =>
   const rowData = visits?.map((visit) => {
     const row: Record<string, JSX.Element | string> = { id: visit.uuid };
     for (const { key, CellComponent } of columns) {
-      row[key] = <CellComponent key={key} visit={visit} />;
+      row[key] = <CellComponent key={key} visit={visit} patient={patient} />;
     }
     return row;
   });

package/src/visit/visit-history-table/visit-type-cell.component.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 
 interface Props {
   visit: Visit;
+  patient: fhir.Patient;
 }
 
 const VisitTypeCell: React.FC<Props> = ({ visit }) => {

package/src/visit/visit-prompt/{delete-visit-dialog.component.tsx → delete-visit-dialog.modal.tsx}

@@ -8,12 +8,18 @@ import styles from './start-visit-dialog.scss';
 interface DeleteVisitDialogProps {
   closeModal: () => void;
   patientUuid: string;
-  visit: Visit;
+  activeVisit: Visit;
+  mutateActiveVisit: () => void;
 }
 
-const DeleteVisitDialog: React.FC<DeleteVisitDialogProps> = ({ closeModal, patientUuid, visit }) => {
+const DeleteVisitDialog: React.FC<DeleteVisitDialogProps> = ({
+  closeModal,
+  mutateActiveVisit,
+  patientUuid,
+  activeVisit,
+}) => {
   const { t } = useTranslation();
-  const { isDeletingVisit, initiateDeletingVisit } = useDeleteVisit(visit, closeModal);
+  const { isDeletingVisit, initiateDeletingVisit } = useDeleteVisit(activeVisit, mutateActiveVisit, closeModal);
 
   return (
     <div>
@@ -24,7 +30,7 @@ const DeleteVisitDialog: React.FC<DeleteVisitDialogProps> = ({ closeModal, patie
       <ModalBody>
         <p className={styles.body}>
           {t('confirmDeleteVisitText', 'Deleting this {{visit}} will delete its associated encounters.', {
-            visit: visit?.visitType?.display ?? t('visit', 'Visit'),
+            visit: activeVisit?.visitType?.display ?? t('visit', 'Visit'),
           })}
         </p>
       </ModalBody>

package/src/visit/visit-prompt/delete-visit-dialog.test.tsx

@@ -4,11 +4,12 @@ import userEvent from '@testing-library/user-event';
 import { mockCurrentVisit } from '__mocks__';
 import React from 'react';
 import { mockPatient } from 'tools';
-import DeleteVisitDialog from './delete-visit-dialog.component';
+import DeleteVisitDialog from './delete-visit-dialog.modal';
 
 const mockCloseModal = jest.fn();
 const mockOpenmrsFetch = jest.mocked(openmrsFetch);
 const mockShowSnackbar = jest.mocked(showSnackbar);
+const mockActiveVisit = jest.fn();
 
 describe('Delete visit', () => {
   it('voids the visit and voids its associated encounters', async () => {
@@ -21,7 +22,14 @@ describe('Delete visit', () => {
 
     mockOpenmrsFetch.mockResolvedValue(response as FetchResponse);
 
-    render(<DeleteVisitDialog visit={mockCurrentVisit} closeModal={mockCloseModal} patientUuid={mockPatient.id} />);
+    render(
+      <DeleteVisitDialog
+        activeVisit={mockCurrentVisit}
+        mutateActiveVisit={mockActiveVisit}
+        closeModal={mockCloseModal}
+        patientUuid={mockPatient.id}
+      />,
+    );
 
     const cancelButton = screen.getByRole('button', { name: /^cancel$/i });
     const deleteVisitButton = screen.getByRole('button', { name: /delete visit$/i });
@@ -46,6 +54,7 @@ describe('Delete visit', () => {
         subtitle: 'Facility Visit deleted successfully',
       }),
     );
+    expect(mockActiveVisit).toHaveBeenCalledTimes(1);
   });
 
   it('displays an error notification if there was problem with deleting a visit', async () => {
@@ -53,7 +62,14 @@ describe('Delete visit', () => {
 
     mockOpenmrsFetch.mockRejectedValueOnce({ message: 'Internal server error', status: 500 });
 
-    render(<DeleteVisitDialog visit={mockCurrentVisit} closeModal={mockCloseModal} patientUuid={mockPatient.id} />);
+    render(
+      <DeleteVisitDialog
+        activeVisit={mockCurrentVisit}
+        mutateActiveVisit={mockActiveVisit}
+        closeModal={mockCloseModal}
+        patientUuid={mockPatient.id}
+      />,
+    );
 
     const cancelButton = screen.getByRole('button', { name: /^cancel$/i });
     const deleteVisitButton = screen.getByRole('button', { name: /delete visit$/i });
@@ -74,5 +90,7 @@ describe('Delete visit', () => {
       kind: 'error',
       title: 'Error deleting visit',
     });
+
+    expect(mockActiveVisit).toHaveBeenCalledTimes(1);
   });
 });

package/src/visit/visit-prompt/{end-visit-dialog.component.tsx → end-visit-dialog.modal.tsx}

@@ -2,6 +2,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
 import { showSnackbar, updateVisit, useVisit } from '@openmrs/esm-framework';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import styles from './end-visit-dialog.scss';
 
 interface EndVisitDialogProps {
@@ -13,10 +14,13 @@ interface EndVisitDialogProps {
  * This modal shows up when user clicks on the "End visit" button in the action menu within the
  * patient banner. It should only show when the patient has an active visit. See stop-visit.component.tsx
  * for the button.
+ *
+ * This dialog uses the patient chart store and SHOULD only be mounted within the patient chart
  */
 const EndVisitDialog: React.FC<EndVisitDialogProps> = ({ patientUuid, closeModal }) => {
   const { t } = useTranslation();
   const { activeVisit, mutate } = useVisit(patientUuid);
+  const { visitContext, setVisitContext } = usePatientChartStore(patientUuid);
 
   const handleEndVisit = () => {
     if (activeVisit) {
@@ -31,7 +35,9 @@ const EndVisitDialog: React.FC<EndVisitDialogProps> = ({ patientUuid, closeModal
           mutate();
           window.dispatchEvent(new CustomEvent('queue-entry-updated'));
           closeModal();
-
+          if (visitContext?.uuid == activeVisit.uuid) {
+            setVisitContext(null, null);
+          }
           showSnackbar({
             isLowContrast: true,
             kind: 'success',

package/src/visit/visit-prompt/end-visit-dialog.test.tsx

@@ -3,7 +3,8 @@ import userEvent from '@testing-library/user-event';
 import { screen, render } from '@testing-library/react';
 import { showSnackbar, updateVisit, useVisit, type Visit, type FetchResponse } from '@openmrs/esm-framework';
 import { mockCurrentVisit } from '__mocks__';
-import EndVisitDialog from './end-visit-dialog.component';
+import EndVisitDialog from './end-visit-dialog.modal';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 const endVisitPayload = {
   stopDatetime: expect.any(Date),
@@ -15,6 +16,22 @@ const mockShowSnackbar = jest.mocked(showSnackbar);
 const mockUseVisit = jest.mocked(useVisit);
 const mockUpdateVisit = jest.mocked(updateVisit);
 
+const mockUsePatientChartStore = jest.mocked(usePatientChartStore);
+const mockSetVisitContext = jest.fn();
+
+jest.mock('@openmrs/esm-patient-common-lib', () => ({
+  usePatientChartStore: jest.fn(),
+}));
+
+mockUsePatientChartStore.mockReturnValue({
+  patientUuid: 'patient-123',
+  patient: null,
+  visitContext: mockCurrentVisit,
+  mutateVisitContext: jest.fn(),
+  setPatient: jest.fn(),
+  setVisitContext: mockSetVisitContext,
+});
+
 describe('End visit dialog', () => {
   beforeEach(() => {
     mockUseVisit.mockReturnValue({
@@ -66,6 +83,8 @@ describe('End visit dialog', () => {
       kind: 'success',
       title: 'Visit ended',
     });
+
+    expect(mockSetVisitContext).toHaveBeenCalledTimes(1);
   });
 
   test('displays an error snackbar if there was a problem ending a visit', async () => {

package/src/visit/visit-prompt/{start-visit-dialog.component.tsx → start-visit-dialog.modal.tsx}

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
-import { launchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
 import { launchPatientChartWithWorkspaceOpen } from '@openmrs/esm-patient-common-lib';
 import styles from './start-visit-dialog.scss';
 
@@ -9,9 +9,15 @@ interface StartVisitDialogProps {
   patientUuid: string;
   closeModal: () => void;
   launchPatientChart?: boolean;
+  onVisitStarted?: () => void;
 }
 
-const StartVisitDialog: React.FC<StartVisitDialogProps> = ({ patientUuid, closeModal, launchPatientChart }) => {
+const StartVisitDialog: React.FC<StartVisitDialogProps> = ({
+  patientUuid,
+  closeModal,
+  launchPatientChart,
+  onVisitStarted,
+}) => {
   const { t } = useTranslation();
 
   const handleStartNewVisit = useCallback(() => {
@@ -22,11 +28,11 @@ const StartVisitDialog: React.FC<StartVisitDialogProps> = ({ patientUuid, closeM
         additionalProps: { openedFrom: 'patient-chart-start-visit' },
       });
     } else {
-      launchWorkspace('start-visit-workspace-form', { openedFrom: 'patient-chart-start-visit' });
+      launchWorkspace2('start-visit-workspace-form', { openedFrom: 'patient-chart-start-visit', onVisitStarted });
     }
 
     closeModal();
-  }, [closeModal, patientUuid, launchPatientChart]);
+  }, [closeModal, patientUuid, launchPatientChart, onVisitStarted]);
 
   const modalHeaderText = t('noActiveVisit', 'No active visit');
 

package/src/visit/visit-prompt/start-visit-dialog.test.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { launchWorkspace } from '@openmrs/esm-framework';
-import StartVisitDialog from './start-visit-dialog.component';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
+import StartVisitDialog from './start-visit-dialog.modal';
 
 const defaultProps = {
   patientUuid: 'some-uuid',
@@ -10,7 +10,7 @@ const defaultProps = {
   visitType: null,
 };
 
-const mockLaunchWorkspace = jest.mocked(launchWorkspace);
+const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
 
 describe('StartVisit', () => {
   test('should launch start visit form', async () => {

package/src/visit/visits-widget/active-visit-buttons/active-visit-buttons.tsx

@@ -20,13 +20,14 @@ const ActiveVisitActions: React.FC<ActiveVisitActionsInterface> = ({ visit, pati
   const isTablet = layout === 'tablet';
   const isMobile = layout === 'phone';
 
-  const launchAllergiesFormWorkspace = useLaunchWorkspaceRequiringVisit('patient-allergy-form-workspace');
-  const launchAppointmentsFormWorkspace = useLaunchWorkspaceRequiringVisit('appointments-form-workspace');
-  const launchClinicalFormsWorkspace = useLaunchWorkspaceRequiringVisit('clinical-forms-workspace');
-  const launchConditionsFormWorkspace = useLaunchWorkspaceRequiringVisit('conditions-form-workspace');
-  const launchOrderBasketFormWorkspace = useLaunchWorkspaceRequiringVisit('order-basket');
-  const launchVisitNotesFormWorkspace = useLaunchWorkspaceRequiringVisit('visit-notes-form-workspace');
+  const launchAllergiesFormWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'patient-allergy-form-workspace');
+  const launchAppointmentsFormWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'appointments-form-workspace');
+  const launchClinicalFormsWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'clinical-forms-workspace');
+  const launchConditionsFormWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'conditions-form-workspace');
+  const launchOrderBasketFormWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'order-basket');
+  const launchVisitNotesFormWorkspace = useLaunchWorkspaceRequiringVisit(patientUuid, 'visit-notes-form-workspace');
   const launchVitalsAndBiometricsFormWorkspace = useLaunchWorkspaceRequiringVisit(
+    patientUuid,
     'patient-vitals-biometrics-form-workspace',
   );
 

package/src/visit/visits-widget/current-visit-summary.extension.tsx

@@ -0,0 +1,48 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
+import { CardHeader, EmptyState, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
+import VisitSummary from './past-visits-components/visit-summary.component';
+import styles from './current-visit-summary.scss';
+
+interface CurrentVisitSummaryProps {
+  patientUuid: string;
+}
+
+/**
+ * This extension is not used in the refapp.
+ * This extension uses the patient chart store and SHOULD only be mounted within the patient chart
+ */
+const CurrentVisitSummary: React.FC<CurrentVisitSummaryProps> = ({ patientUuid }) => {
+  const { t } = useTranslation();
+  const { patientUuid: storePatientUuid, visitContext } = usePatientChartStore(patientUuid);
+
+  if (patientUuid !== storePatientUuid) {
+    return null;
+  }
+
+  if (!visitContext) {
+    return (
+      <EmptyState
+        headerTitle={t('currentVisit', 'Current visit')}
+        displayText={t('noActiveVisitMessage', 'active visits')}
+        launchForm={() =>
+          launchWorkspace2('start-visit-workspace-form', { openedFrom: 'patient-chart-current-visit-summary' })
+        }
+      />
+    );
+  }
+
+  return (
+    <div className={styles.container}>
+      <CardHeader title={t('currentVisit', 'Current visit')}>
+        <span />
+      </CardHeader>
+      <div className={styles.visitSummaryCard}>
+        <VisitSummary visit={visitContext} patientUuid={patientUuid} />
+      </div>
+    </div>
+  );
+};
+
+export default CurrentVisitSummary;

package/src/visit/visits-widget/current-visit-summary.test.tsx

@@ -1,34 +1,52 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { useVisit, getConfig } from '@openmrs/esm-framework';
-import { waitForLoadingToFinish } from 'tools';
-import CurrentVisitSummary from './current-visit-summary.component';
+import { getConfig } from '@openmrs/esm-framework';
+import { mockPatient, waitForLoadingToFinish } from 'tools';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
+import CurrentVisitSummary from './current-visit-summary.extension';
 
 const mockGetConfig = jest.mocked(getConfig);
-const mockUseVisits = jest.mocked(useVisit);
+const mockUsePatientChartStore = jest.mocked(usePatientChartStore);
+
+jest.mock('@openmrs/esm-patient-common-lib', () => ({
+  ...jest.requireActual('@openmrs/esm-patient-common-lib'),
+  usePatientChartStore: jest.fn(),
+}));
 
 describe('CurrentVisitSummary', () => {
   test('renders an empty state when there is no active visit', () => {
-    mockUseVisits.mockReturnValueOnce({
-      activeVisit: null,
-      currentVisit: null,
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
-      mutate: jest.fn(),
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: mockPatient.id,
+      patient: mockPatient,
+      visitContext: null,
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
     });
-
-    render(<CurrentVisitSummary patientUuid="some-uuid" />);
+    render(<CurrentVisitSummary patientUuid={mockPatient.id} />);
     expect(screen.getByText(/current visit/i)).toBeInTheDocument();
-    expect(screen.getByText('There are no active visit to display for this patient')).toBeInTheDocument();
+    expect(screen.getByText('There are no active visits to display for this patient')).toBeInTheDocument();
+  });
+
+  test('returns null when patientUuid does not match store patientUuid', () => {
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: 'different-patient-id',
+      patient: mockPatient,
+      visitContext: null,
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
+    });
+    render(<CurrentVisitSummary patientUuid={mockPatient.id} />);
+    expect(screen.queryByText(/current visit/i)).not.toBeInTheDocument();
   });
 
-  test('renders a visit summary when for the active visit', async () => {
+  test('renders a visit summary when visit context exists', async () => {
     mockGetConfig.mockResolvedValue({ htmlFormEntryForms: [] });
-    mockUseVisits.mockReturnValueOnce({
-      activeVisit: null,
-      currentVisit: {
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: mockPatient.id,
+      patient: mockPatient,
+      visitContext: {
         uuid: 'some-uuid',
         display: 'Visit 1',
         startDatetime: '2021-03-23T10:00:00.000+0300',
@@ -42,15 +60,17 @@ describe('CurrentVisitSummary', () => {
           display: 'Visit Type 1',
         },
         encounters: [],
+        patient: {
+          uuid: mockPatient.id,
+          display: 'Test Patient',
+        },
       },
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
-      mutate: jest.fn(),
+      mutateVisitContext: null,
+      setPatient: jest.fn(),
+      setVisitContext: jest.fn(),
     });
 
-    render(<CurrentVisitSummary patientUuid="some-uuid" />);
+    render(<CurrentVisitSummary patientUuid={mockPatient.id} />);
 
     await waitForLoadingToFinish();
 

package/src/visit/visits-widget/past-visits-components/encounters-table/encounters-table.component.tsx

@@ -27,7 +27,7 @@ import {
 import {
   EditIcon,
   isDesktop,
-  launchWorkspace,
+  launchWorkspace2,
   showModal,
   showSnackbar,
   TrashCanIcon,
@@ -35,16 +35,11 @@ import {
   useLayoutType,
   userHasAccess,
   useSession,
-  useVisit,
   type EncounterType,
   ExtensionSlot,
   useFeatureFlag,
 } from '@openmrs/esm-framework';
-import {
-  type HtmlFormEntryForm,
-  launchFormEntryOrHtmlForms,
-  invalidateVisitAndEncounterData,
-} from '@openmrs/esm-patient-common-lib';
+import { invalidateVisitAndEncounterData, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import { jsonSchemaResourceName } from '../../../../constants';
 import {
   deleteEncounter,
@@ -80,17 +75,12 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
   const pageSizes = [10, 20, 30, 40, 50];
   const desktopLayout = isDesktop(useLayoutType());
   const session = useSession();
-  const { mutate: mutateCurrentVisit } = useVisit(patientUuid);
+  const { mutateVisitContext } = usePatientChartStore(patientUuid);
   const { mutate } = useSWRConfig();
   const responsiveSize = desktopLayout ? 'sm' : 'lg';
   const { data: encounterTypes, isLoading: isLoadingEncounterTypes } = useEncounterTypes();
   const enableEmbeddedFormView = useFeatureFlag('enable-embedded-form-view');
-
   const { encounterEditableDuration, encounterEditableDurationOverridePrivileges } = useConfig<ChartConfig>();
-  const formsConfig: { htmlFormEntryForms: HtmlFormEntryForm[] } = useConfig({
-    externalModuleName: '@openmrs/esm-patient-forms-app',
-  });
-  const { htmlFormEntryForms } = formsConfig;
   const paginatedMappedEncounters = useMemo(
     () => (paginatedEncounters ?? []).map(mapEncounter).filter(Boolean),
     [paginatedEncounters],
@@ -133,7 +123,7 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
           deleteEncounter(encounterUuid, abortController)
             .then(() => {
               // Update current visit data for critical components
-              mutateCurrentVisit();
+              mutateVisitContext?.();
 
               // Also invalidate visit history and encounter tables since the encounter was deleted
               invalidateVisitAndEncounterData(mutate, patientUuid);
@@ -160,7 +150,7 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
         },
       });
     },
-    [mutate, mutateCurrentVisit, patientUuid, t],
+    [mutate, mutateVisitContext, patientUuid, t],
   );
 
   if (isLoadingEncounterTypes || isLoading) {
@@ -269,22 +259,16 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
                                       itemText={t('editThisEncounter', 'Edit this encounter')}
                                       onClick={() => {
                                         if (isVisitNoteEncounter(encounter)) {
-                                          launchWorkspace('visit-notes-form-workspace', {
+                                          launchWorkspace2('visit-notes-form-workspace', {
                                             encounter,
                                             formContext: 'editing',
                                             patientUuid,
                                           });
                                         } else {
-                                          launchFormEntryOrHtmlForms(
-                                            htmlFormEntryForms,
-                                            patientUuid,
-                                            encounter.form,
-                                            encounter.visitUuid,
-                                            encounter.id,
-                                            encounter.visitTypeUuid,
-                                            encounter.visitStartDatetime,
-                                            encounter.visitStopDatetime,
-                                          );
+                                          launchWorkspace2('patient-form-entry-workspace', {
+                                            form: encounter.form,
+                                            encounterUuid: encounter.id,
+                                          });
                                         }
                                       }}
                                     />
@@ -326,22 +310,16 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
                                     kind="ghost"
                                     onClick={() => {
                                       if (isVisitNoteEncounter(encounter)) {
-                                        launchWorkspace('visit-notes-form-workspace', {
+                                        launchWorkspace2('visit-notes-form-workspace', {
                                           encounter,
                                           formContext: 'editing',
                                           patientUuid,
                                         });
                                       } else {
-                                        launchFormEntryOrHtmlForms(
-                                          htmlFormEntryForms,
-                                          patientUuid,
-                                          encounter.form,
-                                          encounter.visitUuid,
-                                          encounter.id,
-                                          encounter.visitTypeUuid,
-                                          encounter.visitStartDatetime,
-                                          encounter.visitStopDatetime,
-                                        );
+                                        launchWorkspace2('patient-form-entry-workspace', {
+                                          form: encounter.form,
+                                          encounterUuid: encounter.id,
+                                        });
                                       }
                                     }}
                                     renderIcon={(props: ComponentProps<typeof EditIcon>) => (

package/src/visit/visits-widget/past-visits-components/encounters-table/encounters-table.resource.ts

@@ -8,7 +8,6 @@ import {
   type Encounter,
   type EncounterType,
   type Obs,
-  type OpenmrsResource,
   useOpenmrsFetchAll,
   useOpenmrsPagination,
 } from '@openmrs/esm-framework';

package/src/visit/visits-widget/visit-context/retrospective-data-date-time-picker/retrospective-date-time-picker.component.tsx

@@ -1,10 +1,9 @@
 import { SelectItem, TimePickerSelect, TimePicker, Checkbox } from '@carbon/react';
-import { OpenmrsDatePicker, ResponsiveWrapper, useFeatureFlag, useVisit } from '@openmrs/esm-framework';
+import { OpenmrsDatePicker, ResponsiveWrapper, useFeatureFlag, type Visit } from '@openmrs/esm-framework';
 import React, { useEffect, useState } from 'react';
 import { type Control, Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import styles from './restrospective-date-time-picker.scss';
-import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 
 type FormValues = {
   retrospectiveDate: Date;
@@ -14,22 +13,22 @@ type FormValues = {
 
 type RetrospectiveDateTimePickerProps = {
   patientUuid: string;
+  visitContext: Visit;
   control?: Control<FormValues>;
   onChange?: (data: FormValues) => void;
 };
 
 const RetrospectiveDateTimePicker = ({
-  patientUuid,
+  visitContext,
   control: propControl,
   onChange,
 }: RetrospectiveDateTimePickerProps) => {
   const { t } = useTranslation();
   const isRdeEnabled = useFeatureFlag('rde');
 
-  const { currentVisit } = useVisit(patientUuid);
-  const isActiveVisit = !Boolean(currentVisit && currentVisit.stopDatetime);
-  const maxDate = currentVisit?.stopDatetime;
-  const minDate = currentVisit?.startDatetime;
+  const isActiveVisit = !Boolean(visitContext && visitContext.stopDatetime);
+  const maxDate = visitContext?.stopDatetime;
+  const minDate = visitContext?.startDatetime;
 
   const [manuallyEnableDateTimePicker, setManuallyEnableDateTimePicker] = useState<boolean>(false);