You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by cc...@apache.org on 2018/08/18 00:45:00 UTC
[incubator-superset] branch master updated: [sqllab] call out
transient state of tabs to users (#5652)
This is an automated email from the ASF dual-hosted git repository.
ccwilliams pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 3d15d91 [sqllab] call out transient state of tabs to users (#5652)
3d15d91 is described below
commit 3d15d910af255c2e283d9725a40e0766023d28d9
Author: Chris Williams <wi...@users.noreply.github.com>
AuthorDate: Fri Aug 17 17:44:56 2018 -0700
[sqllab] call out transient state of tabs to users (#5652)
---
.../src/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 0732a1c..3325afe 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 = (
<div>
- <TabStatusIcon onClose={this.removeQueryEditor.bind(this, qe)} tabState={state} /> {qe.title} {' '}
- <DropdownButton
- bsSize="small"
- id={'ddbtn-tab-' + i}
- title=""
- >
+ <TabStatusIcon onClose={this.removeQueryEditor.bind(this, qe)} tabState={state} />{' '}
+ {qe.title}{' '}
+ <DropdownButton bsSize="small" id={'ddbtn-tab-' + i} title="">
<MenuItem eventKey="1" onClick={this.removeQueryEditor.bind(this, qe)}>
<i className="fa fa-close" /> {t('close tab')}
</MenuItem>
<MenuItem eventKey="2" onClick={this.renameTab.bind(this, qe)}>
<i className="fa fa-i-cursor" /> {t('rename tab')}
</MenuItem>
- {qe &&
- <CopyQueryTabUrl queryEditor={qe} />
- }
+ {qe && <CopyQueryTabUrl queryEditor={qe} />}
<MenuItem eventKey="4" onClick={this.toggleLeftBar.bind(this)}>
<i className="fa fa-cogs" />
@@ -188,17 +186,13 @@ class TabbedSqlEditors extends React.PureComponent {
</div>
);
return (
- <Tab
- key={qe.id}
- title={tabTitle}
- eventKey={qe.id}
- >
+ <Tab key={qe.id} title={tabTitle} eventKey={qe.id}>
<div className="panel panel-default">
<div className="panel-body">
- {isSelected &&
+ {isSelected && (
<SqlEditor
getHeight={this.props.getHeight}
- tables={this.props.tables.filter(xt => (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}
/>
- }
+ )}
</div>
</div>
- </Tab>);
+ </Tab>
+ );
});
return (
<Tabs
@@ -224,7 +219,8 @@ class TabbedSqlEditors extends React.PureComponent {
title={
<div>
<i className="fa fa-plus-circle" />
- </div>}
+ </div>
+ }
eventKey="add_tab"
/>
</Tabs>
@@ -251,4 +247,8 @@ function mapDispatchToProps(dispatch) {
}
export { TabbedSqlEditors };
-export default connect(mapStateToProps, mapDispatchToProps)(TabbedSqlEditors);
+
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps,
+)(TabbedSqlEditors);