plausible/analytics
1
1
Fork 0
mirror of https://github.com/plausible/analytics.git synced 2024-12-23 17:44:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve UI for failed import entry case (#4029)

Browse Source 
* Improve UI for failed import entry case

* Make failed request debugging for UA imports on par with the one for GA4

* Refine failed import state further
This commit is contained in:
Adrian Gruntkowski 2024-04-22 15:29:13 +02:00 committed by GitHub
parent 3023cb12fd
commit 7ae855cda5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/plausible/google/ua/http.ex
View File

@ -45,10 +45,18 @@ defmodule Plausible.Google.UA.HTTP do
{:ok, {report, token}} {:ok, {report, token}}
else else
{:error, %{reason: %{status: status, body: body}}} -> {:error, %{reason: %{status: status, body: body}}} ->
Logger.debug(
"[#{inspect(__MODULE__)}:#{report_request.view_id}] Request failed for #{report_request.dataset} with code #{status}: #{inspect(body)}"
)
Sentry.Context.set_extra_context(%{ga_response: %{body: body, status: status}}) Sentry.Context.set_extra_context(%{ga_response: %{body: body, status: status}})
{:error, :request_failed} {:error, :request_failed}
{:error, _reason} -> {:error, reason} ->
Logger.debug(
"[#{inspect(__MODULE__)}:#{report_request.view_id}] Request failed for #{report_request.dataset}: #{inspect(reason)}"
)
{:error, :request_failed} {:error, :request_failed}
end end
end end

20
lib/plausible_web/live/imports_exports_settings.ex
View File

@ -135,8 +135,11 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do
/> />
<Heroicons.exclamation_triangle <Heroicons.exclamation_triangle
:if={entry.live_status == SiteImport.failed()} :if={entry.live_status == SiteImport.failed()}
class="inline-block h-6 w-5 text-indigo-600 dark:text-green-600" class="inline-block h-6 w-5 text-red-700 dark:text-red-700"
/> />
<span :if={entry.live_status == SiteImport.failed()}>
Import failed -
</span>
<%= Plausible.Imported.SiteImport.label(entry.site_import) %> <%= Plausible.Imported.SiteImport.label(entry.site_import) %>
<span :if={entry.live_status == SiteImport.completed()} class="text-xs font-normal"> <span :if={entry.live_status == SiteImport.completed()} class="text-xs font-normal">
(<%= PlausibleWeb.StatsView.large_number_format( (<%= PlausibleWeb.StatsView.large_number_format(
@ -147,9 +150,13 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do
<p class="text-sm leading-5 text-gray-500 dark:text-gray-200"> <p class="text-sm leading-5 text-gray-500 dark:text-gray-200">
From <%= format_date(entry.site_import.start_date) %> to <%= format_date( From <%= format_date(entry.site_import.start_date) %> to <%= format_date(
entry.site_import.end_date entry.site_import.end_date
) %> (created on <%= format_date( ) %>
entry.site_import.inserted_at || entry.site_import.start_date <%= if entry.live_status == SiteImport.completed() do %>
) %>) (imported
<% else %>
(started
<% end %>
on <%= format_date(entry.site_import.inserted_at) %>)
</p> </p>
</div> </div>
<.button <.button
@ -160,9 +167,12 @@ defmodule PlausibleWeb.Live.ImportsExportsSettings do
class="sm:ml-3 sm:w-auto w-full" class="sm:ml-3 sm:w-auto w-full"
data-confirm="Are you sure you want to delete this import?" data-confirm="Are you sure you want to delete this import?"
> >
<span :if={entry.live_status in [SiteImport.completed(), SiteImport.failed()]}> <span :if={entry.live_status == SiteImport.completed()}>
Delete Import Delete Import
</span> </span>
<span :if={entry.live_status == SiteImport.failed()}>
Discard
</span>
<span :if={entry.live_status not in [SiteImport.completed(), SiteImport.failed()]}> <span :if={entry.live_status not in [SiteImport.completed(), SiteImport.failed()]}>
Cancel Import Cancel Import
</span> </span>