Skip to content

Commit

Permalink
[DQT] Fix for Manage Saved Queries Tab (#5807)
Browse files Browse the repository at this point in the history
Fixes a bug of when clicking on the "Manage Saved Queries" tab, then clicking on other tabs and then trying to click the Managed Saved Queries tab. The bug wouldn't let you view the content of the "Managed Saved Queries" tab again.

Resolves #5806
  • Loading branch information
maltheism authored and driusan committed Nov 29, 2019
1 parent 01e5692 commit 646687f
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions modules/dataquery/jsx/react.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class SavedQueriesList extends Component {
{globalSaved}
</ul>
</li>
<li role='presentation'><a href='#SavedQueriesTab' data-toggle='tab'>Manage Saved Queries</a></li>
<li role='presentation' id='presentationMSQ'><a href='#SavedQueriesTab' data-toggle='tab'>Manage Saved Queries</a></li>
</ul>
);
}
Expand Down Expand Up @@ -148,6 +148,14 @@ class DataQueryApp extends Component {
this.updateFilter = this.updateFilter.bind(this);
}

onTabChangeHandler(e) {
if (e.target.innerHTML !== 'Manage Saved Queries') {
document.getElementById(
'presentationMSQ'
).classList.remove('active');
}
}

componentDidMount() {
// Before the dataquery is loaded into the window, this function is called to gather
// any data that was not passed in the initial load.
Expand Down Expand Up @@ -1033,11 +1041,11 @@ class DataQueryApp extends Component {
<div className={widthClass}>
<nav className='nav nav-tabs'>
<ul className='nav nav-tabs navbar-left' data-tabs='tabs'>
<li role='presentation' className='active'><a href='#Info' data-toggle='tab'>Info</a></li>
<li role='presentation'><a href='#DefineFields' data-toggle='tab'>Define Fields</a></li>
<li role='presentation'><a href='#DefineFilters' data-toggle='tab'>Define Filters</a></li>
<li role='presentation'><a href='#ViewData' data-toggle='tab'>View Data</a></li>
<li role='presentation'><a href='#Statistics' data-toggle='tab'>Statistical Analysis</a></li>
<li role='presentation' onClick={this.onTabChangeHandler} className='active'><a href='#Info' data-toggle='tab'>Info</a></li>
<li role='presentation' onClick={this.onTabChangeHandler}><a href='#DefineFields' data-toggle='tab'>Define Fields</a></li>
<li role='presentation' onClick={this.onTabChangeHandler}><a href='#DefineFilters' data-toggle='tab'>Define Filters</a></li>
<li role='presentation' onClick={this.onTabChangeHandler}><a href='#ViewData' data-toggle='tab'>View Data</a></li>
<li role='presentation' onClick={this.onTabChangeHandler}><a href='#Statistics' data-toggle='tab'>Statistical Analysis</a></li>
</ul>
<SavedQueriesList
userQueries={this.state.queryIDs.User}
Expand Down

0 comments on commit 646687f

Please sign in to comment.