From e3ce6bce6b27e4391d26a9c3647fed3b7822c614 Mon Sep 17 00:00:00 2001 From: ibolton336 Date: Wed, 29 Nov 2023 11:47:34 -0500 Subject: [PATCH] Cleanup assessmentRefs filter logic Signed-off-by: ibolton336 --- client/src/app/pages/reports/reports.tsx | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/client/src/app/pages/reports/reports.tsx b/client/src/app/pages/reports/reports.tsx index db2c377c03..9ddc6ebe19 100644 --- a/client/src/app/pages/reports/reports.tsx +++ b/client/src/app/pages/reports/reports.tsx @@ -123,22 +123,14 @@ export const Reports: React.FC = () => { ? null : questionnairesById[selectedQuestionnaireId]; - const assessmentRefs = isAllQuestionnairesSelected - ? assessments - .map((assessment) => { - const assessmentRef = toIdRef(assessment); - return assessmentRef; - }) - .filter(Boolean) - : assessments - .filter( - ({ questionnaire }) => questionnaire.id === selectedQuestionnaireId - ) - .map((assessment) => { - const assessmentRef = toIdRef(assessment); - return assessmentRef; - }) - .filter(Boolean); + const assessmentRefs = assessments + .filter( + (assessment) => + isAllQuestionnairesSelected || + assessment.questionnaire.id === selectedQuestionnaireId + ) + .map((assessment) => toIdRef(assessment)) + .filter(Boolean); return ( <>