mirror of
https://github.com/plausible/analytics.git
synced 2024-12-30 13:03:23 +03:00
3b97ecdc62
* First pass bringing in previous graph improvements, and comparsion context * Swaps issue template to new issue form syntax * Indentation update * Indentation update? * More indentation * Intendation is hard * Finalized indentation? * Github indentation * Missing fields * Formatting changes * Checkbox changes * Uses new timeseries API, various UI improvements, descopes conversions, ToP from graphing * Fixes Mobile UI Issues * Improves point detection and display on hover * Fixes & adds tests for updated main-graph API route * Changelog * Changes to better metric option declaration & minor UI/default fixes * Fixes top stat tooltips showing unformatted numbers for special (non-rounded) top stats * Formatting * Fixes regression with dashed portion not stopping at present_index * Removes comparison + lint * Improves top stat active style * Removes comparison tests * Splits out tooltip and top stats Still needs: - Tests - Potentially more cleanup * Adds/moves tests for top stats * Formatting * Updates metric LS key, removes console log * Various fixes + cleanup * Makes tooltip position & style more consistent * Fixes test (returns import status on both main graph & top stats) * Fixes interaction with month dateFormatter * Fixes edge case tooltip behavior It was simpler than I thought :/ * Make the entire top stat clickable * Minor UI improvements * Fixes another tooltip visibility edge case + cleans up boolean algebra Co-authored-by: Uku Taht <Uku.taht@gmail.com>
55 lines
1.5 KiB
JavaScript
55 lines
1.5 KiB
JavaScript
import React from 'react';
|
|
import { withRouter } from 'react-router-dom'
|
|
|
|
import Historical from './historical'
|
|
import Realtime from './realtime'
|
|
import {parseQuery} from './query'
|
|
import * as api from './api'
|
|
import { withComparisonProvider } from './comparison-provider-hoc';
|
|
|
|
const THIRTY_SECONDS = 30000
|
|
|
|
class Timer {
|
|
constructor() {
|
|
this.listeners = []
|
|
this.intervalId = setInterval(this.dispatchTick.bind(this), THIRTY_SECONDS)
|
|
}
|
|
|
|
onTick(listener) {
|
|
this.listeners.push(listener)
|
|
}
|
|
|
|
dispatchTick() {
|
|
for (const listener of this.listeners) {
|
|
listener()
|
|
}
|
|
}
|
|
}
|
|
|
|
class Dashboard extends React.Component {
|
|
constructor(props) {
|
|
super(props)
|
|
this.state = {
|
|
query: parseQuery(props.location.search, this.props.site),
|
|
timer: new Timer()
|
|
}
|
|
}
|
|
|
|
componentDidUpdate(prevProps) {
|
|
if (prevProps.location.search !== this.props.location.search) {
|
|
api.cancelAll()
|
|
this.setState({query: parseQuery(this.props.location.search, this.props.site)})
|
|
}
|
|
}
|
|
|
|
render() {
|
|
if (this.state.query.period === 'realtime') {
|
|
return <Realtime timer={this.state.timer} site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} query={this.state.query} />
|
|
} else {
|
|
return <Historical timer={this.state.timer} site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} query={this.state.query} />
|
|
}
|
|
}
|
|
}
|
|
|
|
export default withRouter(withComparisonProvider(Dashboard))
|