Expose metrics to JS (#4654)

apache · Apr 3, 2018 · ab7ba20 · ab7ba20
1 parent 1ef856e
commit ab7ba20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/superset/assets/javascripts/modules/sandbox.js b/superset/assets/javascripts/modules/sandbox.js
@@ -22,6 +22,10 @@ export default function sandboxedEval(code, context, opts) {
   Object.keys(sandboxContext).forEach(function (key) {
     sandbox[key] = sandboxContext[key];
   });
-  vm.runInNewContext(codeToEval, sandbox, opts);
-  return sandbox[resultKey];
+  try {
+    vm.runInNewContext(codeToEval, sandbox, opts);
+    return sandbox[resultKey];
+  } catch (error) {
+    return () => error;
+  }
 }
diff --git a/superset/viz.py b/superset/viz.py
@@ -2048,6 +2048,7 @@ def get_metrics(self):
 
     def get_properties(self, d):
         return {
+            'metric': d.get(self.metric),
             'radius': self.fixed_value if self.fixed_value else d.get(self.metric),
             'cat_color': d.get(self.dim) if self.dim else None,
             'position': d.get('spatial'),