From a0a788be945c14b0aa1a3b89237a89af54f5ee06 Mon Sep 17 00:00:00 2001 From: Marc Morant Date: Thu, 6 Dec 2018 14:03:56 +0100 Subject: [PATCH] Flatten diagnostics to count (filters) (#459) --- .../Presenters/DiagnosticsQuickSelector.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/ExecutionControlEpic/DiagnosticsFeature/Presenters/DiagnosticsQuickSelector.js b/lib/ExecutionControlEpic/DiagnosticsFeature/Presenters/DiagnosticsQuickSelector.js index a29df261..5ef97895 100644 --- a/lib/ExecutionControlEpic/DiagnosticsFeature/Presenters/DiagnosticsQuickSelector.js +++ b/lib/ExecutionControlEpic/DiagnosticsFeature/Presenters/DiagnosticsQuickSelector.js @@ -117,6 +117,17 @@ function DiagnosticsQuickSelector({ severities: Set, onFilterClick: (severity: number) => void, }) { + const flattenDiagnostics = ( + severity: DiagnosticSeverity, + ): List => + diagnostics + .filter(diagnosticGroup => diagnosticGroup.get(severity)) + .reduce( + (acc, serverityMap) => + serverityMap ? acc.concat(...serverityMap.values()) : acc, + List(), + ); + return ( {[3, 5, 2, 1].map((severity: DiagnosticSeverity) => ( @@ -125,9 +136,7 @@ function DiagnosticsQuickSelector({ activated={severities.includes(severity)} key={severity} severity={severity} - count={diagnostics - .filter(diagnosticGroup => diagnosticGroup.get(severity)) - .count()} + count={flattenDiagnostics(severity).count()} /> ))}