@kenyaemr/esm-care-panel-app 5.4.2-pre.2308 → 5.4.2-pre.2311

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true},{"name":"patient-discharge-side-rail-icon","component":"patientDischargeSideRailIcon","slot":"action-menu-ward-patient-items-slot"}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"},{"name":"patient-care-discharge-workspace","title":"Patient Discharge","component":"patientDischargeWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide","groups":["ward-patient"]}],"version":"5.4.2-pre.2308"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false},{"name":"dispensing-patient-vitals","component":"dispensingPaentientVitals","slot":"dispensing-condition-and-diagnoses","order":1,"online":true,"offline":true},{"name":"patient-discharge-side-rail-icon","component":"patientDischargeSideRailIcon","slot":"action-menu-ward-patient-items-slot"}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"},{"name":"patient-care-discharge-workspace","title":"Patient Discharge","component":"patientDischargeWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide","groups":["ward-patient"]}],"version":"5.4.2-pre.2311"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-care-panel-app",
-  "version": "5.4.2-pre.2308",
+  "version": "5.4.2-pre.2311",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-care-panel-app.js",
   "main": "src/index.ts",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "lodash-es": "^4.17.15",
-    "react-to-print": "^3.1.0"
+    "react-to-print": "2.14.13"
   },
   "peerDependencies": {
     "@carbon/react": "1.x",

package/src/patient-summary/patient-summary.component.test.tsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import dayjs from 'dayjs';
 import userEvent from '@testing-library/user-event';
-import { render, screen } from '@testing-library/react';
-import { useReactToPrint } from 'react-to-print';
+import { render, screen, act } from '@testing-library/react';
 import { useConfig } from '@openmrs/esm-framework';
 import { usePatientSummary } from '../hooks/usePatientSummary';
 import { mockPatient } from '../../../../__mocks__/patient-summary.mock';
@@ -12,15 +11,20 @@ jest.mock('../hooks/usePatientSummary');
 
 const mockedUseConfig = useConfig as jest.Mock;
 const mockedUsePatientSummary = usePatientSummary as jest.Mock;
-const mockedUseReactToPrint = jest.mocked(useReactToPrint);
 
-jest.mock('react-to-print', () => {
-  const originalModule = jest.requireActual('react-to-print');
+// Mock window.open and window.print
+const mockOpen = jest.fn();
+const mockPrint = jest.fn();
+const mockClose = jest.fn();
 
-  return {
-    ...originalModule,
-    useReactToPrint: jest.fn().mockReturnValue(jest.fn()),
-  };
+Object.defineProperty(window, 'open', {
+  writable: true,
+  value: mockOpen,
+});
+
+Object.defineProperty(window, 'print', {
+  writable: true,
+  value: mockPrint,
 });
 
 describe('PatientSummary', () => {
@@ -30,13 +34,18 @@ describe('PatientSummary', () => {
       error: false,
       isLoading: true,
     });
+
+    // Reset mocks
+    mockOpen.mockClear();
+    mockPrint.mockClear();
+    mockClose.mockClear();
   });
 
   afterEach(() => jest.clearAllMocks());
 
   it('renders a skeleton loader when loading', () => {
     render(<PatientSummary patientUuid={mockPatient.uuid} />);
-    const skeletonLoader = screen.getByRole('progressbar');
+    const skeletonLoader = document.querySelector('.cds--skeleton');
     expect(skeletonLoader).toBeInTheDocument();
   });
 
@@ -99,6 +108,18 @@ describe('PatientSummary', () => {
 
     mockedUseConfig.mockReturnValue({ logo: {} });
 
+    // Mock the print window
+    const mockPrintWindow = {
+      document: {
+        write: jest.fn(),
+        close: jest.fn(),
+      },
+      focus: jest.fn(),
+      print: jest.fn(),
+      close: jest.fn(),
+    };
+    mockOpen.mockReturnValue(mockPrintWindow);
+
     render(<PatientSummary patientUuid={mockPatient.uuid} />);
 
     const printButton = screen.getByRole('button', { name: /print/i });
@@ -107,7 +128,12 @@ describe('PatientSummary', () => {
     await screen.findByText(/patient summary/i);
     await user.click(printButton);
 
-    // FIXME: Why does this happen twice?
-    expect(mockedUseReactToPrint).toHaveBeenCalled();
+    // Wait for the print functionality to be triggered
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 150));
+    });
+
+    // Verify that window.open was called
+    expect(mockOpen).toHaveBeenCalledWith('', '_blank');
   });
 });

package/src/patient-summary/patient-summary.component.tsx

@@ -1,8 +1,7 @@
-import React, { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { StructuredListSkeleton } from '@carbon/react';
 import { usePatientSummary } from '../hooks/usePatientSummary';
-import { useReactToPrint } from 'react-to-print';
 import PrintComponent from '../print-layout/print.component';
 import PatientSummaryHeader from './patient-summary-header.component';
 import PatientSummaryBody from './patient-summary-body.component';
@@ -19,13 +18,25 @@ const PatientSummary: React.FC<PatientSummaryProps> = ({ patientUuid }) => {
   const printRef = useRef<HTMLDivElement>(null);
   const [showPrintComponent, setShowPrintComponent] = useState(false);
 
-  const handlePrint = useReactToPrint({
-    contentRef: printRef,
-    documentTitle: 'Patient Summary',
-    onAfterPrint: () => {
-      setShowPrintComponent(false);
-    },
-  });
+  const handlePrint = useCallback(async () => {
+    try {
+      // TODO: use backend to generate the print content
+      if (printRef.current) {
+        const printWindow = window.open('', '_blank');
+        if (printWindow) {
+          const printContent = printRef.current.innerHTML;
+          printWindow.document.documentElement.innerHTML = printContent;
+          printWindow.focus();
+          printWindow.print();
+          printWindow.close();
+        }
+      }
+    } catch (error) {
+      console.error('Print error:', error);
+      // Fallback to browser print
+      window.print();
+    }
+  }, []);
 
   const onPrintClick = () => {
     setShowPrintComponent(true);
@@ -33,7 +44,11 @@ const PatientSummary: React.FC<PatientSummaryProps> = ({ patientUuid }) => {
 
   useEffect(() => {
     if (showPrintComponent && printRef.current) {
-      handlePrint?.();
+      // Use setTimeout to ensure the component is fully rendered
+      setTimeout(() => {
+        handlePrint();
+        setShowPrintComponent(false);
+      }, 100);
     }
   }, [showPrintComponent, handlePrint]);