Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Forget has_stats
Uku Taht7c755d7c6de2
diff --git a/lib/plausible/site/schema.ex b/lib/plausible/site/schema.exindex 1a4afe8d65..63b508a9d7 100644--- a/lib/plausible/site/schema.ex+++ b/lib/plausible/site/schema.ex@@ -21,7 +21,6 @@ defmodule Plausible.Site dofield :timezone, :string, default: "Etc/UTC"field :public, :booleanfield :locked, :boolean- field :has_stats, :booleanfield :stats_start_date, :dateembeds_one :imported_data, Plausible.Site.ImportedData, on_replace: :update@@ -60,10 +59,6 @@ defmodule Plausible.Site dochange(site, public: false)end- def set_has_stats(site, has_stats_val) do- change(site, has_stats: has_stats_val)- end-def set_stats_start_date(site, val) dochange(site, stats_start_date: val)enddiff --git a/lib/plausible/sites.ex b/lib/plausible/sites.exindex 48bef5671f..00d32a2040 100644--- a/lib/plausible/sites.ex+++ b/lib/plausible/sites.ex@@ -54,20 +54,7 @@ defmodule Plausible.Sites doenddef has_stats?(site) do- if site.has_stats do- true- else- has_stats = Plausible.Stats.Clickhouse.has_pageviews?(site)-- if has_stats do- Plausible.Site.set_has_stats(site, true)- |> Repo.update()-- true- else- false- end- end+ !!stats_start_date(site)enddef create_shared_link(site, name, password \\ nil) dodiff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.exindex e925904e6a..02acbf4349 100644--- a/lib/plausible_web/controllers/stats_controller.ex+++ b/lib/plausible_web/controllers/stats_controller.ex@@ -7,11 +7,11 @@ defmodule PlausibleWeb.StatsController doplug PlausibleWeb.AuthorizeSiteAccess when action in [:stats, :csv_export]def stats(%{assigns: %{site: site}} = conn, _params) do- has_stats = Plausible.Sites.has_stats?(site)+ stats_start_date = Plausible.Sites.stats_start_date(site)can_see_stats = !site.locked || conn.assigns[:current_user_role] == :super_admincond do- has_stats && can_see_stats ->+ stats_start_date && can_see_stats ->demo = site.domain == PlausibleWeb.Endpoint.host()offer_email_report = get_session(conn, site.domain <> "_offer_email_report")@@ -22,12 +22,13 @@ defmodule PlausibleWeb.StatsController do|> render("stats.html",site: site,has_goals: Plausible.Sites.has_goals?(site),+ stats_start_date: stats_start_date,title: "Plausible · " <> site.domain,offer_email_report: offer_email_report,demo: demo)- !has_stats && can_see_stats ->+ !stats_start_date && can_see_stats ->conn|> assign(:skip_plausible_tracking, true)|> render("waiting_first_pageview.html", site: site)@@ -177,6 +178,7 @@ defmodule PlausibleWeb.StatsController do|> render("stats.html",site: shared_link.site,has_goals: Plausible.Sites.has_goals?(shared_link.site),+ stats_start_date: shared_link.site.stats_start_date,title: "Plausible · " <> shared_link.site.domain,offer_email_report: false,demo: false,diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eexindex 2bf46a964f..76fb8bb7fc 100644--- a/lib/plausible_web/templates/stats/stats.html.eex+++ b/lib/plausible_web/templates/stats/stats.html.eex@@ -12,7 +12,7 @@<% end %><div class="pt-6"></div>- <div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= [email protected][:current_user] %>" data-stats-begin="<%= @site.stats_start_date %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div>+ <div id="stats-react-container" style="overflow-anchor: none;" data-domain="<%= @site.domain %>" data-offset="<%= Timex.Timezone.total_offset(Timex.Timezone.get(@site.timezone)) %>" data-has-goals="<%= @has_goals %>" data-logged-in="<%= [email protected][:current_user] %>" data-stats-begin="<%= @stats_start_date %>" data-shared-link-auth="<%= assigns[:shared_link_auth] %>" data-embedded="<%= @conn.assigns[:embedded] %>" data-background="<%= @conn.assigns[:background] %>" data-selfhosted="<%= Application.get_env(:plausible, :is_selfhost) %>" data-current-user-role="<%= @conn.assigns[:current_user_role] %>"></div><div id="modal_root"></div><%= if [email protected][:current_user] && @conn.assigns[:demo] do %><div class="bg-gray-50 dark:bg-gray-850">diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exsindex 492bfa44a7..0c37aea0f4 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/site/sites_test.exs@@ -66,18 +66,5 @@ defmodule Plausible.SitesTest doassert Sites.has_stats?(site)end-- test "memoizes has_stats value" do- site = insert(:site)-- populate_stats(site, [- build(:pageview)- ])-- refute site.has_stats-- assert Sites.has_stats?(site)- assert Repo.reload!(site).has_stats- endendend