Consider active questionnaire when determining risk values

Signed-off-by: Ian Bolton <[email protected]>
konveyor · Feb 28, 2024 · af8de1f · af8de1f
1 parent efb6720
commit af8de1f
Showing 1 changed file with 9 additions and 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
@@ -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<IApplicationLandscapeProps> = ({
   );
 
   const landscapeData = useMemo(
-    () => aggregateRiskData(filteredAssessments, applications),
-    [filteredAssessments, applications]
+    () => aggregateRiskData(filteredAssessments, applications, questionnaire),
+    [filteredAssessments, applications, questionnaire]
   );
 
   return (