diff --git a/lib/plausible/google/api.ex b/lib/plausible/google/api.ex
index d941f3d62..b0c009fd1 100644
--- a/lib/plausible/google/api.ex
+++ b/lib/plausible/google/api.ex
@@ -307,8 +307,6 @@ defmodule Plausible.Google.Api do
{:ok, nil}
{:error, error} ->
- Plausible.ClickhouseRepo.clear_imported_stats_for(site.domain)
-
Sentry.capture_message("Error saving Google analytics data", extra: error)
{:error, error["error"]["message"]}
end
diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.ex
index 143053aa0..3710518f4 100644
--- a/lib/plausible/stats/clickhouse.ex
+++ b/lib/plausible/stats/clickhouse.ex
@@ -23,6 +23,14 @@ defmodule Plausible.Stats.Clickhouse do
end
end
+ def imported_pageview_count(site) do
+ Plausible.ClickhouseRepo.one(
+ from i in "imported_visitors",
+ where: i.site_id == ^site.id,
+ select: sum(i.pageviews)
+ )
+ end
+
def usage_breakdown(domains) do
range =
Date.range(
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.ex
index 1e8f39acd..21d92ccc0 100644
--- a/lib/plausible_web/controllers/site_controller.ex
+++ b/lib/plausible_web/controllers/site_controller.ex
@@ -170,12 +170,20 @@ defmodule PlausibleWeb.SiteController do
def settings_general(conn, _params) do
site =
conn.assigns[:site]
- |> Repo.preload([:custom_domain, :google_auth])
+ |> Repo.preload([:custom_domain])
+
+ imported_pageviews =
+ if site.imported_data do
+ Plausible.Stats.Clickhouse.imported_pageview_count(site)
+ else
+ 0
+ end
conn
|> assign(:skip_plausible_tracking, true)
|> render("settings_general.html",
site: site,
+ imported_pageviews: imported_pageviews,
changeset: Plausible.Site.changeset(site, %{}),
layout: {PlausibleWeb.LayoutView, "site_settings.html"}
)
@@ -712,6 +720,14 @@ defmodule PlausibleWeb.SiteController do
cond do
site.imported_data ->
+ Oban.cancel_all_jobs(
+ from(j in Oban.Job,
+ where:
+ j.queue == "google_analytics_imports" and
+ fragment("(? ->> 'site_id')::int", j.args) == ^site.id
+ )
+ )
+
Plausible.Imported.forget(site)
site
@@ -719,7 +735,7 @@ defmodule PlausibleWeb.SiteController do
|> Repo.update!()
conn
- |> put_flash(:success, "Imported data has been forgotten")
+ |> put_flash(:success, "Imported data has been cleared")
|> redirect(to: Routes.site_path(conn, :settings_general, site.domain))
true ->
diff --git a/lib/plausible_web/templates/site/settings_general.html.eex b/lib/plausible_web/templates/site/settings_general.html.eex
index eb7157a31..aadc764a1 100644
--- a/lib/plausible_web/templates/site/settings_general.html.eex
+++ b/lib/plausible_web/templates/site/settings_general.html.eex
@@ -59,23 +59,36 @@
<%= if Keyword.get(Application.get_env(:plausible, :google), :client_id) do %>
<%= cond do %>
<% @site.imported_data && @site.imported_data.status == "importing" -> %>
-
-
We are importing data from <%= @site.imported_data.source %> in the background... You will receive an email when it's completed
+
+
+
+ Import from <%= @site.imported_data.source %>
+
+
+
+ From <%= PlausibleWeb.EmailView.date_format(@site.imported_data.start_date) %> to <%= PlausibleWeb.EmailView.date_format(@site.imported_data.end_date) %>
+