diff options
author | Zuul <zuul@review.opendev.org> | 2020-05-21 00:13:35 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-05-21 00:13:35 +0000 |
commit | 551dbcbbc60edb4996563856e2b5f77d31b0bc4a (patch) | |
tree | 1ec61cbb3e3150c189ab5237fddb6ef596c52dc8 /web/src/pages/Status.jsx | |
parent | dff2ec282cfe4dcb88b0ccdb6a61c14e5399eac4 (diff) | |
parent | 86eba8b05d5a3f913ba7e255565e8cd5d20fea35 (diff) | |
download | zuul-551dbcbbc60edb4996563856e2b5f77d31b0bc4a.tar.gz |
Merge "Add new timezone selector in web interface"
Diffstat (limited to 'web/src/pages/Status.jsx')
-rw-r--r-- | web/src/pages/Status.jsx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/web/src/pages/Status.jsx b/web/src/pages/Status.jsx index ad169e556..84555b5d2 100644 --- a/web/src/pages/Status.jsx +++ b/web/src/pages/Status.jsx @@ -13,6 +13,7 @@ // License for the specific language governing permissions and limitations // under the License. +import * as moment from 'moment-timezone' import * as React from 'react' import PropTypes from 'prop-types' import { connect } from 'react-redux' @@ -33,6 +34,7 @@ class StatusPage extends Refreshable { static propTypes = { location: PropTypes.object, tenant: PropTypes.object, + timezone: PropTypes.string, remoteData: PropTypes.object, dispatch: PropTypes.func } @@ -111,6 +113,12 @@ class StatusPage extends Refreshable { this.visibilityChangeEvent, this.visibilityListener) } + componentDidUpdate (prevProps) { + if (this.props.timezone !== prevProps.timezo) { + this.loadState() + } + } + setFilter = (filter) => { this.filter.value = filter this.setState({filter: filter}) @@ -184,7 +192,7 @@ class StatusPage extends Refreshable { <p>Zuul version: <span>{status.zuul_version}</span></p> {status.last_reconfigured ? ( <p>Last reconfigured: <span> - {new Date(status.last_reconfigured).toString()} + {moment.utc(status.last_reconfigured).tz(this.props.timezone).format('llll')} </span></p>) : ''} </React.Fragment> ) @@ -258,5 +266,6 @@ class StatusPage extends Refreshable { export default connect(state => ({ tenant: state.tenant, + timezone: state.timezone, remoteData: state.status, }))(StatusPage) |