From af8de1f53c6824a0ea8c282fffd2ed6ebda4f33e Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Tue, 27 Feb 2024 20:26:54 -0500 Subject: [PATCH] Consider active questionnaire when determining risk values Signed-off-by: Ian Bolton --- .../application-landscape/application-landscape.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx b/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx index 4b789377d1..9b4c2ca00b 100644 --- a/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx +++ b/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx @@ -29,7 +29,8 @@ interface IAggregateRiskData { const aggregateRiskData = ( assessments: AssessmentWithArchetypeApplications[], - applications: Application[] + applications: Application[], + questionnaire: Questionnaire | null ): IAggregateRiskData => { let low = 0; let medium = 0; @@ -61,8 +62,12 @@ const aggregateRiskData = ( const fullApp = findFullApplication(appRef); if (fullApp && fullApp.risk && !processedAppIds.has(fullApp.id)) { processedAppIds.add(fullApp.id); + let risk = fullApp.risk; + if (questionnaire?.id === assessment.questionnaire.id) { + risk = assessment.risk; + } - switch (fullApp.risk) { + switch (risk) { case "green": low++; break; @@ -120,8 +125,8 @@ export const ApplicationLandscape: React.FC = ({ ); const landscapeData = useMemo( - () => aggregateRiskData(filteredAssessments, applications), - [filteredAssessments, applications] + () => aggregateRiskData(filteredAssessments, applications, questionnaire), + [filteredAssessments, applications, questionnaire] ); return (