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

package/src/routes.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "optionalBackendDependencies": {
     "emrapi": {
-      "version": "^2.0.0",
+      "version": ">=2.0.0 <4.0.0",
       "feature": {
         "flagName": "emrapi-module",
         "label": "EMR API Module",
@@ -225,29 +225,18 @@
       "offline": true
     }
   ],
-  "workspaces2": [
+  "workspaces": [
     {
       "name": "mark-patient-deceased-workspace-form",
       "component": "markPatientDeceasedForm",
-      "window": "mark-patient-deceased"
+      "title": "Mark patient deceased",
+      "type": "form"
     },
     {
       "name": "start-visit-workspace-form",
       "component": "startVisitWorkspace",
-      "window": "start-visit"
+      "title": "startVisitWorkspaceTitle",
+      "type": "start-visit"
     }
-  ],
-  "workspaceWindows2": [
-    {
-      "name": "start-visit",
-      "group": "patient-chart"
-    },
-    {
-      "name": "mark-patient-deceased",
-      "group": "patient-chart"
-    }
-  ],
-  "workspaceGroups2": [{
-    "name":"patient-chart"
-  }]
+  ]
 }

package/src/visit/hooks/useDeleteVisit.tsx

@@ -64,7 +64,7 @@ export function useDeleteVisit(
       .then(() => {
         // Update active visit data
         mutateActiveVisit();
-        if (activeVisit.uuid == visitContext?.uuid) {
+        if (activeVisit.uuid === visitContext?.uuid) {
           setVisitContext(null, null);
         }
 

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 { launchWorkspace2, showSnackbar } from '@openmrs/esm-framework';
+import { launchWorkspace, showSnackbar } from '@openmrs/esm-framework';
 
 interface StartVisitButtonProps {
   patientUuid: string;
@@ -20,7 +20,7 @@ const StartVisitButton = ({ patientUuid, handleReturnToSearchList, hidePatientSe
     hidePatientSearch?.();
 
     try {
-      launchWorkspace2(startVisitWorkspaceForm, {
+      launchWorkspace(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 { launchWorkspace2 } from '@openmrs/esm-framework';
+import { launchWorkspace } from '@openmrs/esm-framework';
 import { mockPatient } from 'tools';
 import StartVisitButton from './start-visit-button.component';
 
-const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
+const mockLaunchWorkspace = jest.mocked(launchWorkspace);
 
 describe('StartVisitButton', () => {
   it('renders the start visit button', () => {

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

@@ -6,20 +6,13 @@ import {
   UserHasAccess,
   type Visit,
   getCoreTranslation,
-  launchWorkspace2,
+  launchWorkspace,
   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
@@ -27,32 +20,18 @@ interface EditVisitDetailsActionItemProps {
   compact?: boolean;
 }
 
-/**
- * This component
- */
-const EditVisitDetailsActionItem: React.FC<EditVisitDetailsActionItemProps> = ({ visit, patient, compact }) => {
+const EditVisitDetailsActionItem: React.FC<EditVisitDetailsActionItemProps> = ({ visit, compact }) => {
   const { t } = useTranslation();
-  const { mutate: globalMutate } = useSWRConfig();
 
   const isTablet = useLayoutType() === 'tablet';
   const responsiveSize = isTablet ? 'lg' : 'sm';
-  const patientUuid = patient.id;
 
   const editVisitDetails = () => {
-    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);
-        },
-      },
-    );
+    launchWorkspace('start-visit-workspace-form', {
+      workspaceTitle: t('editVisitDetails', 'Edit visit details'),
+      visitToEdit: visit,
+      openedFrom: 'patient-chart-edit-visit',
+    });
   };
 
   return (

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

@@ -1,8 +1,8 @@
-import React, { useState, useMemo, useCallback, type ChangeEvent } from 'react';
+import React, { useState, useMemo, useCallback, useEffect, useRef, type ChangeEvent } from 'react';
 import classNames from 'classnames';
+import { Layer, RadioButton, RadioButtonGroup, Search, StructuredListSkeleton, Tile } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { useFormContext, Controller } from 'react-hook-form';
-import { Layer, RadioButton, RadioButtonGroup, Search, StructuredListSkeleton, Tile } from '@carbon/react';
 import { PatientChartPagination } from '@openmrs/esm-patient-common-lib';
 import { useDebounce, useLayoutType, usePagination, type VisitType } from '@openmrs/esm-framework';
 import { type VisitFormData } from './visit-form.resource';
@@ -14,7 +14,7 @@ interface BaseVisitTypeProps {
 
 const BaseVisitType: React.FC<BaseVisitTypeProps> = ({ visitTypes }) => {
   const { t } = useTranslation();
-  const { control } = useFormContext<VisitFormData>();
+  const { control, setValue } = useFormContext<VisitFormData>();
   const isTablet = useLayoutType() === 'tablet';
   const [searchTerm, setSearchTerm] = useState<string>('');
   const debouncedSearchTerm = useDebounce(searchTerm, 300);
@@ -29,30 +29,40 @@ const BaseVisitType: React.FC<BaseVisitTypeProps> = ({ visitTypes }) => {
 
   const { results, currentPage, goTo } = usePagination(searchResults, 5);
   const hasNoMatchingSearchResults = debouncedSearchTerm.trim() !== '' && searchResults.length === 0;
+  const prevSearchTermRef = useRef(debouncedSearchTerm);
 
   const handleSearchTermChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
     setSearchTerm(e.target.value);
   }, []);
 
+  useEffect(() => {
+    if (searchResults?.length === 1) {
+      setValue('visitType', searchResults[0].uuid);
+    }
+  }, [searchResults, setValue]);
+
+  // Reset pagination to page 1 when search term changes
+  useEffect(() => {
+    if (prevSearchTermRef.current !== debouncedSearchTerm && currentPage !== 1) {
+      goTo(1);
+    }
+    prevSearchTermRef.current = debouncedSearchTerm;
+  }, [debouncedSearchTerm, currentPage, goTo]);
+
+  const searchComponent = (
+    <Search
+      labelText={t('searchForAVisitType', 'Search for a visit type')}
+      onChange={handleSearchTermChange}
+      placeholder={t('searchForAVisitType', 'Search for a visit type')}
+      value={searchTerm}
+    />
+  );
+
   return (
     <div className={classNames(styles.visitTypeOverviewWrapper, isTablet ? styles.tablet : styles.desktop)}>
       {visitTypes.length ? (
         <>
-          {isTablet ? (
-            <Layer>
-              <Search
-                labelText={t('searchForAVisitType', 'Search for a visit type')}
-                onChange={handleSearchTermChange}
-                placeholder={t('searchForAVisitType', 'Search for a visit type')}
-              />
-            </Layer>
-          ) : (
-            <Search
-              labelText={t('searchForAVisitType', 'Search for a visit type')}
-              onChange={handleSearchTermChange}
-              placeholder={t('searchForAVisitType', 'Search for a visit type')}
-            />
-          )}
+          {isTablet ? <Layer>{searchComponent}</Layer> : searchComponent}
 
           {hasNoMatchingSearchResults ? (
             <div className={styles.tileContainer}>
@@ -67,7 +77,6 @@ const BaseVisitType: React.FC<BaseVisitTypeProps> = ({ visitTypes }) => {
             <Controller
               name="visitType"
               control={control}
-              defaultValue={results?.length === 1 ? results[0].uuid : null}
               render={({ field: { onChange, value } }) => (
                 <RadioButtonGroup
                   className={styles.radioButtonGroup}
@@ -76,7 +85,7 @@ const BaseVisitType: React.FC<BaseVisitTypeProps> = ({ visitTypes }) => {
                   orientation="vertical"
                   valueSelected={value}
                 >
-                  {results.map(({ uuid, display, name }) => (
+                  {results.map(({ display, uuid }) => (
                     <RadioButton
                       className={styles.radioButton}
                       id={`visit-type-${uuid}`}
@@ -97,7 +106,7 @@ const BaseVisitType: React.FC<BaseVisitTypeProps> = ({ visitTypes }) => {
                 onPageNumberChange={({ page }) => goTo(page)}
                 pageNumber={currentPage}
                 pageSize={5}
-                totalItems={visitTypes?.length}
+                totalItems={searchResults.length}
               />
             </div>
           )}

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

@@ -21,6 +21,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import {
   Extension,
   ExtensionSlot,
+  launchWorkspaceGroup2,
   OpenmrsFetchError,
   saveVisit,
   showSnackbar,
@@ -29,6 +30,7 @@ import {
   useConnectivity,
   useEmrConfiguration,
   useLayoutType,
+  useVisit,
   type Visit,
   Workspace2,
   type Workspace2DefinitionProps,
@@ -37,6 +39,7 @@ import {
 } from '@openmrs/esm-framework';
 import {
   createOfflineVisitForPatient,
+  invalidateVisitByUuid,
   invalidateVisitAndEncounterData,
   useActivePatientEnrollment,
 } from '@openmrs/esm-patient-common-lib';

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

@@ -26,8 +26,10 @@ import {
   useVisitFormCallbacks,
   useVisitFormSchemaAndDefaultValues,
 } from './visit-form.resource';
-import VisitForm, { type VisitFormProps } from './visit-form.workspace';
-import { type PatientWorkspace2DefinitionProps } from '@openmrs/esm-patient-common-lib/src';
+import VisitForm from './visit-form.workspace';
+
+// Fixed reference time used in time-dependent tests
+const FIXED_NOW = new Date('2023-01-01T08:00:00.000Z');
 
 const visitUuid = 'test_visit_uuid';
 const visitAttributes = {
@@ -54,23 +56,20 @@ const visitAttributes = {
 };
 
 const mockCloseWorkspace = jest.fn();
+const mockPromptBeforeClosing = jest.fn();
+const mockSetTitle = jest.fn();
 const mockMutateVisitContext = jest.fn();
-const defaultProps: PatientWorkspace2DefinitionProps<VisitFormProps, {}> = {
+
+const testProps = {
+  openedFrom: 'test',
+  patientUuid: mockPatient.id,
+  patient: mockPatient,
   closeWorkspace: mockCloseWorkspace,
-  workspaceProps: {
-    openedFrom: 'test',
-  },
-  windowProps: {},
-  groupProps: {
-    patientUuid: mockPatient.id,
-    patient: mockPatient,
-    visitContext: null,
-    mutateVisitContext: mockMutateVisitContext,
-  },
-  workspaceName: '',
-  launchChildWorkspace: jest.fn(),
-  windowName: '',
-  isRootWorkspace: false,
+  closeWorkspaceWithSavedChanges: mockCloseWorkspace,
+  promptBeforeClosing: mockPromptBeforeClosing,
+  setTitle: mockSetTitle,
+  visitContext: null,
+  mutateVisitContext: mockMutateVisitContext,
 };
 
 const mockSaveVisit = jest.mocked(saveVisit);
@@ -156,10 +155,9 @@ jest.mock('../hooks/useDefaultFacilityLocation', () => {
 
   return {
     ...requireActual,
-    useDefaultFacilityLocation: jest.fn(() => ({
+    useDefaultLoginLocation: jest.fn(() => ({
       defaultFacility: null,
       isLoading: false,
-      error: null,
     })),
   };
 });
@@ -869,12 +867,5 @@ describe('useVisitFormSchemaAndDefaultValues', () => {
 });
 
 function renderVisitForm(visitToEdit?: Visit) {
-  const props: PatientWorkspace2DefinitionProps<VisitFormProps, {}> = {
-    ...defaultProps,
-    groupProps: {
-      ...defaultProps.groupProps,
-      visitContext: visitToEdit ?? null,
-    },
-  };
-  return render(<VisitForm {...props} />);
+  return render(<VisitForm {...{ ...testProps, visitToEdit }} />);
 }