Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1130 from influxdata/feature/1054-alert-history-spinner 

Add simple loading spinner to Alert History page.
pull/10616/head
Hunter Trujillo 2017-03-30 12:13:46 -06:00 committed by GitHub
parent d2a8dec731 f3c6f2e042
commit 20de3ec2fa
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -6,8 +6,9 @@
### Features ### Features
1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard 1. [#1112](https://github.com/influxdata/chronograf/pull/1112): Add ability to delete a dashboard
2. [#1120](https://github.com/influxdata/chronograf/pull/1120): Allow users to update user passwords. 1. [#1120](https://github.com/influxdata/chronograf/pull/1120): Allow users to update user passwords.
3. [#1129](https://github.com/influxdata/chronograf/pull/1129): Allow InfluxDB and Kapacitor configuration via ENV vars or CLI options 1. [#1129](https://github.com/influxdata/chronograf/pull/1129): Allow InfluxDB and Kapacitor configuration via ENV vars or CLI options
1. [#1130](https://github.com/influxdata/chronograf/pull/1130): Add loading spinner to Alert History page.
### UI Improvements ### UI Improvements
1. [#1101](https://github.com/influxdata/chronograf/pull/1101): Compress InfluxQL responses with gzip 1. [#1101](https://github.com/influxdata/chronograf/pull/1101): Compress InfluxQL responses with gzip

7
ui/src/alerts/containers/AlertsApp.js
View File

@ -114,7 +114,12 @@ class AlertsApp extends Component {
render() { render() {
const {source} = this.props const {source} = this.props
const {timeRange} = this.state const {loading, timeRange} = this.state
if (loading || !source) {
return <div className="page-spinner" />
}
return ( return (
<div className="page"> <div className="page">
<div className="page-header"> <div className="page-header">