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
Introduce LV version of pages breakdown (#5953)
Adrian Gruntkowskic11d47a11f63
diff --git a/assets/css/app.css b/assets/css/app.cssindex 71879d553e..abf486b726 100644--- a/assets/css/app.css+++ b/assets/css/app.css@@ -115,6 +115,7 @@@custom-variant dark (&:where(.dark, .dark *));@custom-variant phx-click-loading (.phx-click-loading&, .phx-click-loading &);+@custom-variant phx-hook-loading (.phx-hook-loading&, .phx-hook-loading &);@custom-variant phx-submit-loading (.phx-submit-loading&, .phx-submit-loading &);@custom-variant phx-change-loading (.phx-change-loading&, .phx-change-loading &);diff --git a/assets/js/liveview/dashboard_root.js b/assets/js/liveview/dashboard_root.jsindex 42af690f10..32a9ab2258 100644--- a/assets/js/liveview/dashboard_root.js+++ b/assets/js/liveview/dashboard_root.js@@ -6,10 +6,26 @@import { buildHook } from './hook_builder'+function navigateWithLoader(url) {+ this.portalTargets.map((target) => {+ this.js().addClass(document.querySelector(target), 'phx-navigation-loading')++ this.pushEvent('handle_dashboard_params', { url: url }, () => {+ this.js().removeClass(+ document.querySelector(target),+ 'phx-navigation-loading'+ )+ })+ })+}+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.addListener('click', document.body, (e) => {const type = e.target.dataset.type || null@@ -26,7 +42,7 @@ export default buildHook({}))- this.pushEvent('handle_dashboard_params', { url: this.url })+ navigateWithLoader.bind(this)(this.url)e.preventDefault()}@@ -35,9 +51,7 @@ export default buildHook({// Browser back and forward navigation triggers that event.this.addListener('popstate', window, () => {if (this.url !== window.location.href) {- this.pushEvent('handle_dashboard_params', {- url: window.location.href- })+ navigateWithLoader.bind(this)(window.location.href)}})@@ -48,9 +62,7 @@ export default buildHook({typeof e.detail.search === 'string' &&this.url !== window.location.href) {- this.pushEvent('handle_dashboard_params', {- url: window.location.href- })+ navigateWithLoader.bind(this)(window.location.href)}})}diff --git a/assets/js/liveview/dashboard_tabs.js b/assets/js/liveview/dashboard_tabs.jsindex 0f645a7f01..006cf52c38 100644--- a/assets/js/liveview/dashboard_tabs.js+++ b/assets/js/liveview/dashboard_tabs.js@@ -17,27 +17,32 @@ export default buildHook({this.addListener('click', this.el, (e) => {const button = e.target.closest('button')const tab = button && button.dataset.tab+ const span = button && button.querySelector('span')- if (tab) {+ if (span && span.dataset.active === 'false') {const label = button.dataset.labelconst storageKey = button.dataset.storageKey- const activeClasses = button.dataset.activeClasses- const inactiveClasses = button.dataset.inactiveClasses- const title = this.el- .closest('[data-tile]')- .querySelector('[data-title]')+ const target = button.dataset.target+ const tile = this.el.closest('[data-tile]')+ const title = tile.querySelector('[data-title]')title.innerText = labelthis.el.querySelectorAll(`button[data-tab] span`).forEach((s) => {- s.className = inactiveClasses+ this.js().setAttribute(s, 'data-active', 'false')})- button.querySelector('span').className = activeClasses+ this.js().setAttribute(+ button.querySelector('span'),+ 'data-active',+ 'true'+ )if (storageKey) {localStorage.setItem(`${storageKey}__${domain}`, tab)}++ this.pushEventTo(target, 'set-tab', { tab: tab })}})}diff --git a/lib/plausible/stats/dashboard_query_parser.ex b/lib/plausible/stats/dashboard_query_parser.exindex bd50c91026..75875287f7 100644--- a/lib/plausible/stats/dashboard_query_parser.ex+++ b/lib/plausible/stats/dashboard_query_parser.ex@@ -28,9 +28,9 @@ defmodule Plausible.Stats.DashboardQueryParser dodef default_pagination(), do: @default_pagination- def parse(query_string) when is_binary(query_string) do+ def parse(query_string, defaults \\ %{}) when is_binary(query_string) doquery_string = String.trim_leading(query_string, "?")- params_map = URI.decode_query(query_string)+ params_map = Map.merge(defaults, URI.decode_query(query_string))with {:ok, filters} <- parse_filters(query_string),{:ok, relative_date} <- parse_relative_date(params_map) dodiff --git a/lib/plausible/stats/parsed_query_params.ex b/lib/plausible/stats/parsed_query_params.exindex 2d940f0873..0c473db7a8 100644--- a/lib/plausible/stats/parsed_query_params.ex+++ b/lib/plausible/stats/parsed_query_params.ex@@ -19,6 +19,14 @@ defmodule Plausible.Stats.ParsedQueryParams dostruct!(__MODULE__, Map.to_list(params))end+ def set(params, keywords) do+ struct!(params, keywords)+ end++ def set_include(params, key, value) do+ struct!(params, include: struct!(params.include, [{key, value}]))+ end+@props_prefix "event:props:"def add_or_replace_filter(%__MODULE__{filters: filters} = parsed_query_params, new_filter) dodiff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.exindex 696195bdca..c4407ba585 100644--- a/lib/plausible_web/components/generic.ex+++ b/lib/plausible_web/components/generic.ex@@ -425,10 +425,10 @@ defmodule PlausibleWeb.Components.Generic doviewBox="0 0 24 24"{@rest}>- <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4">+ <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle><path- className="opacity-75"+ class="opacity-75"fill="currentColor"d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">diff --git a/lib/plausible_web/live/components/dashboard/base.ex b/lib/plausible_web/live/components/dashboard/base.exindex 041cac215d..e57201ff4d 100644--- a/lib/plausible_web/live/components/dashboard/base.ex+++ b/lib/plausible_web/live/components/dashboard/base.ex@@ -5,14 +5,27 @@ defmodule PlausibleWeb.Components.Dashboard.Base douse PlausibleWeb, :component- attr :href, :string, required: true+ alias Plausible.Stats.DashboardQuerySerializer+ alias Plausible.Stats.ParsedQueryParams+attr :site, Plausible.Site, required: true+ attr :params, :map, required: true+ attr :path, :string, default: ""attr :class, :string, default: ""attr :rest, :global+slot :inner_block, required: truedef dashboard_link(assigns) do- url = "/" <> assigns.site.domain <> assigns.href+ query_string = DashboardQuerySerializer.serialize(assigns.params)+ url = "/" <> assigns.site.domain <> assigns.path++ url =+ if query_string != "" do+ url <> "?" <> query_string+ else+ url+ endassigns = assign(assigns, :url, url)@@ -20,10 +33,55 @@ defmodule PlausibleWeb.Components.Dashboard.Base do<.linkdata-type="dashboard-link"patch={@url}+ class={@class}{@rest}>{render_slot(@inner_block)}</.link>"""end++ attr :site, Plausible.Site, required: true+ attr :params, :map, required: true+ attr :filter, :list, required: true+ attr :class, :string, default: ""+ attr :rest, :global++ slot :inner_block, required: true++ def filter_link(assigns) do+ params = ParsedQueryParams.add_or_replace_filter(assigns.params, assigns.filter)++ assigns = assign(assigns, :params, params)++ ~H"""+ <.dashboard_link site={@site} params={@params} class={@class} {@rest}>+ {render_slot(@inner_block)}+ </.dashboard_link>+ """+ end++ attr :style, :string, default: ""+ attr :background_class, :string, default: ""+ attr :width, :integer, required: true+ attr :max_width, :integer, required: true++ slot :inner_block, required: true++ def bar(assigns) do+ width_percent = assigns.width / assigns.max_width * 100++ assigns = assign(assigns, :width_percent, width_percent)++ ~H"""+ <div class="w-full h-full relative" style={@style}>+ <div+ class={"absolute top-0 left-0 h-full rounded-sm transition-colors duration-150 #{@background_class || ""}"}+ style={"width: #{@width_percent}%"}+ >+ </div>+ {render_slot(@inner_block)}+ </div>+ """+ endenddiff --git a/lib/plausible_web/live/components/dashboard/metric.ex b/lib/plausible_web/live/components/dashboard/metric.exnew file mode 100644index 0000000000..62fa1f7e0b--- /dev/null+++ b/lib/plausible_web/live/components/dashboard/metric.ex@@ -0,0 +1,60 @@+defmodule PlausibleWeb.Components.Dashboard.Metric do+ @moduledoc """+ Components for rendering metric data.+ """++ use PlausibleWeb, :component++ @formatters %{+ visitors: :number_short,+ conversion_rate: :percentage+ }++ attr :name, :atom, required: true+ attr :value, :any++ def value(assigns) do+ ~H"""+ <div class="cursor-default">+ {format_value(@name, @value)}+ </div>+ """+ end++ defp format_value(name, value) do+ apply_format(@formatters[name], value)+ end++ @hundred_billion :math.pow(10, 11)+ @billion :math.pow(10, 9)+ @hundred_million :math.pow(10, 8)+ @million :math.pow(10, 6)+ @hundred_thousand :math.pow(10, 5)+ @thousand :math.pow(10, 3)++ defp apply_format(:number_short, value) when is_number(value) do+ cond do+ value >= @hundred_billion -> divided(value, @billion)+ value >= @billion -> divided(value, @billion, 2)+ value >= @hundred_million -> divided(value, @million)+ value >= @million -> divided(value, @million, 2)+ value >= @hundred_thousand -> divided(value, @thousand)+ value >= @thousand -> divided(value, @thousand, 2)+ true -> value+ end+ end++ defp apply_format(:number_short, _), do: "-"++ defp apply_format(:percentage, value) do+ if value do+ :erlang.float_to_binary(value, decimals: 2) <> "%"+ else+ "-"+ end+ end++ defp divided(value, divisor, precision \\ 0) do+ :erlang.float_to_binary(value / divisor, decimals: precision)+ end+enddiff --git a/lib/plausible_web/live/components/dashboard/report_list.ex b/lib/plausible_web/live/components/dashboard/report_list.exnew file mode 100644index 0000000000..649c177a71--- /dev/null+++ b/lib/plausible_web/live/components/dashboard/report_list.ex@@ -0,0 +1,228 @@+defmodule PlausibleWeb.Components.Dashboard.ReportList do+ @moduledoc """+ ReportList component.+ """++ use PlausibleWeb, :component++ alias PlausibleWeb.Components.Dashboard.Base+ alias PlausibleWeb.Components.Dashboard.Metric++ @max_items 9+ @min_height 380+ @row_height 32+ @row_gap_height 4+ @data_container_height (@row_height + @row_gap_height) * (@max_items - 1) + @row_height+ @col_min_width 70++ def height, do: @min_height++ def report(assigns) do+ assigns =+ assign(assigns,+ max_items: @max_items,+ min_height: @min_height,+ row_height: @row_height,+ row_gap_height: @row_gap_height,+ data_container_height: @data_container_height,+ col_min_width: @col_min_width+ )++ if assigns.results.loading || !assigns.results.ok? do+ ~H"""+ """+ else+ results = assigns.results.result+ metrics = assigns.metrics.result+ meta = assigns.meta.result+ skip_imported_reason = assigns.skip_imported_reason.result++ max_value =+ results+ |> Enum.map(& &1.visitors)+ |> Enum.max(&>=/2, fn -> 0 end)++ assigns =+ assign(assigns,+ max_value: max_value,+ results: results,+ metrics: metrics,+ meta: meta,+ skip_imported_reason: skip_imported_reason,+ empty?: Enum.empty?(results)+ )++ ~H"""+ <.no_data :if={@empty?} min_height={@min_height} />++ <div :if={not @empty?} class="h-full flex flex-col">+ <div style={"row-height: #{@row_height}px;"}>+ <.report_header key_label={@key_label} metrics={@metrics} col_min_width={@col_min_width} />+ </div>++ <div class="grow" style={"min-height: #{@data_container_height}px;"}>+ <.report_row+ :for={item <- @results}+ link_fn={assigns[:external_link_fn]}+ item={item}+ metrics={@metrics}+ bar_value={item.visitors}+ bar_max_value={@max_value}+ site={@site}+ params={@params}+ filter_dimension={@filter_dimension}+ row_height={@row_height}+ row_gap_height={@row_gap_height}+ col_min_width={@col_min_width}+ />+ </div>++ <div class="w-full text-center">+ <.details_link+ site={@site}+ params={@params}+ path="/pages"+ />+ </div>+ </div>+ """+ end+ end++ defp no_data(assigns) do+ ~H"""+ <div+ class="w-full h-full flex flex-col justify-center group-has-[.tile-tabs.phx-hook-loading]:hidden"+ style={"min-height: #{@min_height}px;"}+ >+ <div class="mx-auto font-medium text-gray-500 dark:text-gray-400">+ No data yet+ </div>+ </div>+ """+ end++ defp external_link(assigns) do+ url = if(assigns[:link_fn], do: assigns.link_fn.(assigns.item))++ assigns = assign(assigns, :url, url)++ ~H"""+ <.link+ :if={@url}+ target="_blank"+ rel="noreferrer"+ href={@url}+ class="w-4 h-4 invisible group-hover:visible"+ >+ <svg+ class="inline w-full h-full ml-1 -mt-1 text-gray-600 dark:text-gray-400"+ fill="currentColor"+ viewBox="0 0 20 20"+ >+ <path d="M11 3a1 1 0 100 2h2.586l-6.293 6.293a1 1 0 101.414 1.414L15 6.414V9a1 1 0 102 0V4a1 1 0 00-1-1h-5z">+ </path>+ <path d="M5 5a2 2 0 00-2 2v8a2 2 0 002 2h8a2 2 0 002-2v-3a1 1 0 10-2 0v3H5V7h3a1 1 0 000-2H5z">+ </path>+ </svg>+ </.link>+ """+ end++ defp report_header(assigns) do+ ~H"""+ <div class="pt-3 w-full text-xs font-bold tracking-wide text-gray-500 flex items-center dark:text-gray-400">+ <span class="grow truncate">{@key_label}</span>+ <div+ :for={metric <- @metrics}+ class={[metric.key, "text-right"]}+ style={"min-width: #{@col_min_width}px;"}+ >+ {metric.label}+ </div>+ </div>+ """+ end++ def report_row(assigns) do+ ~H"""+ <div style={"min-height: #{@row_height}px;"}>+ <div+ class="group flex w-full items-center hover:bg-gray-100/60 dark:hover:bg-gray-850 rounded-sm transition-colors duration-150"+ style={"margin-top: #{@row_gap_height}px;"}+ >+ <div class="grow w-full overflow-hidden">+ <Base.bar+ width={@bar_value}+ max_width={@bar_max_value}+ background_class="bg-green-50 group-hover:bg-green-100 dark:bg-gray-500/15 dark:group-hover:bg-gray-500/30"+ >+ <div class="flex justify-start px-2 py-1.5 group text-sm dark:text-gray-300 relative z-9 break-all w-full">+ <span class="w-full md:truncate">+ <Base.filter_link+ class="max-w-max w-full flex items-center md:overflow-hidden hover:underline"+ site={@site}+ params={@params}+ filter={[:is, @filter_dimension, [@item.name]]}+ >+ {trim_name(@item.name, @col_min_width)}+ </Base.filter_link>+ </span>+ <.external_link item={@item} link_fn={assigns[:link_fn]} />+ </div>+ </Base.bar>+ </div>+ <div+ :for={metric <- @metrics}+ class="text-right"+ style={"width: #{@col_min_width}px; min-width: #{@col_min_width}px;"}+ >+ <span class="font-medium text-sm dark:text-gray-200 text-right">+ <Metric.value name={metric.key} value={@item[metric.key]} />+ </span>+ </div>+ </div>+ </div>+ """+ end++ defp details_link(assigns) do+ ~H"""+ <Base.dashboard_link+ class="leading-snug font-bold text-sm text-gray-500 dark:text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 transition-colors duration-150 tracking-wide"+ site={@site}+ params={@params}+ path={@path}+ >+ <svg+ class="feather mr-1"+ style="margin-top: -2px;"+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ strokeWidth="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ >+ <path d="M8 3H5a2 2 0 0 0-2 2v3m18 0V5a2 2 0 0 0-2-2h-3m0 18h3a2 2 0 0 0 2-2v-3M3 16v3a2 2 0 0 0 2 2h3" />+ </svg>+ DETAILS+ </Base.dashboard_link>+ """+ end++ defp trim_name(name, max_length) do+ if String.length(name) <= max_length do+ name+ else+ left_length = div(max_length, 2)+ right_length = max_length - left_length++ left_side = String.slice(name, 0..left_length)+ right_side = String.slice(name, -right_length..-1)++ left_side <> "..." <> right_side+ end+ end+enddiff --git a/lib/plausible_web/live/components/dashboard/tile.ex b/lib/plausible_web/live/components/dashboard/tile.exindex b09ef681d7..7561a5abc5 100644--- a/lib/plausible_web/live/components/dashboard/tile.ex+++ b/lib/plausible_web/live/components/dashboard/tile.ex@@ -6,10 +6,9 @@ defmodule PlausibleWeb.Components.Dashboard.Tile douse PlausibleWeb, :componentattr :id, :string, required: true+ attr :class, :string, default: ""attr :title, :string, required: true- # Optimistic rendering requires preventing LV patching of- # title and tabs. The update of those is handled by `tab`- # widget hook.+ attr :height, :integer, required: trueattr :connected?, :boolean, required: trueslot :tabs@@ -17,7 +16,7 @@ defmodule PlausibleWeb.Components.Dashboard.Tile dodef tile(assigns) do~H"""- <div data-tile id={@id}>+ <div class={[@class, "group overflow-x-hidden"]} data-tile id={@id}><div class="w-full flex justify-between h-full"><div id={@id <> "-title"} class="flex gap-x-1" phx-update="ignore"><h3 data-title class="font-bold dark:text-gray-100">{@title}</h3>@@ -26,15 +25,25 @@ defmodule PlausibleWeb.Components.Dashboard.Tile do<div:if={@tabs != []}id={@id <> "-tabs"}- phx-update="ignore"phx-hook="DashboardTabs"- class="flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2 items-baseline"+ class="tile-tabs flex text-xs font-medium text-gray-500 dark:text-gray-400 space-x-2 items-baseline">{render_slot(@tabs)}</div></div>- {render_slot(@inner_block)}+ <div+ class="w-full flex-col justify-center group-[.phx-navigation-loading]:flex group-has-[.tile-tabs.phx-hook-loading]:flex hidden"+ style={"min-height: #{@height}px;"}+ >+ <div class="mx-auto loading">+ <div></div>+ </div>+ </div>++ <div class="group-[.phx-navigation-loading]:hidden group-has-[.tile-tabs.phx-hook-loading]:hidden">+ {render_slot(@inner_block)}+ </div></div>"""end@@ -46,10 +55,13 @@ defmodule PlausibleWeb.Components.Dashboard.Tile dodef tab(assigns) doassigns =- assign(assigns,- active_classes:- "text-indigo-600 dark:text-indigo-500 font-bold underline decoration-2 decoration-indigo-600 dark:decoration-indigo-500",- inactive_classes: "hover:text-indigo-700 dark:hover:text-indigo-400 cursor-pointer"+ assign(+ assigns,+ data_attrs:+ if(assigns.value == assigns.active,+ do: %{"data-active": "true"},+ else: %{"data-active": "false"}+ ))~H"""@@ -58,13 +70,12 @@ defmodule PlausibleWeb.Components.Dashboard.Tile dodata-tab={@value}data-label={@label}data-storage-key="pageTab"- data-active-classes={@active_classes}- data-inactive-classes={@inactive_classes}- phx-click="set-tab"- phx-value-tab={@value}- phx-target={@target}+ data-target={@target}>- <span class={if(@value == @active, do: @active_classes, else: @inactive_classes)}>+ <span+ {@data_attrs}+ class="data-[active=true]:text-indigo-600 data-[active=true]:dark:text-indigo-500 data-[active=true]:font-bold data-[active=true]:underline data-[active=true]:decoration-2 data-[active=true]:decoration-indigo-600 data-[active=true]:dark:decoration-indigo-500 data-[active=false]:hover:text-indigo-700 data-[active=false]:dark:hover:text-indigo-400 data-[active=false]:cursor-pointer"+ >{@label}</span></button>diff --git a/lib/plausible_web/live/dashboard.ex b/lib/plausible_web/live/dashboard.exindex a1729f7355..5a7cd197d8 100644--- a/lib/plausible_web/live/dashboard.ex+++ b/lib/plausible_web/live/dashboard.ex@@ -6,8 +6,13 @@ defmodule PlausibleWeb.Live.Dashboard douse PlausibleWeb, :live_viewalias Plausible.Repo+ alias Plausible.Stats.DashboardQueryParseralias Plausible.Teams+ @default_prefs %{+ "period" => "28d"+ }+@spec enabled?(Plausible.Site.t() | nil) :: boolean()def enabled?(nil), do: false@@ -16,7 +21,8 @@ defmodule PlausibleWeb.Live.Dashboard doenddef mount(_params, %{"domain" => domain, "url" => url}, socket) do- user_prefs = get_connect_params(socket)["user_prefs"] || %{}+ # NOTE: implement a dedicated, permissive params fallback.+ user_prefs = Map.merge(@default_prefs, get_connect_params(socket)["user_prefs"] || %{})# As domain is passed via session, the associated site has already passed# validation logic on plug level.@@ -34,14 +40,23 @@ defmodule PlausibleWeb.Live.Dashboard do|> assign(:connected?, connected?(socket))|> assign(:site, site)|> assign(:user_prefs, user_prefs)- |> assign(:params, %{}){:noreply, socket} = handle_params_internal(%{}, url, socket){:ok, socket}end- def handle_params_internal(_params, _url, socket) do+ def handle_params_internal(_params, url, socket) do+ uri = URI.parse(url)+ path = uri.path |> String.split("/") |> Enum.drop(2)+ {:ok, params} = DashboardQueryParser.parse(uri.query || "", socket.assigns.user_prefs)++ socket =+ assign(socket,+ path: path,+ params: params+ )+{:noreply, socket}end@@ -55,6 +70,7 @@ defmodule PlausibleWeb.Live.Dashboard dosite={@site}user_prefs={@user_prefs}connected?={@connected?}+ params={@params}/></.portal_wrapper></div>diff --git a/lib/plausible_web/live/dashboard/pages.ex b/lib/plausible_web/live/dashboard/pages.exindex fafb89282d..ffb9c89e7e 100644--- a/lib/plausible_web/live/dashboard/pages.ex+++ b/lib/plausible_web/live/dashboard/pages.ex@@ -5,16 +5,82 @@ defmodule PlausibleWeb.Live.Dashboard.Pages douse PlausibleWeb, :live_component- alias PlausibleWeb.Components.Dashboard.Base+ alias PlausibleWeb.Components.Dashboard.ReportListalias PlausibleWeb.Components.Dashboard.Tile+ alias Plausible.Stats+ alias Plausible.Stats.Filters+ alias Plausible.Stats.ParsedQueryParams+ alias Plausible.Stats.QueryBuilder+@tabs [{"pages", "Top Pages"},{"entry-pages", "Entry Pages"},{"exit-pages", "Exit Pages"}]- @tab_labels Map.new(@tabs)+ @key_labels %{+ "pages" => "Page",+ "entry-pages" => "Entry page",+ "exit-pages" => "Exit page"+ }++ @max_items 9+ @pagination_params {@max_items, 1}++ @metrics %{+ "pages" => %{+ visitors: %{+ width: "w-24",+ key: :visitors,+ label: "Visitors",+ sortable: true,+ plot: true+ },+ conversion_rate: %{+ width: "w-24",+ key: :conversion_rate,+ label: "CR",+ sortable: true+ }+ },+ "entry-pages" => %{+ visitors: %{+ width: "w-24",+ key: :visitors,+ label: "Unique Entrances",+ sortable: true,+ plot: true+ },+ conversion_rate: %{+ width: "w-24",+ key: :conversion_rate,+ label: "CR",+ sortable: true+ }+ },+ "exit-pages" => %{+ visitors: %{+ width: "w-24",+ key: :visitors,+ label: "Unique Exits",+ sortable: true,+ plot: true+ },+ conversion_rate: %{+ width: "w-24",+ key: :conversion_rate,+ label: "CR",+ sortable: true+ }+ }+ }++ @filter_dimensions %{+ "pages" => "event:page",+ "entry-pages" => "visit:entry_page",+ "exit-pages" => "visit:exit_page"+ }def update(assigns, socket) doactive_tab = assigns.user_prefs["pages_tab"] || "pages"@@ -22,19 +88,30 @@ defmodule PlausibleWeb.Live.Dashboard.Pages dosocket =assign(socket,site: assigns.site,+ params: assigns.params,tabs: @tabs,- tab_labels: @tab_labels,+ key_labels: @key_labels,+ filter_dimensions: @filter_dimensions,active_tab: active_tab,connected?: assigns.connected?)+ |> load_metrics(){:ok, socket}enddef render(assigns) do+ assigns = assign(assigns, :external_link_fn, &external_link/1)+~H"""<div>- <Tile.tile id="breakdown-tile-pages" title={@tab_labels[@active_tab]} connected?={@connected?}>+ <Tile.tile+ id="breakdown-tile-pages"+ class="group/report"+ title={@key_labels[@active_tab]}+ connected?={@connected?}+ height={ReportList.height()}+ ><:tabs><Tile.tab:for={{value, label} <- @tabs}@@ -45,11 +122,17 @@ defmodule PlausibleWeb.Live.Dashboard.Pages do/></:tabs>- <div class="mx-auto font-medium text-gray-500 dark:text-gray-400">- <Base.dashboard_link site={@site} href="?f=is,source,Direct / None">- Filter by source Direct / None- </Base.dashboard_link>- </div>+ <ReportList.report+ site={@site}+ key_label={@key_labels[@active_tab]}+ filter_dimension={@filter_dimensions[@active_tab]}+ params={@params}+ results={@results}+ meta={@meta}+ metrics={@metrics}+ skip_imported_reason={@skip_imported_reason}+ external_link_fn={@external_link_fn}+ /></Tile.tile></div>"""@@ -57,11 +140,112 @@ defmodule PlausibleWeb.Live.Dashboard.Pages dodef handle_event("set-tab", %{"tab" => tab}, socket) doif tab != socket.assigns.active_tab do- socket = assign(socket, :active_tab, tab)+ socket =+ socket+ |> assign(:active_tab, tab)+ |> load_metrics(){:noreply, socket}else{:noreply, socket}endend++ defp external_link(_item) do+ "https://example.com"+ end++ defp load_metrics(socket) do+ %{active_tab: active_tab, site: site, params: params} = socket.assigns++ assign_async(socket, [:metrics, :results, :meta, :skip_imported_reason], fn ->+ %{results: pages, meta: meta, query: query, metrics: metrics} =+ metrics_for_tab(active_tab, site, params)++ {:ok,+ %{+ metrics: Enum.map(metrics, &Map.fetch!(@metrics[active_tab], &1)),+ results: Enum.take(pages, @max_items),+ meta: Map.merge(meta, Stats.Breakdown.formatted_date_ranges(query)),+ skip_imported_reason: meta[:imports_skip_reason]+ }}+ end)+ end++ defp metrics_for_tab("pages", site, params) do+ params =+ params+ |> ParsedQueryParams.set(dimensions: ["event:page"])+ |> ParsedQueryParams.set_include(:time_labels, false)++ {:ok, query} = QueryBuilder.build(site, params, %{})+ metrics = breakdown_metrics(query)++ %{results: results, meta: meta} = Stats.breakdown(site, query, metrics, @pagination_params)++ pages =+ results+ |> transform_keys(%{page: :name})++ %{query: query, results: pages, meta: meta, metrics: metrics}+ end++ defp metrics_for_tab("entry-pages", site, params) do+ params =+ params+ |> ParsedQueryParams.set(dimensions: ["visit:entry_page"])+ |> ParsedQueryParams.set_include(:time_labels, false)++ {:ok, query} = QueryBuilder.build(site, params, %{})+ metrics = breakdown_metrics(query)++ %{results: results, meta: meta} = Stats.breakdown(site, query, metrics, @pagination_params)++ pages =+ results+ |> transform_keys(%{entry_page: :name})++ %{query: query, results: pages, meta: meta, metrics: metrics}+ end++ defp metrics_for_tab("exit-pages", site, params) do+ params =+ params+ |> ParsedQueryParams.set(dimensions: ["visit:exit_page"])+ |> ParsedQueryParams.set_include(:time_labels, false)++ {:ok, query} = QueryBuilder.build(site, params, %{})+ metrics = breakdown_metrics(query)++ %{results: results, meta: meta} = Stats.breakdown(site, query, metrics, @pagination_params)++ pages =+ results+ |> transform_keys(%{exit_page: :name})++ %{query: query, results: pages, meta: meta, metrics: metrics}+ end++ defp breakdown_metrics(query) do+ if toplevel_goal_filter?(query) do+ [:visitors, :conversion_rate]+ else+ [:visitors]+ end+ end++ defp transform_keys(result, keys_to_replace) when is_map(result) do+ for {key, val} <- result, do: {Map.get(keys_to_replace, key, key), val}, into: %{}+ end++ defp transform_keys(results, keys_to_replace) when is_list(results) do+ Enum.map(results, &transform_keys(&1, keys_to_replace))+ end++ defp toplevel_goal_filter?(query) do+ Filters.filtering_on_dimension?(query, "event:goal",+ max_depth: 0,+ behavioral_filters: :ignore+ )+ endend