+ We’re sorry. There’s a problem with our system. The report you just + downloaded doesn’t include these records: +
+
+ Try downloading these records again later. If it still doesn’t work,
+ call us at
Records in these reports last updated at 1:47 p.m. [time zone] on June 23, 2024
First, select the types of records you want in your report. Then diff --git a/src/applications/mhv-medical-records/reducers/blueButton.js b/src/applications/mhv-medical-records/reducers/blueButton.js index 980132d7a1db..81fe79940229 100644 --- a/src/applications/mhv-medical-records/reducers/blueButton.js +++ b/src/applications/mhv-medical-records/reducers/blueButton.js @@ -7,31 +7,23 @@ import { medicationTypes, NA, NONE_RECORDED, UNKNOWN } from '../util/constants'; import { dateFormat } from '../util/helpers'; const initialState = { - /** - * The list of medications returned from the api - * @type {Array} - */ + /** The list of medications returned from the api @type {Array} */ medicationsList: undefined, - /** - * The list of appointments returned from the api - * @type {Array} - */ + + /** The list of appointments returned from the api @type {Array} */ appointmentsList: undefined, - /** - * The demographic info returned from the api - * @type {Array} - */ + + /** The demographic info returned from the api @type {Array} */ demographics: undefined, - /** - * The military service info returned from the api - * @type {Array} - */ + + /** The military service info returned from the api @type {Array} */ militaryService: undefined, - /** - * The account summary info returned from the api - * @type {Array} - */ + + /** The account summary info returned from the api @type {Array} */ accountSummary: undefined, + + /** A list of domains which failed during fetch @type {Array} */ + failedDomains: [], }; /** @@ -157,7 +149,7 @@ export const convertDemographics = info => { return { id: info.id, - facility: info.facilityInfo.name || NONE_RECORDED, + facility: info.facilityInfo?.name || NONE_RECORDED, firstName: info.firstName, middleName: info.middleName || NONE_RECORDED, lastName: info.lastName || NONE_RECORDED, @@ -279,9 +271,9 @@ export const convertAccountSummary = data => { // Map facilities const mappedFacilities = facilities.map(facility => ({ - facilityName: facility.facilityInfo.name, - stationNumber: facility.facilityInfo.stationNumber, - type: facility.facilityInfo.treatment ? 'Treatment' : 'VAMC', + facilityName: facility.facilityInfo?.name || 'Unknown facility', + stationNumber: facility.facilityInfo?.stationNumber || 'Unknown ID', + type: facility.facilityInfo?.treatment ? 'Treatment' : 'VAMC', })); // Extract user profile details @@ -289,8 +281,7 @@ export const convertAccountSummary = data => { const authenticatingFacility = ipa?.authenticatingFacilityId && facilities.find( - facility => - facility.facilityInfo.stationNumber === ipa.authenticatingFacilityId, + facility => facility.facilityInfo?.id === ipa.authenticatingFacilityId, ); const authenticationInfo = ipa @@ -303,7 +294,7 @@ export const convertAccountSummary = data => { authenticationFacilityName: authenticatingFacility?.facilityInfo?.name || 'Unknown facility', authenticationFacilityID: - authenticatingFacility?.facilityInfo?.stationNumber || 'Unknown ID', + authenticatingFacility?.facilityInfo?.id || 'Unknown ID', } : {}; @@ -314,7 +305,6 @@ export const convertAccountSummary = data => { }; export const blueButtonReducer = (state = initialState, action) => { - // eslint-disable-next-line sonarjs/no-small-switch switch (action.type) { case Actions.BlueButtonReport.GET: { const updates = {}; @@ -354,6 +344,22 @@ export const blueButtonReducer = (state = initialState, action) => { ...updates, }; } + case Actions.BlueButtonReport.ADD_FAILED: { + const failedDomain = action.payload; + + return { + ...state, + failedDomains: state.failedDomains.includes(failedDomain) + ? state.failedDomains + : [...state.failedDomains, failedDomain], + }; + } + case Actions.BlueButtonReport.CLEAR_FAILED: { + return { + ...state, + failedDomains: [], + }; + } default: return state; } diff --git a/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js b/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js index 5b3a295d278a..a50b249cc608 100644 --- a/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js +++ b/src/applications/mhv-medical-records/tests/actions/blueButtonReport.spec.js @@ -28,4 +28,19 @@ describe('getBlueButtonReportData', () => { expect(dispatch.notCalled).to.be.true; }); }); + + it('should dispatch an error for a failed API call', () => { + const mockData = allergies; + mockApiRequest(mockData, false); // Unresolved promise + const dispatch = sinon.spy(); + return getBlueButtonReportData({ allergies: true })(dispatch).then(() => { + // Verify that dispatch was called only once + expect(dispatch.calledOnce).to.be.true; + + // Check the first and only dispatch action type + expect(dispatch.firstCall.args[0].type).to.equal( + Actions.BlueButtonReport.ADD_FAILED, + ); + }); + }); }); diff --git a/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js b/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js index 1290ab97e192..b00a3404adf7 100644 --- a/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js +++ b/src/applications/mhv-medical-records/tests/reducers/blueButton.unit.spec.js @@ -277,8 +277,9 @@ describe('convertAccountSummary', () => { facilities: [ { facilityInfo: { + id: '123', name: 'VA Medical Center', - stationNumber: '123', + stationNumber: 'TEST', treatment: true, }, }, @@ -330,6 +331,7 @@ describe('blueButtonReducer', () => { demographics: undefined, militaryService: undefined, accountSummary: undefined, + failedDomains: [], }; it('should return the initial state when passed an undefined state', () => { @@ -409,6 +411,7 @@ describe('blueButtonReducer', () => { 'demographics', 'militaryService', 'accountSummary', + 'failedDomains', ]); expect(newState.medicationsList).to.be.an('array'); diff --git a/src/applications/mhv-medical-records/util/actionTypes.js b/src/applications/mhv-medical-records/util/actionTypes.js index 86a7508068ff..a38042af9ca1 100644 --- a/src/applications/mhv-medical-records/util/actionTypes.js +++ b/src/applications/mhv-medical-records/util/actionTypes.js @@ -84,6 +84,8 @@ export const Actions = { }, BlueButtonReport: { GET: 'MR_BLUE_BUTTON_GET_DATA', + ADD_FAILED: 'MR_BLUE_BUTTON_ADD_FAILED', + CLEAR_FAILED: 'MR_BLUE_BUTTON_CLEAR_FAILED', }, PageTracker: { SET_PAGE_TRACKER: 'MR_SET_PAGE_TRACKER',