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

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/start-visit-button.component.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button } from '@carbon/react';
-import { launchWorkspace, showSnackbar } from '@openmrs/esm-framework';
+import { launchWorkspace2, showSnackbar } from '@openmrs/esm-framework';
 
 interface StartVisitButtonProps {
   patientUuid: string;
@@ -20,7 +20,7 @@ const StartVisitButton = ({ patientUuid, handleReturnToSearchList, hidePatientSe
     hidePatientSearch?.();
 
     try {
-      launchWorkspace(startVisitWorkspaceForm, {
+      launchWorkspace2(startVisitWorkspaceForm, {
         patientUuid,
         openedFrom: 'patient-chart-start-visit',
         handleReturnToSearchList,

package/src/visit/start-visit-button.test.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
-import { launchWorkspace } from '@openmrs/esm-framework';
+import { launchWorkspace2 } from '@openmrs/esm-framework';
 import { mockPatient } from 'tools';
 import StartVisitButton from './start-visit-button.component';
 
-const mockLaunchWorkspace = jest.mocked(launchWorkspace);
+const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
 
 describe('StartVisitButton', () => {
   it('renders the start visit button', () => {

package/src/visit/visit-action-items/edit-visit-details.component.tsx

@@ -6,13 +6,20 @@ import {
   UserHasAccess,
   type Visit,
   getCoreTranslation,
-  launchWorkspace,
+  launchWorkspace2,
   useLayoutType,
 } from '@openmrs/esm-framework';
+import { type VisitFormProps } from '../visit-form/visit-form.workspace';
+import {
+  invalidateVisitAndEncounterData,
+  invalidateVisitByUuid,
+  type PatientWorkspaceGroupProps,
+} from '@openmrs/esm-patient-common-lib';
+import { useSWRConfig } from 'swr';
 
 interface EditVisitDetailsActionItemProps {
-  patientUuid: string;
   visit: Visit;
+  patient: fhir.Patient;
 
   /**
    * If true, renders as IconButton instead
@@ -20,18 +27,32 @@ interface EditVisitDetailsActionItemProps {
   compact?: boolean;
 }
 
-const EditVisitDetailsActionItem: React.FC<EditVisitDetailsActionItemProps> = ({ visit, compact }) => {
+/**
+ * This component
+ */
+const EditVisitDetailsActionItem: React.FC<EditVisitDetailsActionItemProps> = ({ visit, patient, compact }) => {
   const { t } = useTranslation();
+  const { mutate: globalMutate } = useSWRConfig();
 
   const isTablet = useLayoutType() === 'tablet';
   const responsiveSize = isTablet ? 'lg' : 'sm';
+  const patientUuid = patient.id;
 
   const editVisitDetails = () => {
-    launchWorkspace('start-visit-workspace-form', {
-      workspaceTitle: t('editVisitDetails', 'Edit visit details'),
-      visitToEdit: visit,
-      openedFrom: 'patient-chart-edit-visit',
-    });
+    launchWorkspace2<VisitFormProps, {}, PatientWorkspaceGroupProps>(
+      'start-visit-workspace-form',
+      { openedFrom: 'patient-chart-edit-visit' },
+      {},
+      {
+        patient,
+        patientUuid: patientUuid,
+        visitContext: visit,
+        mutateVisitContext: () => {
+          invalidateVisitByUuid(globalMutate, visit.uuid);
+          invalidateVisitAndEncounterData(globalMutate, patientUuid);
+        },
+      },
+    );
   };
 
   return (

package/src/visit/visit-form/base-visit-type.component.tsx

@@ -41,14 +41,14 @@ const BaseVisitType: React.FC<BaseVisitTypeProps> = ({ visitTypes }) => {
           {isTablet ? (
             <Layer>
               <Search
-                labelText=""
+                labelText={t('searchForAVisitType', 'Search for a visit type')}
                 onChange={handleSearchTermChange}
                 placeholder={t('searchForAVisitType', 'Search for a visit type')}
               />
             </Layer>
           ) : (
             <Search
-              labelText=""
+              labelText={t('searchForAVisitType', 'Search for a visit type')}
               onChange={handleSearchTermChange}
               placeholder={t('searchForAVisitType', 'Search for a visit type')}
             />