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
Add error state when no data is returned from GA API
Uku Taht30b3cc1ed6fd
diff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 188d71c7a5..31f2990895 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -654,7 +654,6 @@ defmodule PlausibleWeb.SiteController dodef import_from_google_view_id_form(conn, %{"access_token" => access_token}) dosite = conn.assigns[:site]-view_ids = Plausible.Google.Api.get_analytics_view_ids(access_token)conn@@ -674,6 +673,20 @@ defmodule PlausibleWeb.SiteController dostart_date = Plausible.Google.Api.get_analytics_start_date(view_id, access_token)case start_date do+ {:ok, nil} ->+ site = conn.assigns[:site]+ view_ids = Plausible.Google.Api.get_analytics_view_ids(access_token)++ conn+ |> assign(:skip_plausible_tracking, true)+ |> render("import_from_google_view_id_form.html",+ access_token: access_token,+ site: site,+ view_ids: view_ids,+ selected_view_id_error: "No data found. Nothing to import",+ layout: {PlausibleWeb.LayoutView, "focus.html"}+ )+{:ok, date} ->if Timex.before?(date, @google_analytics_new_user_metric_date) doredirect(conn,diff --git a/lib/plausible_web/templates/site/import_from_google_view_id_form.html.eex b/lib/plausible_web/templates/site/import_from_google_view_id_form.html.eexindex 330680a9e6..e6e9df24ac 100644--- a/lib/plausible_web/templates/site/import_from_google_view_id_form.html.eex+++ b/lib/plausible_web/templates/site/import_from_google_view_id_form.html.eex@@ -13,10 +13,12 @@<div class="mt-3"><%= styled_label(f, :view_id, "Google Analytics view") %><%= styled_select f, :view_id, view_ids, prompt: "(Choose view)", required: "true" %>+ <%= styled_error(@conn.assigns[:selected_view_id_error]) %></div><% {:error, error} -> %><p class="text-gray-700 dark:text-gray-300 mt-6">The following error occurred when fetching your Google Analytics view ids.</p><p class="text-red-700 font-medium mt-3"><%= error %></p><% end %>+<%= submit "Continue ->", class: "button mt-6" %><% end %>diff --git a/lib/plausible_web/views/form_helpers.ex b/lib/plausible_web/views/form_helpers.exindex 1dc16f75b5..6386a7d2fc 100644--- a/lib/plausible_web/views/form_helpers.ex+++ b/lib/plausible_web/views/form_helpers.ex@@ -38,6 +38,13 @@ defmodule PlausibleWeb.FormHelpers doPhoenix.HTML.Form.select(form, field, options, opts)end+ @error_opts [class: "mt-1 block text-sm font-medium text-red-700 dark:text-red-500"]+ def styled_error(nil), do: nil++ def styled_error(error) when is_binary(error) do+ Phoenix.HTML.Tag.content_tag(:p, error, @error_opts)+ end+defp merge_opts(opts1, opts2) doKeyword.merge(opts1, opts2, fn:class, v1, v2 -> v1 <> " " <> v2