(fix) Fix DefaultWorkspaceProps type annotations (openmrs#1996)

* (fix) Fix DefaultWorkspaceProps type annotations * Fix age function invocation
mccarthyaaron · Sep 5, 2024 · 09d8c11 · 09d8c11
1 parent 5e7a458
commit 09d8c11
Show file tree

Hide file tree

Showing 18 changed files with 1,486 additions and 1,234 deletions.
diff --git a/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx b/packages/esm-form-engine-app/src/form-renderer/form-renderer.test.tsx
@@ -24,6 +24,9 @@ describe('FormRenderer', () => {
     closeWorkspaceWithSavedChanges: jest.fn(),
     promptBeforeClosing: jest.fn(),
     setTitle: jest.fn(),
+    setCancelTitle: jest.fn(),
+    setCancelMessage: jest.fn(),
+    setCancelConfirmText: jest.fn(),
   };
 
   test('renders FormError component when there is an error', () => {

diff --git a/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx b/packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx
@@ -322,6 +322,9 @@ function renderAllergyForm(props = {}) {
     patient: mockPatient,
     patientUuid: mockPatient.id,
     setTitle: jest.fn(),
+    setCancelTitle: jest.fn(),
+    setCancelMessage: jest.fn(),
+    setCancelConfirmText: jest.fn(),
   };
 
   render(<AllergyForm {...defaultProps} {...props} />);

diff --git a/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx b/packages/esm-patient-chart-app/src/visit/past-visit-overview.test.tsx
@@ -10,7 +10,10 @@ const defaultProps = {
   closeWorkspaceWithSavedChanges: jest.fn(),
   patientUuid: mockPatient.id,
   promptBeforeClosing: jest.fn(),
-  setTitle: jest.fn(),
+  setTitle: jest.fn,
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 const mockPastVisits = {

diff --git a/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx b/packages/esm-patient-chart-app/src/visit/visit-form/visit-form.test.tsx
@@ -55,6 +55,9 @@ const testProps = {
   promptBeforeClosing: mockPromptBeforeClosing,
   showVisitEndDateTimeFields: false,
   setTitle: mockSetTitle,
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 const mockSaveVisit = jest.mocked(saveVisit);

diff --git a/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx b/packages/esm-patient-conditions-app/src/conditions/conditions-form.test.tsx
@@ -19,6 +19,9 @@ const defaultProps = {
   promptBeforeClosing: jest.fn(),
   formContext: 'creating' as 'creating' | 'editing',
   setTitle: jest.fn(),
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 function renderConditionsForm(props = {}) {

diff --git a/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx b/packages/esm-patient-flags-app/src/flags/flags-list.test.tsx
@@ -30,6 +30,9 @@ it('renders an Edit form that enables users to toggle flags on or off', async ()
       patientUuid={mockPatient.id}
       promptBeforeClosing={jest.fn()}
       setTitle={jest.fn()}
+      setCancelTitle={jest.fn()}
+      setCancelMessage={jest.fn()}
+      setCancelConfirmText={jest.fn()}
     />,
   );
 

diff --git a/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx b/packages/esm-patient-forms-app/src/forms/form-entry.test.tsx
@@ -14,6 +14,9 @@ const testProps = {
   formInfo: { formUuid: 'some-form-uuid' },
   mutateForm: jest.fn(),
   setTitle: jest.fn(),
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 const mockFormEntrySub = jest.fn();

diff --git a/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx b/packages/esm-patient-forms-app/src/forms/forms-dashboard.test.tsx
@@ -44,6 +44,9 @@ describe('FormsDashboard', () => {
         closeWorkspaceWithSavedChanges={jest.fn()}
         patientUuid=""
         setTitle={jest.fn()}
+        setCancelTitle={jest.fn()}
+        setCancelMessage={jest.fn()}
+        setCancelConfirmText={jest.fn()}
       />,
     );
 

diff --git a/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx b/packages/esm-patient-immunizations-app/src/immunizations/immunizations-form.test.tsx
@@ -73,6 +73,9 @@ const testProps = {
   closeWorkspaceWithSavedChanges: mockCloseWorkspaceWithSavedChanges,
   promptBeforeClosing: mockPromptBeforeClosing,
   setTitle: mockSetTitle,
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 mockUseConfig.mockReturnValue({

diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.test.tsx
@@ -76,6 +76,9 @@ function renderAddLabOrderWorkspace() {
       promptBeforeClosing={mockPromptBeforeClosing}
       patientUuid={ptUuid}
       setTitle={jest.fn()}
+      setCancelTitle={jest.fn()}
+      setCancelMessage={jest.fn()}
+      setCancelConfirmText={jest.fn()}
     />,
   );
   return { mockCloseWorkspace, mockPromptBeforeClosing, mockCloseWorkspaceWithSavedChanges, ...view };

diff --git a/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx b/packages/esm-patient-labs-app/src/lab-orders/add-lab-order/add-lab-order.workspace.tsx
@@ -78,6 +78,9 @@ export default function AddLabOrderWorkspace({
           closeWorkspaceWithSavedChanges={closeWorkspaceWithSavedChanges}
           promptBeforeClosing={promptBeforeClosing}
           setTitle={() => {}}
+          setCancelTitle={() => {}}
+          setCancelMessage={() => {}}
+          setCancelConfirmText={() => {}}
         />
       )}
     </div>

diff --git a/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx b/packages/esm-patient-lists-app/src/workspaces/patient-list-details.workspace.test.tsx
@@ -21,6 +21,9 @@ const defaultProps = {
     type: 'My List',
   },
   setTitle: jest.fn(),
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 const mockPatientListData = [

diff --git a/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx b/packages/esm-patient-medications-app/src/add-drug-order/add-drug-order.test.tsx
@@ -79,16 +79,7 @@ describe('AddDrugOrderWorkspace drug search', () => {
   test('looks ok', async () => {
     const user = userEvent.setup();
 
-    render(
-      <AddDrugOrderWorkspace
-        order={undefined as any}
-        closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
-        closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
-        promptBeforeClosing={() => false}
-        patientUuid={'mock-patient-uuid'}
-        setTitle={jest.fn()}
-      />,
-    );
+    renderAddDrugOrderWorkspace();
 
     await user.type(screen.getByRole('searchbox'), 'Aspirin');
     await screen.findAllByRole('listitem');
@@ -113,16 +104,7 @@ describe('AddDrugOrderWorkspace drug search', () => {
     });
     const user = userEvent.setup();
 
-    render(
-      <AddDrugOrderWorkspace
-        order={undefined as any}
-        closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
-        closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
-        promptBeforeClosing={() => false}
-        patientUuid={'mock-patient-uuid'}
-        setTitle={jest.fn()}
-      />,
-    );
+    renderAddDrugOrderWorkspace();
 
     await user.type(screen.getByRole('searchbox'), 'Aspirin');
     expect(screen.getAllByRole('listitem').length).toEqual(3);
@@ -133,16 +115,7 @@ describe('AddDrugOrderWorkspace drug search', () => {
   test('can add items directly to the basket', async () => {
     const user = userEvent.setup();
 
-    render(
-      <AddDrugOrderWorkspace
-        order={undefined as any}
-        closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
-        closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
-        promptBeforeClosing={() => false}
-        patientUuid={'mock-patient-uuid'}
-        setTitle={jest.fn()}
-      />,
-    );
+    renderAddDrugOrderWorkspace();
 
     await user.type(screen.getByRole('searchbox'), 'Aspirin');
     const { result: hookResult } = renderHook(() =>
@@ -166,16 +139,7 @@ describe('AddDrugOrderWorkspace drug search', () => {
   test('can open the drug form ', async () => {
     const user = userEvent.setup();
 
-    render(
-      <AddDrugOrderWorkspace
-        order={undefined as any}
-        closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
-        closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
-        promptBeforeClosing={() => false}
-        patientUuid={'mock-patient-uuid'}
-        setTitle={jest.fn()}
-      />,
-    );
+    renderAddDrugOrderWorkspace();
 
     await user.type(screen.getByRole('searchbox'), 'Aspirin');
     const { result: hookResult } = renderHook(() =>
@@ -191,16 +155,7 @@ describe('AddDrugOrderWorkspace drug search', () => {
   test('can open an item in the medication form and on saving, it should add the order in the order basket store', async () => {
     const user = userEvent.setup();
 
-    render(
-      <AddDrugOrderWorkspace
-        order={undefined as any}
-        closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
-        closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
-        promptBeforeClosing={() => false}
-        patientUuid={'mock-patient-uuid'}
-        setTitle={jest.fn()}
-      />,
-    );
+    renderAddDrugOrderWorkspace();
 
     const { result: hookResult } = renderHook(() =>
       useOrderBasket('medications', ((x) => x) as unknown as PostDataPrepFunction),
@@ -233,3 +188,19 @@ describe('AddDrugOrderWorkspace drug search', () => {
     );
   });
 });
+
+function renderAddDrugOrderWorkspace() {
+  render(
+    <AddDrugOrderWorkspace
+      order={undefined as any}
+      closeWorkspace={({ onWorkspaceClose }) => onWorkspaceClose()}
+      closeWorkspaceWithSavedChanges={({ onWorkspaceClose }) => onWorkspaceClose()}
+      promptBeforeClosing={() => false}
+      patientUuid={'mock-patient-uuid'}
+      setTitle={jest.fn()}
+      setCancelTitle={jest.fn()}
+      setCancelMessage={jest.fn()}
+      setCancelConfirmText={jest.fn()}
+    />,
+  );
+}
diff --git a/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx b/packages/esm-patient-notes-app/src/notes/visit-notes-form.test.tsx
@@ -20,6 +20,9 @@ const defaultProps = {
   closeWorkspaceWithSavedChanges: jest.fn(),
   promptBeforeClosing: jest.fn(),
   setTitle: jest.fn(),
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 function renderVisitNotesForm(props = {}) {

diff --git a/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx b/packages/esm-patient-programs-app/src/programs/programs-form.test.tsx
@@ -28,6 +28,9 @@ const testProps = {
   patientUuid: mockPatient.id,
   promptBeforeClosing: mockPromptBeforeClosing,
   setTitle: jest.fn(),
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 jest.mock('./programs.resource', () => ({

diff --git a/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx b/packages/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.test.tsx
@@ -24,6 +24,9 @@ const testProps = {
   promptBeforeClosing: () => {},
   formContext: 'creating' as 'creating' | 'editing',
   setTitle: jest.fn(),
+  setCancelTitle: jest.fn(),
+  setCancelMessage: jest.fn(),
+  setCancelConfirmText: jest.fn(),
 };
 
 const mockShowSnackbar = jest.mocked(showSnackbar);

diff --git a/...es/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.workspace.tsx b/...es/esm-patient-vitals-app/src/vitals-biometrics-form/vitals-biometrics-form.workspace.tsx
@@ -122,7 +122,11 @@ const VitalsAndBiometricsForm: React.FC<DefaultPatientWorkspaceProps> = ({
   const height = watch('height');
 
   useEffect(() => {
-    getMuacColorCode(extractNumbers(age(patient.patient?.birthDate)), midUpperArmCircumference, setMuacColorCode);
+    const patientBirthDate = patient?.patient?.birthDate;
+    if (patientBirthDate && midUpperArmCircumference) {
+      const patientAge = extractNumbers(age(patientBirthDate));
+      getMuacColorCode(patientAge, midUpperArmCircumference, setMuacColorCode);
+    }
   }, [watch, patient.patient?.birthDate, midUpperArmCircumference]);
 
   useEffect(() => {