From 300da5bb97e66147588c92aa5bcc0457650a55f7 Mon Sep 17 00:00:00 2001 From: Lina Roth Date: Thu, 22 Aug 2024 12:59:39 -0400 Subject: [PATCH 1/2] Update symptoms and problems unavailable data to be 1 heading like the others --- .../app/tests/components/Unavailable.test.tsx | 6 ++++-- .../AccordionContent.test.tsx.snap | 19 +++++++++++++++++++ .../__snapshots__/Unavailable.test.tsx.snap | 19 +++++++++++++++++++ .../view-data/components/AccordionContent.tsx | 4 ++++ .../view-data/components/UnavailableInfo.tsx | 14 +++++--------- 5 files changed, 51 insertions(+), 11 deletions(-) diff --git a/containers/ecr-viewer/src/app/tests/components/Unavailable.test.tsx b/containers/ecr-viewer/src/app/tests/components/Unavailable.test.tsx index 4d8fa177d0..1710ec73d3 100644 --- a/containers/ecr-viewer/src/app/tests/components/Unavailable.test.tsx +++ b/containers/ecr-viewer/src/app/tests/components/Unavailable.test.tsx @@ -97,8 +97,10 @@ describe("UnavailableInfo", () => { socialUnavailableData={socialUnavailability} encounterUnavailableData={encounterUnavailableData} providerUnavailableData={providerUnavailableData} - reasonForVisitUnavailableData={reasonForVisitUnavailableData} - activeProblemsUnavailableData={activeProblemsUnavailableData} + symptomsProblemsUnavailableData={[ + ...reasonForVisitUnavailableData, + ...activeProblemsUnavailableData, + ]} immunizationsUnavailableData={immunizationsUnavailableData} vitalUnavailableData={vitalUnavailableData} treatmentData={treatmentUnavailableData} diff --git a/containers/ecr-viewer/src/app/tests/components/__snapshots__/AccordionContent.test.tsx.snap b/containers/ecr-viewer/src/app/tests/components/__snapshots__/AccordionContent.test.tsx.snap index df7d98f1a7..aa41350bf3 100644 --- a/containers/ecr-viewer/src/app/tests/components/__snapshots__/AccordionContent.test.tsx.snap +++ b/containers/ecr-viewer/src/app/tests/components/__snapshots__/AccordionContent.test.tsx.snap @@ -922,6 +922,25 @@ exports[`Snapshot test for Accordion Content Given no data, info message for emp
+
+
+
+ Reason for Visit +
+
+ No data +
+
+
+
+
+
+
+ Reason for Visit +
+
+ No data +
+
+
+
= ({ demographicsUnavailableData={demographicsData.unavailableData} socialUnavailableData={social_data.unavailableData} encounterUnavailableData={encounterData.unavailableData} + symptomsProblemsUnavailableData={[ + ...clinicalData.reasonForVisitDetails.unavailableData, + ...clinicalData.activeProblemsDetails.unavailableData, + ]} reasonForVisitUnavailableData={ clinicalData.reasonForVisitDetails.unavailableData } diff --git a/containers/ecr-viewer/src/app/view-data/components/UnavailableInfo.tsx b/containers/ecr-viewer/src/app/view-data/components/UnavailableInfo.tsx index a6946900a7..5566556193 100644 --- a/containers/ecr-viewer/src/app/view-data/components/UnavailableInfo.tsx +++ b/containers/ecr-viewer/src/app/view-data/components/UnavailableInfo.tsx @@ -10,8 +10,7 @@ interface UnavailableInfoProps { socialUnavailableData: DisplayDataProps[]; encounterUnavailableData: DisplayDataProps[]; providerUnavailableData: DisplayDataProps[]; - reasonForVisitUnavailableData: DisplayDataProps[]; - activeProblemsUnavailableData: DisplayDataProps[]; + symptomsProblemsUnavailableData: DisplayDataProps[]; vitalUnavailableData: DisplayDataProps[]; treatmentData: DisplayDataProps[]; clinicalNotesData: DisplayDataProps[]; @@ -26,8 +25,7 @@ interface UnavailableInfoProps { * @param props.socialUnavailableData The unavailable social data * @param props.encounterUnavailableData The unavailable encounter data * @param props.providerUnavailableData The unavailable provider data - * @param props.reasonForVisitUnavailableData The unavailable reason for visit data - * @param props.activeProblemsUnavailableData The unavailable active problems data + * @param props.symptomsProblemsUnavailableData The unavailable symptoms and problems data * @param props.immunizationsUnavailableData The unavailable immunizations data * @param props.vitalUnavailableData The unavailable vital data * @param props.treatmentData The unavailable treatment data @@ -40,8 +38,7 @@ const UnavailableInfo: React.FC = ({ socialUnavailableData, encounterUnavailableData, providerUnavailableData, - reasonForVisitUnavailableData, - activeProblemsUnavailableData, + symptomsProblemsUnavailableData, immunizationsUnavailableData, vitalUnavailableData, treatmentData, @@ -79,9 +76,8 @@ const UnavailableInfo: React.FC = ({ renderSection("Clinical Notes", clinicalNotesData)} {providerUnavailableData.length > 0 && renderSection("Provider Details", providerUnavailableData)} - {(reasonForVisitUnavailableData?.length > 0 || - activeProblemsUnavailableData?.length > 0) && - renderSection("Symptoms and Problems", activeProblemsUnavailableData)} + {symptomsProblemsUnavailableData?.length > 0 && + renderSection("Symptoms and Problems", symptomsProblemsUnavailableData)} {vitalUnavailableData?.length > 0 && renderSection("Diagnostics and Vital Signs", vitalUnavailableData)} {immunizationsUnavailableData?.length > 0 && From 32d3fc7ec78b81ddfdd45d52364a93858a6bf9c5 Mon Sep 17 00:00:00 2001 From: Lina Roth Date: Thu, 22 Aug 2024 13:25:13 -0400 Subject: [PATCH 2/2] remove old code --- .../src/app/view-data/components/AccordionContent.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/containers/ecr-viewer/src/app/view-data/components/AccordionContent.tsx b/containers/ecr-viewer/src/app/view-data/components/AccordionContent.tsx index 2588e7eeeb..f9c8198e0b 100644 --- a/containers/ecr-viewer/src/app/view-data/components/AccordionContent.tsx +++ b/containers/ecr-viewer/src/app/view-data/components/AccordionContent.tsx @@ -187,12 +187,6 @@ const AccordionContent: React.FC = ({ ...clinicalData.reasonForVisitDetails.unavailableData, ...clinicalData.activeProblemsDetails.unavailableData, ]} - reasonForVisitUnavailableData={ - clinicalData.reasonForVisitDetails.unavailableData - } - activeProblemsUnavailableData={ - clinicalData.activeProblemsDetails.unavailableData - } providerUnavailableData={providerData.unavailableData} vitalUnavailableData={clinicalData.vitalData.unavailableData} immunizationsUnavailableData={