diff --git a/assets/js/dashboard/stats/graph/visitor-graph.js b/assets/js/dashboard/stats/graph/visitor-graph.js index 50b2bc124..e47cb63b4 100644 --- a/assets/js/dashboard/stats/graph/visitor-graph.js +++ b/assets/js/dashboard/stats/graph/visitor-graph.js @@ -14,7 +14,7 @@ import LineGraphWithRouter from './line-graph' function fetchTopStats(site, query) { const q = { ...query } - + if (!isComparisonEnabled(q.comparison)) { q.comparison = 'previous_period' } @@ -73,10 +73,10 @@ 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) @@ -91,7 +91,7 @@ export default function VisitorGraph(props) { function fetchGraphData(metric, interval) { fetchMainGraph(site, query, metric, interval) .then((res) => { - setGraphData(res) + setGraphData({...res, metric}) setLoading(LoadingState.loaded) }) } diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index e5ef41d63..d2d913022 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -132,7 +132,6 @@ defmodule PlausibleWeb.Api.StatsController do site_import = Plausible.Imported.get_earliest_import(site) json(conn, %{ - metric: metric, plot: plot_timeseries(timeseries_result, metric), labels: labels, comparison_plot: comparison_result && plot_timeseries(comparison_result, metric), @@ -1344,7 +1343,6 @@ defmodule PlausibleWeb.Api.StatsController do metric = case params["metric"] do nil -> :visitors - "conversions" -> :visitors m -> Plausible.Stats.Metrics.from_string!(m) end