@openmrs/esm-patient-chart-app 11.3.1-pre.9294 → 11.3.1-pre.9304

package/src/visit/hooks/useDeleteVisit.test.tsx

@@ -1,7 +1,7 @@
 import { useSWRConfig } from 'swr';
 import { renderHook, act } from '@testing-library/react';
-import { showSnackbar, useVisit, type Visit, type VisitType } from '@openmrs/esm-framework';
-import { invalidateVisitAndEncounterData } from '@openmrs/esm-patient-common-lib';
+import { showSnackbar, type Visit } from '@openmrs/esm-framework';
+import { invalidateVisitAndEncounterData, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import { useDeleteVisit } from './useDeleteVisit';
 import { deleteVisit, restoreVisit } from '../visits-widget/visit.resource';
 
@@ -20,17 +20,19 @@ jest.mock('../visits-widget/visit.resource', () => {
 
 jest.mock('@openmrs/esm-patient-common-lib', () => ({
   invalidateVisitAndEncounterData: jest.fn(),
+  usePatientChartStore: jest.fn(),
 }));
 
 const mockDeleteVisit = jest.mocked(deleteVisit);
 const mockRestoreVisit = jest.mocked(restoreVisit);
 const mockShowSnackbar = jest.mocked(showSnackbar);
 const mockUseSWRConfig = jest.mocked(useSWRConfig);
-const mockUseVisit = jest.mocked(useVisit);
+const mockUsePatientChartStore = jest.mocked(usePatientChartStore);
 const mockInvalidateVisitAndEncounterData = jest.mocked(invalidateVisitAndEncounterData);
 
-const mockMutateCurrentVisit = jest.fn();
+const mockMutateActiveVisit = jest.fn();
 const mockGlobalMutate = jest.fn();
+const mockSetVisitContext = jest.fn();
 
 const mockVisitType = {
   uuid: 'visit-type-123',
@@ -54,16 +56,13 @@ const mockVisit = {
 
 describe('useDeleteVisit', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
-
-    mockUseVisit.mockReturnValue({
-      mutate: mockMutateCurrentVisit,
-      currentVisit: null,
-      activeVisit: null,
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: 'patient-123',
+      patient: null,
+      visitContext: null,
+      mutateVisitContext: jest.fn(),
+      setPatient: jest.fn(),
+      setVisitContext: mockSetVisitContext,
     });
 
     mockUseSWRConfig.mockReturnValue({
@@ -76,14 +75,14 @@ describe('useDeleteVisit', () => {
     mockDeleteVisit.mockResolvedValue({ data: {} } as any);
     const onVisitDelete = jest.fn();
 
-    const { result } = renderHook(() => useDeleteVisit(mockVisit, onVisitDelete));
+    const { result } = renderHook(() => useDeleteVisit(mockVisit, mockMutateActiveVisit, onVisitDelete));
 
     await act(async () => {
       result.current.initiateDeletingVisit();
     });
 
     expect(mockDeleteVisit).toHaveBeenCalledWith('visit-123');
-    expect(mockMutateCurrentVisit).toHaveBeenCalledTimes(1);
+    expect(mockMutateActiveVisit).toHaveBeenCalledTimes(1);
     expect(mockInvalidateVisitAndEncounterData).toHaveBeenCalledWith(mockGlobalMutate, 'patient-123');
 
     expect(mockShowSnackbar).toHaveBeenCalledWith(
@@ -103,13 +102,13 @@ describe('useDeleteVisit', () => {
     mockDeleteVisit.mockRejectedValue(new Error('Delete failed'));
     const onVisitDelete = jest.fn();
 
-    const { result } = renderHook(() => useDeleteVisit(mockVisit, onVisitDelete));
+    const { result } = renderHook(() => useDeleteVisit(mockVisit, mockMutateActiveVisit, onVisitDelete));
 
     await act(async () => {
       result.current.initiateDeletingVisit();
     });
 
-    expect(mockMutateCurrentVisit).toHaveBeenCalledTimes(1);
+    expect(mockMutateActiveVisit).toHaveBeenCalledTimes(1);
     expect(mockInvalidateVisitAndEncounterData).toHaveBeenCalledWith(mockGlobalMutate, 'patient-123');
 
     expect(mockShowSnackbar).toHaveBeenCalledWith({
@@ -125,7 +124,7 @@ describe('useDeleteVisit', () => {
     mockRestoreVisit.mockResolvedValue({ data: {} } as any);
     const onVisitRestore = jest.fn();
 
-    const { result } = renderHook(() => useDeleteVisit(mockVisit, undefined, onVisitRestore));
+    const { result } = renderHook(() => useDeleteVisit(mockVisit, mockMutateActiveVisit, undefined, onVisitRestore));
 
     // First delete to get the restore function
     mockDeleteVisit.mockResolvedValue({ data: {} } as any);
@@ -138,14 +137,13 @@ describe('useDeleteVisit', () => {
 
     // Clear mocks to test restore independently
     jest.clearAllMocks();
-    mockUseVisit.mockReturnValue({
-      mutate: mockMutateCurrentVisit,
-      currentVisit: null,
-      activeVisit: null,
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: 'patient-123',
+      patient: null,
+      visitContext: null,
+      mutateVisitContext: jest.fn(),
+      setPatient: jest.fn(),
+      setVisitContext: mockSetVisitContext,
     });
     mockUseSWRConfig.mockReturnValue({
       mutate: mockGlobalMutate,
@@ -158,7 +156,7 @@ describe('useDeleteVisit', () => {
     });
 
     expect(mockRestoreVisit).toHaveBeenCalledWith('visit-123');
-    expect(mockMutateCurrentVisit).toHaveBeenCalledTimes(1);
+    expect(mockMutateActiveVisit).toHaveBeenCalledTimes(1);
     expect(mockInvalidateVisitAndEncounterData).toHaveBeenCalledWith(mockGlobalMutate, 'patient-123');
 
     expect(mockShowSnackbar).toHaveBeenCalledWith({
@@ -174,7 +172,7 @@ describe('useDeleteVisit', () => {
     mockRestoreVisit.mockRejectedValue(new Error('Restore failed'));
     const onVisitRestore = jest.fn();
 
-    const { result } = renderHook(() => useDeleteVisit(mockVisit, undefined, onVisitRestore));
+    const { result } = renderHook(() => useDeleteVisit(mockVisit, mockMutateActiveVisit, undefined, onVisitRestore));
 
     // First delete to get the restore function
     mockDeleteVisit.mockResolvedValue({ data: {} } as any);
@@ -186,14 +184,13 @@ describe('useDeleteVisit', () => {
 
     // Clear mocks to test restore independently
     jest.clearAllMocks();
-    mockUseVisit.mockReturnValue({
-      mutate: mockMutateCurrentVisit,
-      currentVisit: null,
-      activeVisit: null,
-      currentVisitIsRetrospective: false,
-      error: null,
-      isLoading: false,
-      isValidating: false,
+    mockUsePatientChartStore.mockReturnValue({
+      patientUuid: 'patient-123',
+      patient: null,
+      visitContext: null,
+      mutateVisitContext: jest.fn(),
+      setPatient: jest.fn(),
+      setVisitContext: mockSetVisitContext,
     });
     mockUseSWRConfig.mockReturnValue({
       mutate: mockGlobalMutate,
@@ -205,7 +202,7 @@ describe('useDeleteVisit', () => {
       restoreFunction();
     });
 
-    expect(mockMutateCurrentVisit).toHaveBeenCalledTimes(1);
+    expect(mockMutateActiveVisit).toHaveBeenCalledTimes(1);
     expect(mockInvalidateVisitAndEncounterData).toHaveBeenCalledWith(mockGlobalMutate, 'patient-123');
 
     expect(mockShowSnackbar).toHaveBeenCalledWith({
@@ -220,7 +217,7 @@ describe('useDeleteVisit', () => {
   it('should manage loading state correctly', async () => {
     mockDeleteVisit.mockResolvedValue({ data: {} } as any);
 
-    const { result } = renderHook(() => useDeleteVisit(mockVisit));
+    const { result } = renderHook(() => useDeleteVisit(mockVisit, mockMutateActiveVisit, () => {}));
 
     // Initially not deleting
     expect(result.current.isDeletingVisit).toBe(false);
@@ -238,7 +235,7 @@ describe('useDeleteVisit', () => {
     const visitWithoutPatient = { ...mockVisit, patient: null };
 
     expect(() => {
-      renderHook(() => useDeleteVisit(visitWithoutPatient));
+      renderHook(() => useDeleteVisit(visitWithoutPatient, mockMutateActiveVisit, () => {}));
     }).not.toThrow();
   });
 
@@ -246,7 +243,7 @@ describe('useDeleteVisit', () => {
     const visitWithEmptyPatient = { ...mockVisit, patient: { uuid: '' } };
 
     expect(() => {
-      renderHook(() => useDeleteVisit(visitWithEmptyPatient));
+      renderHook(() => useDeleteVisit(visitWithEmptyPatient, mockMutateActiveVisit, () => {}));
     }).not.toThrow();
   });
 
@@ -257,7 +254,7 @@ describe('useDeleteVisit', () => {
     };
 
     mockDeleteVisit.mockResolvedValue({ data: {} } as any);
-    const { result } = renderHook(() => useDeleteVisit(visitWithoutDisplay));
+    const { result } = renderHook(() => useDeleteVisit(visitWithoutDisplay, mockMutateActiveVisit, () => {}));
 
     await act(async () => {
       result.current.initiateDeletingVisit();

package/src/visit/hooks/useDeleteVisit.tsx

@@ -1,22 +1,35 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSWRConfig } from 'swr';
-import { type Visit, showSnackbar, useVisit } from '@openmrs/esm-framework';
-import { invalidateVisitAndEncounterData } from '@openmrs/esm-patient-common-lib';
+import { type Visit, showSnackbar } from '@openmrs/esm-framework';
+import {
+  invalidateVisitAndEncounterData,
+  invalidateVisitByUuid,
+  usePatientChartStore,
+} from '@openmrs/esm-patient-common-lib';
 import { deleteVisit, restoreVisit } from '../visits-widget/visit.resource';
 
-export function useDeleteVisit(visit: Visit, onVisitDelete = () => {}, onVisitRestore = () => {}) {
+export function useDeleteVisit(
+  activeVisit: Visit,
+  mutateActiveVisit: () => void,
+  onVisitDelete = () => {},
+  onVisitRestore = () => {},
+) {
   const { t } = useTranslation();
   const { mutate: globalMutate } = useSWRConfig();
-  const { mutate: mutateCurrentVisit } = useVisit(visit?.patient?.uuid || '');
   const [isDeletingVisit, setIsDeletingVisit] = useState(false);
-  const patientUuid = visit?.patient?.uuid || '';
+  const patientUuid = activeVisit?.patient?.uuid || '';
+  const { visitContext, setVisitContext } = usePatientChartStore(patientUuid);
 
   const restoreDeletedVisit = () => {
-    restoreVisit(visit?.uuid)
-      .then(() => {
+    restoreVisit(activeVisit?.uuid)
+      .then(({ data: updatedVisit }) => {
         // Update current visit data for critical components (useVisit hook)
-        mutateCurrentVisit();
+        mutateActiveVisit();
+        if (!updatedVisit.stopDatetime) {
+          const mutateSavedOrUpdatedVisit = () => invalidateVisitByUuid(globalMutate, updatedVisit.uuid);
+          setVisitContext(updatedVisit, mutateSavedOrUpdatedVisit);
+        }
 
         // Use targeted SWR invalidation instead of global mutateVisit
         invalidateVisitAndEncounterData(globalMutate, patientUuid);
@@ -24,7 +37,7 @@ export function useDeleteVisit(visit: Visit, onVisitDelete = () => {}, onVisitRe
         showSnackbar({
           title: t('visitRestored', 'Visit restored'),
           subtitle: t('visitRestoredSuccessfully', '{{visit}} restored successfully', {
-            visit: visit?.visitType?.display ?? t('visit', 'Visit'),
+            visit: activeVisit?.visitType?.display ?? t('visit', 'Visit'),
           }),
           kind: 'success',
         });
@@ -32,12 +45,12 @@ export function useDeleteVisit(visit: Visit, onVisitDelete = () => {}, onVisitRe
       })
       .catch(() => {
         // On error, revalidate to get correct state
-        mutateCurrentVisit();
+        mutateActiveVisit();
         invalidateVisitAndEncounterData(globalMutate, patientUuid);
         showSnackbar({
           title: t('visitNotRestored', "Visit couldn't be restored"),
           subtitle: t('errorWhenRestoringVisit', 'Error occurred when restoring {{visit}}', {
-            visit: visit?.visitType?.display ?? t('visit', 'Visit'),
+            visit: activeVisit?.visitType?.display ?? t('visit', 'Visit'),
           }),
           kind: 'error',
         });
@@ -47,20 +60,23 @@ export function useDeleteVisit(visit: Visit, onVisitDelete = () => {}, onVisitRe
   const initiateDeletingVisit = () => {
     setIsDeletingVisit(true);
 
-    deleteVisit(visit?.uuid)
+    deleteVisit(activeVisit?.uuid)
       .then(() => {
-        // Update current visit data for critical components (useVisit hook)
-        mutateCurrentVisit();
+        // Update active visit data
+        mutateActiveVisit();
+        if (activeVisit.uuid === visitContext?.uuid) {
+          setVisitContext(null, null);
+        }
 
         // Use targeted SWR invalidation instead of global mutateVisit
         invalidateVisitAndEncounterData(globalMutate, patientUuid);
 
         showSnackbar({
           title: t('visitDeleted', '{{visit}} deleted', {
-            visit: visit?.visitType?.display ?? t('visit', 'Visit'),
+            visit: activeVisit?.visitType?.display ?? t('visit', 'Visit'),
           }),
           subtitle: t('visitDeletedSuccessfully', '{{visit}} deleted successfully', {
-            visit: visit?.visitType?.display ?? t('visit', 'Visit'),
+            visit: activeVisit?.visitType?.display ?? t('visit', 'Visit'),
           }),
           kind: 'success',
           actionButtonLabel: t('undo', 'Undo'),
@@ -70,7 +86,7 @@ export function useDeleteVisit(visit: Visit, onVisitDelete = () => {}, onVisitRe
       })
       .catch(() => {
         // On error, revalidate to get correct state
-        mutateCurrentVisit();
+        mutateActiveVisit();
         invalidateVisitAndEncounterData(globalMutate, patientUuid);
 
         showSnackbar({

package/src/visit/visit-form/visit-form.test.tsx

@@ -11,7 +11,6 @@ import {
   useConfig,
   useEmrConfiguration,
   useLocations,
-  useVisitContextStore,
   useVisitTypes,
   type Visit,
 } from '@openmrs/esm-framework';
@@ -59,6 +58,7 @@ const visitAttributes = {
 const mockCloseWorkspace = jest.fn();
 const mockPromptBeforeClosing = jest.fn();
 const mockSetTitle = jest.fn();
+const mockMutateVisitContext = jest.fn();
 
 const testProps = {
   openedFrom: 'test',
@@ -68,6 +68,8 @@ const testProps = {
   closeWorkspaceWithSavedChanges: mockCloseWorkspace,
   promptBeforeClosing: mockPromptBeforeClosing,
   setTitle: mockSetTitle,
+  visitContext: null,
+  mutateVisitContext: mockMutateVisitContext,
 };
 
 const mockSaveVisit = jest.mocked(saveVisit);
@@ -181,14 +183,6 @@ mockSaveVisit.mockResolvedValue({
   },
 } as unknown as FetchResponse<Visit>);
 
-jest.mocked(useVisitContextStore).mockReturnValue({
-  manuallySetVisitUuid: null,
-  patientUuid: null,
-  setVisitContext: jest.fn(),
-  mutateVisitCallbacks: {},
-  mutateVisit: jest.fn(),
-});
-
 describe('Visit form', () => {
   beforeEach(() => {
     mockUseConfig.mockReturnValue({

package/src/visit/visit-form/visit-form.workspace.tsx

@@ -36,8 +36,10 @@ import {
 } from '@openmrs/esm-framework';
 import {
   createOfflineVisitForPatient,
+  invalidateVisitByUuid,
   invalidateVisitAndEncounterData,
   useActivePatientEnrollment,
+  usePatientChartStore,
   type DefaultPatientWorkspaceProps,
 } from '@openmrs/esm-patient-common-lib';
 import { MemoizedRecommendedVisitType } from './recommended-visit-type.component';
@@ -120,9 +122,10 @@ const VisitForm: React.FC<VisitFormProps> = ({
   );
   const visitHeaderSlotState = useMemo(() => ({ patientUuid }), [patientUuid]);
   const { activePatientEnrollment, isLoading } = useActivePatientEnrollment(patientUuid);
-  const { mutate: mutateCurrentVisit } = useVisit(patientUuid);
+  const { mutate: mutateActiveVisit } = useVisit(patientUuid);
   const { mutate: globalMutate } = useSWRConfig();
   const allVisitTypes = useConditionalVisitTypes();
+  const { setVisitContext } = usePatientChartStore(patientUuid);
 
   const [errorFetchingResources, setErrorFetchingResources] = useState<{
     blockSavingForm: boolean;
@@ -327,12 +330,15 @@ const VisitForm: React.FC<VisitFormProps> = ({
             // 1. Current visit data (for critical components like visit summary, action buttons)
             // 2. Visit history table (for the paginated visit list)
 
-            // Update current visit data for critical components (useVisit hook)
-            mutateCurrentVisit();
+            // Update patient's visit data for critical components
+            const mutateSavedOrUpdatedVisit = () => invalidateVisitByUuid(globalMutate, visit.uuid);
+            mutateActiveVisit();
+            setVisitContext?.(visit, mutateSavedOrUpdatedVisit);
+            visitToEdit && mutateSavedOrUpdatedVisit();
 
             // Use targeted SWR invalidation instead of global mutateVisit
             // This will invalidate visit history and encounter tables for this patient
-            // (current visit is already updated with mutateCurrentVisit)
+            // (if visitContext is updated, it should have been invalidated with mutateSavedOrUpdatedVisit)
             invalidateVisitAndEncounterData(globalMutate, patientUuid);
 
             // handleVisitAttributes already has code to show error snackbar when attribute fails to update
@@ -371,9 +377,12 @@ const VisitForm: React.FC<VisitFormProps> = ({
           config.offlineVisitTypeUuid,
           payload.startDatetime,
         ).then(
-          () => {
+          (visit) => {
             // Use same targeted approach for offline visits for consistency
-            mutateCurrentVisit();
+            const mutateSavedOrUpdatedVisit = () => invalidateVisitByUuid(globalMutate, visit.uuid);
+            mutateActiveVisit();
+            setVisitContext?.(visit, mutateSavedOrUpdatedVisit);
+            visitToEdit && mutateSavedOrUpdatedVisit();
 
             // Also invalidate visit history and encounter tables
             invalidateVisitAndEncounterData(globalMutate, patientUuid);
@@ -407,12 +416,13 @@ const VisitForm: React.FC<VisitFormProps> = ({
       globalMutate,
       handleVisitAttributes,
       isOnline,
-      mutateCurrentVisit,
+      setVisitContext,
       patientUuid,
       t,
       visitFormCallbacks,
       visitToEdit,
       isValidVisitAttributesArray,
+      mutateActiveVisit,
     ],
   );
 

package/src/visit/visit-prompt/delete-visit-dialog.component.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

@@ -9,6 +9,7 @@ import DeleteVisitDialog from './delete-visit-dialog.component';
 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

@@ -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

@@ -4,6 +4,7 @@ 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 { 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/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.component.tsx → current-visit-summary.extension.tsx}

@@ -1,8 +1,7 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { InlineLoading } from '@carbon/react';
-import { ErrorState, launchWorkspace, useVisit } from '@openmrs/esm-framework';
-import { CardHeader, EmptyState } from '@openmrs/esm-patient-common-lib';
+import { launchWorkspace } 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';
 
@@ -10,29 +9,23 @@ 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 { isLoading, currentVisit, error, isValidating } = useVisit(patientUuid);
+  const { patientUuid: storePatientUuid, visitContext } = usePatientChartStore(patientUuid);
 
-  if (isLoading) {
-    return (
-      <InlineLoading
-        status="active"
-        iconDescription={t('loading', 'Loading')}
-        description={t('loadingVisit', 'Loading current visit...')}
-      />
-    );
-  }
-
-  if (!!error) {
-    return <ErrorState headerTitle={t('failedToLoadCurrentVisit', 'Failed loading current visit')} error={error} />;
+  if (patientUuid !== storePatientUuid) {
+    return null;
   }
 
-  if (!currentVisit) {
+  if (!visitContext) {
     return (
       <EmptyState
         headerTitle={t('currentVisit', 'Current visit')}
-        displayText={t('noActiveVisitMessage', 'active visit')}
+        displayText={t('activeVisits__lower', 'active visits')}
         launchForm={() =>
           launchWorkspace('start-visit-workspace-form', { openedFrom: 'patient-chart-current-visit-summary' })
         }
@@ -43,10 +36,10 @@ const CurrentVisitSummary: React.FC<CurrentVisitSummaryProps> = ({ patientUuid }
   return (
     <div className={styles.container}>
       <CardHeader title={t('currentVisit', 'Current visit')}>
-        <span>{isValidating ? <InlineLoading /> : null}</span>
+        <span />
       </CardHeader>
       <div className={styles.visitSummaryCard}>
-        <VisitSummary visit={currentVisit} patientUuid={patientUuid} />
+        <VisitSummary visit={visitContext} patientUuid={patientUuid} />
       </div>
     </div>
   );