fix: dataElementGroup no longer needed to fetch current data values (#…

…1503) * fix: dataElementGroup no longer needed to fetch current data values * fix: data element placeholder
dhis2 · Oct 11, 2022 · 9a9602f · 9a9602f
1 parent 742889a
commit 9a9602f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -837,6 +837,9 @@ msgstr "Select associated geometry for selected organisation units"
 msgid "Data element"
 msgstr "Data element"
 
+msgid "Select data element"
+msgstr "Select data element"
+
 msgid "The data element where Earth Engine data will be added"
 msgstr "The data element where Earth Engine data will be added"
 

diff --git a/src/pages/EarthEngineImport/EarthEngineImport.js b/src/pages/EarthEngineImport/EarthEngineImport.js
@@ -15,7 +15,7 @@ const query = {
     dataElements: {
         resource: 'dataElements',
         params: {
-            fields: 'id,displayName~rename(name),categoryCombo[categoryOptionCombos[id,code,displayName~rename(name)]],dataElementGroups',
+            fields: 'id,displayName~rename(name),categoryCombo[categoryOptionCombos[id,code,displayName~rename(name)]]',
             filter: 'domainType:eq:AGGREGATE',
             paging: false,
         },

diff --git a/src/pages/EarthEngineImport/components/DataElements.js b/src/pages/EarthEngineImport/components/DataElements.js
@@ -14,6 +14,7 @@ const DataElements = () => {
                 component={SingleSelectFieldFF}
                 name={DATA_ELEMENT_ID}
                 label={i18n.t('Data element')}
+                placeholder={i18n.t('Select data element')}
                 options={dataElements}
                 dataTest="input-data-elements"
                 helpText={i18n.t(

diff --git a/src/pages/EarthEngineImport/components/useFetchCurrentValues.js b/src/pages/EarthEngineImport/components/useFetchCurrentValues.js
@@ -3,7 +3,6 @@ import { useConfig } from '@dhis2/app-runtime'
 import i18n from '@dhis2/d2-i18n'
 import { ReactFinalForm } from '@dhis2/ui'
 import { useState, useEffect } from 'react'
-import { useCachedDataQuery } from '../util/CachedQueryProvider.js'
 
 const { useFormState } = ReactFinalForm
 
@@ -30,14 +29,10 @@ const useFetchCurrentValues = () => {
     const { values } = useFormState()
     const { earthEngineId, organisationUnits, dataElementId, period } = values
 
-    const { dataElements } = useCachedDataQuery()
     const [currentValues, setCurrentValues] = useState([])
     const [error, setError] = useState(null)
     const { baseUrl } = useConfig()
 
-    const dataElement = dataElements.find((el) => el.id === dataElementId)
-    const dataElementGroupId = dataElement?.dataElementGroups[0]?.id
-
     useEffect(() => {
         const fetchCurrVals = async (url) => {
             const { dataValues } = await fetchCurrentValues(url)
@@ -46,12 +41,7 @@ const useFetchCurrentValues = () => {
             setCurrentValues(cv)
         }
 
-        if (
-            organisationUnits &&
-            period &&
-            dataElementId &&
-            dataElementGroupId
-        ) {
+        if (organisationUnits && period && dataElementId) {
             setError(null)
             const ouQueryParams = organisationUnits
                 .map(({ id }) => `orgUnit=${id}`)
@@ -60,20 +50,18 @@ const useFetchCurrentValues = () => {
             const hasLevelPrefix = organisationUnits.find((ou) =>
                 ouIdHelper.hasLevelPrefix(ou.id)
             )
-            let url = `${baseUrl}/api/dataValueSets?dataElementGroup=${dataElementGroupId}&period=${period}&${ouQueryParams}`
+            let url = `${baseUrl}/api/dataValueSets?dataElement=${dataElementId}&period=${period}&${ouQueryParams}`
             if (hasLevelPrefix) {
                 url = url.concat('&children=true')
             }
 
             fetchCurrVals(url)
         } else {
-            const missingDEG =
-                dataElementGroupId === undefined ? 'Data element group' : null
             const missingPeriod = period === undefined ? 'Period' : null
             const missingOus = !organisationUnits.length
                 ? 'Organisation units'
                 : null
-            const missingParams = [missingDEG, missingPeriod, missingOus]
+            const missingParams = [missingPeriod, missingOus]
                 .filter((m) => m !== null)
                 .join(', ')
             setError(
@@ -82,14 +70,7 @@ const useFetchCurrentValues = () => {
                 )
             )
         }
-    }, [
-        earthEngineId,
-        dataElementId,
-        dataElementGroupId,
-        period,
-        organisationUnits,
-        baseUrl,
-    ])
+    }, [earthEngineId, dataElementId, period, organisationUnits, baseUrl])
 
     return { currentValues, error }
 }