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
Use `assign` instead of `assign_async` for pages breakdown query result (#5989)
Adrian Gruntkowskif1b43919f51b
diff --git a/assets/js/liveview/dashboard_root.js b/assets/js/liveview/dashboard_root.jsindex 32a9ab2258..769044bc44 100644--- a/assets/js/liveview/dashboard_root.js+++ b/assets/js/liveview/dashboard_root.js@@ -21,17 +21,15 @@ function navigateWithLoader(url) {export default buildHook({initialize() {- this.url = window.location.href-const portals = document.querySelectorAll('[data-phx-portal]')this.portalTargets = Array.from(portals, (p) => p.dataset.phxPortal)+ this.url = window.location.hrefthis.addListener('click', document.body, (e) => {const type = e.target.dataset.type || nullif (type === 'dashboard-link') {- this.url = e.target.href- const uri = new URL(this.url)+ const uri = new URL(e.target.href)// Domain is dropped from URL prefix, because that's what react-dom-router// expects.const path = '/' + uri.pathname.split('/').slice(2).join('/')@@ -42,8 +40,6 @@ export default buildHook({}))- navigateWithLoader.bind(this)(this.url)-e.preventDefault()}})diff --git a/lib/plausible_web/live/components/dashboard/imported_data_warnings.ex b/lib/plausible_web/live/components/dashboard/imported_data_warnings.exindex 4cf0b9df64..ce9f68518d 100644--- a/lib/plausible_web/live/components/dashboard/imported_data_warnings.ex+++ b/lib/plausible_web/live/components/dashboard/imported_data_warnings.ex@@ -2,13 +2,12 @@ defmodule PlausibleWeb.Components.Dashboard.ImportedDataWarnings do@moduledoc falseuse PlausibleWeb, :component- alias Phoenix.LiveView.AsyncResultalias Plausible.Stats.QueryResultdef unsupported_filters(assigns) doshow? =case assigns.query_result do- %AsyncResult{result: %QueryResult{meta: meta}} ->+ %QueryResult{meta: meta} ->meta[:imports_skip_reason] == :unsupported_query_ ->diff --git a/lib/plausible_web/live/components/dashboard/report_list.ex b/lib/plausible_web/live/components/dashboard/report_list.exindex 80d32e1fcf..81a1f3948e 100644--- a/lib/plausible_web/live/components/dashboard/report_list.ex+++ b/lib/plausible_web/live/components/dashboard/report_list.ex@@ -30,52 +30,47 @@ defmodule PlausibleWeb.Components.Dashboard.ReportList docol_min_width: @col_min_width)- if assigns.query_result.loading || !assigns.query_result.ok? do- ~H"""- """- else- %QueryResult{results: results, meta: meta, query: query} = assigns.query_result.result-- assigns =- assign(assigns,- results: results,- metric_keys: query[:metrics],- metric_labels: meta[:metric_labels],- empty?: Enum.empty?(results)- )-- ~H"""- <.no_data :if={@empty?} min_height={@min_height} data_test_id={@data_test_id} />-- <div :if={not @empty?} class="h-full flex flex-col" data-test-id={@data_test_id}>- <div style={"min-height: #{@row_height}px;"}>- <.report_header- key_label={@key_label}- metric_labels={@metric_labels}- col_min_width={@col_min_width}- />- </div>+ %QueryResult{results: results, meta: meta, query: query} = assigns.query_result- <div class="grow" style={"min-height: #{@data_container_height}px;"}>- <.report_row- :for={{item, item_index} <- Enum.with_index(@results)}- link_fn={assigns[:external_link_fn]}- item={item}- item_index={item_index}- item_name={List.first(item.dimensions)}- metrics={Enum.zip(@metric_keys, item.metrics)}- bar_max_value={bar_max_value(@results, @metric_keys)}- site={@site}- params={@params}- dimension={@dimension}- row_height={@row_height}- row_gap_height={@row_gap_height}- col_min_width={@col_min_width}- />- </div>+ assigns =+ assign(assigns,+ results: results,+ metric_keys: query[:metrics],+ metric_labels: meta[:metric_labels],+ empty?: Enum.empty?(results)+ )++ ~H"""+ <.no_data :if={@empty?} min_height={@min_height} data_test_id={@data_test_id} />++ <div :if={not @empty?} class="h-full flex flex-col" data-test-id={@data_test_id}>+ <div style={"min-height: #{@row_height}px;"}>+ <.report_header+ key_label={@key_label}+ metric_labels={@metric_labels}+ col_min_width={@col_min_width}+ /></div>- """- end++ <div class="grow" style={"min-height: #{@data_container_height}px;"}>+ <.report_row+ :for={{item, item_index} <- Enum.with_index(@results)}+ link_fn={assigns[:external_link_fn]}+ item={item}+ item_index={item_index}+ item_name={List.first(item.dimensions)}+ metrics={Enum.zip(@metric_keys, item.metrics)}+ bar_max_value={bar_max_value(@results, @metric_keys)}+ site={@site}+ params={@params}+ dimension={@dimension}+ row_height={@row_height}+ row_gap_height={@row_gap_height}+ col_min_width={@col_min_width}+ />+ </div>+ </div>+ """enddefp no_data(assigns) dodiff --git a/lib/plausible_web/live/dashboard/pages.ex b/lib/plausible_web/live/dashboard/pages.exindex 2b7ebc1728..d4763e987b 100644--- a/lib/plausible_web/live/dashboard/pages.ex+++ b/lib/plausible_web/live/dashboard/pages.ex@@ -105,24 +105,22 @@ defmodule PlausibleWeb.Live.Dashboard.Pages dodefp load_stats(socket) do%{active_tab: active_tab, site: site, params: params} = socket.assigns- assign_async(socket, :query_result, fn ->- metrics = choose_metrics(params)- dimension = get_tab_info(active_tab, :dimension)-- params =- params- |> ParsedQueryParams.set(- metrics: metrics,- dimensions: [dimension],- pagination: @pagination- )+ metrics = choose_metrics(params)+ dimension = get_tab_info(active_tab, :dimension)++ params =+ params+ |> ParsedQueryParams.set(+ metrics: metrics,+ dimensions: [dimension],+ pagination: @pagination+ )- query = QueryBuilder.build!(site, params)+ query = QueryBuilder.build!(site, params)- %QueryResult{} = query_result = Stats.query(site, query)+ %QueryResult{} = query_result = Stats.query(site, query)- {:ok, %{query_result: query_result}}- end)+ assign(socket, :query_result, query_result)enddefp choose_metrics(%ParsedQueryParams{} = params) dodiff --git a/test/plausible_web/live/components/dashboard/report_list_test.exs b/test/plausible_web/live/components/dashboard/report_list_test.exsindex e3c06c9c04..84e5e381d1 100644--- a/test/plausible_web/live/components/dashboard/report_list_test.exs+++ b/test/plausible_web/live/components/dashboard/report_list_test.exs@@ -4,7 +4,6 @@ defmodule PlausibleWeb.Components.Dashboard.ReportListTest doalias PlausibleWeb.Components.Dashboard.ReportListalias Plausible.Stats.{ParsedQueryParams, QueryResult}- alias Phoenix.LiveView.AsyncResultimport Plausible.DashboardTestUtils@report_list_selector ~s|[data-test-id="pages-report-list"]|@@ -23,21 +22,9 @@ defmodule PlausibleWeb.Components.Dashboard.ReportListTest do{:ok, %{assigns: assigns}}end- test "renders empty when loading", %{assigns: assigns} do- assigns = Keyword.put(assigns, :query_result, AsyncResult.loading())- assert render_component(&ReportList.report/1, assigns) == ""- end-- test "renders empty when result not ok", %{assigns: assigns} do- assigns =- Keyword.put(assigns, :query_result, AsyncResult.failed(AsyncResult.loading(), :some_error))-- assert render_component(&ReportList.report/1, assigns) == ""- end-test "item bar width depends on visitors metric", %{assigns: assigns} do- successful_async_result =- AsyncResult.ok(%QueryResult{+ query_result =+ %QueryResult{results: [%{metrics: [100, 60.0], dimensions: ["/a"]},%{metrics: [70, 40.0], dimensions: ["/b"]},@@ -45,9 +32,9 @@ defmodule PlausibleWeb.Components.Dashboard.ReportListTest do],meta: Jason.OrderedObject.new(metric_labels: ["Conversions", "CR"]),query: Jason.OrderedObject.new(metrics: [:visitors, :conversion_rate])- })+ }- assigns = Keyword.put(assigns, :query_result, successful_async_result)+ assigns = Keyword.put(assigns, :query_result, query_result)html = render_component(&ReportList.report/1, assigns)