fix: Select a query from History and Run (apache#15891)

* fix: Run query picked from History * remove sql from component local state
betodealmeida · Jul 27, 2021 · 8c7e09e · 8c7e09e
1 parent e5540b7
commit 8c7e09e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/superset-frontend/src/SqlLab/components/SqlEditor.jsx b/superset-frontend/src/SqlLab/components/SqlEditor.jsx
@@ -158,7 +158,6 @@ class SqlEditor extends React.PureComponent {
  ctas: '',
  northPercent: props.queryEditor.northPercent || INITIAL_NORTH_PERCENT,
  southPercent: props.queryEditor.southPercent || INITIAL_SOUTH_PERCENT,
- sql: props.queryEditor.sql,
  autocompleteEnabled: true,
  showCreateAsModal: false,
  createAs: '',
@@ -256,7 +255,6 @@ class SqlEditor extends React.PureComponent {
  }
 
  onSqlChanged(sql) {
- this.setState({ sql });
  this.setQueryEditorSqlWithDebounce(sql);
  // Request server-side validation of the query text
  if (this.canValidateQuery()) {
@@ -295,7 +293,7 @@ class SqlEditor extends React.PureComponent {
  key: 'ctrl+r',
  descr: t('Run query'),
  func: () => {
- if (this.state.sql.trim() !== '') {
+ if (this.props.queryEditor.sql.trim() !== '') {
  this.runQuery();
  }
  },
@@ -305,7 +303,7 @@ class SqlEditor extends React.PureComponent {
  key: 'ctrl+enter',
  descr: t('Run query'),
  func: () => {
- if (this.state.sql.trim() !== '') {
+ if (this.props.queryEditor.sql.trim() !== '') {
  this.runQuery();
  }
  },
@@ -344,7 +342,7 @@ class SqlEditor extends React.PureComponent {
  const qe = this.props.queryEditor;
  const query = {
  dbId: qe.dbId,
- sql: qe.selectedText ? qe.selectedText : this.state.sql,
+ sql: qe.selectedText ? qe.selectedText : this.props.queryEditor.sql,
  sqlEditorId: qe.id,
  schema: qe.schema,
  templateParams: qe.templateParams,
@@ -376,7 +374,7 @@ class SqlEditor extends React.PureComponent {
  const qe = this.props.queryEditor;
  const query = {
  dbId: qe.dbId,
- sql: this.state.sql,
+ sql: this.props.queryEditor.sql,
  sqlEditorId: qe.id,
  schema: qe.schema,
  templateParams: qe.templateParams,
@@ -409,7 +407,7 @@ class SqlEditor extends React.PureComponent {
  const qe = this.props.queryEditor;
  const query = {
  dbId: qe.dbId,
- sql: qe.selectedText ? qe.selectedText : this.state.sql,
+ sql: qe.selectedText ? qe.selectedText : this.props.queryEditor.sql,
  sqlEditorId: qe.id,
  tab: qe.title,
  schema: qe.schema,
@@ -622,7 +620,7 @@ class SqlEditor extends React.PureComponent {
  runQuery={this.runQuery}
  selectedText={qe.selectedText}
  stopQuery={this.stopQuery}
- sql={this.state.sql}
+ sql={this.props.queryEditor.sql}
  overlayCreateAsMenu={showMenu ? runMenuBtn : null}
  />
  </span>