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

package/src/visit/visits-widget/visit-context/visit-context-switcher.modal.tsx

@@ -9,12 +9,13 @@ import {
   OpenmrsDatePicker,
   useDebounce,
   useOnVisible,
-  useVisitContextStore,
   type Visit,
 } from '@openmrs/esm-framework';
+import { invalidateVisitByUuid, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 import { useInfiniteVisits } from '../visit.resource';
 import VisitContextInfo from './visit-context-info.component';
 import styles from './visit-context-switcher.scss';
+import { useSWRConfig } from 'swr';
 
 interface VisitContextSwitcherProps {
   patientUuid: string;
@@ -37,10 +38,9 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
     { toStartDate: dayjs(maxStartDateDebounced).endOf('day').toISOString() },
     rep,
   );
-  const { patientUuid: selectedVisitPatientUuid, manuallySetVisitUuid, setVisitContext } = useVisitContextStore();
-  const [selectedVisit, setSelectedVisit] = useState<string>(
-    selectedVisitPatientUuid === patientUuid ? manuallySetVisitUuid : null,
-  );
+  const { visitContext, setVisitContext } = usePatientChartStore(patientUuid);
+  const [selectedVisitUuid, setSelectedVisitUuid] = useState<string>(visitContext?.uuid ?? null);
+  const { mutate: globalMutate } = useSWRConfig();
 
   const onScrollToEnd = useCallback(() => {
     if (hasMore) {
@@ -71,7 +71,7 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
       <ModalBody>
         {error ? (
           <ErrorState headerTitle={t('visits', 'visits')} error={error} />
-        ) : visits?.length == 0 ? (
+        ) : visits?.length === 0 ? (
           <Tile className={styles.tile}>
             <div className={styles.tileContent}>
               <p className={styles.content}>{t('noVisitsToDisplay', 'No visits to display')}</p>
@@ -85,8 +85,8 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
                 <VisitCardRow
                   key={visit.uuid}
                   visit={visit}
-                  setSelectedVisit={setSelectedVisit}
-                  isSelected={selectedVisit === visit.uuid}
+                  setSelectedVisit={setSelectedVisitUuid}
+                  isSelected={selectedVisitUuid === visit.uuid}
                 />
               );
             })}
@@ -104,9 +104,11 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
           {t('cancel', 'Cancel')}
         </Button>
         <Button
-          disabled={selectedVisit === null || isLoading}
+          disabled={selectedVisitUuid === null || isLoading}
           onClick={() => {
-            setVisitContext(visits.find((v) => v.uuid === selectedVisit));
+            const selectedVisit = visits.find((v) => v.uuid === selectedVisitUuid);
+            const mutateVisitContext = () => invalidateVisitByUuid(globalMutate, selectedVisit.uuid);
+            setVisitContext(selectedVisit, mutateVisitContext);
             onAfterVisitSelected?.();
             closeModal();
           }}
@@ -125,7 +127,7 @@ interface VisitCardRowProps {
 }
 
 /**
- * A clickable row within the the visit context switcher to select a visit. This
+ * A clickable row within the visit context switcher to select a visit. This
  * has slightly different UX than a regular radio button, as the entire card
  * (not just the radio button and the label) is clickable
  */

package/src/visit/visits-widget/visit-context/visit-context-switcher.test.tsx

@@ -1,46 +1,49 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { useVisitContextStore } from '@openmrs/esm-framework';
+import userEvent from '@testing-library/user-event';
 import { useSystemVisitSetting } from '@openmrs/esm-patient-common-lib';
 import { mockCurrentVisit, mockVisit2, mockVisit3 } from '__mocks__';
 import { useInfiniteVisits } from '../visit.resource';
 import VisitContextSwitcherModal from './visit-context-switcher.modal';
 
-const mockUseSystemVisitSetting = jest.fn(useSystemVisitSetting).mockReturnValue({
-  errorFetchingSystemVisitSetting: null,
-  isLoadingSystemVisitSetting: false,
-  systemVisitEnabled: true,
-});
-
-jest.mocked(useVisitContextStore).mockReturnValue({
-  manuallySetVisitUuid: null,
-  mutateVisitCallbacks: {},
-  patientUuid: null,
-  setVisitContext: jest.fn(),
-  mutateVisit: jest.fn(),
-});
-
-const mockUseInfiniteVisits = jest.fn(useInfiniteVisits).mockReturnValue({
-  visits: [mockCurrentVisit, mockVisit2, mockVisit3],
-  error: null,
-  mutate: jest.fn(),
-  isValidating: false,
-  isLoading: false,
-  totalCount: 3,
-  hasMore: false,
-  loadMore: jest.fn(),
-  nextUri: '',
-});
-
-jest.mock('@openmrs/esm-patient-common-lib/src/useSystemVisitSetting', () => ({
-  useSystemVisitSetting: () => mockUseSystemVisitSetting(),
-}));
+const mockUseInfiniteVisits = jest.fn(useInfiniteVisits);
 
 jest.mock('../visit.resource', () => ({
   useInfiniteVisits: () => mockUseInfiniteVisits('some-uuid'),
 }));
 
+const mockSetVisitContext = jest.fn();
+const mockUseSystemVisitSetting = jest.fn(useSystemVisitSetting);
+
+jest.mock('@openmrs/esm-patient-common-lib', () => ({
+  ...jest.requireActual('@openmrs/esm-patient-common-lib'),
+  useSystemVisitSetting: jest.fn(),
+  usePatientChartStore: jest.fn(() => ({
+    visitContext: null,
+    setVisitContext: mockSetVisitContext,
+  })),
+}));
+
 describe('VisitContextSwitcherModal', () => {
+  beforeEach(() => {
+    mockUseInfiniteVisits.mockReturnValue({
+      visits: [mockCurrentVisit, mockVisit2, mockVisit3],
+      error: null,
+      mutate: jest.fn(),
+      isValidating: false,
+      isLoading: false,
+      totalCount: 3,
+      hasMore: false,
+      loadMore: jest.fn(),
+      nextUri: '',
+    });
+    mockUseSystemVisitSetting.mockReturnValue({
+      errorFetchingSystemVisitSetting: null,
+      isLoadingSystemVisitSetting: false,
+      systemVisitEnabled: true,
+    });
+  });
+
   it('should display a list of past visits', () => {
     mockUseSystemVisitSetting.mockReturnValueOnce({
       systemVisitEnabled: false,
@@ -53,6 +56,23 @@ describe('VisitContextSwitcherModal', () => {
     // visit type - only check the visitType div elements
     expect(screen.getAllByText('Facility Visit', { selector: '.visitType' })).toHaveLength(3);
   });
+
+  it('should call setVisitContext when continue button is clicked with selected visit', async () => {
+    const user = userEvent.setup();
+
+    renderVisitContextSwitcherModal();
+
+    // Select a visit by clicking on the first visit card
+    const firstVisitRadio = screen.getAllByRole('radio', { name: /Facility Visit/ })[0];
+    await user.click(firstVisitRadio);
+
+    // Click the continue button
+    const continueButton = screen.getByRole('button', { name: /continue/i });
+    await user.click(continueButton);
+
+    // Verify setVisitContext was called with the selected visit
+    expect(mockSetVisitContext).toHaveBeenCalledWith(mockCurrentVisit, expect.any(Function));
+  });
 });
 
 function renderVisitContextSwitcherModal() {

package/src/visit/visits-widget/visit.resource.tsx

@@ -53,7 +53,7 @@ export function deleteVisit(visitUuid: string) {
 }
 
 export function restoreVisit(visitUuid: string) {
-  return openmrsFetch(`${restBaseUrl}/visit/${visitUuid}`, {
+  return openmrsFetch<Visit>(`${restBaseUrl}/visit/${visitUuid}`, {
     headers: {
       'content-type': 'application/json',
     },

package/translations/en.json

@@ -1,5 +1,6 @@
 {
   "actions": "Actions",
+  "activeVisits__lower": "active visits",
   "addingToVisit": "Adding to:",
   "additionalVisitInformationUpdatedSuccessfully": "Additional visit information updated successfully",
   "addVisit": "Add visit",
@@ -75,7 +76,6 @@
   "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
   "errorUpdatingVisitDetails": "Error updating visit details",
   "errorWhenRestoringVisit": "Error occurred when restoring {{visit}}",
-  "failedToLoadCurrentVisit": "Failed loading current visit",
   "fieldRequired": "This field is required",
   "filterByEncounterType": "Filter by encounter type",
   "form": "Form name",
@@ -85,7 +85,6 @@
   "indication": "Indication",
   "inThePast": "In the past",
   "loading": "Loading",
-  "loadingVisit": "Loading current visit...",
   "markAliveSuccessfully": "Patient marked alive successfully",
   "markDeceasedWarning": "Marking the patient as deceased will end any active visits for this patient",
   "markPatientAlive": "Mark patient alive",
@@ -99,7 +98,6 @@
   "nextPage": "Next page",
   "no": "No",
   "noActiveVisit": "No Active Visit",
-  "noActiveVisitMessage": "active visit",
   "noActiveVisitNoRDEText": "You can't add data to the patient chart without an active visit. Would you like to start a new visit?",
   "noDiagnosesFound": "No diagnoses found",
   "noEncountersToDisplay": "No encounters to display",