fixes for duplicate loading of histogram data and future.str serializ…

…ation in scatter data
man-group · Nov 7, 2019 · 26fe80d · 26fe80d
1 parent 934212f
commit 26fe80d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/dtale/views.py b/dtale/views.py
@@ -582,7 +582,7 @@ def get_scatter():
             data = data.query(query)
 
         data = data[list(set(cols))].dropna(how='any')
-        data['index'] = data.index
+        data[str('index')] = data.index
         s0 = data[cols[0]]
         s1 = data[cols[1]]
         pearson = s0.corr(s1, method='pearson')

diff --git a/static/popups/Histogram.jsx b/static/popups/Histogram.jsx
@@ -73,12 +73,10 @@ class ReactHistogram extends React.Component {
     return false;
   }
 
-  componentDidUpdate() {
-    if (!this.props.chartData.visible || this.state.error) {
-      return;
+  componentDidUpdate(_prevProps, prevState) {
+    if (this.state.bins !== prevState.bins) {
+      this.buildHistogram();
     }
-
-    this.buildHistogram();
   }
 
   componentDidMount() {