From 372b27aabf574a2b70db5a6294bbbdf65bf3fd00 Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Tue, 4 Jun 2024 11:33:33 +0200
Subject: [PATCH 1/8] feat: Selecting time interval based on child age

---
 i18n/en.pot                                   | 16 ++---
 src/components/GrowthChart/GrowthChart.tsx    | 60 +++++++++--------
 .../Calculations/useAppropriateChartData.ts   | 65 +++++++++++++++++++
 3 files changed, 103 insertions(+), 38 deletions(-)
 create mode 100644 src/utils/Hooks/Calculations/useAppropriateChartData.ts

diff --git a/i18n/en.pot b/i18n/en.pot
index 7c03ade..f8a2ae0 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-05-22T11:41:21.544Z\n"
-"PO-Revision-Date: 2024-05-22T11:41:21.544Z\n"
+"POT-Creation-Date: 2024-06-03T12:47:42.239Z\n"
+"PO-Revision-Date: 2024-06-03T12:47:42.239Z\n"
 
 msgid "Growth Chart"
 msgstr "Growth Chart"
@@ -20,6 +20,9 @@ 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 "Print"
+msgstr "Print"
+
 msgid "Date"
 msgstr "Date"
 
@@ -38,9 +41,6 @@ msgstr "Months"
 msgid "Weeks"
 msgstr "Weeks"
 
-msgid "Days"
-msgstr "Days"
-
 msgid "year"
 msgstr "year"
 
@@ -59,12 +59,6 @@ msgstr "week"
 msgid "weeks"
 msgstr "weeks"
 
-msgid "day"
-msgstr "day"
-
-msgid "days"
-msgstr "days"
-
 msgid "Head circumference"
 msgstr "Head circumference"
 
diff --git a/src/components/GrowthChart/GrowthChart.tsx b/src/components/GrowthChart/GrowthChart.tsx
index efd3f05..90286a0 100644
--- a/src/components/GrowthChart/GrowthChart.tsx
+++ b/src/components/GrowthChart/GrowthChart.tsx
@@ -1,11 +1,12 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { GrowthChartBuilder } from './GrowthChartBuilder';
 import { ChartSelector } from './GrowthChartSelector';
-import { GenderCodes, CategoryCodes, MeasurementData, ChartData } from '../../types/chartDataTypes';
-import { useCalculateMinMaxValues } from '../../utils/Hooks/Calculations/useCalculateMinMaxValues';
+import { ChartData, GenderCodes, MeasurementData } from '../../types/chartDataTypes';
+import { useCalculateMinMaxValues } from '../../utils/Hooks/Calculations';
 import { ChartSettingsButton } from './ChartSettingsButton';
-import { useChartDataForGender } from '../../utils/DataFetching/Sorting/useChartDataForGender';
+import { useChartDataForGender } from '../../utils/DataFetching/Sorting';
 import { MappedEntityValues } from '../../utils/DataFetching/Sorting/useMappedTrackedEntity';
+import { useAppropriateChartData } from '../../utils/Hooks/Calculations/useAppropriateChartData';
 
 interface GrowthChartProps {
     trackedEntity: MappedEntityValues;
@@ -21,31 +22,33 @@ export const GrowthChart = ({
     chartData,
 }: GrowthChartProps) => {
     const trackedEntityGender = trackedEntity?.gender;
-
+    const dateOfBirth = new Date(trackedEntity?.dateOfBirth);
     const [gender, setGender] = useState<string>(trackedEntityGender !== undefined ? trackedEntityGender : GenderCodes.CGC_Female);
-    const { chartDataForGender } = useChartDataForGender({ gender, chartData });
-
-    const [category, setCategory] = useState<keyof typeof CategoryCodes>();
-    const [dataset, setDataset] = useState<string>();
+    const { chartDataForGender } = useChartDataForGender({
+        gender,
+        chartData,
+    });
 
-    useEffect(() => {
-        if (Object.keys(chartDataForGender).length > 0) {
-            const newCategory = Object.keys(chartDataForGender)[0] as keyof typeof CategoryCodes;
-            setCategory(newCategory);
-            const newDataset = Object.keys(chartDataForGender[newCategory].datasets)[0];
-            setDataset(newDataset);
-        }
-    }, [chartDataForGender]);
+    const {
+        selectedCategory,
+        selectedDataset,
+        setSelectedCategory: setCategory,
+        setSelectedDataset: setDataset,
+    } = useAppropriateChartData(chartDataForGender, dateOfBirth);
 
     useEffect(() => {
-        Object.values(GenderCodes).includes(trackedEntity.gender) && setGender(trackedEntity?.gender);
+        Object.values(GenderCodes)
+            .includes(trackedEntity.gender) && setGender(trackedEntity?.gender);
     }, [trackedEntity]);
 
-    const dataSetEntry = chartDataForGender[category]?.datasets[dataset];
+    const dataSetEntry = chartDataForGender[selectedCategory]?.datasets[selectedDataset];
 
     const dataSetValues = isPercentiles ? dataSetEntry?.percentileDatasetValues : dataSetEntry?.zScoreDatasetValues;
     const dataSetMetadata = dataSetEntry?.metadata;
-    const { min, max } = useCalculateMinMaxValues(dataSetValues);
+    const {
+        min,
+        max,
+    } = useCalculateMinMaxValues(dataSetValues);
 
     const [minDataValue, maxDataValue] = useMemo(() => {
         const minVal = Math.max(0, Math.floor(min));
@@ -58,15 +61,18 @@ export const GrowthChart = ({
     }
 
     const keysDataSet = Object.keys(dataSetValues[0]);
-    const yAxisValues = { minDataValue, maxDataValue };
+    const yAxisValues = {
+        minDataValue,
+        maxDataValue,
+    };
 
     return (
         <div>
             <div className='flex flex-wrap-reverse pl-12'>
                 <div>
                     <ChartSelector
-                        category={category}
-                        dataset={dataset}
+                        category={selectedCategory}
+                        dataset={selectedDataset}
                         setCategory={setCategory}
                         setDataset={setDataset}
                         chartData={chartDataForGender}
@@ -77,8 +83,8 @@ export const GrowthChart = ({
                 </div>
                 <div className='grow relative min-w-[100px] text-sm'>
                     <ChartSettingsButton
-                        category={category}
-                        dataset={dataset}
+                        category={selectedCategory}
+                        dataset={selectedDataset}
                         gender={gender}
                         trackedEntity={trackedEntity}
                     />
@@ -91,9 +97,9 @@ export const GrowthChart = ({
                 datasetMetadata={dataSetMetadata}
                 yAxisValues={yAxisValues}
                 keysDataSet={keysDataSet}
-                dateOfBirth={new Date(trackedEntity?.dateOfBirth)}
-                category={category}
-                dataset={dataset}
+                dateOfBirth={dateOfBirth}
+                category={selectedCategory}
+                dataset={selectedDataset}
                 isPercentiles={isPercentiles}
             />
         </div>
diff --git a/src/utils/Hooks/Calculations/useAppropriateChartData.ts b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
new file mode 100644
index 0000000..926343f
--- /dev/null
+++ b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
@@ -0,0 +1,65 @@
+import { useEffect, useRef, useState } from 'react';
+import { differenceInMonths, differenceInWeeks } from 'date-fns';
+import { CategoryCodes, ChartData, MeasurementTypeCodesLabel, TimeUnitCodes } from '../../../types/chartDataTypes';
+
+export const useAppropriateChartData = (
+    chartDataForGender: ChartData,
+    dateOfBirth: Date,
+) => {
+    const [selectedCategory, setSelectedCategory] = useState<keyof typeof CategoryCodes>();
+    const [selectedDataset, setSelectedDataset] = useState<string>();
+
+    const selectDatasetForCategoryRef = useRef<(category: keyof typeof CategoryCodes) => void>();
+    selectDatasetForCategoryRef.current = (category: keyof typeof CategoryCodes) => {
+        const { datasets } = chartDataForGender[category];
+        const childAgeInWeeks = differenceInWeeks(new Date(), dateOfBirth);
+        const childAgeInMonths = differenceInMonths(new Date(), dateOfBirth);
+        Object.entries(datasets)
+            .some(([key, value]) => {
+                const { range } = value.metadata;
+                const xAxis = value.metadata.xAxisLabel;
+
+                if (Object.values(MeasurementTypeCodesLabel)
+                    .includes(xAxis)) {
+                    setSelectedDataset((prevDataset) => (prevDataset !== key ? key : prevDataset));
+                    return true;
+                }
+
+                if (xAxis === TimeUnitCodes.weeks && childAgeInWeeks <= 13) {
+                    setSelectedDataset((prevDataset) => (prevDataset !== key ? key : prevDataset));
+                    return true;
+                }
+
+                const isChildAgeInRange = xAxis === TimeUnitCodes.months && childAgeInMonths >= range.start && childAgeInMonths <= range.end;
+
+                if (isChildAgeInRange) {
+                    setSelectedDataset((prevDataset) => (prevDataset !== key ? key : prevDataset));
+                    return true;
+                }
+
+                return false;
+            });
+    };
+
+    useEffect(() => {
+        if (selectedCategory && chartDataForGender[selectedCategory]) {
+            selectDatasetForCategoryRef.current?.(selectedCategory);
+        }
+    }, [selectedCategory, chartDataForGender]);
+
+    useEffect(() => {
+        if (Object.keys(chartDataForGender).length > 0) {
+            const firstKey = Object.keys(chartDataForGender)[0];
+            if (firstKey) {
+                chartDataForGender[firstKey] && setSelectedCategory(firstKey);
+            }
+        }
+    }, [chartDataForGender]);
+
+    return {
+        selectedCategory,
+        selectedDataset,
+        setSelectedCategory,
+        setSelectedDataset,
+    };
+};

From 2aa781c26c0ae8830850b7c582ddfb3e4987e819 Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Tue, 4 Jun 2024 12:00:15 +0200
Subject: [PATCH 2/8] feat: Merge with automatic indicator selector in CGC-61

---
 .gitignore                                    |  3 +-
 i18n/en.pot                                   | 19 +++--
 src/Plugin.tsx                                | 70 +++++++++++++++----
 src/UI/GenericError/ChartConfigError.tsx      | 33 ---------
 src/UI/GenericError/CustomReferencesError.tsx | 33 ---------
 src/UI/GenericError/GenericError.tsx          | 54 ++++++++++++++
 src/components/GrowthChart/GrowthChart.tsx    | 23 +++++-
 .../DataFetching/Hooks/useChartConfig.ts      |  6 +-
 .../Calculations/useAppropriateChartData.ts   | 20 ++++--
 9 files changed, 167 insertions(+), 94 deletions(-)
 delete mode 100644 src/UI/GenericError/ChartConfigError.tsx
 delete mode 100644 src/UI/GenericError/CustomReferencesError.tsx
 create mode 100644 src/UI/GenericError/GenericError.tsx

diff --git a/.gitignore b/.gitignore
index 6570aa5..2eedf17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 node_modules
 .d2
 src/locales
-build
\ No newline at end of file
+build
+.idea/*
diff --git a/i18n/en.pot b/i18n/en.pot
index f8a2ae0..3b8211e 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,11 +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-06-03T12:47:42.239Z\n"
-"PO-Revision-Date: 2024-06-03T12:47:42.239Z\n"
-
-msgid "Growth Chart"
-msgstr "Growth Chart"
+"POT-Creation-Date: 2024-06-03T10:25:33.640Z\n"
+"PO-Revision-Date: 2024-06-03T10:25:33.640Z\n"
 
 msgid "There was an error fetching the config for the growth chart."
 msgstr "There was an error fetching the config for the growth chart."
@@ -20,9 +17,21 @@ 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 "Growth Chart"
+msgstr "Growth Chart"
+
 msgid "Print"
 msgstr "Print"
 
+msgid "The default indicator"
+msgstr "The default indicator"
+
+msgid "is not a valid indicator."
+msgstr "is not a valid indicator."
+
+msgid "Please select a valid indicator in the configuration."
+msgstr "Please select a valid indicator in the configuration."
+
 msgid "Date"
 msgstr "Date"
 
diff --git a/src/Plugin.tsx b/src/Plugin.tsx
index b4200ae..3af44c3 100644
--- a/src/Plugin.tsx
+++ b/src/Plugin.tsx
@@ -7,24 +7,41 @@ import i18n from '@dhis2/d2-i18n';
 import { WidgetCollapsible } from './components/WidgetCollapsible';
 import { GrowthChart } from './components/GrowthChart/GrowthChart';
 import { EnrollmentOverviewProps } from './Plugin.types';
-import { useTeiById } from './utils/DataFetching/Hooks';
-import { useChartConfig } from './utils/DataFetching/Hooks/useChartConfig';
+import { useChartConfig, useEvents, useTeiById } from './utils/DataFetching/Hooks';
 import { useMappedGrowthVariables } from './utils/DataFetching/Sorting/useMappedGrowthVariables';
-import { useEvents } from './utils/DataFetching/Hooks/useEvents';
 import { useMappedTrackedEntityVariables } from './utils/DataFetching/Sorting/useMappedTrackedEntity';
-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 { CustomReferencesError } from './UI/GenericError/CustomReferencesError';
+import { GenericError } from './UI/GenericError/GenericError';
 
 const queryClient = new QueryClient();
 
 const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
-    const { chartConfig, isLoading, isError } = useChartConfig();
-    const { customReferences, isLoading: isLoadingRef, isError: isErrorRef } = useCustomReferences();
-    const { teiId, programId, orgUnitId } = propsFromParent;
-    const { trackedEntity } = useTeiById({ teiId });
+    const {
+        chartConfig,
+        isLoading,
+        isError,
+    } = useChartConfig();
+
+    const {
+        customReferences,
+        isLoading: isLoadingRef,
+        isError: isErrorRef,
+    } = useCustomReferences();
+
+    const {
+        teiId,
+        programId,
+        orgUnitId,
+    } = propsFromParent;
+
+    const {
+        trackedEntity,
+        isLoading: isLoadingTei,
+        isError: isErrorTei,
+    } = useTeiById({ teiId });
+
     const { events } = useEvents({
         orgUnitId,
         programStageId: chartConfig?.metadata.program.programStageId,
@@ -33,7 +50,9 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
     });
 
     const mappedTrackedEntity = useMappedTrackedEntityVariables({
-        variableMappings: chartConfig?.metadata.attributes, trackedEntity, trackedEntityAttributes: trackedEntity?.attributes,
+        variableMappings: chartConfig?.metadata.attributes,
+        trackedEntity,
+        trackedEntityAttributes: trackedEntity?.attributes,
     });
 
     const mappedGrowthVariables = useMappedGrowthVariables({
@@ -44,18 +63,42 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
 
     const isPercentiles = chartConfig?.settings.usePercentiles || false;
 
+    const defaultIndicator = chartConfig?.settings.defaultIndicator || 'wfa';
+
     const [open, setOpen] = useState(true);
 
-    if (isLoading || isLoadingRef) {
+    if (isLoading || isLoadingRef || isLoadingTei) {
         return <GenericLoading />;
     }
 
     if (isError) {
-        return <ChartConfigError />;
+        return (
+            <GenericError
+                withWidgetCollapsible
+                errorTextLine_1={i18n.t('There was an error fetching the config for the growth chart.')}
+                errorTextLine_2={i18n.t('Please check the configuration in Datastore Management and try again.')}
+            />
+        );
     }
 
     if (chartConfig?.settings.customReferences && isErrorRef) {
-        return <CustomReferencesError />;
+        return (
+            <GenericError
+                withWidgetCollapsible
+                errorTextLine_1={i18n.t('There was an error fetching the custom references for the growth chart.')}
+                errorTextLine_2={i18n.t('Please check the configuration in Datastore Management and try again.')}
+            />
+        );
+    }
+
+    if (isErrorTei) {
+        return (
+            <GenericError
+                withWidgetCollapsible
+                errorTextLine_1={i18n.t('There was an error fetching the tracked entity for the growth chart.')}
+                errorTextLine_2={i18n.t('Please check the configuration in Datastore Management and try again.')}
+            />
+        );
     }
 
     return (
@@ -84,6 +127,7 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
                             trackedEntity={mappedTrackedEntity}
                             measurementData={mappedGrowthVariables}
                             chartData={chartConfig.settings.customReferences ? customReferences : chartData}
+                            defaultIndicator={defaultIndicator}
                             isPercentiles={isPercentiles}
                         />
                     </WidgetCollapsible>
diff --git a/src/UI/GenericError/ChartConfigError.tsx b/src/UI/GenericError/ChartConfigError.tsx
deleted file mode 100644
index a500262..0000000
--- a/src/UI/GenericError/ChartConfigError.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { useState } from 'react';
-import i18n from '@dhis2/d2-i18n';
-import { WidgetCollapsible } from '../../components/WidgetCollapsible';
-import { Warning } from '../Icons';
-
-export const ChartConfigError = () => {
-    const [open, setOpen] = useState(true);
-    return (
-        <div style={{
-            width: '100vw',
-            margin: 0,
-            padding: 0,
-        }}
-        >
-            <WidgetCollapsible
-                header={i18n.t('Growth Chart')}
-                borderless={false}
-                open={open}
-                onOpen={() => setOpen(true)}
-                onClose={() => setOpen(false)}
-            >
-                <div className='flex justify-center'>
-                    <Warning className='w-12 h-12' />
-                    <p className='flex p-5 pt-2'>
-                        {i18n.t('There was an error fetching the config for the growth chart.')}
-                        <br />
-                        {i18n.t('Please check the configuration in Datastore Management and try again.')}
-                    </p>
-                </div>
-            </WidgetCollapsible>
-        </div>
-    );
-};
diff --git a/src/UI/GenericError/CustomReferencesError.tsx b/src/UI/GenericError/CustomReferencesError.tsx
deleted file mode 100644
index 0621799..0000000
--- a/src/UI/GenericError/CustomReferencesError.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { useState } from 'react';
-import i18n from '@dhis2/d2-i18n';
-import { WidgetCollapsible } from '../../components/WidgetCollapsible';
-import { Warning } from '../Icons';
-
-export const CustomReferencesError = () => {
-    const [open, setOpen] = useState(true);
-    return (
-        <div style={{
-            width: '100vw',
-            margin: 0,
-            padding: 0,
-        }}
-        >
-            <WidgetCollapsible
-                header={i18n.t('Growth Chart')}
-                borderless={false}
-                open={open}
-                onOpen={() => setOpen(true)}
-                onClose={() => setOpen(false)}
-            >
-                <div className='flex justify-center'>
-                    <Warning className='w-12 h-12' />
-                    <p className='flex p-5 pt-2'>
-                        {i18n.t('There was an error fetching the custom references for the growth chart.')}
-                        <br />
-                        {i18n.t('Please check the configuration in Datastore Management and try again.')}
-                    </p>
-                </div>
-            </WidgetCollapsible>
-        </div>
-    );
-};
diff --git a/src/UI/GenericError/GenericError.tsx b/src/UI/GenericError/GenericError.tsx
new file mode 100644
index 0000000..d413557
--- /dev/null
+++ b/src/UI/GenericError/GenericError.tsx
@@ -0,0 +1,54 @@
+import React, { useState } from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { WidgetCollapsible } from '../../components/WidgetCollapsible';
+import { Warning } from '../Icons';
+
+interface GenericErrorProps {
+    withWidgetCollapsible?: boolean;
+    errorTextLine_1: string;
+    errorTextLine_2?: string;
+}
+
+export const GenericError = ({
+    withWidgetCollapsible = false,
+    errorTextLine_1,
+    errorTextLine_2,
+}: GenericErrorProps) => {
+    const [open, setOpen] = useState(true);
+    return (
+        withWidgetCollapsible ? (
+            <div style={{
+                width: '100vw',
+                margin: 0,
+                padding: 0,
+            }}
+            >
+                <WidgetCollapsible
+                    header={i18n.t('Growth Chart')}
+                    borderless={false}
+                    open={open}
+                    onOpen={() => setOpen(true)}
+                    onClose={() => setOpen(false)}
+                >
+                    <div className='flex justify-center'>
+                        <Warning className='w-12 h-12' />
+                        <p className='flex p-5 pt-2 items-center'>
+                            {errorTextLine_1}
+                            <br />
+                            {errorTextLine_2}
+                        </p>
+                    </div>
+                </WidgetCollapsible>
+            </div>
+        ) : (
+            <div className='flex justify-center'>
+                <Warning className='w-12 h-12' />
+                <p className='flex p-5 pt-2 items-center'>
+                    {errorTextLine_1}
+                    <br />
+                    {errorTextLine_2}
+                </p>
+            </div>
+        )
+    );
+};
diff --git a/src/components/GrowthChart/GrowthChart.tsx b/src/components/GrowthChart/GrowthChart.tsx
index 90286a0..696fe47 100644
--- a/src/components/GrowthChart/GrowthChart.tsx
+++ b/src/components/GrowthChart/GrowthChart.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react';
+import i18n from '@dhis2/d2-i18n';
 import { GrowthChartBuilder } from './GrowthChartBuilder';
 import { ChartSelector } from './GrowthChartSelector';
 import { ChartData, GenderCodes, MeasurementData } from '../../types/chartDataTypes';
@@ -7,12 +8,14 @@ import { ChartSettingsButton } from './ChartSettingsButton';
 import { useChartDataForGender } from '../../utils/DataFetching/Sorting';
 import { MappedEntityValues } from '../../utils/DataFetching/Sorting/useMappedTrackedEntity';
 import { useAppropriateChartData } from '../../utils/Hooks/Calculations/useAppropriateChartData';
+import { GenericError } from '../../UI/GenericError/GenericError';
 
 interface GrowthChartProps {
     trackedEntity: MappedEntityValues;
     measurementData: MeasurementData[];
     isPercentiles: boolean;
     chartData: ChartData;
+    defaultIndicator?: string;
 }
 
 export const GrowthChart = ({
@@ -20,6 +23,7 @@ export const GrowthChart = ({
     measurementData,
     isPercentiles,
     chartData,
+    defaultIndicator,
 }: GrowthChartProps) => {
     const trackedEntityGender = trackedEntity?.gender;
     const dateOfBirth = new Date(trackedEntity?.dateOfBirth);
@@ -29,12 +33,20 @@ export const GrowthChart = ({
         chartData,
     });
 
+    const [defaultIndicatorError, setDefaultIndicatorError] = useState<boolean>(false);
+
     const {
         selectedCategory,
         selectedDataset,
         setSelectedCategory: setCategory,
         setSelectedDataset: setDataset,
-    } = useAppropriateChartData(chartDataForGender, dateOfBirth);
+    } = useAppropriateChartData(
+        chartDataForGender,
+        dateOfBirth,
+        defaultIndicator,
+        gender,
+        setDefaultIndicatorError,
+    );
 
     useEffect(() => {
         Object.values(GenderCodes)
@@ -56,6 +68,15 @@ export const GrowthChart = ({
         return [minVal, maxVal];
     }, [min, max]);
 
+    if (defaultIndicatorError) {
+        return (
+            <GenericError
+                errorTextLine_1={`${i18n.t('The default indicator')} "${defaultIndicator}" ${i18n.t('is not a valid indicator.')}`}
+                errorTextLine_2={i18n.t('Please select a valid indicator in the configuration.')}
+            />
+        );
+    }
+
     if (!chartDataForGender || !dataSetValues) {
         return null;
     }
diff --git a/src/utils/DataFetching/Hooks/useChartConfig.ts b/src/utils/DataFetching/Hooks/useChartConfig.ts
index 329c696..541f210 100644
--- a/src/utils/DataFetching/Hooks/useChartConfig.ts
+++ b/src/utils/DataFetching/Hooks/useChartConfig.ts
@@ -20,8 +20,9 @@ export type ChartConfig = {
     };
     settings: {
         customReferences: boolean;
-        zScoreStandard: string;
+        usePercentiles: boolean;
         weightInGrams: boolean;
+        defaultIndicator: string;
     };
 };
 
@@ -33,7 +34,8 @@ export const useChartConfig = () => {
         isError,
     } = useQuery(
         'chartConfig',
-        (): any => dataEngine.query({ chartConfig: { resource: 'dataStore/capture-growth-chart/config' } }),
+        (): any =>
+            dataEngine.query({ chartConfig: { resource: 'dataStore/capture-growth-chart/config' } }),
         { staleTime: 5000 },
     );
 
diff --git a/src/utils/Hooks/Calculations/useAppropriateChartData.ts b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
index 926343f..9c9ac01 100644
--- a/src/utils/Hooks/Calculations/useAppropriateChartData.ts
+++ b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
@@ -5,6 +5,9 @@ import { CategoryCodes, ChartData, MeasurementTypeCodesLabel, TimeUnitCodes } fr
 export const useAppropriateChartData = (
     chartDataForGender: ChartData,
     dateOfBirth: Date,
+    defaultIndicator: string,
+    gender: string,
+    setDefaultIndicatorError: (value: boolean) => void,
 ) => {
     const [selectedCategory, setSelectedCategory] = useState<keyof typeof CategoryCodes>();
     const [selectedDataset, setSelectedDataset] = useState<string>();
@@ -47,14 +50,19 @@ export const useAppropriateChartData = (
         }
     }, [selectedCategory, chartDataForGender]);
 
+    const isKeyOfCategoryCodes = (key: string): key is keyof typeof CategoryCodes => key in CategoryCodes;
+
     useEffect(() => {
-        if (Object.keys(chartDataForGender).length > 0) {
-            const firstKey = Object.keys(chartDataForGender)[0];
-            if (firstKey) {
-                chartDataForGender[firstKey] && setSelectedCategory(firstKey);
-            }
+        const key = `${defaultIndicator}_${gender.charAt(0)
+            .toLowerCase()}`;
+        if (!isKeyOfCategoryCodes(key)) {
+            setDefaultIndicatorError(true);
+        }
+        if (isKeyOfCategoryCodes(key) && chartDataForGender[key]) {
+            const newCategory = CategoryCodes[key];
+            setSelectedCategory(newCategory);
         }
-    }, [chartDataForGender]);
+    }, [chartDataForGender, defaultIndicator, gender, setDefaultIndicatorError]);
 
     return {
         selectedCategory,

From e1ac7c422d31f43ee60dd0208685a745afb2b581 Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Wed, 19 Jun 2024 13:21:19 +0200
Subject: [PATCH 3/8] fix: Alterations after review

---
 src/components/GrowthChart/GrowthChart.tsx    | 12 +++++--
 .../Calculations/useAppropriateChartData.ts   | 35 +++++++++----------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/components/GrowthChart/GrowthChart.tsx b/src/components/GrowthChart/GrowthChart.tsx
index 887ac8d..189ffd7 100644
--- a/src/components/GrowthChart/GrowthChart.tsx
+++ b/src/components/GrowthChart/GrowthChart.tsx
@@ -1,4 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react';
+import { differenceInMonths, differenceInWeeks } from 'date-fns';
 import { GrowthChartBuilder } from './GrowthChartBuilder';
 import { ChartSelector } from './GrowthChartSelector';
 import { ChartData, GenderCodes, MeasurementData } from '../../types/chartDataTypes';
@@ -26,7 +27,10 @@ export const GrowthChart = ({
     setDefaultIndicatorError,
 }: GrowthChartProps) => {
     const trackedEntityGender = trackedEntity?.gender;
-    const dateOfBirth = new Date(trackedEntity?.dateOfBirth);
+    const dateOfBirth = useMemo(() => new Date(trackedEntity.dateOfBirth), [trackedEntity.dateOfBirth]);
+    const childAgeInWeeks = useMemo(() => differenceInWeeks(new Date(), dateOfBirth), [dateOfBirth]);
+    const childAgeInMonths = useMemo(() => differenceInMonths(new Date(), dateOfBirth), [dateOfBirth]);
+
     const [gender, setGender] = useState<string>(trackedEntityGender !== undefined ? trackedEntityGender : GenderCodes.CGC_Female);
     const { chartDataForGender } = useChartDataForGender({
         gender,
@@ -40,14 +44,16 @@ export const GrowthChart = ({
         setSelectedDataset: setDataset,
     } = useAppropriateChartData(
         chartDataForGender,
-        dateOfBirth,
         defaultIndicator,
         gender,
         setDefaultIndicatorError,
+        childAgeInWeeks,
+        childAgeInMonths,
     );
 
     useEffect(() => {
-        if (trackedEntity && Object.values(GenderCodes).includes(trackedEntity.gender)) {
+        if (trackedEntity && Object.values(GenderCodes)
+            .includes(trackedEntity.gender)) {
             setGender(trackedEntity.gender);
         }
     }, [trackedEntity]);
diff --git a/src/utils/Hooks/Calculations/useAppropriateChartData.ts b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
index b85a4ed..ec7226f 100644
--- a/src/utils/Hooks/Calculations/useAppropriateChartData.ts
+++ b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
@@ -1,13 +1,13 @@
 import { useEffect, useRef, useState } from 'react';
-import { differenceInMonths, differenceInWeeks } from 'date-fns';
 import { CategoryCodes, ChartData, MeasurementTypeCodesLabel, TimeUnitCodes } from '../../../types/chartDataTypes';
 
 export const useAppropriateChartData = (
     chartDataForGender: ChartData,
-    dateOfBirth: Date,
     defaultIndicator: string,
     gender: string,
     setDefaultIndicatorError: (value: boolean) => void,
+    childAgeInWeeks: number,
+    childAgeInMonths: number,
 ) => {
     const [selectedCategory, setSelectedCategory] = useState<keyof typeof CategoryCodes>();
     const [selectedDataset, setSelectedDataset] = useState<string>();
@@ -15,27 +15,23 @@ export const useAppropriateChartData = (
     const selectDatasetForCategoryRef = useRef<(category: keyof typeof CategoryCodes) => void>();
     selectDatasetForCategoryRef.current = (category: keyof typeof CategoryCodes) => {
         const { datasets } = chartDataForGender[category];
-        const childAgeInWeeks = differenceInWeeks(new Date(), dateOfBirth);
-        const childAgeInMonths = differenceInMonths(new Date(), dateOfBirth);
+
+        const isMeasurementType = (xAxis: string) =>
+            Object.values(MeasurementTypeCodesLabel)
+                .includes(xAxis);
+
+        const isWeeksInRange = (xAxis: string) =>
+            xAxis === TimeUnitCodes.weeks && childAgeInWeeks < 13;
+
+        const isMonthsInRange = (xAxis: string, range: { start: number, end: number }) =>
+            xAxis === TimeUnitCodes.months && childAgeInMonths >= range.start && childAgeInMonths < range.end;
+
         Object.entries(datasets)
             .some(([key, value]) => {
                 const { range } = value.metadata;
                 const xAxis = value.metadata.xAxisLabel;
 
-                if (Object.values(MeasurementTypeCodesLabel)
-                    .includes(xAxis)) {
-                    setSelectedDataset((prevDataset) => (prevDataset !== key ? key : prevDataset));
-                    return true;
-                }
-
-                if (xAxis === TimeUnitCodes.weeks && childAgeInWeeks <= 13) {
-                    setSelectedDataset((prevDataset) => (prevDataset !== key ? key : prevDataset));
-                    return true;
-                }
-
-                const isChildAgeInRange = xAxis === TimeUnitCodes.months && childAgeInMonths >= range.start && childAgeInMonths <= range.end;
-
-                if (isChildAgeInRange) {
+                if (isMeasurementType(xAxis) || isWeeksInRange(xAxis) || isMonthsInRange(xAxis, range)) {
                     setSelectedDataset((prevDataset) => (prevDataset !== key ? key : prevDataset));
                     return true;
                 }
@@ -53,7 +49,8 @@ export const useAppropriateChartData = (
     const isKeyOfCategoryCodes = (key: string): key is keyof typeof CategoryCodes => key in CategoryCodes;
 
     useEffect(() => {
-        const key = `${defaultIndicator}_${gender.charAt(0).toLowerCase()}`;
+        const key = `${defaultIndicator}_${gender.charAt(0)
+            .toLowerCase()}`;
         if (!isKeyOfCategoryCodes(key)) {
             setDefaultIndicatorError(true);
         }

From 81adcd57078dbbdb01c8c7601b123e62ba582309 Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Thu, 1 Aug 2024 11:08:09 +0200
Subject: [PATCH 4/8] fix: Updated en.pot file

---
 i18n/en.pot | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index ccd32b7..efcc143 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-06-10T07:28:02.836Z\n"
-"PO-Revision-Date: 2024-06-10T07:28:02.836Z\n"
+"POT-Creation-Date: 2024-08-01T09:01:17.374Z\n"
+"PO-Revision-Date: 2024-08-01T09:01:17.374Z\n"
 
 msgid "Growth Chart"
 msgstr "Growth Chart"
@@ -31,6 +31,13 @@ msgstr "The default indicator"
 msgid "is not a valid. Please select a valid indicator in the configuration"
 msgstr "is not a valid. Please select a valid indicator in the configuration"
 
+msgid ""
+"There was an error fetching the tracked entity for the growth chart. Please "
+"check the configuration in Datastore Management and try again."
+msgstr ""
+"There was an error fetching the tracked entity for the growth chart. Please "
+"check the configuration in Datastore Management and try again."
+
 msgid "Print"
 msgstr "Print"
 
@@ -46,6 +53,9 @@ msgstr "Year"
 msgid "Years"
 msgstr "Years"
 
+msgid "Gender is pre-selected based on the profile"
+msgstr "Gender is pre-selected based on the profile"
+
 msgid "Months"
 msgstr "Months"
 

From 72644594678b0ba27f532e84f283452e543ec04a Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Thu, 1 Aug 2024 11:11:21 +0200
Subject: [PATCH 5/8] fix: 2 versions of '@dhis2/ui' in yarn.lock

---
 yarn.lock | 726 +++---------------------------------------------------
 1 file changed, 31 insertions(+), 695 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index eebce67..b136553 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1316,18 +1316,6 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@dhis2-ui/alert@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.4.3.tgz#62f628047f8dce01961a7a70aa424504f7beeb57"
-  integrity sha512-lOHs36Mit3pzRgimvcfeh5o1QvokmNgwFmcOmWp8p+Bqi2GEMOhCeZWAf7RlkS4onfU/YA6oIZMeHjJ9hiPVbA==
-  dependencies:
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/alert@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/alert/-/alert-9.8.5.tgz#951cdfee34ed468ec2a152608a83b7ead8629410"
@@ -1340,16 +1328,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/box@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.4.3.tgz#7a7766e28ab36775d37e6ff7639e8527b8809b9b"
-  integrity sha512-RsxKBJkjkER3gAkhhE/JLlQFVSa0u4DrwaFRh+05j4Xr+ssH5ABMSjR21vtHo3M9dzNUt63XXgv191H235sLzw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/box@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/box/-/box-9.8.5.tgz#c6dc5ce7bb1b9079cd19111d8b0d774e8f233605"
@@ -1360,20 +1338,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/button@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.4.3.tgz#0440f3dc390ac9649c1c477452e32e9e61261c1d"
-  integrity sha512-EXPDMN7t/tCnwxL/8s8TffN6yyakjSEQ8wjGxkaATZR6pt/NfQSlWwVbb7m1MPkjeLOjXwsHtNc/k8atNAHGXQ==
-  dependencies:
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/button@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/button/-/button-9.8.5.tgz#2a35d84ffb81262da3802a4d3adbd6e08e04a41e"
@@ -1388,23 +1352,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/calendar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.4.3.tgz#ffe62abdf68dee9b7afd4e4b4dde0c71f6b2ed8a"
-  integrity sha512-taUBZmCeoTlKr1U9wj2WbymWNg6iEOW8whD8Q6rLLBx6wvn2yLDPJg4A/dQEFUgje42afhzfImrkH80Lt8UtHQ==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/multi-calendar-dates" "1.0.2"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/calendar@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/calendar/-/calendar-9.8.5.tgz#5a4bc4df7f5082385a44d31060085248cc7c5d28"
@@ -1422,16 +1369,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/card@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.4.3.tgz#994052de11162a00daf0e60e47aabd0df4162b23"
-  integrity sha512-5QyepdsKMGwfRUQ+nERXHfQEtiXHDdXhiVGiwPkV6JByYwM+z49qZH3v7ctOQxyX1Px+j7THfp0RYSEh7DISlA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/card@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/card/-/card-9.8.5.tgz#d4144767764eb8d95bd5ff3dbd57042244738045"
@@ -1442,16 +1379,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/center@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.4.3.tgz#5b96d1e672921fa418e840a0485e763f81b3951a"
-  integrity sha512-mM71RjuBwRuvohls3stz+JpqM28NFXDVWZFV7qZFa75GTGtJLkvGaT5g/+hfxlBL3plSfPLN001jCSfGaKiBog==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/center@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/center/-/center-9.8.5.tgz#cf19ef947d0e778dd90bf7acf9d811f373147d4c"
@@ -1462,18 +1389,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/checkbox@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.4.3.tgz#6bace74d49e58118da1c6d158ca88c18c011d58c"
-  integrity sha512-2sHidyzz+Ss0x4/bFLRpzD8v+BM/f2f6KQRdrU40s+W498R9wZn0KYXqJYG8ClDwOJe0YqoNrDlSHOJcsV+ibQ==
-  dependencies:
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/checkbox@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/checkbox/-/checkbox-9.8.5.tgz#a9818cad0ba8fa983330336cfde99c27282f936e"
@@ -1486,16 +1401,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/chip@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.4.3.tgz#c1efcbbef2fe4a34d4ca8cf67874f25a43dc59eb"
-  integrity sha512-h4UkxiIEHk9+jeUVWAl6Fam0HQ//6qVxCf2vVB61O7LBIprZSjSbGnarITMCGLtDHzkhhvoGTXJUtb8l6pX+cw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/chip@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/chip/-/chip-9.8.5.tgz#a44c09bda08cd13f71c8dc57ed27c365332842c1"
@@ -1506,16 +1411,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/cover@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.4.3.tgz#cdc4393180f56e1f9cb9f9e8d766e61773d20708"
-  integrity sha512-5hNt4WHr2zHVzXYcoj97g2Fb2QRZXWXJ+5bz+sOcRSpZD0RearTky4shCFJeNMVbUjvCJCzmLdRBXwpDJH6YsA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/cover@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/cover/-/cover-9.8.5.tgz#ee9a7515cc9da82dac9b2cc3a9db4496bcf63f7b"
@@ -1526,16 +1421,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/css@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.4.3.tgz#a9b9573a9ca56062ad5a990e943c056a9c1fa939"
-  integrity sha512-afsj1qv2ltDV03QSjebYB4hw3YZTtQAmjn9SAKXfQE4VlIsWzj2B77ByLvUmqMwsgPOjlkYzdt9Kc5g2uZ3wrQ==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/css@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/css/-/css-9.8.5.tgz#5b9bc63207be1fe5783d711bba9d209a2e7f1467"
@@ -1546,16 +1431,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/divider@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.4.3.tgz#c6f934a49a2377044a08def865b607b1e2060a4f"
-  integrity sha512-knkdyCDxK+NFex0Lu1ucG9BU8e/rsCpGjoU1HzNpnKs1fYJg8+DdbirILmAE4QniywNtiGo4w7xY0N0bX0e0Vg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/divider@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/divider/-/divider-9.8.5.tgz#9b8e69eb27c674ef778d7c1a7986016f03de9637"
@@ -1566,19 +1441,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/field@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.4.3.tgz#b8b006e667cf443fb15fe05a51369cbea564f7c2"
-  integrity sha512-XEOQ+t/yORg3FiQyqqjD58LJ2faGoMJWvLO1EhM0Tt2P+MPxka+5reEe9MQzouOyyl/dRw5m5jisTHrkONMMig==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/help" "9.4.3"
-    "@dhis2-ui/label" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/field@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/field/-/field-9.8.5.tgz#7e8a8abb1513ed58d67f03751aea9211ff08590b"
@@ -1592,22 +1454,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/file-input@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.4.3.tgz#5c3a1c235ada95a125d4bd4ed3926e16c07b9f34"
-  integrity sha512-45FcrLQvNJtgqMwNGmW9Yx+EpkTqFDImRrFwq0t9dWL7UTaY7Ww5UM7iFAFRAIBKctKt8rVSYENhdbEn2suQwQ==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/label" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/file-input@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/file-input/-/file-input-9.8.5.tgz#349acd00229d295e9d2438adf9016dafcf78ab05"
@@ -1624,30 +1470,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/header-bar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.4.3.tgz#666af097b2c8058ea1ff733e26abd5cfd2ba7074"
-  integrity sha512-2D4QHXXnnSdOTiocHdzjOFyiBMQnF/E9fAmO46MvwJ1s9+TNl5hBMN5kbCwzxVlgoF/3UXcHIQ7n/EO7rNPlZw==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/center" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/logo" "9.4.3"
-    "@dhis2-ui/menu" "9.4.3"
-    "@dhis2-ui/modal" "9.4.3"
-    "@dhis2-ui/user-avatar" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    moment "^2.29.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/header-bar@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/header-bar/-/header-bar-9.8.5.tgz#d6965d7c8d6dc8fd09f1c09039134737359e2702"
@@ -1672,16 +1494,6 @@
     moment "^2.29.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/help@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.4.3.tgz#6bb24d0ebabe26a2b85f453df64e8f07fa52a797"
-  integrity sha512-ufYCWORYaEZk5XbNJ8jeS3hmfERnbjEK4+tsClsU2L4yMzu9vB4cpeG0sXD5Tyim7Sw1OO2+tdT9mV40p3jmVw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/help@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/help/-/help-9.8.5.tgz#605c6a026822d5c7db19cac178e9860a35647c73"
@@ -1692,22 +1504,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/input@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.4.3.tgz#99779bfddfc8aa557df3202f1f6bfb489234f30f"
-  integrity sha512-9sXfZpNOSAodfHRNBGOokxSTYvhr7u8irqmNYgtCYCb2jl4wJ3lXBOvBM4hPNxThhM61HV3WMD4SAWRD22O9fQ==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/input@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/input/-/input-9.8.5.tgz#b52a0d211ee4681a864d8e25161a9c123dc24ed7"
@@ -1724,16 +1520,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/intersection-detector@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.4.3.tgz#4b2df40f73ab6b76d0f94b8721546ab42232e96d"
-  integrity sha512-Ag+KkVLcNyMCjvre/zmK78UnLpQGT/psogPNgKSh14nlGdyL3gAQcmqF4AnWmBQ07+0fL9hOIv4AIqyVNeYJEQ==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/intersection-detector@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/intersection-detector/-/intersection-detector-9.8.5.tgz#ceb160a1953233b80855ff4ae983eb83de44af1a"
@@ -1744,17 +1530,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/label@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.4.3.tgz#9ebab25a734baab05a1680d577bd11cf8d94a086"
-  integrity sha512-Gv6GUVqQJWAz4jvqx6DbNDxszH3YhZlE6EOR3067AXESoQaAiq4Uwkaf2Gs0vdzS1t9vCoG39Qd8w+4D8Ufl7A==
-  dependencies:
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/label@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/label/-/label-9.8.5.tgz#be071d63005d6b37567299544bfc9ccdc091fa5b"
@@ -1766,17 +1541,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/layer@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.4.3.tgz#9cd91dcc8999a9270936fc899262a96f6684088b"
-  integrity sha512-Cf0zDpwDNfVItg8/h2rVzUQQBY1QBJBYLIw/Lal5YUrJS0hie8yZA5SkxB7su1PYJGirC4Zv96hkrfu5z2OMlA==
-  dependencies:
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/layer@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/layer/-/layer-9.8.5.tgz#1b81235858e93eef93a7391447f2cd34e67b0084"
@@ -1788,17 +1552,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/legend@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.4.3.tgz#bf1461062aa05e8aefe36356e38437ef1a6d765e"
-  integrity sha512-Qwxp+VCsGid3gr3uDxuncdUEw3t1R/jjduArz7VdXlzIH07/gcBOjICCG5iTcTx4ZBix5ffIQ1Od1Fq8sJZ82w==
-  dependencies:
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/legend@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/legend/-/legend-9.8.5.tgz#7eebbcc5fd42fa47a3c17a24d911d65332f5af1c"
@@ -1810,16 +1563,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/loader@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.4.3.tgz#41f8a212c7c9a3c62be3c087e0f6ec5838695238"
-  integrity sha512-zSLASWqLuIsHgMsu7YC5fV55/8JaO99FDXMPh78ezcJgT3kZ3h07tzbJi5fDltLlJ48Er5lCdDFliwfCPH9vVA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/loader@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/loader/-/loader-9.8.5.tgz#eebfb11915260ed4c219ae4eb38a8d54385e8eb9"
@@ -1830,16 +1573,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/logo@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.4.3.tgz#9479533737626dab0285445e117776110a475ee6"
-  integrity sha512-+LEH9n9ZlB289W5wfYfyIhCFPtLnEqQKuWjItrnSmd7bcqocH/wPH0mVtm7GPt8IxhSBMqDidJd1yIhyMMpXhQ==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/logo@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/logo/-/logo-9.8.5.tgz#513de3c12223d36943932277781737de1616beb4"
@@ -1850,22 +1583,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/menu@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.4.3.tgz#9042c76f9257f8eaac9eaa8d9f3ffc6eafda8d6b"
-  integrity sha512-noVyX3Qc4dU+uhD5msbNS6uiUBpxdo9e3unyh56piuBQSseafsGepZIr3lLUs1bWOfIfTrXt/RYnvtXWlkjS7w==
-  dependencies:
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/menu@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/menu/-/menu-9.8.5.tgz#1c06255e2e86379b1ae12004abec2403ef37dc23"
@@ -1882,21 +1599,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/modal@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.4.3.tgz#402d687a231076992ae671e9029f6bb83c8bb2b8"
-  integrity sha512-7hV8kB4hdoNxiRNWO32Sb78PkRvfDxnh2QSrExnjO/C+hYyhnjkVfCshgEMdyO4WnASKe8gUIMwkLf+v6T3nOg==
-  dependencies:
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/center" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/modal@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/modal/-/modal-9.8.5.tgz#c874b48e9a9b5b8d01c226864e796f59fb0ebcf7"
@@ -1912,17 +1614,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/node@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.4.3.tgz#690bb1069efa8d6e1087efb21905ccafbd31768e"
-  integrity sha512-dxhe/Jb79mRellWU6nMTh5Mkuve6brTQ1j255l+xjPzDkQCU5UMRJ9YrijdrLFyD2nBO0868BUUutwHegyvYJw==
-  dependencies:
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/node@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/node/-/node-9.8.5.tgz#8058c76b3be03e63423800a1d5217279944ceadc"
@@ -1934,17 +1625,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/notice-box@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.4.3.tgz#48ba69fa439b9bdee85190ae40baad55b995cd36"
-  integrity sha512-z0hiOA4wnzcZZKX4lXCQp6dt5j8c6virnUn5uBhKGCsWzrfRYUaKjn/pUQVHiMlysO9lsw3IdyHC79pEIp74jg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/notice-box@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/notice-box/-/notice-box-9.8.5.tgz#440fe5a77a9f690faeb5e29cecf4b078efb4fc1e"
@@ -1956,19 +1636,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/organisation-unit-tree@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.4.3.tgz#00c00ab39f811be0f7dc885141bf178093f3799d"
-  integrity sha512-q4qdEXGFbsWBkmgII6r2tbVPetQyxS1Sh9/B8vAeSAKBTPXmOKagE0bDH0gwqqoUVGLtLUjGxWYiNhi3uJyTpQ==
-  dependencies:
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/node" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/organisation-unit-tree@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/organisation-unit-tree/-/organisation-unit-tree-9.8.5.tgz#78333e914eff8646cb6a8cfd4491d2f16c37d40b"
@@ -1982,19 +1649,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/pagination@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.4.3.tgz#9c5172a74feb10a795866c9f44a98a7a5a80c3b0"
-  integrity sha512-2k0/ty57+MgvwCzKad+90Vbu3muHvCBVgoQ2wX8UMWyH0bGPSnSx/0n6NaUBRISmz4EQF1GNcuNOKnWZREkSfQ==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/pagination@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/pagination/-/pagination-9.8.5.tgz#a3ae57890317d80b8cc7cbe72b47bbbe4e0e2690"
@@ -2008,18 +1662,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/popover@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.4.3.tgz#2ed3b6b5ad6540982c648bb0aecca4168e0ed34b"
-  integrity sha512-uP0gB/doUZ9CHH/9J8+Zb796Erda5z7GhEJFvbq+irOwKYwRR2dfrac2K0qlAOmwX4VjZKAFyMdsEMFNvyXB4Q==
-  dependencies:
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/popover@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/popover/-/popover-9.8.5.tgz#5532f9cf609cacbcbbb1de769bb84047be5ae687"
@@ -2032,19 +1674,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/popper@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.4.3.tgz#4fa1ce4893988f1cb03e2ee11b358940c65468ff"
-  integrity sha512-1ETf832VWh2lZOWkJw0YcftyPkOOsX/jVTKJWI2bQG/Sck5aMTc5GU53mg5CowxOFU09yiM9OL5FD/ljey56gg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@popperjs/core" "^2.10.1"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-    react-popper "^2.2.5"
-    resize-observer-polyfill "^1.5.1"
-
 "@dhis2-ui/popper@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/popper/-/popper-9.8.5.tgz#5f4f676c0774629b59da7708fbe0d38d5daea0a2"
@@ -2058,14 +1687,6 @@
     react-popper "^2.2.5"
     resize-observer-polyfill "^1.5.1"
 
-"@dhis2-ui/portal@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.4.3.tgz#3f72d076c869ebaa0d495d421a872fc1d944acb6"
-  integrity sha512-v8+1WveMDJKpfoiEfsdF5tju8pzZpilIRIAzoMv636ehPg3jNdwsNUMA4QWL+pO+MjtULIcVjB1e4bdra/cREA==
-  dependencies:
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/portal@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/portal/-/portal-9.8.5.tgz#0effdc8755cca894db5767de0a2e9e658d9ba4b9"
@@ -2074,16 +1695,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/radio@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.4.3.tgz#c7f40a156ed9cd4362b6ac135356c30285d638bd"
-  integrity sha512-RNbanxBN631xuibjpRo1Agk47ZLFK2Kcoe9O81OyZzZEdDdcT0SiLaXdN9EqIhn2GpU4TJqj4Ky+KA4r1UNvLA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/radio@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/radio/-/radio-9.8.5.tgz#d5cb688d730a8d1ec860555f3563e9610729e985"
@@ -2094,16 +1705,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/required@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.4.3.tgz#71a190295a2607dc104a228154163a111f357ac0"
-  integrity sha512-XEdTPqOcgu8Qwuhbyekqk3WEl8XQvEha2tvTywsBLyimD5bIBf7Z46U7h/8fKXIMySangyk62e99q2PcE/Bt9g==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/required@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/required/-/required-9.8.5.tgz#280911cdbf1c665d6d47a61b99d8b52c9882d4a9"
@@ -2114,16 +1715,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/segmented-control@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.4.3.tgz#e1b4577b79402cde2d89b6966ac695f6f62ca405"
-  integrity sha512-LqrfMjaANacTaydHHlZwQYcxaDI+/Wkw4Rfsm1L0ISatpqEmGN3XEAeJs/TV9pOLvELYai9UZMtLEtnPt2urFg==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/segmented-control@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/segmented-control/-/segmented-control-9.8.5.tgz#ce333fe1a7a6ee429726a8611d9c1ef5b405a7e2"
@@ -2134,29 +1725,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/select@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.4.3.tgz#3963a2a0fa3710ea222bf7754a205d77eb4a6a9f"
-  integrity sha512-TBPloheNPvi78VmEPI8aNd4NvBJtmAyT9EOVOh1C8a2XbR3SNeNTK/dDs+uTLfP3y4+dAwGQpZLphnZkIp2rNw==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/chip" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2-ui/tooltip" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/select@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/select/-/select-9.8.5.tgz#5df904bc18bd322786a3bf416736f49aea45303c"
@@ -2180,21 +1748,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/selector-bar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.4.3.tgz#a25e30dd35ffb93728513ab88bbcee5ee18d02bf"
-  integrity sha512-K4r+P1hTlsiESuHwaKe7LoNz2ALY1d6MjGWdiA3EfwQNCEl8SFb4yrbdp3RpWAKz4F9t2TNIMwEVtqdwTEe07Q==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    "@testing-library/react" "^12.1.2"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/selector-bar@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/selector-bar/-/selector-bar-9.8.5.tgz#d5653fb88708be0cffa03e5350027dc870a10da3"
@@ -2210,32 +1763,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/sharing-dialog@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.4.3.tgz#463a1b6faa45dc06380f2c0a1dea0fd448252162"
-  integrity sha512-x2HJNMz0qAvvbMRVM6yh1ytc3FxffBV+W4Ndakw8NkvqTI7ICp2xQYKD/JXhlfOw5PnR2lopUNQiIKl3tK0v7g==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/menu" "9.4.3"
-    "@dhis2-ui/modal" "9.4.3"
-    "@dhis2-ui/notice-box" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2-ui/tab" "9.4.3"
-    "@dhis2-ui/tooltip" "9.4.3"
-    "@dhis2-ui/user-avatar" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    "@react-hook/size" "^2.1.2"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/sharing-dialog@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/sharing-dialog/-/sharing-dialog-9.8.5.tgz#190f6249a054443aa3a03e6893acba48446a4306"
@@ -2262,18 +1789,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/status-icon@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.4.3.tgz#4b90cf35ec0569c629f4186dc9041d373432d111"
-  integrity sha512-4XeN0qkzZRCLqhU0uuuaWN8hIofImn+y2ihO4zMVfTrtwDvjYrO0ByFk+BBxf3SeTQ7Px4w0J0KFtCawME2EvA==
-  dependencies:
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/status-icon@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/status-icon/-/status-icon-9.8.5.tgz#305d9737b192a091b6c36ffb49037e7585f54b00"
@@ -2286,18 +1801,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/switch@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.4.3.tgz#54c7f45e11942657ebbbd1de4f35f3f55ff4576d"
-  integrity sha512-yYCWz63/A5R7hrLyUTAM3HsLxNYL/mvDtANV/JGwX0QvbwBXoPt+lIvzdHZfEbdjAt+eDBtApcN6KAwaVOEnfg==
-  dependencies:
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/switch@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/switch/-/switch-9.8.5.tgz#37a47c5883e87126f4d1e13498f8274f04715213"
@@ -2310,17 +1813,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tab@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.4.3.tgz#62417dda2594cf307cdb320cae092fd1cac3c12c"
-  integrity sha512-fQ/Ri19kARDlPlu1RN7j7jt19y1w331i3pDJZfFZxcyirtT4FaF4DawS8tzpXmsCfgYs6sROy6MqI+yS3Pjx6w==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/tab@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tab/-/tab-9.8.5.tgz#0b8c417fade64c3573c979a55bdbfe770d247967"
@@ -2332,17 +1824,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/table@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.4.3.tgz#4e593ff5d15a4b0d0599e98818c054cd34c303fa"
-  integrity sha512-r9nJkq0W3bO4Z8T3C88DbU+SAEE6Yx5LqFUuZv861qKJmMUTh8qCqRnSrb7gVujrBS3YFbmjngygOxF+W9tGlw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/table@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/table/-/table-9.8.5.tgz#ce54a03cf436b949584e01d3fb569e5800fbd923"
@@ -2354,16 +1835,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tag@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.4.3.tgz#c8bcc942dddf02b8b8659aea497cc5fe0c50cb7d"
-  integrity sha512-3Z7qUxziESkW8Q2y/erWDcT2YII3T9MRz7IcgZ4dU/ljbWCwYBgqo+AmGIC1HSJ/Nij9WEM8+CIy6KxPNc2NaA==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/tag@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tag/-/tag-9.8.5.tgz#f0b8179630e902900a68a493d691ad92ffeb0d98"
@@ -2374,21 +1845,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/text-area@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.4.3.tgz#72953f5dcf75623769740b1ea8ff356610de7068"
-  integrity sha512-OeCR6GiDH8vyuoxFK7CySeeBMTMULAcd7owpQo9nmelpcx7jn5P8/fmYkjhvllJrkKHiHl+mMFqa00l4qn6aTw==
-  dependencies:
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/status-icon" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/text-area@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/text-area/-/text-area-9.8.5.tgz#656a0f2f6f6cc21541b833211edbeb39ced45011"
@@ -2404,18 +1860,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/tooltip@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.4.3.tgz#29820574c938341fc9cbe154806c6e6fbfe03b93"
-  integrity sha512-2JaXlVRcfRrfaEvdKnn41qRydkflWAecDw3Gh+2huu8VyUKNu7TctfN9dXfMrvmeqfLCwtAT0NBffzw3UgoXCg==
-  dependencies:
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/tooltip@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/tooltip/-/tooltip-9.8.5.tgz#ae861762bab0ca70d8008c0bea5ede7bbdf27936"
@@ -2428,21 +1872,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/transfer@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.4.3.tgz#989b262b464b089653f02a746e97dc5958ed8489"
-  integrity sha512-Gvut7g8/GqWZ0QXiPdXaoSC5r/vxfOrIXOJH+JvJW1ZoUsWPO7wjEvib1DSmbjGxRqrtf8MFZ3uTdkwDnWAYSg==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/intersection-detector" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/transfer@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/transfer/-/transfer-9.8.5.tgz#f86fc9956baa70c0cd10d3c36f28e83f0b0e02cd"
@@ -2458,16 +1887,6 @@
     classnames "^2.3.1"
     prop-types "^15.7.2"
 
-"@dhis2-ui/user-avatar@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.4.3.tgz#1874867bd92a44a21969927be8f3d162287466de"
-  integrity sha512-M+c+zV4HpkL7RJgicFc3MGM+gf95TpfnvKX8yT89SvQZgSKtcQnWSzp+3/Ss1JABH92Aitfba6MOQdvme3x/Tw==
-  dependencies:
-    "@dhis2/prop-types" "^3.1.2"
-    "@dhis2/ui-constants" "9.4.3"
-    classnames "^2.3.1"
-    prop-types "^15.7.2"
-
 "@dhis2-ui/user-avatar@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2-ui/user-avatar/-/user-avatar-9.8.5.tgz#620f2362aba88d6c85d2bd4b8591be665c5864b0"
@@ -2628,14 +2047,6 @@
     i18next "^10.3"
     moment "^2.24.0"
 
-"@dhis2/multi-calendar-dates@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.0.2.tgz#e54dc85e512aba93fceef3004e67e199077f3ba8"
-  integrity sha512-oQZ7PFMwHFpt4ygDN9DmAeYO3g07L7AHJW6diZ37mzpkEF/DyMafhsZHnJWNlTH5HDp8nYuO3EjBiM7fZN6C0g==
-  dependencies:
-    "@js-temporal/polyfill" "^0.4.2"
-    classnames "^2.3.2"
-
 "@dhis2/multi-calendar-dates@^1.1.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.1.2.tgz#93dc265b63664b5fb54a79f9400e5196fbd6cb14"
@@ -2660,13 +2071,6 @@
     workbox-routing "^6.1.5"
     workbox-strategies "^6.1.5"
 
-"@dhis2/ui-constants@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.4.3.tgz#aae69e2a00eddc1cb46ba0693be15cbbf7a64d7f"
-  integrity sha512-iSQi70BnvXWvqFWblO4M4AVMHRXLOD9Gay9LNx/6NPcwwL8UU633nFf1M8TV71bm4CrZci/m3zew/hXjCMtF9w==
-  dependencies:
-    prop-types "^15.7.2"
-
 "@dhis2/ui-constants@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-constants/-/ui-constants-9.8.5.tgz#f3fd4f83ea315a632a31107ea7398d74f0f0a0a7"
@@ -2674,26 +2078,6 @@
   dependencies:
     prop-types "^15.7.2"
 
-"@dhis2/ui-forms@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.4.3.tgz#0d4ff0ae7dd89d99d1b9fc4d29e382853b621731"
-  integrity sha512-PGMpWfTZEgEjeEPus804XAQCtcyx7RQElAg1/s7zmJCWm4Uj4Okn4ZjZtNfH7/qQF2unFzbdRL3ryeMMh/GscA==
-  dependencies:
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/file-input" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/radio" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2-ui/switch" "9.4.3"
-    "@dhis2-ui/text-area" "9.4.3"
-    "@dhis2/prop-types" "^3.1.2"
-    classnames "^2.3.1"
-    final-form "^4.20.2"
-    prop-types "^15.7.2"
-    react-final-form "^6.5.3"
-
 "@dhis2/ui-forms@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-forms/-/ui-forms-9.8.5.tgz#a80597c28b5dae291224da8fcf37bca77c20cace"
@@ -2714,72 +2098,12 @@
     prop-types "^15.7.2"
     react-final-form "^6.5.3"
 
-"@dhis2/ui-icons@9.4.3":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.4.3.tgz#b7eac309031351003d0afdde31e5bbe15de928d0"
-  integrity sha512-6o6L9gfWGLPlB35aBzyU13v6qGE+f2Xk1Xmt68fhqzcAqBj7e1UZ+XIQPb7b3bQlv2AWftWBhUGaMJJIlddtZg==
-
 "@dhis2/ui-icons@9.8.5":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2/ui-icons/-/ui-icons-9.8.5.tgz#93cfe2f2703462236f73bd21b87f57438ff8ddab"
   integrity sha512-HDeP+cWf8yc6yVJhwb9+A1lkxJc+C+sbUmc++utGurLUvUx+qmSTJWhgSP0h4Fd/2D8KhSb4MeQIp7J08+MeAQ==
 
-"@dhis2/ui@^9.0.1", "@dhis2/ui@^9.2.0":
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.4.3.tgz#2b8606a1cf806750c075873086cb3bae3efa5c28"
-  integrity sha512-0U47fkp+5Ree3k8MdhhFvuBiYmWWiRGv46BWGg27yGBQOGeCoBMNsDTE+nZfRW0op2aW/okOloNneeter0K52w==
-  dependencies:
-    "@dhis2-ui/alert" "9.4.3"
-    "@dhis2-ui/box" "9.4.3"
-    "@dhis2-ui/button" "9.4.3"
-    "@dhis2-ui/calendar" "9.4.3"
-    "@dhis2-ui/card" "9.4.3"
-    "@dhis2-ui/center" "9.4.3"
-    "@dhis2-ui/checkbox" "9.4.3"
-    "@dhis2-ui/chip" "9.4.3"
-    "@dhis2-ui/cover" "9.4.3"
-    "@dhis2-ui/css" "9.4.3"
-    "@dhis2-ui/divider" "9.4.3"
-    "@dhis2-ui/field" "9.4.3"
-    "@dhis2-ui/file-input" "9.4.3"
-    "@dhis2-ui/header-bar" "9.4.3"
-    "@dhis2-ui/help" "9.4.3"
-    "@dhis2-ui/input" "9.4.3"
-    "@dhis2-ui/intersection-detector" "9.4.3"
-    "@dhis2-ui/label" "9.4.3"
-    "@dhis2-ui/layer" "9.4.3"
-    "@dhis2-ui/legend" "9.4.3"
-    "@dhis2-ui/loader" "9.4.3"
-    "@dhis2-ui/logo" "9.4.3"
-    "@dhis2-ui/menu" "9.4.3"
-    "@dhis2-ui/modal" "9.4.3"
-    "@dhis2-ui/node" "9.4.3"
-    "@dhis2-ui/notice-box" "9.4.3"
-    "@dhis2-ui/organisation-unit-tree" "9.4.3"
-    "@dhis2-ui/pagination" "9.4.3"
-    "@dhis2-ui/popover" "9.4.3"
-    "@dhis2-ui/popper" "9.4.3"
-    "@dhis2-ui/portal" "9.4.3"
-    "@dhis2-ui/radio" "9.4.3"
-    "@dhis2-ui/required" "9.4.3"
-    "@dhis2-ui/segmented-control" "9.4.3"
-    "@dhis2-ui/select" "9.4.3"
-    "@dhis2-ui/selector-bar" "9.4.3"
-    "@dhis2-ui/sharing-dialog" "9.4.3"
-    "@dhis2-ui/switch" "9.4.3"
-    "@dhis2-ui/tab" "9.4.3"
-    "@dhis2-ui/table" "9.4.3"
-    "@dhis2-ui/tag" "9.4.3"
-    "@dhis2-ui/text-area" "9.4.3"
-    "@dhis2-ui/tooltip" "9.4.3"
-    "@dhis2-ui/transfer" "9.4.3"
-    "@dhis2-ui/user-avatar" "9.4.3"
-    "@dhis2/ui-constants" "9.4.3"
-    "@dhis2/ui-forms" "9.4.3"
-    "@dhis2/ui-icons" "9.4.3"
-    prop-types "^15.7.2"
-
-"@dhis2/ui@^9.4.3":
+"@dhis2/ui@^9.0.1", "@dhis2/ui@^9.2.0", "@dhis2/ui@^9.4.3":
   version "9.8.5"
   resolved "https://registry.yarnpkg.com/@dhis2/ui/-/ui-9.8.5.tgz#547c25f2ad26b9da53a0d3dc057b54462e8b650f"
   integrity sha512-Q9MlyHgPKViI1r8gopvsFpMoyl9X6/OxgGnzYbcn1/aB77O+lvK3mBqRtexuKVDzQfLRc7ljESPONkwyAyXubg==
@@ -3179,14 +2503,6 @@
     jsbi "^4.1.0"
     tslib "^2.3.1"
 
-"@js-temporal/polyfill@^0.4.2":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.4.tgz#4c26b4a1a68c19155808363f520204712cfc2558"
-  integrity sha512-2X6bvghJ/JAoZO52lbgyAPFj8uCflhTo2g7nkFzEQdXd/D8rEeD4HtmTEpmtGCva260fcd66YNXBOYdnmHqSOg==
-  dependencies:
-    jsbi "^4.3.0"
-    tslib "^2.4.1"
-
 "@juggle/resize-observer@^3.3.1":
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.4.0.tgz#08d6c5e20cf7e4cc02fd181c4b0c225cd31dbb60"
@@ -9439,7 +8755,7 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbi@^4.1.0, jsbi@^4.3.0:
+jsbi@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
   integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
@@ -12850,7 +12166,7 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -12876,6 +12192,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -12954,7 +12279,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -12975,6 +12300,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -13464,12 +12796,7 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
-tslib@^2.3.1:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
   integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
@@ -14385,7 +13712,7 @@ workbox-window@6.6.1:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.6.1"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -14412,6 +13739,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From c029012a41328564c601a6edc038da2ab7f5503c Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Tue, 6 Aug 2024 13:54:21 +0200
Subject: [PATCH 6/8] fix: Merge conflicts from master resolved

---
 src/Plugin.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Plugin.tsx b/src/Plugin.tsx
index 220c923..f775474 100644
--- a/src/Plugin.tsx
+++ b/src/Plugin.tsx
@@ -85,7 +85,7 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
         );
     }
 
-    if (isErrorTei || isErrorEvents) {
+    if (isErrorEvents) {
         return (
             <GenericError
                 errorMessage={i18n.t('Failed to load data. Please check that you have selected the correct programStageId in the configuration.')}

From 266a385073050a1ff08cfc62b2635600b4c1de9f Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Tue, 6 Aug 2024 14:42:48 +0200
Subject: [PATCH 7/8] fix: Alterations after review

---
 src/Plugin.tsx                                       |  6 +++---
 .../Hooks/Calculations/useAppropriateChartData.ts    | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/Plugin.tsx b/src/Plugin.tsx
index f775474..5b1e647 100644
--- a/src/Plugin.tsx
+++ b/src/Plugin.tsx
@@ -35,9 +35,9 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
     } = useCustomReferences();
 
     const {
-        teiId,
-        programId,
-        orgUnitId,
+        teiId = 'oJGqqqazdje',
+        programId = 'Ewe20zBQxw4',
+        orgUnitId = 'RaTwtPm4gBX',
     } = propsFromParent;
 
     const {
diff --git a/src/utils/Hooks/Calculations/useAppropriateChartData.ts b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
index ec7226f..668f410 100644
--- a/src/utils/Hooks/Calculations/useAppropriateChartData.ts
+++ b/src/utils/Hooks/Calculations/useAppropriateChartData.ts
@@ -26,6 +26,13 @@ export const useAppropriateChartData = (
         const isMonthsInRange = (xAxis: string, range: { start: number, end: number }) =>
             xAxis === TimeUnitCodes.months && childAgeInMonths >= range.start && childAgeInMonths < range.end;
 
+        const getMaxRangeDataset = (datasets: ChartData[0]['datasets']) =>
+            Object.entries(datasets)
+                .reduce((max, [key, value]) =>
+                    ((!max || value.metadata.range.end > max[1].metadata.range.end) ? [key, value] : max));
+
+        const isAboveRange = (xAxis: string, range: { start: number, end: number }) =>
+            xAxis === TimeUnitCodes.months && childAgeInMonths >= range.end;
         Object.entries(datasets)
             .some(([key, value]) => {
                 const { range } = value.metadata;
@@ -36,6 +43,11 @@ export const useAppropriateChartData = (
                     return true;
                 }
 
+                if (isAboveRange(xAxis, range)) {
+                    const [newDatasetKey] = getMaxRangeDataset(datasets);
+                    setSelectedDataset(newDatasetKey);
+                    return true;
+                }
                 return false;
             });
     };

From 1decbfde33042a591acb8685c79aed5d71ac3b3a Mon Sep 17 00:00:00 2001
From: edvinstava <edvin@devotta.no>
Date: Fri, 20 Sep 2024 10:49:29 +0200
Subject: [PATCH 8/8] fix: Alterations after review

---
 i18n/en.pot    | 15 +++++++++++----
 src/Plugin.tsx |  6 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/i18n/en.pot b/i18n/en.pot
index a13b6c7..f89f6be 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,15 +5,15 @@ 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-07-31T11:25:42.922Z\n"
-"PO-Revision-Date: 2024-07-31T11:25:42.922Z\n"
+"POT-Creation-Date: 2024-09-20T08:45:15.376Z\n"
+"PO-Revision-Date: 2024-09-20T08:45:15.376Z\n"
 
 msgid ""
 "Failed to load data. Please check that you have selected the correct "
-"program stage ID in the configuration."
+"programStageId in the configuration."
 msgstr ""
 "Failed to load data. Please check that you have selected the correct "
-"program stage ID in the configuration."
+"programStageId in the configuration."
 
 msgid "Growth Chart"
 msgstr "Growth Chart"
@@ -38,6 +38,13 @@ msgstr "The default indicator"
 msgid "is not a valid. Please select a valid indicator in the configuration"
 msgstr "is not a valid. Please select a valid indicator in the configuration"
 
+msgid ""
+"There was an error fetching the tracked entity for the growth chart. Please "
+"check the configuration in Datastore Management and try again."
+msgstr ""
+"There was an error fetching the tracked entity for the growth chart. Please "
+"check the configuration in Datastore Management and try again."
+
 msgid "Print"
 msgstr "Print"
 
diff --git a/src/Plugin.tsx b/src/Plugin.tsx
index 5b1e647..f775474 100644
--- a/src/Plugin.tsx
+++ b/src/Plugin.tsx
@@ -35,9 +35,9 @@ const PluginInner = (propsFromParent: EnrollmentOverviewProps) => {
     } = useCustomReferences();
 
     const {
-        teiId = 'oJGqqqazdje',
-        programId = 'Ewe20zBQxw4',
-        orgUnitId = 'RaTwtPm4gBX',
+        teiId,
+        programId,
+        orgUnitId,
     } = propsFromParent;
 
     const {