diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js
index 15e263955..f391bf3a4 100644
--- a/assets/js/dashboard/datepicker.js
+++ b/assets/js/dashboard/datepicker.js
@@ -98,10 +98,10 @@ class DatePicker extends React.Component {
return (
this.dropDownNode = node}>
{this.timeFrameText()}
-
diff --git a/assets/js/dashboard/stats/more-link.js b/assets/js/dashboard/stats/more-link.js
index 8aab864e5..c32bc9e6e 100644
--- a/assets/js/dashboard/stats/more-link.js
+++ b/assets/js/dashboard/stats/more-link.js
@@ -6,7 +6,7 @@ export default function MoreLink({site, list, endpoint}) {
return (
diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js
index afe12e339..faf6fef08 100644
--- a/assets/js/dashboard/stats/visitor-graph.js
+++ b/assets/js/dashboard/stats/visitor-graph.js
@@ -6,7 +6,7 @@ import { eventName } from '../query'
import numberFormatter, {durationFormatter} from '../number-formatter'
import * as api from '../api'
-function mainSet(plot, present_index, ctx, label) {
+function buildDataSet(plot, present_index, ctx, label) {
var gradient = ctx.createLinearGradient(0, 0, 0, 300);
gradient.addColorStop(0, 'rgba(101,116,205, 0.2)');
gradient.addColorStop(1, 'rgba(101,116,205, 0)');
@@ -47,57 +47,6 @@ function mainSet(plot, present_index, ctx, label) {
}
}
-function compareSet(plot, present_index, ctx) {
- var gradient = ctx.createLinearGradient(0, 0, 0, 300);
- gradient.addColorStop(0, 'rgba(255, 68, 87, .2)');
- gradient.addColorStop(1, 'rgba(255, 68, 87, 0)');
-
- if (present_index) {
- var dashedPart = plot.slice(present_index - 1);
- var dashedPlot = (new Array(plot.length - dashedPart.length)).concat(dashedPart)
- for(var i = present_index; i < plot.length; i++) {
- plot[i] = undefined
- }
-
- return [{
- label: 'Conversions',
- data: plot,
- borderWidth: 3,
- borderColor: 'rgba(255, 68, 87, 1)',
- pointBackgroundColor: 'rgba(255, 68, 87, 1)',
- backgroundColor: gradient,
- },
- {
- label: 'Conversions',
- data: dashedPlot,
- borderWidth: 3,
- borderDash: [5, 10],
- borderColor: 'rgba(255, 68, 87, 1)',
- pointBackgroundColor: 'rgba(255, 68, 87, 1)',
- backgroundColor: gradient,
- }]
- } else {
- return [{
- label: 'Conversions',
- data: plot,
- borderWidth: 3,
- borderColor: 'rgba(255, 68, 87, 1)',
- pointBackgroundColor: 'rgba(255, 68, 87, 1)',
- backgroundColor: gradient,
- }]
- }
-}
-
-function dataSets(graphData, ctx) {
- const dataSets = mainSet(graphData.plot, graphData.present_index, ctx, graphData.interval === 'minute' ? 'Pageviews' : 'Visitors')
-
- if (graphData.compare_plot) {
- return dataSets.concat(compareSet(graphData.compare_plot, graphData.present_index, ctx))
- } else {
- return dataSets
- }
-}
-
const MONTHS = [
"January", "February", "March",
"April", "May", "June", "July",
@@ -136,12 +85,14 @@ class LineGraph extends React.Component {
componentDidMount() {
const {graphData} = this.props
this.ctx = document.getElementById("main-graph-canvas").getContext('2d');
+ const label = this.props.query.filters.goal ? 'Converted visitors' : graphData.interval === 'minute' ? 'Pageviews' : 'Visitors'
+ const dataSet = buildDataSet(graphData.plot, graphData.present_index, this.ctx, label)
this.chart = new Chart(this.ctx, {
type: 'line',
data: {
labels: graphData.labels,
- datasets: dataSets(graphData, this.ctx)
+ datasets: dataSet
},
options: {
animation: false,
@@ -296,7 +247,7 @@ class LineGraph extends React.Component {
return (
-
+
)
}
diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex
index a24302046..b11d8cba8 100644
--- a/lib/plausible/stats/clickhouse.ex
+++ b/lib/plausible/stats/clickhouse.ex
@@ -34,7 +34,7 @@ defmodule Plausible.Stats.Clickhouse do
groups =
Clickhouse.all(
- from e in base_query(site, %{query | filters: %{}}),
+ from e in base_query(site, query),
select:
{fragment("toStartOfMonth(toTimeZone(?, ?)) as month", e.timestamp, ^site.timezone),
fragment("uniq(?) as visitors", e.user_id)},
@@ -44,30 +44,15 @@ defmodule Plausible.Stats.Clickhouse do
|> Enum.map(fn row -> {row["month"], row["visitors"]} end)
|> Enum.into(%{})
- compare_groups =
- if query.filters["goal"] do
- Clickhouse.all(
- from e in base_query(site, query),
- select:
- {fragment("toStartOfMonth(toTimeZone(?, ?)) as month", e.timestamp, ^site.timezone),
- fragment("uniq(?) as visitors", e.user_id)},
- group_by: fragment("month"),
- order_by: fragment("month")
- )
- |> Enum.map(fn row -> {row["month"], row["visitors"]} end)
- |> Enum.into(%{})
- end
-
present_index =
Enum.find_index(steps, fn step ->
step == Timex.now(site.timezone) |> Timex.to_date() |> Timex.beginning_of_month()
end)
plot = Enum.map(steps, fn step -> groups[step] || 0 end)
- compare_plot = compare_groups && Enum.map(steps, fn step -> compare_groups[step] || 0 end)
labels = Enum.map(steps, fn step -> Timex.format!(step, "{ISOdate}") end)
- {plot, compare_plot, labels, present_index}
+ {plot, labels, present_index}
end
def calculate_plot(site, %Query{step_type: "date"} = query) do
@@ -75,7 +60,7 @@ defmodule Plausible.Stats.Clickhouse do
groups =
Clickhouse.all(
- from e in base_query(site, %{query | filters: %{}}),
+ from e in base_query(site, query),
select:
{fragment("toDate(toTimeZone(?, ?)) as day", e.timestamp, ^site.timezone),
fragment("uniq(?) as visitors", e.user_id)},
@@ -85,29 +70,14 @@ defmodule Plausible.Stats.Clickhouse do
|> Enum.map(fn row -> {row["day"], row["visitors"]} end)
|> Enum.into(%{})
- compare_groups =
- if query.filters["goal"] do
- Clickhouse.all(
- from e in base_query(site, query),
- select:
- {fragment("toDate(toTimeZone(?, ?)) as day", e.timestamp, ^site.timezone),
- fragment("uniq(?) as visitors", e.user_id)},
- group_by: fragment("day"),
- order_by: fragment("day")
- )
- |> Enum.map(fn row -> {row["day"], row["visitors"]} end)
- |> Enum.into(%{})
- end
-
present_index =
Enum.find_index(steps, fn step -> step == Timex.now(site.timezone) |> Timex.to_date() end)
steps_to_show = if present_index, do: present_index + 1, else: Enum.count(steps)
plot = Enum.map(steps, fn step -> groups[step] || 0 end) |> Enum.take(steps_to_show)
- compare_plot = compare_groups && Enum.map(steps, fn step -> compare_groups[step] || 0 end)
labels = Enum.map(steps, fn step -> Timex.format!(step, "{ISOdate}") end)
- {plot, compare_plot, labels, present_index}
+ {plot, labels, present_index}
end
def calculate_plot(site, %Query{step_type: "hour"} = query) do
@@ -115,7 +85,7 @@ defmodule Plausible.Stats.Clickhouse do
groups =
Clickhouse.all(
- from e in base_query(site, %{query | filters: %{}}),
+ from e in base_query(site, query),
select:
{fragment("toHour(toTimeZone(?, ?)) as hour", e.timestamp, ^site.timezone),
fragment("uniq(?) as visitors", e.user_id)},
@@ -125,20 +95,6 @@ defmodule Plausible.Stats.Clickhouse do
|> Enum.map(fn row -> {row["hour"], row["visitors"]} end)
|> Enum.into(%{})
- compare_groups =
- if query.filters["goal"] do
- Clickhouse.all(
- from e in base_query(site, query),
- select:
- {fragment("toHour(toTimeZone(?, ?)) as hour", e.timestamp, ^site.timezone),
- fragment("uniq(?) as visitors", e.user_id)},
- group_by: fragment("hour"),
- order_by: fragment("hour")
- )
- |> Enum.map(fn row -> {row["hour"], row["visitors"]} end)
- |> Enum.into(%{})
- end
-
now = Timex.now(site.timezone)
is_today = Timex.to_date(now) == query.date_range.first
present_index = is_today && Enum.find_index(steps, fn step -> step == now.hour end)
@@ -152,8 +108,7 @@ defmodule Plausible.Stats.Clickhouse do
end)
plot = Enum.map(steps, fn step -> groups[step] || 0 end) |> Enum.take(steps_to_show)
- compare_plot = compare_groups && Enum.map(steps, fn step -> compare_groups[step] || 0 end)
- {plot, compare_plot, labels, present_index}
+ {plot, labels, present_index}
end
def calculate_plot(site, %Query{period: "realtime"}) do
@@ -174,7 +129,7 @@ defmodule Plausible.Stats.Clickhouse do
labels = Enum.into(-30..-1, [])
plot = Enum.map(labels, fn label -> groups[label] || 0 end)
- {plot, nil, labels, nil}
+ {plot, labels, nil}
end
def bounce_rate(site, query) do
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index 884f97946..331eae7ac 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -11,11 +11,10 @@ defmodule PlausibleWeb.Api.StatsController do
plot_task = Task.async(fn -> Stats.calculate_plot(site, query) end)
top_stats = fetch_top_stats(site, query)
- {plot, compare_plot, labels, present_index} = Task.await(plot_task)
+ {plot, labels, present_index} = Task.await(plot_task)
json(conn, %{
plot: plot,
- compare_plot: compare_plot,
labels: labels,
present_index: present_index,
top_stats: top_stats,
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index cd2e5ccb2..47a8d3bba 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -44,7 +44,7 @@ defmodule PlausibleWeb.StatsController do
site = conn.assigns[:site]
query = Query.from(site.timezone, conn.params)
- {plot, _, labels, _} = Stats.calculate_plot(site, query)
+ {plot, labels, _} = Stats.calculate_plot(site, query)
csv_content =
Enum.zip(labels, plot)