Compare commits

...

5 Commits

@ -4,43 +4,62 @@ import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load'
import classNames from "classnames"; import classNames from "classnames";
import numberFormatter, { durationFormatter } from '../../util/number-formatter' import numberFormatter, { durationFormatter } from '../../util/number-formatter'
import { METRIC_MAPPING } from './graph-util' import { METRIC_MAPPING } from './graph-util'
import { parseUTCDate, formatDayShort } from '../../util/date.js'
function Maybe({condition, children}) {
if (condition) {
return children
} else {
return null
}
}
export default class TopStats extends React.Component { export default class TopStats extends React.Component {
renderComparison(name, comparison) { renderPercentageComparison(name, comparison, forceDarkMode = false) {
const formattedComparison = numberFormatter(Math.abs(comparison)) const formattedComparison = numberFormatter(Math.abs(comparison))
const defaultClassName = classNames({
"text-xs dark:text-gray-100": !forceDarkMode,
"text-xs text-gray-100": forceDarkMode
})
const noChangeClassName = classNames({
"text-xs text-gray-700 dark:text-gray-300": !forceDarkMode,
"text-xs text-gray-300": forceDarkMode
})
if (comparison > 0) { if (comparison > 0) {
const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500' const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500'
return <span className="text-xs dark:text-gray-100"><span className={color + ' font-bold'}>&uarr;</span> {formattedComparison}%</span> return <span className={defaultClassName}><span className={color + ' font-bold'}>&uarr;</span> {formattedComparison}%</span>
} else if (comparison < 0) { } else if (comparison < 0) {
const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400' const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400'
return <span className="text-xs dark:text-gray-100"><span className={color + ' font-bold'}>&darr;</span> {formattedComparison}%</span> return <span className={defaultClassName}><span className={color + ' font-bold'}>&darr;</span> {formattedComparison}%</span>
} else if (comparison === 0) { } else if (comparison === 0) {
return <span className="text-xs text-gray-700 dark:text-gray-300">&#12336; 0%</span> return <span className={noChangeClassName}>&#12336; 0%</span>
} }
} }
topStatNumberShort(stat) { topStatNumberShort(name, value) {
if (['visit duration', 'time on page'].includes(stat.name.toLowerCase())) { if (['visit duration', 'time on page'].includes(name.toLowerCase())) {
return durationFormatter(stat.value) return durationFormatter(value)
} else if (['bounce rate', 'conversion rate'].includes(stat.name.toLowerCase())) { } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {
return stat.value + '%' return value + '%'
} else { } else {
return numberFormatter(stat.value) return numberFormatter(value)
} }
} }
topStatNumberLong(stat) { topStatNumberLong(name, value) {
if (['visit duration', 'time on page'].includes(stat.name.toLowerCase())) { if (['visit duration', 'time on page'].includes(name.toLowerCase())) {
return durationFormatter(stat.value) return durationFormatter(value)
} else if (['bounce rate', 'conversion rate'].includes(stat.name.toLowerCase())) { } else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {
return stat.value + '%' return value + '%'
} else { } else {
return stat.value.toLocaleString() return (value || 0).toLocaleString()
} }
} }
topStatTooltip(stat) { topStatTooltip(stat, query) {
let statName = stat.name.toLowerCase() let statName = stat.name.toLowerCase()
statName = stat.value === 1 ? statName.slice(0, -1) : statName statName = stat.value === 1 ? statName.slice(0, -1) : statName
@ -49,7 +68,15 @@ export default class TopStats extends React.Component {
return ( return (
<div> <div>
<div className="whitespace-nowrap">{this.topStatNumberLong(stat)} {statName}</div> {query.comparison && <div className="whitespace-nowrap">
{this.topStatNumberLong(stat.name, stat.value)} vs. {this.topStatNumberLong(stat.name, stat.comparison_value)} {statName}
<span className="ml-2">{this.renderPercentageComparison(stat.name, stat.change, true)}</span>
</div>}
{!query.comparison && <div className="whitespace-nowrap">
{this.topStatNumberLong(stat.name, stat.value)} {statName}
</div>}
{stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp}/>s ago</p>} {stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp}/>s ago</p>}
{stat.name === 'Views per visit' && showingImported && <p className="font-normal text-xs whitespace-nowrap">Based only on native data</p>} {stat.name === 'Views per visit' && showingImported && <p className="font-normal text-xs whitespace-nowrap">Based only on native data</p>}
</div> </div>
@ -105,12 +132,42 @@ export default class TopStats extends React.Component {
'border-r lg:border-r-0': index % 2 === 0 'border-r lg:border-r-0': index % 2 === 0
}) })
const formatRange = (from, to) => {
if (!from || !to) return
from = parseUTCDate(from)
to = parseUTCDate(to)
if (from.getTime() == to.getTime()) {
return formatDayShort(from, true)
} else {
const includeFromYear = from.getFullYear() != to.getFullYear()
return `${formatDayShort(from, includeFromYear)} - ${formatDayShort(to, true)}`
}
}
return ( return (
<Tooltip key={stat.name} info={this.topStatTooltip(stat)} className={className} onClick={() => { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}> <Tooltip key={stat.name} info={this.topStatTooltip(stat, query)} className={className} onClick={() => { this.maybeUpdateMetric(stat) }} boundary={this.props.tooltipBoundary}>
{this.renderStatName(stat)} {this.renderStatName(stat)}
<div className="flex items-center justify-between my-1 whitespace-nowrap"> <div className="my-1 space-y-2">
<b className="mr-4 text-xl md:text-2xl dark:text-gray-100" id={METRIC_MAPPING[stat.name]}>{this.topStatNumberShort(stat)}</b> <div>
{this.renderComparison(stat.name, stat.change)} <span className="flex items-center justify-between whitespace-nowrap">
<p className="font-bold text-xl dark:text-gray-100" id={METRIC_MAPPING[stat.name]}>{this.topStatNumberShort(stat.name, stat.value)}</p>
<Maybe condition={!query.comparison}>
{this.renderPercentageComparison(stat.name, stat.change)}
</Maybe>
</span>
<Maybe condition={query.comparison}>
<p className="text-xs dark:text-gray-100">{ formatRange(topStatData.from, topStatData.to) }</p>
</Maybe>
</div>
<Maybe condition={query.comparison}>
<div>
<p className="font-bold text-xl text-gray-500 dark:text-gray-400">{ this.topStatNumberShort(stat.name, stat.comparison_value) }</p>
<p className="text-xs text-gray-500 dark:text-gray-400">{ formatRange(topStatData.comparing_from, topStatData.comparing_to) }</p>
</div>
</Maybe>
</div> </div>
</Tooltip> </Tooltip>
) )

@ -190,19 +190,29 @@ defmodule PlausibleWeb.Api.StatsController do
site = conn.assigns[:site] site = conn.assigns[:site]
with :ok <- validate_params(params) do with :ok <- validate_params(params) do
query = Query.from(site, params) |> Filters.add_prefix()
comparison_mode = params["comparison"] || "previous_period" comparison_mode = params["comparison"] || "previous_period"
comparison_opts = [from: params["compare_from"], to: params["compare_to"]] comparison_opts = [from: params["compare_from"], to: params["compare_to"]]
query = Query.from(site, params) |> Filters.add_prefix() comparison_query =
case Stats.Comparisons.compare(site, query, comparison_mode, comparison_opts) do
{:ok, query} -> query
{:error, _cause} -> nil
end
{top_stats, sample_percent} = fetch_top_stats(site, query, comparison_mode, comparison_opts) {top_stats, sample_percent} = fetch_top_stats(site, query, comparison_query)
json(conn, %{ json(conn, %{
top_stats: top_stats, top_stats: top_stats,
interval: query.interval, interval: query.interval,
sample_percent: sample_percent, sample_percent: sample_percent,
with_imported: query.include_imported, with_imported: query.include_imported,
imported_source: site.imported_data && site.imported_data.source imported_source: site.imported_data && site.imported_data.source,
comparing_from: comparison_query && comparison_query.date_range.first,
comparing_to: comparison_query && comparison_query.date_range.last,
from: query.date_range.first,
to: query.date_range.last
}) })
else else
{:error, message} when is_binary(message) -> bad_request(conn, message) {:error, message} when is_binary(message) -> bad_request(conn, message)
@ -263,8 +273,7 @@ defmodule PlausibleWeb.Api.StatsController do
defp fetch_top_stats( defp fetch_top_stats(
site, site,
%Query{period: "realtime", filters: %{"event:goal" => _goal}} = query, %Query{period: "realtime", filters: %{"event:goal" => _goal}} = query,
_comparison_mode, _comparison_query
_comparison_opts
) do ) do
query_30m = %Query{query | period: "30m"} query_30m = %Query{query | period: "30m"}
@ -291,12 +300,7 @@ defmodule PlausibleWeb.Api.StatsController do
{stats, 100} {stats, 100}
end end
defp fetch_top_stats( defp fetch_top_stats(site, %Query{period: "realtime"} = query, _comparison_query) do
site,
%Query{period: "realtime"} = query,
_comparison_mode,
_comparison_opts
) do
query_30m = %Query{query | period: "30m"} query_30m = %Query{query | period: "30m"}
%{ %{
@ -322,34 +326,25 @@ defmodule PlausibleWeb.Api.StatsController do
{stats, 100} {stats, 100}
end end
defp fetch_top_stats( defp fetch_top_stats(site, %Query{filters: %{"event:goal" => _goal}} = query, comparison_query) do
site,
%Query{filters: %{"event:goal" => _goal}} = query,
comparison_mode,
comparison_opts
) do
total_q = Query.remove_event_filters(query, [:goal, :props]) total_q = Query.remove_event_filters(query, [:goal, :props])
{prev_converted_visitors, prev_completions} = {prev_converted_visitors, prev_completions} =
case Stats.Comparisons.compare(site, query, comparison_mode, comparison_opts) do if comparison_query do
{:ok, prev_query} ->
%{visitors: %{value: prev_converted_visitors}, events: %{value: prev_completions}} = %{visitors: %{value: prev_converted_visitors}, events: %{value: prev_completions}} =
Stats.aggregate(site, prev_query, [:visitors, :events]) Stats.aggregate(site, comparison_query, [:visitors, :events])
{prev_converted_visitors, prev_completions} {prev_converted_visitors, prev_completions}
else
{:error, :not_supported} ->
{nil, nil} {nil, nil}
end end
prev_unique_visitors = prev_unique_visitors =
case Stats.Comparisons.compare(site, total_q, comparison_mode) do if comparison_query do
{:ok, prev_total_query} ->
site site
|> Stats.aggregate(prev_total_query, [:visitors]) |> Stats.aggregate(comparison_query, [:visitors])
|> get_in([:visitors, :value]) |> get_in([:visitors, :value])
else
{:error, :not_supported} ->
nil nil
end end
@ -369,21 +364,25 @@ defmodule PlausibleWeb.Api.StatsController do
%{ %{
name: "Unique visitors", name: "Unique visitors",
value: unique_visitors, value: unique_visitors,
comparison_value: prev_unique_visitors,
change: percent_change(prev_unique_visitors, unique_visitors) change: percent_change(prev_unique_visitors, unique_visitors)
}, },
%{ %{
name: "Unique conversions", name: "Unique conversions",
value: converted_visitors, value: converted_visitors,
comparison_value: prev_converted_visitors,
change: percent_change(prev_converted_visitors, converted_visitors) change: percent_change(prev_converted_visitors, converted_visitors)
}, },
%{ %{
name: "Total conversions", name: "Total conversions",
value: completions, value: completions,
comparison_value: prev_completions,
change: percent_change(prev_completions, completions) change: percent_change(prev_completions, completions)
}, },
%{ %{
name: "Conversion rate", name: "Conversion rate",
value: conversion_rate, value: conversion_rate,
comparison_value: prev_conversion_rate,
change: percent_change(prev_conversion_rate, conversion_rate) change: percent_change(prev_conversion_rate, conversion_rate)
} }
] ]
@ -391,7 +390,7 @@ defmodule PlausibleWeb.Api.StatsController do
{stats, 100} {stats, 100}
end end
defp fetch_top_stats(site, query, comparison_mode, comparison_opts) do defp fetch_top_stats(site, query, comparison_query) do
metrics = metrics =
if query.filters["event:page"] do if query.filters["event:page"] do
[ [
@ -416,12 +415,7 @@ defmodule PlausibleWeb.Api.StatsController do
end end
current_results = Stats.aggregate(site, query, metrics) current_results = Stats.aggregate(site, query, metrics)
prev_results = comparison_query && Stats.aggregate(site, comparison_query, metrics)
prev_results =
case Stats.Comparisons.compare(site, query, comparison_mode, comparison_opts) do
{:ok, prev_results_query} -> Stats.aggregate(site, prev_results_query, metrics)
{:error, :not_supported} -> nil
end
stats = stats =
[ [
@ -444,7 +438,7 @@ defmodule PlausibleWeb.Api.StatsController do
prev_value = get_in(prev_results, [key, :value]) prev_value = get_in(prev_results, [key, :value])
change = prev_value && calculate_change(key, prev_value, value) change = prev_value && calculate_change(key, prev_value, value)
%{name: name, value: value, change: change} %{name: name, value: value, comparison_value: prev_value, change: change}
end end
end end

@ -16,7 +16,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "counts total pageviews", %{conn: conn, site: site} do test "counts total pageviews", %{conn: conn, site: site} do
@ -29,7 +35,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Total pageviews", "value" => 3, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Total pageviews",
"value" => 3
} in res["top_stats"]
end end
test "counts total visits", %{conn: conn, site: site} do test "counts total visits", %{conn: conn, site: site} do
@ -43,7 +55,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Total visits", "value" => 3, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Total visits", "value" => 3} in res[
"top_stats"
]
end end
test "counts pages per visit", %{conn: conn, site: site} do test "counts pages per visit", %{conn: conn, site: site} do
@ -57,7 +72,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Views per visit", "value" => 1.33, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0.0,
"name" => "Views per visit",
"value" => 1.33
} in res["top_stats"]
end end
test "calculates bounce rate", %{conn: conn, site: site} do test "calculates bounce rate", %{conn: conn, site: site} do
@ -70,7 +91,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Bounce rate", "value" => 50, "change" => nil} in res["top_stats"]
assert %{"change" => nil, "comparison_value" => 0, "name" => "Bounce rate", "value" => 50} in res[
"top_stats"
]
end end
test "calculates average visit duration", %{conn: conn, site: site} do test "calculates average visit duration", %{conn: conn, site: site} do
@ -91,7 +115,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01") conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01")
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Visit duration", "value" => 450, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Visit duration",
"value" => 450
} in res["top_stats"]
end end
test "calculates time on page instead when filtered for page", %{conn: conn, site: site} do test "calculates time on page instead when filtered for page", %{conn: conn, site: site} do
@ -121,7 +151,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 900, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Time on page", "value" => 900} in res[
"top_stats"
]
end end
test "calculates time on page when filtered for multiple pages", %{ test "calculates time on page when filtered for multiple pages", %{
@ -159,7 +192,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 480, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Time on page", "value" => 480} in res[
"top_stats"
]
end end
test "calculates time on page when filtered for multiple negated pages", %{ test "calculates time on page when filtered for multiple negated pages", %{
@ -197,7 +233,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 60, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Time on page", "value" => 60} in res[
"top_stats"
]
end end
test "calculates time on page when filtered for multiple wildcard pages", %{ test "calculates time on page when filtered for multiple wildcard pages", %{
@ -236,7 +275,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 480, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Time on page", "value" => 480} in res[
"top_stats"
]
end end
test "calculates time on page when filtered for multiple negated wildcard pages", %{ test "calculates time on page when filtered for multiple negated wildcard pages", %{
@ -277,7 +319,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Time on page", "value" => 600, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Time on page", "value" => 600} in res[
"top_stats"
]
end end
end end
@ -312,12 +357,42 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert res["top_stats"] == [ assert res["top_stats"] == [
%{"name" => "Unique visitors", "value" => 3, "change" => 100}, %{
%{"name" => "Total visits", "value" => 3, "change" => 100}, "change" => 100,
%{"name" => "Total pageviews", "value" => 4, "change" => 100}, "comparison_value" => 0,
%{"name" => "Views per visit", "value" => 1.5, "change" => 100}, "name" => "Unique visitors",
%{"name" => "Bounce rate", "value" => 33, "change" => nil}, "value" => 3
%{"name" => "Visit duration", "value" => 303, "change" => 100} },
%{
"change" => 100,
"comparison_value" => 0,
"name" => "Total visits",
"value" => 3
},
%{
"change" => 100,
"comparison_value" => 0,
"name" => "Total pageviews",
"value" => 4
},
%{
"change" => 100,
"comparison_value" => 0.0,
"name" => "Views per visit",
"value" => 1.5
},
%{
"change" => nil,
"comparison_value" => 0,
"name" => "Bounce rate",
"value" => 33
},
%{
"change" => 100,
"comparison_value" => 0,
"name" => "Visit duration",
"value" => 303
}
] ]
end end
end end
@ -422,7 +497,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "page glob filter", %{conn: conn, site: site} do test "page glob filter", %{conn: conn, site: site} do
@ -441,7 +522,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "contains (~) filter", %{conn: conn, site: site} do test "contains (~) filter", %{conn: conn, site: site} do
@ -460,7 +547,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "returns only visitors with specific screen size", %{conn: conn, site: site} do test "returns only visitors with specific screen size", %{conn: conn, site: site} do
@ -479,7 +572,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "returns only visitors with specific browser", %{conn: conn, site: site} do test "returns only visitors with specific browser", %{conn: conn, site: site} do
@ -498,7 +597,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "returns only visitors with specific operating system", %{conn: conn, site: site} do test "returns only visitors with specific operating system", %{conn: conn, site: site} do
@ -517,7 +622,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 2, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 2
} in res["top_stats"]
end end
test "returns number of visits from one specific referral source", %{conn: conn, site: site} do test "returns number of visits from one specific referral source", %{conn: conn, site: site} do
@ -549,7 +660,10 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Total visits", "value" => 2, "change" => 100} in res["top_stats"]
assert %{"change" => 100, "comparison_value" => 0, "name" => "Total visits", "value" => 2} in res[
"top_stats"
]
end end
end end
@ -573,7 +687,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique visitors", "value" => 3, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique visitors",
"value" => 3
} in res["top_stats"]
end end
test "returns converted visitors", %{conn: conn, site: site} do test "returns converted visitors", %{conn: conn, site: site} do
@ -593,7 +713,13 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
) )
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Unique conversions", "value" => 1, "change" => 100} in res["top_stats"]
assert %{
"change" => 100,
"comparison_value" => 0,
"name" => "Unique conversions",
"value" => 1
} in res["top_stats"]
end end
test "returns conversion rate", %{conn: conn, site: site} do test "returns conversion rate", %{conn: conn, site: site} do
@ -614,7 +740,12 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Conversion rate", "value" => 33.3, "change" => 100} in res["top_stats"] assert %{
"change" => 100,
"comparison_value" => 0.0,
"name" => "Conversion rate",
"value" => 33.3
} in res["top_stats"]
end end
test "returns conversion rate with change=nil when comparison mode disallowed", %{ test "returns conversion rate with change=nil when comparison mode disallowed", %{
@ -638,7 +769,83 @@ defmodule PlausibleWeb.Api.StatsController.TopStatsTest do
res = json_response(conn, 200) res = json_response(conn, 200)
assert %{"name" => "Conversion rate", "value" => 33.3, "change" => nil} in res["top_stats"] assert %{
"change" => nil,
"comparison_value" => nil,
"name" => "Conversion rate",
"value" => 33.3
} in res["top_stats"]
end
end
describe "GET /api/stats/top-stats - with comparisons" do
setup [:create_user, :log_in, :create_new_site]
test "defaults to previous period when comparison is not set", %{site: site, conn: conn} do
populate_stats(site, [
build(:pageview, timestamp: ~N[2020-12-31 00:00:00]),
build(:pageview, timestamp: ~N[2020-12-31 00:00:00]),
build(:pageview, timestamp: ~N[2021-01-01 00:00:00]),
build(:pageview, timestamp: ~N[2021-01-01 00:01:00]),
build(:pageview, timestamp: ~N[2021-01-01 10:00:00])
])
conn = get(conn, "/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01")
res = json_response(conn, 200)
assert %{"change" => 50, "comparison_value" => 2, "name" => "Total visits", "value" => 3} in res[
"top_stats"
]
end
test "returns comparison data when mode is custom", %{site: site, conn: conn} do
populate_stats(site, [
build(:pageview, timestamp: ~N[2020-01-01 00:00:00]),
build(:pageview, timestamp: ~N[2020-01-05 00:00:00]),
build(:pageview, timestamp: ~N[2020-01-20 00:00:00]),
build(:pageview, timestamp: ~N[2020-12-31 00:00:00]),
build(:pageview, timestamp: ~N[2021-01-01 00:00:00]),
build(:pageview, timestamp: ~N[2021-01-01 00:01:00]),
build(:pageview, timestamp: ~N[2021-01-01 10:00:00])
])
conn =
get(
conn,
"/api/stats/#{site.domain}/top-stats?period=day&date=2021-01-01&comparison=custom&compare_from=2020-01-01&compare_to=2020-01-20"
)
res = json_response(conn, 200)
assert %{"change" => 0, "comparison_value" => 3, "name" => "Total visits", "value" => 3} in res[
"top_stats"
]
end
test "returns source query and comparison query date range", %{site: site, conn: conn} do
populate_stats(site, [
build(:pageview, timestamp: ~N[2020-01-01 00:00:00]),
build(:pageview, timestamp: ~N[2020-01-05 00:00:00]),
build(:pageview, timestamp: ~N[2020-01-20 00:00:00]),
build(:pageview, timestamp: ~N[2020-12-31 00:00:00]),
build(:pageview, timestamp: ~N[2021-01-01 00:00:00]),
build(:pageview, timestamp: ~N[2021-01-01 00:01:00]),
build(:pageview, timestamp: ~N[2021-01-01 10:00:00])
])
conn =
get(
conn,
"/api/stats/#{site.domain}/top-stats?period=month&date=2021-01-01&comparison=previous_period"
)
assert %{
"comparing_from" => "2020-12-01",
"comparing_to" => "2020-12-31",
"from" => "2021-01-01",
"to" => "2021-01-31"
} = json_response(conn, 200)
end end
end end
end end

Loading…
Cancel
Save