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

package/src/forms/form-entry.test.tsx

@@ -2,25 +2,9 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { BehaviorSubject } from 'rxjs';
 import { ExtensionSlot, useConnectivity, useFeatureFlag } from '@openmrs/esm-framework';
-import { useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
 import { mockPatient } from 'tools';
 import FormEntry from './form-entry.workspace';
 
-const testProps = {
-  closeWorkspace: jest.fn(),
-  closeWorkspaceWithSavedChanges: jest.fn(),
-  promptBeforeClosing: jest.fn(),
-  patientUuid: mockPatient.id,
-  patient: mockPatient,
-  formInfo: { formUuid: 'some-form-uuid' },
-  mutateForm: jest.fn(),
-  setTitle: jest.fn(),
-};
-
-const mockFormEntrySub = jest.fn();
-const mockUseConnectivity = jest.mocked(useConnectivity);
-const mockUseVisitOrOfflineVisit = useVisitOrOfflineVisit as jest.Mock;
-
 const mockCurrentVisit = {
   uuid: '17f512b4-d264-4113-a6fe-160cb38cb46e',
   encounters: [],
@@ -30,7 +14,7 @@ const mockCurrentVisit = {
     display: 'Facility Visit',
   },
   attributes: [],
-  startDatetime: new Date('2021-03-16T08:16:00.000+0000'),
+  startDatetime: '2021-03-16T08:16:00.000+0000',
   stopDatetime: null,
   location: {
     uuid: '6351fcf4-e311-4a19-90f9-35667d99a8af',
@@ -39,15 +23,26 @@ const mockCurrentVisit = {
   },
 };
 
-jest.mock('@openmrs/esm-patient-common-lib', () => ({
-  useVisitOrOfflineVisit: jest.fn(),
-}));
+const testProps = {
+  closeWorkspace: jest.fn(),
+  closeWorkspaceWithSavedChanges: jest.fn(),
+  promptBeforeClosing: jest.fn(),
+  patientUuid: mockPatient.id,
+  patient: mockPatient,
+  formInfo: { formUuid: 'some-form-uuid' },
+  mutateForm: jest.fn(),
+  setTitle: jest.fn(),
+  visitContext: mockCurrentVisit,
+  mutateVisitContext: null,
+};
+
+const mockFormEntrySub = jest.fn();
+const mockUseConnectivity = jest.mocked(useConnectivity);
 
 const mockExtensionSlot = jest.mocked(ExtensionSlot);
 
 describe('FormEntry', () => {
   it('renders an extension where the form entry widget plugs in', async () => {
-    mockUseVisitOrOfflineVisit.mockReturnValue({ currentVisit: mockCurrentVisit });
     mockUseConnectivity.mockReturnValue(true);
     mockFormEntrySub.mockReturnValue(
       new BehaviorSubject({ encounterUuid: null, formUuid: 'some-form-uuid', patient: mockPatient }),

package/src/forms/form-entry.workspace.tsx

@@ -1,10 +1,9 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { useSWRConfig } from 'swr';
-import { ExtensionSlot, useConnectivity, useVisit } from '@openmrs/esm-framework';
+import { ExtensionSlot, useConnectivity } from '@openmrs/esm-framework';
 import {
   clinicalFormsWorkspace,
   invalidateVisitAndEncounterData,
-  useVisitOrOfflineVisit,
   type DefaultPatientWorkspaceProps,
   type FormEntryProps,
 } from '@openmrs/esm-patient-common-lib';
@@ -24,23 +23,23 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({
   promptBeforeClosing,
   mutateForm,
   formInfo,
+  visitContext,
+  mutateVisitContext,
 }) => {
   const { encounterUuid, formUuid, visitStartDatetime, visitStopDatetime, visitTypeUuid, visitUuid, additionalProps } =
     formInfo || {};
-  const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
   const [showForm, setShowForm] = useState(true);
   const isOnline = useConnectivity();
-  const { mutate: mutateCurrentVisit } = useVisit(patientUuid);
   const { mutate: globalMutate } = useSWRConfig();
 
   const state = useMemo(
     () => ({
       view: 'form',
       formUuid: formUuid ?? null,
-      visitUuid: visitUuid ?? currentVisit?.uuid ?? null,
-      visitTypeUuid: visitTypeUuid ?? currentVisit?.visitType?.uuid ?? null,
-      visitStartDatetime: visitStartDatetime ?? currentVisit?.startDatetime ?? null,
-      visitStopDatetime: visitStopDatetime ?? currentVisit?.stopDatetime ?? null,
+      visitUuid: visitUuid ?? visitContext?.uuid ?? null,
+      visitTypeUuid: visitTypeUuid ?? visitContext?.visitType?.uuid ?? null,
+      visitStartDatetime: visitStartDatetime ?? visitContext?.startDatetime ?? null,
+      visitStopDatetime: visitStopDatetime ?? visitContext?.stopDatetime ?? null,
       isOffline: !isOnline,
       patientUuid: patientUuid ?? null,
       patient,
@@ -52,7 +51,7 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({
       closeWorkspaceWithSavedChanges: () => {
         typeof mutateForm === 'function' && mutateForm();
         // Update current visit data for critical components
-        mutateCurrentVisit();
+        mutateVisitContext?.();
 
         // Also invalidate visit history and encounter tables since form submission may create/update encounters
         invalidateVisitAndEncounterData(globalMutate, patientUuid);
@@ -68,15 +67,15 @@ const FormEntry: React.FC<FormEntryComponentProps> = ({
       clinicalFormsWorkspaceName,
       closeWorkspace,
       closeWorkspaceWithSavedChanges,
-      currentVisit?.startDatetime,
-      currentVisit?.stopDatetime,
-      currentVisit?.uuid,
-      currentVisit?.visitType?.uuid,
+      visitContext?.startDatetime,
+      visitContext?.stopDatetime,
+      visitContext?.uuid,
+      visitContext?.visitType?.uuid,
       encounterUuid,
       formUuid,
       globalMutate,
       isOnline,
-      mutateCurrentVisit,
+      mutateVisitContext,
       mutateForm,
       patient,
       patientUuid,

package/src/forms/forms-dashboard.component.tsx

@@ -8,7 +8,6 @@ import {
   type Form,
   launchFormEntryOrHtmlForms,
   mapFormsToHtmlFormEntryForms,
-  useVisitOrOfflineVisit,
 } from '@openmrs/esm-patient-common-lib';
 import type { ConfigObject } from '../config-schema';
 import { useForms } from '../hooks/use-forms';
@@ -26,17 +25,17 @@ const FormsDashboard: React.FC<FormsDashboardProps> = ({
   clinicalFormsWorkspaceName,
   formEntryWorkspaceName,
   htmlFormEntryWorkspaceName,
+  visitContext,
 }) => {
   const { t } = useTranslation();
   const config = useConfig<ConfigObject>();
   const isOnline = useConnectivity();
-  const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
   const {
     data: forms,
     allForms,
     error,
     mutateForms,
-  } = useForms(patientUuid, currentVisit?.uuid, undefined, undefined, !isOnline, config.orderBy);
+  } = useForms(patientUuid, visitContext?.uuid, undefined, undefined, !isOnline, config.orderBy);
 
   const htmlFormEntryForms = useMemo(() => {
     return mapFormsToHtmlFormEntryForms(allForms, config.htmlFormEntryForms);
@@ -48,11 +47,11 @@ const FormsDashboard: React.FC<FormsDashboardProps> = ({
         htmlFormEntryForms,
         patientUuid,
         form,
-        currentVisit?.uuid,
+        visitContext?.uuid,
         encounterUuid,
-        currentVisit?.visitType.uuid,
-        currentVisit?.startDatetime,
-        currentVisit?.stopDatetime,
+        visitContext?.visitType.uuid,
+        visitContext?.startDatetime,
+        visitContext?.stopDatetime,
         mutateForms,
         clinicalFormsWorkspaceName,
         formEntryWorkspaceName,
@@ -60,7 +59,7 @@ const FormsDashboard: React.FC<FormsDashboardProps> = ({
       );
     },
     [
-      currentVisit,
+      visitContext,
       htmlFormEntryForms,
       mutateForms,
       patientUuid,

package/src/forms/forms-dashboard.test.tsx

@@ -1,15 +1,12 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { getDefaultsFromConfigSchema, launchWorkspace, useConfig } from '@openmrs/esm-framework';
-import { useVisitOrOfflineVisit } from '@openmrs/esm-patient-common-lib';
+import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
 import { configSchema, type ConfigObject } from '../config-schema';
 import { mockCurrentVisit } from '__mocks__';
 import FormsDashboard from './forms-dashboard.component';
 import { mockPatient } from 'tools';
 
 const mockUseConfig = jest.mocked(useConfig<ConfigObject>);
-const mockLaunchWorkspace = jest.mocked(launchWorkspace);
-const mockUseVisitOrOfflineVisit = useVisitOrOfflineVisit as jest.Mock;
 
 jest.mock('../hooks/use-forms', () => ({
   useForms: jest.fn().mockReturnValueOnce({
@@ -20,24 +17,10 @@ jest.mock('../hooks/use-forms', () => ({
   }),
 }));
 
-jest.mock('@openmrs/esm-patient-common-lib', () => {
-  const originalModule = jest.requireActual('@openmrs/esm-patient-common-lib');
-
-  return {
-    ...originalModule,
-    useVisitOrOfflineVisit: jest.fn(),
-  };
-});
-
 mockUseConfig.mockReturnValue({ ...getDefaultsFromConfigSchema(configSchema), htmlFormEntryForms: [] });
 
 describe('FormsDashboard', () => {
   test('renders an empty state if there are no forms persisted on the server', async () => {
-    mockUseVisitOrOfflineVisit.mockReturnValue({
-      currentVisit: mockCurrentVisit,
-      error: null,
-    });
-
     render(
       <FormsDashboard
         promptBeforeClosing={jest.fn()}
@@ -46,6 +29,8 @@ describe('FormsDashboard', () => {
         patientUuid={mockPatient.id}
         patient={mockPatient}
         setTitle={jest.fn()}
+        visitContext={mockCurrentVisit}
+        mutateVisitContext={null}
       />,
     );
 

package/src/htmlformentry/html-form-entry.workspace.tsx

@@ -1,9 +1,5 @@
 import React from 'react';
-import {
-  type DefaultPatientWorkspaceProps,
-  type FormEntryProps,
-  useVisitOrOfflineVisit,
-} from '@openmrs/esm-patient-common-lib';
+import { type DefaultPatientWorkspaceProps, type FormEntryProps } from '@openmrs/esm-patient-common-lib';
 import HtmlFormEntryWrapper from './html-form-entry-wrapper.component';
 
 interface HtmlFormEntryComponentProps extends DefaultPatientWorkspaceProps {
@@ -12,12 +8,11 @@ interface HtmlFormEntryComponentProps extends DefaultPatientWorkspaceProps {
 
 const HtmlFormEntry: React.FC<HtmlFormEntryComponentProps> = ({
   patientUuid,
-  patient,
   closeWorkspaceWithSavedChanges,
   promptBeforeClosing,
   formInfo,
+  visitContext,
 }) => {
-  const { currentVisit } = useVisitOrOfflineVisit(patientUuid);
   const { encounterUuid, visitUuid, htmlForm } = formInfo || {};
 
   // we always want to prompt the user before closing/hiding the workspace because we can't guarantee maintaining the state of the form
@@ -30,8 +25,8 @@ const HtmlFormEntry: React.FC<HtmlFormEntryComponentProps> = ({
   const url = `${window.openmrsBase}/htmlformentryui/htmlform/${uiPage}.page?`;
   const searchParams = new URLSearchParams();
   searchParams.append('patientId', patientUuid);
-  if (visitUuid || currentVisit?.uuid) {
-    searchParams.append('visitId', visitUuid ?? currentVisit?.uuid);
+  if (visitUuid || visitContext?.uuid) {
+    searchParams.append('visitId', visitUuid ?? visitContext?.uuid);
   }
   if (encounterUuid) {
     searchParams.append('encounterId', encounterUuid);