From 9de9e1c19d8606340efa9849b2176704e4916e9b Mon Sep 17 00:00:00 2001 From: Jason Davis <32852580+JasonD28@users.noreply.github.com> Date: Fri, 26 Jun 2020 09:54:55 -0700 Subject: [PATCH] feat: Added configuration to SQL Lab results "Explore" button (#10164) * added configuration to virtual table explore button * added description to mixin * fixed unit tests Co-authored-by: Jason Davis <@dropbox.com> --- .../javascripts/sqllab/ResultSet_spec.jsx | 1 + .../src/SqlLab/components/ResultSet.jsx | 16 +++++++------ superset/models/core.py | 7 ++++++ superset/views/database/api.py | 1 + superset/views/database/mixins.py | 4 +++- tests/core_tests.py | 23 +++++++++++++++++++ tests/database_api_tests.py | 1 + 7 files changed, 45 insertions(+), 8 deletions(-) diff --git a/superset-frontend/spec/javascripts/sqllab/ResultSet_spec.jsx b/superset-frontend/spec/javascripts/sqllab/ResultSet_spec.jsx index 114755cb5..e77b1c895 100644 --- a/superset-frontend/spec/javascripts/sqllab/ResultSet_spec.jsx +++ b/superset-frontend/spec/javascripts/sqllab/ResultSet_spec.jsx @@ -37,6 +37,7 @@ describe('ResultSet', () => { cache: true, query: queries[0], height: 0, + database: { allows_virtual_table_explore: true }, }; const stoppedQueryProps = { ...mockedProps, query: stoppedQuery }; const runningQueryProps = { ...mockedProps, query: runningQuery }; diff --git a/superset-frontend/src/SqlLab/components/ResultSet.jsx b/superset-frontend/src/SqlLab/components/ResultSet.jsx index 5ccc08954..71f3f4625 100644 --- a/superset-frontend/src/SqlLab/components/ResultSet.jsx +++ b/superset-frontend/src/SqlLab/components/ResultSet.jsx @@ -145,13 +145,15 @@ export default class ResultSet extends React.PureComponent { return (
- {this.props.visualize && ( - - )} + {this.props.visualize && + this.props.database && + this.props.database.allows_virtual_table_explore && ( + + )} {this.props.csv && (