From baec7d5d087769fa1f97d82abb1dbe4420f5614b Mon Sep 17 00:00:00 2001 From: Robert Joonas Date: Mon, 1 Apr 2024 13:11:13 +0100 Subject: [PATCH] fetch top stats and graph async --- assets/js/dashboard/stats/graph/graph-util.js | 24 ++++++--- .../js/dashboard/stats/graph/visitor-graph.js | 53 +++++++++++-------- 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/assets/js/dashboard/stats/graph/graph-util.js b/assets/js/dashboard/stats/graph/graph-util.js index c517d27f6..728cd6bdd 100644 --- a/assets/js/dashboard/stats/graph/graph-util.js +++ b/assets/js/dashboard/stats/graph/graph-util.js @@ -1,5 +1,23 @@ import numberFormatter, {durationFormatter} from '../../util/number-formatter' +export function getGraphableMetrics(query) { + const isRealtime = query.period === 'realtime' + const isGoalFilter = !!query.filters.goal + const isPageFilter = !!query.filters.page + + if (isRealtime && isGoalFilter) { + return ["visitors"] + } else if (isRealtime) { + return ["visitors", "pageviews"] + } else if (isGoalFilter) { + return ["visitors", "events", "conversion_rate"] + } else if (isPageFilter) { + return ["visitors", "visits", "pageviews", "bounce_rate", "time_on_page"] + } else { + return ["visitors", "visits", "pageviews", "views_per_visit", "bounce_rate", "visit_duration"] + } +} + export const METRIC_LABELS = { 'visitors': 'Visitors', 'pageviews': 'Pageviews', @@ -28,12 +46,6 @@ export const METRIC_FORMATTER = { 'average_revenue': numberFormatter, } -export const LoadingState = { - loading: 0, - updatingGraph: 1, - loaded: 2 -} - const buildComparisonDataset = function(comparisonPlot) { if (!comparisonPlot) return [] diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js index 50b2bc124..667840502 100644 --- a/assets/js/dashboard/stats/graph/visitor-graph.js +++ b/assets/js/dashboard/stats/graph/visitor-graph.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef, useCallback } from 'react'; import * as api from '../../api' import * as storage from '../../util/storage' -import { LoadingState } from './graph-util' +import { getGraphableMetrics } from './graph-util' import TopStats from './top-stats'; import { IntervalPicker, getCurrentInterval } from './interval-picker' import StatsExport from './stats-export' @@ -34,26 +34,35 @@ export default function VisitorGraph(props) { const topStatsBoundary = useRef(null) - const [loading, setLoading] = useState(LoadingState.loading) const [topStatData, setTopStatData] = useState(null) + const [topStatsLoading, setTopStatsLoading] = useState(true) const [graphData, setGraphData] = useState(null) + const [graphLoading, setGraphLoading] = useState(true) + + // This state is explicitly meant for the situation where either graph interval + // or graph metric is changed. That results in behaviour where Top Stats stay + // intact, but the graph container alone will display a loading spinner for as + // long as new graph data is fetched. + const [graphRefreshing, setGraphRefreshing] = useState(false) + const onIntervalUpdate = useCallback((newInterval) => { setGraphData(null) - setLoading(LoadingState.updatingGraph) + setGraphRefreshing(true) fetchGraphData(getStoredMetric(), newInterval) }, [query]) const onMetricUpdate = useCallback((newMetric) => { setGraphData(null) - setLoading(LoadingState.updatingGraph) + setGraphRefreshing(true) fetchGraphData(newMetric, getCurrentInterval(site, query)) }, [query]) useEffect(() => { setTopStatData(null) + setTopStatsLoading(true) setGraphData(null) - setLoading(LoadingState.loading) + setGraphLoading(true) fetchTopStatsAndGraphData() if (isRealtime) { @@ -73,26 +82,28 @@ export default function VisitorGraph(props) { fetchTopStats(site, query) .then((res) => { setTopStatData(res) - - let metric = getStoredMetric() - const availableMetrics = res.top_stats.filter(stat => !!stat.graph_metric).map(stat => stat.graph_metric) - - if (!availableMetrics.includes(metric)) { - metric = availableMetrics[0] - storage.setItem(`metric__${site.domain}`, metric) - } - - const interval = getCurrentInterval(site, query) - - fetchGraphData(metric, interval) + setTopStatsLoading(false) }) + + let metric = getStoredMetric() + const availableMetrics = getGraphableMetrics(query) + + if (!availableMetrics.includes(metric)) { + metric = availableMetrics[0] + storage.setItem(`metric__${site.domain}`, metric) + } + + const interval = getCurrentInterval(site, query) + + fetchGraphData(metric, interval) } function fetchGraphData(metric, interval) { fetchMainGraph(site, query, metric, interval) .then((res) => { setGraphData(res) - setLoading(LoadingState.loaded) + setGraphLoading(false) + setGraphRefreshing(false) }) } @@ -119,13 +130,13 @@ export default function VisitorGraph(props) { return (
- {loading === LoadingState.loading && renderLoader()} - + {(topStatsLoading || graphLoading) && renderLoader()} +
- {loading === LoadingState.updatingGraph && renderLoader()} + {graphRefreshing && renderLoader()}
{!isRealtime && }