From 007d927db197c6a04f2258d37d7aba4a86a7d485 Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Wed, 24 Apr 2024 13:14:36 +0200
Subject: [PATCH] feat: Filter chartData based on measurmentData

---
 i18n/en.pot                                            | 10 ++++++++--
 src/Plugin.tsx                                         | 10 ++++++++--
 src/components/GrowthChart/GrowthChart.tsx             |  1 -
 .../DataFetching/Sorting/useFilterByMissingData.ts     |  3 +++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index 3c358fe..429a790 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-04-23T10:55:58.423Z\n"
-"PO-Revision-Date: 2024-04-23T10:55:58.423Z\n"
+"POT-Creation-Date: 2024-04-24T10:57:45.778Z\n"
+"PO-Revision-Date: 2024-04-24T10:57:45.778Z\n"
 
 msgid "Growth Chart"
 msgstr "Growth Chart"
@@ -17,12 +17,18 @@ msgstr "There was an error fetching the config for the growth chart."
 msgid "Please check the configuration in Datastore Management and try again."
 msgstr "Please check the configuration in Datastore Management and try again."
 
+msgid "There was an error fetching the custom references for the growth chart."
+msgstr "There was an error fetching the custom references for the growth chart."
+
 msgid "Date"
 msgstr "Date"
 
 msgid "Age"
 msgstr "Age"
 
+msgid "Year"
+msgstr "Year"
+
 msgid "Years"
 msgstr "Years"
 
diff --git a/src/Plugin.tsx b/src/Plugin.tsx
index 404e6f4..baaded8 100644
--- a/src/Plugin.tsx
+++ b/src/Plugin.tsx
@@ -15,8 +15,9 @@ import { useMappedTrackedEntityVariables } from './utils/DataFetching/Sorting/us
 import { ChartConfigError } from './UI/GenericError/ChartConfigError';
 import { GenericLoading } from './UI/GenericLoading';
 import { useCustomReferences } from './utils/DataFetching/Hooks/useCustomReferences';
-import { chartData } from './DataSets/WhoStandardDataSets/ChartData';
+import { chartData as chartDataWHO } from './DataSets/WhoStandardDataSets/ChartData';
 import { CustomReferencesError } from './UI/GenericError/CustomReferencesError';
+import { useFilterByMissingData } from './utils/DataFetching/Sorting';
 
 const queryClient = new QueryClient();
 
@@ -40,6 +41,11 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
         isWeightInGrams: chartConfig?.settings.weightInGrams || false,
     });
 
+    const { chartData } = useFilterByMissingData(
+        mappedGrowthVariables,
+        chartConfig?.settings.customReferences ? customReferences : chartDataWHO,
+    );
+
     const isPercentiles = chartConfig?.settings.usePercentiles || false;
 
     const [open, setOpen] = useState(true);
@@ -81,7 +87,7 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
                         <GrowthChart
                             trackedEntity={mappedTrackedEntity}
                             measurementData={mappedGrowthVariables}
-                            chartData={chartConfig.settings.customReferences ? customReferences : chartData}
+                            chartData={chartData}
                             isPercentiles={isPercentiles}
                         />
                     </WidgetCollapsible>
diff --git a/src/components/GrowthChart/GrowthChart.tsx b/src/components/GrowthChart/GrowthChart.tsx
index efd3f05..b23f5fc 100644
--- a/src/components/GrowthChart/GrowthChart.tsx
+++ b/src/components/GrowthChart/GrowthChart.tsx
@@ -21,7 +21,6 @@ export const GrowthChart = ({
     chartData,
 }: GrowthChartProps) => {
     const trackedEntityGender = trackedEntity?.gender;
-
     const [gender, setGender] = useState<string>(trackedEntityGender !== undefined ? trackedEntityGender : GenderCodes.CGC_Female);
     const { chartDataForGender } = useChartDataForGender({ gender, chartData });
 
diff --git a/src/utils/DataFetching/Sorting/useFilterByMissingData.ts b/src/utils/DataFetching/Sorting/useFilterByMissingData.ts
index f286427..bc9924c 100644
--- a/src/utils/DataFetching/Sorting/useFilterByMissingData.ts
+++ b/src/utils/DataFetching/Sorting/useFilterByMissingData.ts
@@ -2,6 +2,9 @@ import { useMemo } from 'react';
 import { ChartData, MeasurementData } from '../../../types/chartDataTypes';
 
 export const useFilterByMissingData = (measurementData: MeasurementData[], chartData: ChartData) => {
+    if (!chartData || !measurementData) {
+        return {};
+    }
     const requiredData = Object.freeze({
         hcfa_b: { headCircumference: true },
         hcfa_g: { headCircumference: true },