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

package/src/visit/visit-history-table/visit-actions-cell.component.tsx

@@ -4,15 +4,14 @@ import styles from './visit-actions-cell.scss';
 
 interface Props {
   visit: Visit;
-  patient: fhir.Patient;
 }
 
-const VisitActionsCell: React.FC<Props> = ({ visit, patient }) => {
+const VisitActionsCell: React.FC<Props> = ({ visit }) => {
   return (
     <ExtensionSlot
       name="visit-detail-overview-actions"
       className={styles.visitActions}
-      state={{ patientUuid: visit.patient.uuid, patient, visit, compact: true }}
+      state={{ patientUuid: visit.patient.uuid, visit, compact: true }}
     />
   );
 };

package/src/visit/visit-history-table/visit-date-cell.component.tsx

@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next';
 
 interface Props {
   visit: Visit;
-  patient: fhir.Patient;
 }
 
 const VisitDateCell: React.FC<Props> = ({ visit }) => {

package/src/visit/visit-history-table/visit-diagnoses-cell.component.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 
 interface Props {
   visit: Visit;
-  patient: fhir.Patient;
 }
 
 const VisitDiagnosisCell: React.FC<Props> = ({ visit }) => {

package/src/visit/visit-history-table/visit-history-table.component.tsx

@@ -27,13 +27,12 @@ import styles from './visit-history-table.scss';
 
 interface VisitHistoryTableProps {
   patientUuid: string;
-  patient: fhir.Patient;
 }
 
 /**
  * This show a list of visit histories in the visit tab in patient chart
  */
-const VisitHistoryTable: React.FC<VisitHistoryTableProps> = ({ patientUuid, patient }) => {
+const VisitHistoryTable: React.FC<VisitHistoryTableProps> = ({ patientUuid }) => {
   const defaultPageSize = 10;
   const [pageSize, setPageSize] = useState(defaultPageSize);
   const pageSizes = [10, 20, 30, 40, 50];
@@ -55,7 +54,7 @@ const VisitHistoryTable: React.FC<VisitHistoryTableProps> = ({ patientUuid, pati
   const rowData = visits?.map((visit) => {
     const row: Record<string, JSX.Element | string> = { id: visit.uuid };
     for (const { key, CellComponent } of columns) {
-      row[key] = <CellComponent key={key} visit={visit} patient={patient} />;
+      row[key] = <CellComponent key={key} visit={visit} />;
     }
     return row;
   });

package/src/visit/visit-history-table/visit-type-cell.component.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 
 interface Props {
   visit: Visit;
-  patient: fhir.Patient;
 }
 
 const VisitTypeCell: React.FC<Props> = ({ visit }) => {

package/src/visit/visit-prompt/delete-visit-dialog.test.tsx

@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import { mockCurrentVisit } from '__mocks__';
 import React from 'react';
 import { mockPatient } from 'tools';
-import DeleteVisitDialog from './delete-visit-dialog.modal';
+import DeleteVisitDialog from './delete-visit-dialog.component';
 
 const mockCloseModal = jest.fn();
 const mockOpenmrsFetch = jest.mocked(openmrsFetch);

package/src/visit/visit-prompt/{end-visit-dialog.modal.tsx → end-visit-dialog.component.tsx}

@@ -35,7 +35,7 @@ const EndVisitDialog: React.FC<EndVisitDialogProps> = ({ patientUuid, closeModal
           mutate();
           window.dispatchEvent(new CustomEvent('queue-entry-updated'));
           closeModal();
-          if (visitContext?.uuid == activeVisit.uuid) {
+          if (visitContext?.uuid === activeVisit.uuid) {
             setVisitContext(null, null);
           }
           showSnackbar({

package/src/visit/visit-prompt/end-visit-dialog.test.tsx

@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 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.modal';
+import EndVisitDialog from './end-visit-dialog.component';
 import { usePatientChartStore } from '@openmrs/esm-patient-common-lib';
 
 const endVisitPayload = {

package/src/visit/visit-prompt/{start-visit-dialog.modal.tsx → start-visit-dialog.component.tsx}

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Button, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
-import { launchWorkspace2 } from '@openmrs/esm-framework';
+import { launchWorkspace } from '@openmrs/esm-framework';
 import { launchPatientChartWithWorkspaceOpen } from '@openmrs/esm-patient-common-lib';
 import styles from './start-visit-dialog.scss';
 
@@ -9,15 +9,9 @@ interface StartVisitDialogProps {
   patientUuid: string;
   closeModal: () => void;
   launchPatientChart?: boolean;
-  onVisitStarted?: () => void;
 }
 
-const StartVisitDialog: React.FC<StartVisitDialogProps> = ({
-  patientUuid,
-  closeModal,
-  launchPatientChart,
-  onVisitStarted,
-}) => {
+const StartVisitDialog: React.FC<StartVisitDialogProps> = ({ patientUuid, closeModal, launchPatientChart }) => {
   const { t } = useTranslation();
 
   const handleStartNewVisit = useCallback(() => {
@@ -28,11 +22,11 @@ const StartVisitDialog: React.FC<StartVisitDialogProps> = ({
         additionalProps: { openedFrom: 'patient-chart-start-visit' },
       });
     } else {
-      launchWorkspace2('start-visit-workspace-form', { openedFrom: 'patient-chart-start-visit', onVisitStarted });
+      launchWorkspace('start-visit-workspace-form', { openedFrom: 'patient-chart-start-visit' });
     }
 
     closeModal();
-  }, [closeModal, patientUuid, launchPatientChart, onVisitStarted]);
+  }, [closeModal, patientUuid, launchPatientChart]);
 
   const modalHeaderText = t('noActiveVisit', 'No active visit');
 

package/src/visit/visit-prompt/start-visit-dialog.test.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { launchWorkspace2 } from '@openmrs/esm-framework';
-import StartVisitDialog from './start-visit-dialog.modal';
+import { launchWorkspace } from '@openmrs/esm-framework';
+import StartVisitDialog from './start-visit-dialog.component';
 
 const defaultProps = {
   patientUuid: 'some-uuid',
@@ -10,7 +10,7 @@ const defaultProps = {
   visitType: null,
 };
 
-const mockLaunchWorkspace = jest.mocked(launchWorkspace2);
+const mockLaunchWorkspace = jest.mocked(launchWorkspace);
 
 describe('StartVisit', () => {
   test('should launch start visit form', async () => {

package/src/visit/visits-widget/current-visit-summary.extension.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { launchWorkspace2 } from '@openmrs/esm-framework';
+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';
@@ -25,9 +25,9 @@ const CurrentVisitSummary: React.FC<CurrentVisitSummaryProps> = ({ patientUuid }
     return (
       <EmptyState
         headerTitle={t('currentVisit', 'Current visit')}
-        displayText={t('noActiveVisitMessage', 'active visits')}
+        displayText={t('activeVisits__lower', 'active visits')}
         launchForm={() =>
-          launchWorkspace2('start-visit-workspace-form', { openedFrom: 'patient-chart-current-visit-summary' })
+          launchWorkspace('start-visit-workspace-form', { openedFrom: 'patient-chart-current-visit-summary' })
         }
       />
     );

package/src/visit/visits-widget/past-visits-components/encounters-table/encounters-table.component.tsx

@@ -27,7 +27,7 @@ import {
 import {
   EditIcon,
   isDesktop,
-  launchWorkspace2,
+  launchWorkspace,
   showModal,
   showSnackbar,
   TrashCanIcon,
@@ -35,11 +35,17 @@ import {
   useLayoutType,
   userHasAccess,
   useSession,
+  useVisit,
   type EncounterType,
   ExtensionSlot,
   useFeatureFlag,
 } from '@openmrs/esm-framework';
-import { invalidateVisitAndEncounterData, usePatientChartStore } from '@openmrs/esm-patient-common-lib';
+import {
+  type HtmlFormEntryForm,
+  launchFormEntryOrHtmlForms,
+  invalidateVisitAndEncounterData,
+  usePatientChartStore,
+} from '@openmrs/esm-patient-common-lib';
 import { jsonSchemaResourceName } from '../../../../constants';
 import {
   deleteEncounter,
@@ -80,7 +86,12 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
   const responsiveSize = desktopLayout ? 'sm' : 'lg';
   const { data: encounterTypes, isLoading: isLoadingEncounterTypes } = useEncounterTypes();
   const enableEmbeddedFormView = useFeatureFlag('enable-embedded-form-view');
+
   const { encounterEditableDuration, encounterEditableDurationOverridePrivileges } = useConfig<ChartConfig>();
+  const formsConfig: { htmlFormEntryForms: HtmlFormEntryForm[] } = useConfig({
+    externalModuleName: '@openmrs/esm-patient-forms-app',
+  });
+  const { htmlFormEntryForms } = formsConfig;
   const paginatedMappedEncounters = useMemo(
     () => (paginatedEncounters ?? []).map(mapEncounter).filter(Boolean),
     [paginatedEncounters],
@@ -259,16 +270,22 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
                                       itemText={t('editThisEncounter', 'Edit this encounter')}
                                       onClick={() => {
                                         if (isVisitNoteEncounter(encounter)) {
-                                          launchWorkspace2('visit-notes-form-workspace', {
+                                          launchWorkspace('visit-notes-form-workspace', {
                                             encounter,
                                             formContext: 'editing',
                                             patientUuid,
                                           });
                                         } else {
-                                          launchWorkspace2('patient-form-entry-workspace', {
-                                            form: encounter.form,
-                                            encounterUuid: encounter.id,
-                                          });
+                                          launchFormEntryOrHtmlForms(
+                                            htmlFormEntryForms,
+                                            patientUuid,
+                                            encounter.form,
+                                            encounter.visitUuid,
+                                            encounter.id,
+                                            encounter.visitTypeUuid,
+                                            encounter.visitStartDatetime,
+                                            encounter.visitStopDatetime,
+                                          );
                                         }
                                       }}
                                     />
@@ -310,16 +327,22 @@ const EncountersTable: React.FC<EncountersTableProps> = ({
                                     kind="ghost"
                                     onClick={() => {
                                       if (isVisitNoteEncounter(encounter)) {
-                                        launchWorkspace2('visit-notes-form-workspace', {
+                                        launchWorkspace('visit-notes-form-workspace', {
                                           encounter,
                                           formContext: 'editing',
                                           patientUuid,
                                         });
                                       } else {
-                                        launchWorkspace2('patient-form-entry-workspace', {
-                                          form: encounter.form,
-                                          encounterUuid: encounter.id,
-                                        });
+                                        launchFormEntryOrHtmlForms(
+                                          htmlFormEntryForms,
+                                          patientUuid,
+                                          encounter.form,
+                                          encounter.visitUuid,
+                                          encounter.id,
+                                          encounter.visitTypeUuid,
+                                          encounter.visitStartDatetime,
+                                          encounter.visitStopDatetime,
+                                        );
                                       }
                                     }}
                                     renderIcon={(props: ComponentProps<typeof EditIcon>) => (

package/src/visit/visits-widget/visit-context/retrospective-data-date-time-picker/retrospective-date-time-picker.component.tsx

@@ -12,7 +12,6 @@ type FormValues = {
 };
 
 type RetrospectiveDateTimePickerProps = {
-  patientUuid: string;
   visitContext: Visit;
   control?: Control<FormValues>;
   onChange?: (data: FormValues) => void;

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

@@ -5,7 +5,7 @@ import { Button, ModalBody, ModalFooter, ModalHeader, RadioButton, InlineLoading
 import { useTranslation } from 'react-i18next';
 import {
   ErrorState,
-  launchWorkspace2,
+  launchWorkspace,
   OpenmrsDatePicker,
   useDebounce,
   useOnVisible,
@@ -51,7 +51,7 @@ const VisitContextSwitcherModal: React.FC<VisitContextSwitcherProps> = ({
 
   const openStartVisitWorkspace = () => {
     closeModal();
-    launchWorkspace2('start-visit-workspace-form', {
+    launchWorkspace('start-visit-workspace-form', {
       openedFrom: 'visit-context-switcher',
     });
   };

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

@@ -6,35 +6,18 @@ 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,
-});
-
-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,
@@ -43,7 +26,22 @@ jest.mock('@openmrs/esm-patient-common-lib', () => ({
 
 describe('VisitContextSwitcherModal', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+    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', () => {

package/src/visit/visits-widget/visit-detail-overview.component.tsx

@@ -9,10 +9,9 @@ import styles from './visit-detail-overview.scss';
 
 interface VisitOverviewComponentProps {
   patientUuid: string;
-  patient: fhir.Patient;
 }
 
-function VisitDetailOverviewComponent({ patientUuid, patient }: VisitOverviewComponentProps) {
+function VisitDetailOverviewComponent({ patientUuid }: VisitOverviewComponentProps) {
   const { t } = useTranslation();
   const [tabIndex, setTabIndex] = useState(0);
   const { showAllEncountersTab } = useConfig<ChartConfig>();
@@ -34,7 +33,7 @@ function VisitDetailOverviewComponent({ patientUuid, patient }: VisitOverviewCom
         </TabList>
         <TabPanels>
           <TabPanel>
-            <VisitHistoryTable patientUuid={patientUuid} patient={patient} />
+            <VisitHistoryTable patientUuid={patientUuid} />
           </TabPanel>
           {showAllEncountersTab && (
             <TabPanel>

package/src/visit/visits-widget/visit-detail-overview.test.tsx

@@ -82,7 +82,7 @@ describe('VisitDetailOverview', () => {
     });
     mockGetConfig.mockResolvedValue({ htmlFormEntryForms: [] });
 
-    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} patient={mockPatient} />);
+    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} />);
 
     await waitForLoadingToFinish();
 
@@ -106,7 +106,7 @@ describe('VisitDetailOverview', () => {
       error,
     });
 
-    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} patient={mockPatient} />);
+    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} />);
 
     await waitForLoadingToFinish();
 
@@ -125,7 +125,7 @@ describe('VisitDetailOverview', () => {
     });
     mockUsePaginatedVisits.mockReturnValue(mockPaginatedVisitsData);
 
-    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} patient={mockPatient} />);
+    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} />);
 
     await waitForLoadingToFinish();
 
@@ -161,7 +161,7 @@ describe('VisitDetailOverview', () => {
     });
     mockUsePaginatedVisits.mockReturnValue(mockPaginatedVisitsData);
 
-    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} patient={mockPatient} />);
+    renderWithSwr(<VisitDetailOverview patientUuid={mockPatient.id} />);
 
     await waitForLoadingToFinish();
 

package/translations/am.json

@@ -38,6 +38,7 @@
   "dosingInstructions": "Dosing Instructions",
   "editEncounter": "Edit",
   "editThisEncounter": "Edit this encounter",
+  "editVisit": "Edit visit",
   "editVisitDetails": "Edit visit details",
   "emptyStateText": "There are no {{displayText}} to display for this patient",
   "enable": "Enable",
@@ -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",

package/translations/ar.json

@@ -38,6 +38,7 @@
   "dosingInstructions": "Dosing Instructions",
   "editEncounter": "Edit",
   "editThisEncounter": "تعديل هذا اللقاء",
+  "editVisit": "Edit visit",
   "editVisitDetails": "Edit visit details",
   "emptyStateText": "لا يوجد {{displayText}} لعرضه لهذا المريض",
   "enable": "Enable",
@@ -75,7 +76,6 @@
   "errorUpdatingVisitAttribute": "Could not update {{attributeName}} attribute",
   "errorUpdatingVisitDetails": "Error updating visit details",
   "errorWhenRestoringVisit": "Error occurred when restoring {{visit}}",
-  "failedToLoadCurrentVisit": "فشل في تحميل الزيارة الحالية",
   "fieldRequired": "This field is required",
   "filterByEncounterType": "تصفية حسب نوع اللقاء",
   "form": "Form name",
@@ -85,7 +85,6 @@
   "indication": "دلالة",
   "inThePast": "In the past",
   "loading": "جار التحميل",
-  "loadingVisit": "جار تحميل الزيارة الحالية...",
   "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,7 @@
   "nextPage": "Next page",
   "no": "لا",
   "noActiveVisit": "لا يوجد زيارة نشطة",
-  "noActiveVisitMessage": "زيارة نشطة",
+  "noActiveVisitMessage": "active visit",
   "noActiveVisitNoRDEText": "لا يمكنك إضافة بيانات إلى السجل الطبي للمريض بدون زيارة نشطة. هل ترغب في بدء زيارة جديدة؟",
   "noDiagnosesFound": "لم يتم العثور على تشخيصات",
   "noEncountersToDisplay": "لا يوجد لقاءات لعرضها",

package/translations/ar_SY.json

@@ -38,6 +38,7 @@
   "dosingInstructions": "Dosing Instructions",
   "editEncounter": "Edit",
   "editThisEncounter": "Edit this encounter",
+  "editVisit": "Edit visit",
   "editVisitDetails": "Edit visit details",
   "emptyStateText": "There are no {{displayText}} to display for this patient",
   "enable": "Enable",
@@ -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",

package/translations/bn.json

@@ -38,6 +38,7 @@
   "dosingInstructions": "Dosing Instructions",
   "editEncounter": "Edit",
   "editThisEncounter": "Edit this encounter",
+  "editVisit": "Edit visit",
   "editVisitDetails": "Edit visit details",
   "emptyStateText": "There are no {{displayText}} to display for this patient",
   "enable": "Enable",
@@ -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",