Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[QuerySearch] Add loading status to QuerySearch page #1657

Merged
merged 1 commit into from
Nov 21, 2016
Merged

[QuerySearch] Add loading status to QuerySearch page #1657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions superset/assets/javascripts/SqlLab/components/QuerySearch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ class QuerySearch extends React.PureComponent {
to: null,
status: 'success',
queriesArray: [],
queriesLoading: true,
};
}
componentWillMount() {
this.fetchUsers();
}
componentDidMount() {
this.refreshQueries();
}
onUserClicked(userId) {
Expand Down Expand Up @@ -100,6 +103,7 @@ class QuerySearch extends React.PureComponent {
});
}
refreshQueries() {
this.setState({ queriesLoading: true });
const params = [
this.state.userId ? `user_id=${this.state.userId}` : '',
this.state.databaseId ? `database_id=${this.state.databaseId}` : '',
Expand All @@ -116,7 +120,7 @@ class QuerySearch extends React.PureComponent {
for (const id in data) {
newQueriesArray.push(data[id]);
}
this.setState({ queriesArray: newQueriesArray });
this.setState({ queriesArray: newQueriesArray, queriesLoading: false });
}
});
}
Expand Down Expand Up @@ -185,16 +189,20 @@ class QuerySearch extends React.PureComponent {
Search
</Button>
</div>
<QueryTable
columns={[
'state', 'db', 'user', 'date',
'progress', 'rows', 'sql', 'querylink',
]}
onUserClicked={this.onUserClicked.bind(this)}
onDbClicked={this.onDbClicked.bind(this)}
queries={this.state.queriesArray}
actions={this.props.actions}
/>
{this.state.queriesLoading ?
(<img className="loading" alt="Loading..." src="/static/assets/images/loading.gif" />)
:
(<QueryTable
columns={[
'state', 'db', 'user', 'date',
'progress', 'rows', 'sql', 'querylink',
]}
onUserClicked={this.onUserClicked.bind(this)}
onDbClicked={this.onDbClicked.bind(this)}
queries={this.state.queriesArray}
actions={this.props.actions}
/>)
}
</div>
);
}
Expand Down