MHV-65164 MHV-65254 Handle labs & tests and radiology together (#33583)

* Prevent React state update on an unmounted component

* MHV-65164 Ensure labs & tests and radiology are handled together

src/applications/mhv-medical-records/actions/blueButtonReport.js

@@ -48,22 +48,19 @@ export const getBlueButtonReportData = (options = {}) => async dispatch => {
 
   const results = await Promise.allSettled(promises);
 
+  // Temporary variables to hold labsAndTests and radiology results
+  let labsAndTestsResponse = null;
+  let radiologyResponse = null;
+
   results.forEach(({ status, value, reason }) => {
     if (status === 'fulfilled') {
       const { key, response } = value;
       switch (key) {
         case 'labsAndTests':
-          dispatch({
-            type: Actions.LabsAndTests.GET_LIST,
-            labsAndTestsResponse: response,
-          });
+          labsAndTestsResponse = response;
           break;
-        // TODO: Handle this with labs
         case 'radiology':
-          dispatch({
-            type: Actions.LabsAndTests.GET_LIST,
-            radiologyResponse: response,
-          });
+          radiologyResponse = response;
           break;
         case 'notes':
           dispatch({
@@ -114,4 +111,13 @@ export const getBlueButtonReportData = (options = {}) => async dispatch => {
       dispatch({ type: Actions.BlueButtonReport.ADD_FAILED, payload: key });
     }
   });
+
+  // Dispatch combined labsAndTests and radiology response
+  if (labsAndTestsResponse || radiologyResponse) {
+    dispatch({
+      type: Actions.LabsAndTests.GET_LIST,
+      labsAndTestsResponse,
+      radiologyResponse,
+    });
+  }
 };

src/applications/mhv-medical-records/components/DownloadRecords/DownloadFileType.jsx

@@ -169,6 +169,7 @@ const DownloadFileType = props => {
     () => {
       const options = {
         labsAndTests: recordFilter?.includes('labTests'),
+        radiology: recordFilter?.includes('labTests'),
         notes: recordFilter?.includes('careSummaries'),
         vaccines: recordFilter?.includes('vaccines'),
         allergies:

src/applications/mhv-medical-records/containers/App.jsx

@@ -128,15 +128,18 @@ const App = ({ children }) => {
   useEffect(
     () => {
       if (!current) return () => {};
+      let isMounted = true; // Flag to prevent React state update on an unmounted component
+
       const resizeObserver = new ResizeObserver(() => {
         requestAnimationFrame(() => {
-          if (height !== current.offsetHeight) {
+          if (isMounted && height !== current.offsetHeight) {
             setHeight(current.offsetHeight);
           }
         });
       });
       resizeObserver.observe(current);
       return () => {
+        isMounted = false;
         if (current) {
           resizeObserver.unobserve(current);
         }

src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js

@@ -43,4 +43,22 @@ describe('getBlueButtonReportData', () => {
       );
     });
   });
+
+  it('should dispatch combined labsAndTests and radiology responses in a single action', () => {
+    const mockData = { mockData: 'mockData' };
+    mockApiRequest(mockData);
+    const dispatch = sinon.spy();
+
+    return getBlueButtonReportData({ labsAndTests: true, radiology: true })(
+      dispatch,
+    ).then(() => {
+      // Verify dispatch was called once for the combined action
+      expect(dispatch.calledOnce).to.be.true;
+
+      const action = dispatch.firstCall.args[0];
+      expect(action.type).to.equal(Actions.LabsAndTests.GET_LIST);
+      expect(action.labsAndTestsResponse).to.deep.equal(mockData);
+      expect(action.radiologyResponse).to.deep.equal(mockData);
+    });
+  });
 });