Merge branch 'dev' into fix/add-outlier-table-instructions-for-push-a…

…nalytics
dhis2 · Mar 21, 2024 · 6beaefe · 6beaefe
2 parents 7444c91 + 8a54037
commit 6beaefe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/api/analytics.js b/src/api/analytics.js
@@ -59,7 +59,11 @@ export const getAnalyticsRequestForOutlierTable = ({
     const headers = []
 
     columns.forEach(({ dimension, items }) => {
-        parameters[dimension] = items.map(({ id }) => id).join(',')
+        // only use the first period, this accommodates for the dashboard filter scenario
+        parameters[dimension] =
+            dimension === DIMENSION_ID_PERIOD
+                ? items[0].id
+                : items.map(({ id }) => id).join(',')
 
         headers.push(forDownload ? dimension : dimensionIdHeaderMap[dimension])
 

diff --git a/src/components/VisualizationPlugin/VisualizationPluginWrapper.js b/src/components/VisualizationPlugin/VisualizationPluginWrapper.js
@@ -27,7 +27,10 @@ const VisualizationPluginWrapper = (props) => {
         [pluginProps]
     )
 
-    useEffect(() => setPluginProps(props), [props])
+    useEffect(() => {
+        setIsLoading(true)
+        setPluginProps(props)
+    }, [props])
 
     const onLoadingComplete = () => setIsLoading(false)