chore: geojsonloader and thematicloader

dhis2 · Oct 30, 2024 · 52315bb · 52315bb
1 parent 4cfb808
commit 52315bb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/hooks/useLayersLoader.js b/src/hooks/useLayersLoader.js
@@ -9,6 +9,7 @@ import useLoaderAlerts from '../components/loaders/useLoaderAlerts.js'
 // import eventLoader from '../loaders/eventLoader.js'
 import externalLoader from '../loaders/externalLoader.js'
 import facilityLoader from '../loaders/facilityLoader.js'
+import geoJsonUrlLoader from '../loaders/geoJsonUrlLoader.js'
 import orgUnitLoader from '../loaders/orgUnitLoader.js'
 import thematicLoader from '../loaders/thematicLoader.js'
 // import trackedEntityLoader from '../loaders/trackedEntityLoader.js'
@@ -20,6 +21,8 @@ const loaders = {
     facility: facilityLoader,
     orgUnit: orgUnitLoader,
     thematic: thematicLoader,
+    geoJsonUrl: geoJsonUrlLoader,
+
     // trackedEntity: trackedEntityLoader,
 }
 
@@ -31,7 +34,7 @@ export const useLayersLoader = () => {
         ({ layer }) => `Could not load layer ${layer}`,
         { critical: true }
     )
-    const { nameProperty } = useCachedDataQuery()
+    const { nameProperty, currentUser } = useCachedDataQuery()
     const { showAlerts } = useLoaderAlerts()
 
     const allLayers = useSelector((state) => state.map.mapViews)
@@ -45,6 +48,8 @@ export const useLayersLoader = () => {
                 engine,
                 analyticsEngine,
                 baseUrl,
+                keyAnalysisDisplayProperty:
+                    currentUser.keyAnalysisDisplayProperty,
             })
             if (result.alerts) {
                 showAlerts(result.alerts)
@@ -72,6 +77,7 @@ export const useLayersLoader = () => {
         allLayers,
         dispatch,
         nameProperty,
+        currentUser.keyAnalysisDisplayProperty,
         engine,
         analyticsEngine,
         showAlerts,

diff --git a/src/loaders/geoJsonUrlLoader.js b/src/loaders/geoJsonUrlLoader.js
@@ -45,7 +45,11 @@ const fetchData = async (url, engine, instanceBaseUrl) => {
 }
 
 const EMPTY_FEATURE_STYLE = {}
-const geoJsonUrlLoader = async (layer, engine, instanceBaseUrl) => {
+const geoJsonUrlLoader = async ({
+    config: layer,
+    engine,
+    baseUrl: instanceBaseUrl,
+}) => {
     const { config } = layer
 
     let newConfig

diff --git a/src/loaders/thematicLoader.js b/src/loaders/thematicLoader.js
@@ -59,9 +59,9 @@ const GEOFEATURES_QUERY = {
 
 const thematicLoader = async ({
     config,
-    displayProperty,
     engine,
     analyticsEngine,
+    keyAnalysisDisplayProperty,
 }) => {
     const {
         columns,
@@ -82,7 +82,7 @@ const thematicLoader = async ({
 
     const response = await loadData({
         config,
-        displayProperty,
+        keyAnalysisDisplayProperty,
         engine,
         analyticsEngine,
         alerts,
@@ -362,7 +362,7 @@ const getOrderedValues = (data) => {
 // Load features and data values from api
 const loadData = async ({
     config,
-    displayProperty,
+    keyAnalysisDisplayProperty,
     engine,
     analyticsEngine,
     alerts,
@@ -399,7 +399,7 @@ const loadData = async ({
     let analyticsRequest = new analyticsEngine.request()
         .addOrgUnitDimension(orgUnits.map((ou) => ou.id))
         .addDataDimension(dataDimension)
-        .withDisplayProperty(displayProperty.toUpperCase())
+        .withDisplayProperty(keyAnalysisDisplayProperty)
 
     if (!isSingleMap) {
         analyticsRequest = analyticsRequest.addPeriodDimension(period.id)
@@ -451,7 +451,7 @@ const loadData = async ({
         {
             variables: {
                 ou: ouParam,
-                displayProperty,
+                displayProperty: keyAnalysisDisplayProperty,
                 userOrgUnit: geoFeaturesParams.userOrgUnit, // TODO
             },
         },
@@ -482,7 +482,7 @@ const loadData = async ({
             {
                 variables: {
                     ou: ouParam,
-                    displayProperty,
+                    displayProperty: keyAnalysisDisplayProperty,
                     userOrgUnit: geoFeaturesParams.userOrgUnit,
                     coordinateField: coordinateField.id,
                 },