Vliu explorev2 bugs (#1701)

* Fixed table_name does not exist in druid * Make Chart container scrollable for large chart * Fixed bug of action buttons not clickable in heatmap * Solve codeclimate issue * Limit overflow to x
apache · Nov 29, 2016 · 7919428 · 7919428
1 parent 3496a80
commit 7919428
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/superset/assets/javascripts/explorev2/components/ChartContainer.jsx b/superset/assets/javascripts/explorev2/components/ChartContainer.jsx
@@ -204,6 +204,7 @@ class ChartContainer extends React.Component {
               id={this.props.containerId}
               ref={(ref) => { this.chartContainerRef = ref; }}
               className={this.props.viz_type}
+              style={{ 'overflow-x': 'scroll' }}
             />)
           }
         </Panel>

diff --git a/superset/assets/visualizations/heatmap.js b/superset/assets/visualizations/heatmap.js
@@ -12,9 +12,9 @@ function heatmapVis(slice) {
   function refresh() {
     // Header for panel in explore v2
     const header = document.getElementById('slice-header');
-    const headerHeight = header ? header.getBoundingClientRect().height : 0;
+    const headerHeight = header ? 30 + header.getBoundingClientRect().height : 0;
     const margin = {
-      top: 20 + headerHeight,
+      top: headerHeight,
       right: 10,
       bottom: 35,
       left: 35,
@@ -101,14 +101,14 @@ function heatmapVis(slice) {
         .style('height', hmHeight + 'px')
         .style('image-rendering', fd.canvas_image_rendering)
         .style('left', margin.left + 'px')
-        .style('top', margin.top + 'px')
+        .style('top', margin.top + headerHeight + 'px')
         .style('position', 'absolute');
 
       const svg = container.append('svg')
         .attr('width', width)
         .attr('height', height)
         .style('left', '0px')
-        .style('top', '0px')
+        .style('top', headerHeight + 'px')
         .style('position', 'absolute');
 
       const rect = svg.append('g')

diff --git a/superset/views.py b/superset/views.py
@@ -1451,11 +1451,14 @@ def explore(self, datasource_type, datasource_id):
                 "user_id": g.user.get_id() if g.user else None,
                 "viz": json.loads(viz_obj.get_json())
             }
+            table_name = viz_obj.datasource.table_name \
+                if datasource_type == 'table' \
+                else viz_obj.datasource.datasource_name
             return self.render_template(
                 "superset/explorev2.html",
                 bootstrap_data=json.dumps(bootstrap_data),
                 slice=slc,
-                table_name=viz_obj.datasource.table_name)
+                table_name=table_name)
         else:
             return self.render_template(
                 "superset/explore.html",