Merge branch 'master' into 36.x

dhis2 · Mar 12, 2021 · 43c4842 · 43c4842
2 parents 9242a27 + b07f248
commit 43c4842
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [35.20.19](https://github.com/dhis2/data-visualizer-app/compare/v35.20.18...v35.20.19) (2021-03-12)
+
+
+### Bug Fixes
+
+* use VISUALIZATION_VIEW ([#1662](https://github.com/dhis2/data-visualizer-app/issues/1662)) ([05e2798](https://github.com/dhis2/data-visualizer-app/commit/05e2798906c1d924e9ce09f96f9eca05a5b90191))
+
 ## [35.20.18](https://github.com/dhis2/data-visualizer-app/compare/v35.20.17...v35.20.18) (2021-03-12)
 
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "data-visualizer",
     "description": "DHIS2 Data Visualizer",
     "private": true,
-    "version": "35.20.18",
+    "version": "35.20.19",
     "workspaces": [
         "packages/*"
     ],

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
     "name": "data-visualizer-app",
-    "version": "35.20.18",
+    "version": "35.20.19",
     "description": "DHIS2 Data Visualizer app",
     "license": "BSD-3-Clause",
     "private": true,
@@ -17,7 +17,7 @@
         "@dhis2/app-runtime": "^2.8.0",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-ui-interpretations": "^7.1.6",
-        "@dhis2/data-visualizer-plugin": "35.20.18",
+        "@dhis2/data-visualizer-plugin": "35.20.19",
         "@dhis2/ui": "^6.5.5",
         "@material-ui/icons": "^3.0.1",
         "d2": "^31.9.1",

diff --git a/packages/app/src/api/dataStatistics.js b/packages/app/src/api/dataStatistics.js
@@ -1,12 +1,12 @@
 import { onError } from './index'
 
-const EVENT_TYPE_CHART_VIEW = 'CHART_VIEW'
+export const EVENT_TYPE = 'VISUALIZATION_VIEW'
 
 const dataStatisticMutation = {
     resource: 'dataStatistics',
     params: ({ id }) => ({
         favorite: id,
-        eventType: EVENT_TYPE_CHART_VIEW,
+        eventType: EVENT_TYPE,
     }),
     type: 'create',
 }

diff --git a/packages/app/src/api/mostViewedVisualizations.js b/packages/app/src/api/mostViewedVisualizations.js
@@ -1,10 +1,13 @@
 // TODO move into component StartScreen?
+
+import { EVENT_TYPE } from './dataStatistics'
+
 // most likely is not needed anywhere else
 export const apiFetchMostViewedVisualizations = (dataEngine, pageSize) => {
     const visualizationQuery = {
         resource: 'dataStatistics/favorites',
         params: {
-            eventType: 'VISUALIZATION_VIEW',
+            eventType: EVENT_TYPE,
             pageSize: pageSize || 10,
         },
     }

diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/data-visualizer-plugin",
-    "version": "35.20.18",
+    "version": "35.20.19",
     "description": "DHIS2 Data Visualizer plugin",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",