From 9142338d100e9e163ffef03ff4874595b828ab03 Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Thu, 14 Nov 2024 18:48:19 +0000 Subject: [PATCH 1/2] ESCKAN-73 Add dummy population count in connectivity grid --- src/components/ConnectivityGrid.tsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/components/ConnectivityGrid.tsx b/src/components/ConnectivityGrid.tsx index 6939e26..a6a57e5 100644 --- a/src/components/ConnectivityGrid.tsx +++ b/src/components/ConnectivityGrid.tsx @@ -26,6 +26,7 @@ const { gray100, primaryPurple600, gray400, + gray600A, } = vars; function ConnectivityGrid() { @@ -146,6 +147,8 @@ function ConnectivityGrid() { const isLoading = yAxis.length == 0; + const totalPopulationCount = 253; // TODO: calculate + return isLoading ? ( ) : ( @@ -157,10 +160,20 @@ function ConnectivityGrid() { display="flex" flexDirection="column" > - + Connection Origin to End Organ + + {totalPopulationCount} populations + From 7c5d03765336c6441c1b989083e7951b825f598d Mon Sep 17 00:00:00 2001 From: Diogo Correia Date: Tue, 19 Nov 2024 11:38:00 +0000 Subject: [PATCH 2/2] ESCKAN-73 Add population count logic --- src/components/ConnectivityGrid.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/ConnectivityGrid.tsx b/src/components/ConnectivityGrid.tsx index a6a57e5..e4bca20 100644 --- a/src/components/ConnectivityGrid.tsx +++ b/src/components/ConnectivityGrid.tsx @@ -13,6 +13,7 @@ import { filterConnectionsMap, getNonEmptyColumns, filterYAxis, + filterKnowledgeStatements, } from '../services/heatmapService.ts'; import FiltersDropdowns from './FiltersDropdowns.tsx'; import { HierarchicalItem } from './common/Types.ts'; @@ -147,7 +148,14 @@ function ConnectivityGrid() { const isLoading = yAxis.length == 0; - const totalPopulationCount = 253; // TODO: calculate + const totalPopulationCount = useMemo(() => { + const filteredStatements = filterKnowledgeStatements( + knowledgeStatements, + hierarchicalNodes, + filters, + ); + return Object.keys(filteredStatements).length; + }, [knowledgeStatements, hierarchicalNodes, filters]); return isLoading ? (