From 3d15d910af255c2e283d9725a40e0766023d28d9 Mon Sep 17 00:00:00 2001 From: Chris Williams Date: Fri, 17 Aug 2018 17:44:56 -0700 Subject: [PATCH] [sqllab] call out transient state of tabs to users (#5652) --- .../SqlLab/components/TabbedSqlEditors.jsx | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx b/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx index 0732a1cc49..3325afe185 100644 --- a/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx +++ b/superset/assets/src/SqlLab/components/TabbedSqlEditors.jsx @@ -126,12 +126,15 @@ class TabbedSqlEditors extends React.PureComponent { const activeQueryEditor = this.activeQueryEditor(); const qe = { title: t('Untitled Query %s', queryCount), - dbId: (activeQueryEditor && activeQueryEditor.dbId) ? - activeQueryEditor.dbId : - this.props.defaultDbId, - schema: (activeQueryEditor) ? activeQueryEditor.schema : null, + dbId: + activeQueryEditor && activeQueryEditor.dbId + ? activeQueryEditor.dbId + : this.props.defaultDbId, + schema: activeQueryEditor ? activeQueryEditor.schema : null, autorun: false, - sql: 'SELECT ...', + sql: `${t( + '-- Note: Unless you save your query, these tabs will NOT persist if you clear your cookies or change browsers.', + )}\n\nSELECT ...`, }; this.props.actions.addQueryEditor(qe); } @@ -150,7 +153,7 @@ class TabbedSqlEditors extends React.PureComponent { } render() { const editors = this.props.queryEditors.map((qe, i) => { - const isSelected = (qe.id === this.activeQueryEditor().id); + const isSelected = qe.id === this.activeQueryEditor().id; let latestQuery; if (qe.latestQueryId) { @@ -160,25 +163,20 @@ class TabbedSqlEditors extends React.PureComponent { if (qe.dbId) { database = this.props.databases[qe.dbId]; } - const state = (latestQuery) ? latestQuery.state : ''; + const state = latestQuery ? latestQuery.state : ''; const tabTitle = (
- {qe.title} {' '} - + {' '} + {qe.title}{' '} + {t('close tab')} {t('rename tab')} - {qe && - - } + {qe && }   @@ -188,17 +186,13 @@ class TabbedSqlEditors extends React.PureComponent {
); return ( - +
- {isSelected && + {isSelected && ( (xt.queryEditorId === qe.id))} + tables={this.props.tables.filter(xt => xt.queryEditorId === qe.id)} queryEditor={qe} editorQueries={this.state.queriesArray} dataPreviewQueries={this.state.dataPreviewQueries} @@ -207,10 +201,11 @@ class TabbedSqlEditors extends React.PureComponent { actions={this.props.actions} hideLeftBar={this.state.hideLeftBar} /> - } + )}
-
); +
+ ); }); return (   - } + + } eventKey="add_tab" /> @@ -251,4 +247,8 @@ function mapDispatchToProps(dispatch) { } export { TabbedSqlEditors }; -export default connect(mapStateToProps, mapDispatchToProps)(TabbedSqlEditors); + +export default connect( + mapStateToProps, + mapDispatchToProps, +)(TabbedSqlEditors);