fix: use displayName and displayShortName to get correct name

dhis2 · Apr 19, 2024 · bf1fc85 · bf1fc85
1 parent 2acf033
commit bf1fc85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/components/UserSettingsProvider.js b/src/components/UserSettingsProvider.js
@@ -17,7 +17,9 @@ const UserSettingsProvider = ({ children }) => {
 
             setSettings({
                 ...userSettings,
-                displayProperty: userSettings.keyAnalysisDisplayProperty,
+                displayProperty:  userSettings.keyAnalysisDisplayProperty === 'name'
+                ? 'displayName'
+                : 'displayShortName',
             })
         }
         fetchData()

diff --git a/src/modules/useDimensions.js b/src/modules/useDimensions.js
@@ -17,7 +17,7 @@ const useDimensions = (doFetch) => {
             try {
                 const unfilteredDimensions = await apiFetchDimensions(
                     dataEngine,
-                    userSettings.keyAnalysisDisplayProperty
+                    userSettings.displayProperty
                 )
 
                 dispatch(
@@ -31,11 +31,11 @@ const useDimensions = (doFetch) => {
         if (
             !dimensions.length &&
             doFetch &&
-            userSettings.keyAnalysisDisplayProperty
+            userSettings.displayProperty
         ) {
             fetchDimensions()
         }
-    }, [dimensions, doFetch, userSettings.keyAnalysisDisplayProperty])
+    }, [dimensions, doFetch, userSettings.displayProperty, dispatch, dataEngine])
 
     return dimensions
 }

diff --git a/src/pages/view/TitleBar/FilterDialog.js b/src/pages/view/TitleBar/FilterDialog.js
@@ -120,7 +120,7 @@ const FilterDialog = ({
                         onSelect={onSelectItems}
                         dimensionTitle={dimension.name}
                         displayNameProp={
-                            userSettings.keyAnalysisDisplayProperty
+                            userSettings.displayProperty
                         }
                     />
                 )