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

package/src/patient-banner-tags/{visit-attribute-tags.component.tsx → visit-attribute-tags.extension.tsx}

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Tag } from '@carbon/react';
-import { formatDate, useConfig } from '@openmrs/esm-framework';
-import { useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
+import { formatDate, useConfig, useVisit } from '@openmrs/esm-framework';
 import { type ChartConfig } from '../config-schema';
 
 interface VisitAttributeTagsProps {
@@ -26,13 +25,16 @@ const getAttributeValue = (attributeType, value) => {
   }
 };
 
+/**
+ * This extension slots to the patient-banner-tags-slot by default.
+ */
 const VisitAttributeTags: React.FC<VisitAttributeTagsProps> = ({ patientUuid }) => {
-  const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
+  const { activeVisit } = useVisit(patientUuid);
   const { visitAttributeTypes } = useConfig<ChartConfig>();
 
   return (
     <>
-      {currentVisit?.attributes
+      {activeVisit?.attributes
         ?.filter(
           (attribute) =>
             visitAttributeTypes.find(({ uuid }) => attribute?.attributeType?.uuid === uuid)?.displayInThePatientBanner,

package/src/patient-chart/patient-chart.component.tsx

@@ -1,46 +1,21 @@
-import {
-  ExtensionSlot,
-  WorkspaceContainer,
-  setCurrentVisit,
-  usePatient,
-  useWorkspaces,
-  useLeftNav,
-} from '@openmrs/esm-framework';
-import { getPatientChartStore } from '@openmrs/esm-patient-common-lib';
+import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
 import { useParams } from 'react-router-dom';
+import { ExtensionSlot, WorkspaceContainer, useWorkspaces, useLeftNav } from '@openmrs/esm-framework';
 import { spaBasePath } from '../constants';
-import Loader from '../loader/loader.component';
+import { usePatientChartPatientAndVisit } from './patient-chart.resources';
+import { type LayoutMode } from './chart-review/dashboard-view.component';
 import ChartReview from '../patient-chart/chart-review/chart-review.component';
+import Loader from '../loader/loader.component';
 import SideMenuPanel from '../side-nav/side-menu.component';
-import { type LayoutMode } from './chart-review/dashboard-view.component';
 import styles from './patient-chart.scss';
 
 const PatientChart: React.FC = () => {
   const { patientUuid, view: encodedView } = useParams();
-  const view = decodeURIComponent(encodedView);
-  const { isLoading: isLoadingPatient, patient } = usePatient(patientUuid);
-  const state = useMemo(() => ({ patient, patientUuid }), [patient, patientUuid]);
   const { workspaceWindowState, active } = useWorkspaces();
   const [layoutMode, setLayoutMode] = useState<LayoutMode>();
-  // Keep state updated with the current patient. Anything used outside the patient
-  // chart (e.g., the current visit is used by the Active Visit Tag used in the
-  // patient search) must be updated in the callback, which is called when the patient
-  // chart unmounts.
-  useEffect(() => {
-    setCurrentVisit(patientUuid, null);
-    return () => {
-      setCurrentVisit(null, null);
-    };
-  }, [patientUuid]);
-
-  useEffect(() => {
-    getPatientChartStore().setState({ ...state });
-    return () => {
-      getPatientChartStore().setState({});
-    };
-  }, [state]);
+  const state = usePatientChartPatientAndVisit(patientUuid);
+  const view = decodeURIComponent(encodedView);
 
   const leftNavBasePath = useMemo(() => spaBasePath.replace(':patientUuid', patientUuid), [patientUuid]);
 
@@ -50,43 +25,42 @@ const PatientChart: React.FC = () => {
     <>
       <SideMenuPanel />
       <main className={classNames('omrs-main-content', styles.chartContainer)}>
-        <>
-          <div
-            className={classNames(
-              styles.innerChartContainer,
-              workspaceWindowState === 'normal' && active ? styles.closeWorkspace : styles.activeWorkspace,
-            )}
-          >
-            {isLoadingPatient ? (
-              <Loader />
-            ) : (
-              <>
-                <aside>
-                  <ExtensionSlot name="patient-header-slot" state={state} />
-                  <ExtensionSlot name="patient-highlights-bar-slot" state={state} />
-                  <ExtensionSlot name="patient-info-slot" state={state} />
-                </aside>
-                <div className={styles.grid}>
-                  <div
-                    className={classNames(styles.chartReview, { [styles.widthContained]: layoutMode == 'contained' })}
-                  >
-                    <ChartReview
-                      patient={state.patient}
-                      patientUuid={state.patientUuid}
-                      view={view}
-                      setDashboardLayoutMode={setLayoutMode}
-                    />
-                  </div>
+        <div
+          className={classNames(
+            styles.innerChartContainer,
+            workspaceWindowState === 'normal' && active ? styles.closeWorkspace : styles.activeWorkspace,
+          )}
+        >
+          {state.isLoadingPatient ? (
+            <Loader />
+          ) : (
+            <>
+              <aside>
+                <ExtensionSlot name="patient-header-slot" state={state} />
+                <ExtensionSlot name="patient-highlights-bar-slot" state={state} />
+                <ExtensionSlot name="patient-info-slot" state={state} />
+              </aside>
+              <div className={styles.grid}>
+                <div
+                  className={classNames(styles.chartReview, { [styles.widthContained]: layoutMode === 'contained' })}
+                >
+                  <ChartReview
+                    patient={state.patient}
+                    patientUuid={state.patientUuid}
+                    view={view}
+                    setDashboardLayoutMode={setLayoutMode}
+                  />
                 </div>
-              </>
-            )}
-          </div>
-        </>
+              </div>
+            </>
+          )}
+        </div>
       </main>
       <WorkspaceContainer
-        showSiderailAndBottomNav
-        contextKey={`patient/${patientUuid}`}
+        actionMenuProps={state}
         additionalWorkspaceProps={state}
+        contextKey={`patient/${patientUuid}`}
+        showSiderailAndBottomNav
       />
     </>
   );

package/src/patient-chart/patient-chart.resources.ts

@@ -0,0 +1,108 @@
+import { useEffect, useMemo } from 'react';
+import useSWR from 'swr';
+import { openmrsFetch, restBaseUrl, usePatient, useVisit, type Visit } from '@openmrs/esm-framework';
+import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
+
+const defaultVisitCustomRepresentation =
+  'custom:(uuid,display,voided,indication,startDatetime,stopDatetime,' +
+  'encounters:(uuid,display,encounterDatetime,' +
+  'form:(uuid,name),location:ref,' +
+  'encounterType:ref,' +
+  'encounterProviders:(uuid,display,' +
+  'provider:(uuid,display))),' +
+  'patient:(uuid,display),' +
+  'visitType:(uuid,name,display),' +
+  'attributes:(uuid,display,attributeType:(name,datatypeClassname,uuid),value),' +
+  'location:(uuid,name,display))';
+
+export function useVisitByUuid(visitUuid: string | null, representation: string = defaultVisitCustomRepresentation) {
+  const url = `${restBaseUrl}/visit/${visitUuid}?v=${representation}`;
+  const { data, ...rest } = useSWR<{ data: Visit }>(visitUuid ? url : null, openmrsFetch);
+  return { visit: data?.data, ...rest };
+}
+
+/**
+ * This hook manages fetching of the patient and the visitContext
+ * when entering the patient chart, and the associated updated to patient chart store.
+ *
+ * The patient chart store sets the patient when we enter the patient chart
+ * and unsets the patient when we leave. (This gives extensions and workspaces a way
+ * to check whether they are rendered within the patient chart app.)
+ * Note: We do not unset visitContext when leaving the chart, so it persists across
+ * in‑app navigation. On a full page reload, visitContext is rehydrated by refetching
+ * (via useVisit/useVisitByUuId) rather than restored from storage.
+ * When we enter the chart, we want to update the visit context as follows:
+ * does the stored visitContext exist and belong to the patient?
+ * 1. If so, the visitContext should be valid but possibly stale; fetch the visit again
+ *    and update the context
+ * 2. If not, fetch the active visit of the patient, If it exists, set it as the
+ *    visitContext; otherwise, clear it.
+ * @param patientUuid
+ * @returns
+ */
+export function usePatientChartPatientAndVisit(patientUuid: string) {
+  const { isLoading: isLoadingPatient, patient } = usePatient(patientUuid);
+  const {
+    patientUuid: storePatientUuid,
+    setPatient,
+    visitContext,
+    mutateVisitContext,
+    setVisitContext,
+  } = usePatientChartStore(patientUuid);
+
+  const isVisitContextValid = visitContext && visitContext.patient?.uuid === patientUuid;
+  const {
+    visit: newVisitContext,
+    mutate: newMutateVisitContext,
+    isValidating: isValidatingVisitContext,
+  } = useVisitByUuid(isVisitContextValid ? visitContext.uuid : null);
+  const {
+    activeVisit,
+    isValidating: isValidatingActiveVisit,
+    mutate: mutateActiveVisit,
+  } = useVisit(isVisitContextValid ? null : patientUuid);
+
+  useEffect(() => {
+    if (!isValidatingVisitContext && !isValidatingActiveVisit && storePatientUuid) {
+      if (activeVisit) {
+        setVisitContext(activeVisit, mutateActiveVisit);
+      } else if (newVisitContext) {
+        setVisitContext(newVisitContext, newMutateVisitContext);
+      } else {
+        setVisitContext(null, null);
+      }
+    }
+  }, [
+    newVisitContext,
+    isValidatingVisitContext,
+    newMutateVisitContext,
+    setVisitContext,
+    activeVisit,
+    isValidatingActiveVisit,
+    storePatientUuid,
+    mutateActiveVisit,
+  ]);
+
+  useEffect(() => {
+    if (!isLoadingPatient) {
+      setPatient(patient);
+    }
+
+    return () => {
+      setPatient(null);
+    };
+  }, [patient, setPatient, isLoadingPatient]);
+
+  const state = useMemo(
+    () => ({
+      patientUuid,
+      patient: patient ?? {},
+      visitContext,
+      mutateVisitContext,
+      isLoadingPatient,
+    }),
+    [patient, patientUuid, visitContext, mutateVisitContext, isLoadingPatient],
+  );
+
+  return state;
+}

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({