From 77a5ecab419a6e4ac1fcd781e06cb2d3f1ec8a3c Mon Sep 17 00:00:00 2001
From: Adrian Gruntkowski
Date: Wed, 25 Oct 2023 14:16:04 +0200
Subject: [PATCH] Integrate batch 24h interval query with plots on sites view
---
.../live/components/visitors24.ex | 8 ++----
lib/plausible_web/live/sites.ex | 27 +++++++++----------
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/lib/plausible_web/live/components/visitors24.ex b/lib/plausible_web/live/components/visitors24.ex
index bf8061958..ed2d768ab 100644
--- a/lib/plausible_web/live/components/visitors24.ex
+++ b/lib/plausible_web/live/components/visitors24.ex
@@ -10,17 +10,13 @@ defmodule PlausibleWeb.Live.Components.Visitors do
# - move under Live.Components or .Components depending on how it turns out,
# - make it render once per site - currently both mounts call it
- attr :site, Plausible.Site, required: true
+ attr :intervals, :list, required: true
attr :height, :integer, default: 50
attr :tick, :integer, default: 20
def chart(assigns) do
- site = assigns.site
- q = Plausible.Stats.Query.from(site, %{"period" => "day", "interval" => "hour"})
-
points =
- site
- |> Plausible.Stats.timeseries(q, [:visitors])
+ assigns.intervals
|> scale(assigns.height)
|> Enum.with_index(fn scaled_value, index ->
"#{(index - 1) * assigns.tick},#{scaled_value}"
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 7f5dd1d93..328afd526 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -55,14 +55,11 @@ defmodule PlausibleWeb.Live.Sites do
<%= for invitation <- @invitations do %>
- <.invitation
- invitation={invitation}
- visitors={Map.get(@visitors, invitation.site.domain, 0)}
- />
+ <.invitation invitation={invitation} hourly_stats={@hourly_stats[invitation.site.domain]} />
<% end %>
<%= for site <- @sites.entries do %>
- <.site site={site} visitors={Map.get(@visitors, site.domain, 0)} />
+ <.site site={site} hourly_stats={@hourly_stats[site.domain]} />
<% end %>
@@ -110,7 +107,7 @@ defmodule PlausibleWeb.Live.Sites do
end
attr :invitation, Plausible.Auth.Invitation, required: true
- attr :visitors, :integer, required: true
+ attr :hourly_stats, :map, required: true
def invitation(assigns) do
~H"""
@@ -137,12 +134,12 @@ defmodule PlausibleWeb.Live.Sites do
-
+
- <%= PlausibleWeb.StatsView.large_number_format(@visitors) %>
+ <%= PlausibleWeb.StatsView.large_number_format(@hourly_stats.visitors) %>
- visitors in last 24h
+ visitors in last 24h
@@ -152,7 +149,7 @@ defmodule PlausibleWeb.Live.Sites do
end
attr :site, Plausible.Site, required: true
- attr :visitors, :integer, required: true
+ attr :hourly_stats, :map, required: true
def site(assigns) do
~H"""
@@ -172,12 +169,12 @@ defmodule PlausibleWeb.Live.Sites do
-
+
- <%= PlausibleWeb.StatsView.large_number_format(@visitors) %>
+ <%= PlausibleWeb.StatsView.large_number_format(@hourly_stats.visitors) %>
- visitors in last 24h
+ visitors in last 24h
@@ -417,8 +414,8 @@ defmodule PlausibleWeb.Live.Sites do
excluded_site_ids = Enum.map(invitations, & &1.site_id)
Sites.list(user, params, exclude_ids: excluded_site_ids, filter_by_domain: filter_text)
end)
- |> assign_fn.(:visitors, fn %{sites: sites, invitations: invitations} ->
- Plausible.Stats.Clickhouse.last_24h_visitors(
+ |> assign_fn.(:hourly_stats, fn %{sites: sites, invitations: invitations} ->
+ Plausible.Stats.Clickhouse.last_24h_visitors_hourly_intervals(
sites.entries ++ Enum.map(invitations, & &1.site)
)
end)