Merge branch 'master' of http://github.com/datawheel/canon into featu…

…re-local-images
Datawheel · Dec 7, 2020 · 331fdf3 · 331fdf3
2 parents 37dc1be + c1fbb56
commit 331fdf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/vizbuilder/package.json b/packages/vizbuilder/package.json
@@ -2,7 +2,7 @@
   "name": "@datawheel/canon-vizbuilder",
   "sideEffects": ["*.css"],
   "description": "A visualization explorer for OLAP cube servers.",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
   "author": "Francisco Abarzúa <francisco@datawheel.us>",

diff --git a/packages/vizbuilder/src/helpers/chartConfig.js b/packages/vizbuilder/src/helpers/chartConfig.js
@@ -87,7 +87,6 @@ export default function createChartConfig(chart, uiParams) {
     };
   }
 
-  config.data = chart.data;
   config.tooltipConfig = tooltipGenerator(chart, uiParams);
   config.zoom = chartType === "geomap" && isSingleChart;
 
@@ -99,6 +98,9 @@ export default function createChartConfig(chart, uiParams) {
   //   });
   // }
 
+  assign(config, uiParams.measureConfig || {});
+  config.data = chart.data;
+
   return config;
 }