fix query manage old state retained on add query (ToolJet#1537)

dan-amoroso · Dec 8, 2021 · 886da25 · 886da25
1 parent bc19612
commit 886da25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
@@ -850,6 +850,8 @@ class Editor extends React.Component {
                             className="btn btn-sm btn-light btn-px-1 text-muted"
                             onClick={() =>
                               this.setState({
+                                options: {},
+                                selectedDataSource: null,
                                 selectedQuery: {},
                                 editingQuery: false,
                                 addingQuery: true,
@@ -915,6 +917,7 @@ class Editor extends React.Component {
                             dataQueries={dataQueries}
                             mode={editingQuery ? 'edit' : 'create'}
                             selectedQuery={selectedQuery}
+                            selectedDataSource={this.state.selectedDataSource}
                             dataQueriesChanged={this.dataQueriesChanged}
                             appId={appId}
                             addingQuery={addingQuery}

diff --git a/frontend/src/Editor/QueryManager/QueryManager.jsx b/frontend/src/Editor/QueryManager/QueryManager.jsx
@@ -45,6 +45,7 @@ let QueryManager = class QueryManager extends React.Component {
         queryPaneHeight: props.queryPaneHeight,
         currentState: props.currentState,
         selectedSource: source,
+        selectedDataSource: props.selectedDataSource,
       },
       () => {
         if (this.props.mode === 'edit') {