Explore to SQL Lab #5101

betodealmeida · 2018-05-30T00:36:34Z

This PR adds a button that takes from the explore view to SQLlab, with a pre-populated query on the datasource:

codecov-io · 2018-05-30T02:27:02Z

Codecov Report

Merging #5101 into master will decrease coverage by 0.03%.
The diff coverage is 50%.

@@            Coverage Diff             @@
##           master    #5101      +/-   ##
==========================================
- Coverage   61.31%   61.27%   -0.04%     
==========================================
  Files         369      369              
  Lines       23497    23534      +37     
  Branches     2715     2721       +6     
==========================================
+ Hits        14407    14421      +14     
- Misses       9078     9101      +23     
  Partials       12       12

Impacted Files	Coverage Δ
superset/views/core.py	`72.86% <ø> (ø)`	⬆️
superset/connectors/druid/models.py	`80.56% <ø> (ø)`	⬆️
...sets/src/explore/components/ExploreChartHeader.jsx	`71.42% <ø> (ø)`	⬆️
superset/models/core.py	`85.29% <ø> (ø)`	⬆️
...ts/src/explore/components/ExploreViewContainer.jsx	`0% <ø> (ø)`	⬆️
superset/connectors/base/models.py	`90.85% <100%> (+0.11%)`	⬆️
superset/connectors/sqla/models.py	`78.21% <100%> (+0.08%)`	⬆️
...ts/src/explore/components/ExploreActionButtons.jsx	`100% <100%> (ø)`	⬆️
.../explore/components/controls/DatasourceControl.jsx	`66.66% <100%> (+0.95%)`	⬆️
superset/assets/src/chart/chartAction.js	`46.77% <15.38%> (-3.68%)`	⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6b15592...2d255c5. Read the comment docs.

mistercrunch · 2018-05-30T04:27:43Z

The link should only show for SQLAlchemy datasources. I've been meaning to do something similar from the "View query" modal as well.

betodealmeida · 2018-05-30T17:46:23Z

@mistercrunch it only shows for SQLA: https://github.com/apache/incubator-superset/pull/5101/files#diff-39c3f576c74efa400932ceb7eebe8a91R214

I talked with @vylc and she thinks it's more useful to pre-generate the query based on the form data, instead of a plain SELECT *. I'll update this PR.

mistercrunch · 2018-05-30T18:47:40Z

Yup there was some thoughts of showing a "Preview data" tab here as well.

betodealmeida · 2018-06-01T23:27:33Z

I changed the "View Query" button to a dropdown label "Query" with 3 options:

View query: same as before
View data: shows preview of the data
Run in SQL Lab: auto-runs the query in SQL Lab

For the data preview, we can't reuse the data that is present in queryResponse, since its format depends on the viz type. Instead, I changed the query endpoint to return the data in a format appropriate for displaying as a table.

betodealmeida · 2018-06-01T23:28:26Z

superset/assets/src/chart/chartAction.js

+        }
+        url.searchParams.set('datasourceKey', formData.datasource);
+        url.searchParams.set('sql', response.query);
+        window.open(url.href, '_blank');


@mistercrunch, is there a better way of doing this? I wasn't sure how to get the base URL from JS.

I think it's a bit the wild west in terms of URL composition in Superset at the moment. It could be good to refactor a src/utils/urls.js module with constants and utilities for all this.

mistercrunch · 2018-06-19T05:07:23Z

superset/assets/src/SqlLab/actions.js

+        };
+        dispatch(addQueryEditor(queryEditorProps));
+      },
+      error: () => notify.error(t('The datasource couldn\'t be loaded')),


nit (optional): the linter allows double quotes when the string contains a single quote, so that you don't have to escape it

mistercrunch · 2018-06-19T05:20:21Z

superset/assets/src/explore/components/DisplayQueryButton.jsx

 import CopyToClipboard from './../../components/CopyToClipboard';
 import { getExploreUrlAndPayload } from '../exploreUtils';

 import ModalTrigger from './../../components/ModalTrigger';
 import Button from '../../components/Button';
 import { t } from '../../locales';

+require('react-bootstrap-table/css/react-bootstrap-table.css');


nit: import should do the same

mistercrunch · 2018-06-19T05:31:07Z

superset/assets/src/explore/components/DisplayQueryButton.jsx

@@ -21,6 +25,7 @@ registerLanguage('json', json);
 const $ = window.$ = require('jquery');

 const propTypes = {
+  actions: PropTypes.object.isRequired,


(optional) I think the code has a fair amount of passing the whole actions object around. I think it's preferable to pass something more generic when possible to make the component more reusable and less bound to the app. Here you could pass the redirectSQLLab action to an onOpenInEditor prop.

Good point, will do that.

mistercrunch · 2018-06-19T05:34:02Z

superset/assets/src/explore/components/controls/DatasourceControl.jsx

@@ -211,6 +211,18 @@ export default class DatasourceControl extends React.PureComponent {
            />
          </a>
        </OverlayTrigger>
+        {this.props.datasource.type === 'table' && <OverlayTrigger


nit (optional): personally I like to break before an incomplete tag as in \n<OverlayTrigger but will defer on the linter here

mistercrunch · 2018-06-19T05:37:57Z

superset/connectors/base/models.py

@@ -152,6 +152,12 @@ def short_data(self):
            'creator': str(self.created_by),
        }

+    @property


This method belongs in connectors.sqla.models.SqlaTable as Druid datasources don't linke to Database but to cluster, this base should have a raise NotImplementedError() or pass.

Also in that context you'll be able to simply use self.database.select_star(...)

mistercrunch · 2018-06-19T05:39:11Z

superset/connectors/base/models.py

@@ -185,6 +191,8 @@ def data(self):
            'metrics': [o.data for o in self.metrics],
            'columns': [o.data for o in self.columns],
            'verbose_map': verbose_map,
+            'schema': self.schema,
+            'select_star': self.select_star,


Given this here in the base class I'd go for a pass or return None in BaseDatasource.select_star

mistercrunch · 2018-06-19T05:40:35Z

superset/views/core.py

@@ -1038,6 +1038,18 @@ def get_viz(
            )
            return viz_obj

+    @has_access
+    @expose('/sql')
+    def sql_from_form_data(self):


I feel like this endpoint already exists, let me check.

Basically call getExploreUrlAndPayload(formData, endpointType = true)

FYI it gets called when opening the "View Query" while the query is still running or has never run yet.

mistercrunch · 2018-06-19T05:46:33Z

A few minor comments, otherwise LGTM

* WIP * Working version * Clean code * Fix lint * Fix unit test; show only for sqla * Working on UX * Dropdown working 66% * Working but needs CSS * Fixed table * Fix lint * Fix unit test * Fix languages path * Fixes * Fix Javascript lint

betodealmeida added 5 commits May 29, 2018 10:46

WIP

096dcab

Working version

d2b98f1

Clean code

dbb5ecf

Fix lint

8f22014

Fix unit test; show only for sqla

4c22ecb

betodealmeida changed the title ~~Explore to SQLlab~~ Explore to SQL Lab May 30, 2018

betodealmeida added 2 commits May 30, 2018 18:38

Working on UX

5ce83da

Dropdown working 66%

befde64

hughhhh added the lyft Related to Lyft label May 31, 2018

betodealmeida added 2 commits June 1, 2018 15:13

Working but needs CSS

136b670

Fixed table

dccfc64

betodealmeida commented Jun 1, 2018

View reviewed changes

betodealmeida added 2 commits June 1, 2018 21:28

Fix lint

07ec4a4

Fix unit test

60a3303

mistercrunch reviewed Jun 19, 2018

View reviewed changes

betodealmeida added 3 commits July 9, 2018 14:06

Fix merge conflict

dedbc91

Fix languages path

dda16a5

Fixes

7008546

Fix Javascript lint

2d255c5

mistercrunch merged commit c445ef8 into apache:master Jul 16, 2018

mistercrunch deleted the DPTOOLS-366_explore_to_sql branch July 16, 2018 22:00

mistercrunch added 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 0.28.0 labels Feb 27, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Explore to SQL Lab #5101

Explore to SQL Lab #5101

betodealmeida commented May 30, 2018

codecov-io commented May 30, 2018 •

edited

Loading

mistercrunch commented May 30, 2018

betodealmeida commented May 30, 2018

mistercrunch commented May 30, 2018

betodealmeida commented Jun 1, 2018

betodealmeida Jun 1, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

betodealmeida Jul 9, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch Jun 19, 2018

mistercrunch commented Jun 19, 2018

Explore to SQL Lab #5101

Explore to SQL Lab #5101

Conversation

betodealmeida commented May 30, 2018

codecov-io commented May 30, 2018 • edited Loading

Codecov Report

mistercrunch commented May 30, 2018

betodealmeida commented May 30, 2018

mistercrunch commented May 30, 2018

betodealmeida commented Jun 1, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mistercrunch commented Jun 19, 2018

codecov-io commented May 30, 2018 •

edited

Loading