diff --git a/CHANGELOG.md b/CHANGELOG.md index 0689addb3..a7d83e61f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file. ## Unreleased +### Added +- 'Last updated X seconds ago' info to 'current visitors' tooltips + ### Fixed +- Cascade delete sent_renewal_notifications table when user is deleted plausible/analytics#2549 - Show appropriate top-stat metric labels on the realtime dashboard when filtering by a goal - Fix breakdown API pagination when using event metrics plausible/analytics#2562 - Automatically update all visible dashboard reports in the realtime view @@ -14,9 +18,6 @@ All notable changes to this project will be documented in this file. - Always show direct traffic in sources reports plausible/analytics#2531 - Stop recording XX and T1 country codes plausible/analytics#2556 -## Fixed -- Cascade delete sent_renewal_notifications table when user is deleted plausible/analytics#2549 - ## v1.5.1 - 2022-12-06 ### Fixed diff --git a/assets/css/app.css b/assets/css/app.css index 55b09f4ad..939d8e531 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -135,8 +135,6 @@ blockquote { .pulsating-circle { position: absolute; - left: 50%; - top: 50%; width: 10px; height: 10px; } diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js index 8c97ca0d0..486a5ecf4 100644 --- a/assets/js/dashboard/historical.js +++ b/assets/js/dashboard/historical.js @@ -13,6 +13,8 @@ import Conversions from './stats/conversions' import { withPinnedHeader } from './pinned-header-hoc'; function Historical(props) { + const tooltipBoundary = React.useRef(null) + function renderConversions() { if (props.site.hasGoals) { return ( @@ -30,9 +32,9 @@ function Historical(props) {
-
+
- +
diff --git a/assets/js/dashboard/index.js b/assets/js/dashboard/index.js index 3e539df8c..f97cc65d0 100644 --- a/assets/js/dashboard/index.js +++ b/assets/js/dashboard/index.js @@ -10,23 +10,37 @@ import { withComparisonProvider } from './comparison-provider-hoc'; class Dashboard extends React.Component { constructor(props) { super(props) + this.updateLastLoadTimestamp = this.updateLastLoadTimestamp.bind(this) this.state = { query: parseQuery(props.location.search, this.props.site), + lastLoadTimestamp: new Date() } } + componentDidMount() { + document.addEventListener('tick', this.updateLastLoadTimestamp) + } + componentDidUpdate(prevProps) { if (prevProps.location.search !== this.props.location.search) { api.cancelAll() this.setState({query: parseQuery(this.props.location.search, this.props.site)}) + this.updateLastLoadTimestamp() } } + updateLastLoadTimestamp() { + this.setState({lastLoadTimestamp: new Date()}) + } + render() { + const { site, loggedIn, currentUserRole } = this.props + const { query, lastLoadTimestamp } = this.state + if (this.state.query.period === 'realtime') { - return + return } else { - return + return } } } diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.js index cf28c79b6..1c85f8b8c 100644 --- a/assets/js/dashboard/realtime.js +++ b/assets/js/dashboard/realtime.js @@ -39,7 +39,7 @@ class Realtime extends React.Component {
- +
diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js index 5bfb41144..7c16ecc15 100644 --- a/assets/js/dashboard/stats/current-visitors.js +++ b/assets/js/dashboard/stats/current-visitors.js @@ -3,6 +3,8 @@ import { Link } from 'react-router-dom' import * as api from '../api' import * as url from '../util/url' import { appliedFilters } from '../query'; +import { Tooltip } from '../util/tooltip'; +import { SecondsSinceLastLoad } from '../util/seconds-since-last-load'; export default class CurrentVisitors extends React.Component { constructor(props) { @@ -25,18 +27,29 @@ export default class CurrentVisitors extends React.Component { .then((res) => this.setState({currentVisitors: res})) } + tooltipInfo() { + return ( +
+

Last updated s ago

+

Click to view realtime dashboard

+
+ ) + } + render() { if (appliedFilters(this.props.query).length >= 1) { return null } const { currentVisitors } = this.state; if (currentVisitors !== null) { return ( - - - - - {currentVisitors} current visitor{currentVisitors === 1 ? '' : 's'} - + + + + + + {currentVisitors} current visitor{currentVisitors === 1 ? '' : 's'} + + ) } diff --git a/assets/js/dashboard/stats/graph/top-stats.js b/assets/js/dashboard/stats/graph/top-stats.js index 85f800f47..15846c05c 100644 --- a/assets/js/dashboard/stats/graph/top-stats.js +++ b/assets/js/dashboard/stats/graph/top-stats.js @@ -1,5 +1,6 @@ import React from "react"; import { Tooltip } from '../../util/tooltip' +import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load' import classNames from "classnames"; import numberFormatter, { durationFormatter } from '../../util/number-formatter' import { METRIC_MAPPING } from './graph-util' @@ -47,6 +48,7 @@ export default class TopStats extends React.Component {
{this.topStatNumberLong(stat)} {statName}
{this.canMetricBeGraphed(stat) &&
{this.titleFor(stat)}
} + {stat.name === 'Current visitors' &&

Last updated s ago

}
) } @@ -76,21 +78,35 @@ export default class TopStats extends React.Component { } } - renderStat(stat) { + blinkingDot() { return ( - - {this.topStatNumberShort(stat)} - {this.renderComparison(stat.name, stat.change)} - +
+ ) + } + + renderStatName(stat) { + const { metric } = this.props + const isSelected = metric === METRIC_MAPPING[stat.name] + + const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g) + + const statDisplayNameClass = classNames('text-xs font-bold tracking-wide text-gray-500 uppercase dark:text-gray-400 whitespace-nowrap flex w-content border-b', { + 'text-indigo-700 dark:text-indigo-500 border-indigo-700 dark:border-indigo-500': isSelected, + 'group-hover:text-indigo-700 dark:group-hover:text-indigo-500 border-transparent': !isSelected + }) + + return( +
+ {statDisplayName} + {statExtraName && {statExtraName}} +
) } render() { - const { metric, topStatData, query } = this.props + const { topStatData, query } = this.props const stats = topStatData && topStatData.top_stats.map((stat, index) => { - const isSelected = metric === METRIC_MAPPING[stat.name] - const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g) const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', { 'cursor-pointer': this.canMetricBeGraphed(stat), @@ -99,22 +115,18 @@ export default class TopStats extends React.Component { }) return ( - { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}> -
- {statDisplayName} - {statExtraName && {statExtraName}} -
-
- {this.topStatNumberShort(stat)} - {this.renderComparison(stat.name, stat.change)} -
-
+ { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}> + {this.renderStatName(stat)} +
+ {this.topStatNumberShort(stat)} + {this.renderComparison(stat.name, stat.change)} +
+
) }) if (stats && query && query.period === 'realtime') { - stats.push(
) + stats.push(this.blinkingDot()) } return stats || null; diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js index fbe61e647..a486c66b2 100644 --- a/assets/js/dashboard/stats/graph/visitor-graph.js +++ b/assets/js/dashboard/stats/graph/visitor-graph.js @@ -288,7 +288,7 @@ class LineGraph extends React.Component { return (
- +
@@ -452,7 +452,7 @@ export default class VisitorGraph extends React.Component { return ( - + ) } diff --git a/assets/js/dashboard/util/seconds-since-last-load.js b/assets/js/dashboard/util/seconds-since-last-load.js new file mode 100644 index 000000000..e47330a05 --- /dev/null +++ b/assets/js/dashboard/util/seconds-since-last-load.js @@ -0,0 +1,15 @@ +import { useState, useEffect } from "react"; + +// A function component that renders an integer value of how many +// seconds have passed from the last data load on the dashboard. +// Updates the value every second when the component is visible. +export function SecondsSinceLastLoad({ lastLoadTimestamp }) { + const [timeNow, setTimeNow] = useState(new Date()) + + useEffect(() => { + const interval = setInterval(() => setTimeNow(new Date()), 1000) + return () => clearInterval(interval) + }, []); + + return Math.round(Math.abs(lastLoadTimestamp - timeNow) / 1000) +} diff --git a/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex b/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex index ea34a30ef..8bed44247 100644 --- a/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex +++ b/lib/plausible_web/templates/stats/waiting_first_pageview.html.eex @@ -23,7 +23,7 @@

Waiting for first pageview

on <%= @site.domain %>

-
+

Need to see the snippet again? <%= link("Click here", to: "/#{URI.encode_www_form(@site.domain)}/snippet", class: "text-indigo-600 dark:text-indigo-500 text-underline")%>
Not working? <%= link("Troubleshoot the integration", to: "https://plausible.io/docs/troubleshoot-integration#keep-seeing-a-blinking-green-dot", class: "text-indigo-600 dark:text-indigo-500 text-underline", rel: "noreferrer") %> with our guide