Merge branch 'master' into validate-empty-filter-list

Author: ukutaht

CHANGELOG.md

@@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file.
 - Fixed Stats API timeseries returning time buckets falling outside the queried range
 - Fixed issue with all non-interactive events being counted as interactive
 - Fixed countries map countries staying highlighted on Chrome
+- Fixed comparison tooltip in the top pages report missing date labels
 
 ## v3.2.0 - 2026-01-16
 

assets/js/dashboard/stats/graph/graph-util.js

@@ -25,19 +25,38 @@ function plottable(dataArray) {
   })
 }
 
-const buildComparisonDataset = function (comparisonPlot) {
+const buildComparisonDataset = function (comparisonPlot, presentIndex) {
   if (!comparisonPlot) return []
 
+  const data = presentIndex
+    ? comparisonPlot.slice(0, presentIndex)
+    : comparisonPlot
+
   return [
     {
-      data: plottable(comparisonPlot),
+      data: plottable(data),
       borderColor: 'rgba(99, 102, 241, 0.3)',
       pointBackgroundColor: 'rgba(99, 102, 241, 0.2)',
       pointHoverBackgroundColor: 'rgba(99, 102, 241, 0.5)',
       yAxisID: 'yComparison'
     }
   ]
 }
+
+const buildDashedComparisonDataset = function (comparisonPlot, presentIndex) {
+  if (!comparisonPlot || !presentIndex) return []
+  const dashedPart = comparisonPlot.slice(presentIndex - 1, presentIndex + 1)
+  const dashedPlot = new Array(presentIndex - 1).concat(dashedPart)
+  return [
+    {
+      data: plottable(dashedPlot),
+      borderDash: [3, 3],
+      borderColor: 'rgba(99, 102, 241, 0.3)',
+      pointHoverBackgroundColor: 'rgba(99, 102, 241, 0.5)',
+      yAxisID: 'yComparison'
+    }
+  ]
+}
 const buildDashedDataset = function (plot, presentIndex) {
   if (!presentIndex) return []
   const dashedPart = plot.slice(presentIndex - 1, presentIndex + 1)
@@ -90,7 +109,8 @@ export const buildDataSet = (
   const dataset = [
     ...buildMainPlotDataset(plot, present_index),
     ...buildDashedDataset(plot, present_index),
-    ...buildComparisonDataset(comparisonPlot)
+    ...buildComparisonDataset(comparisonPlot, present_index),
+    ...buildDashedComparisonDataset(comparisonPlot, present_index)
   ]
 
   return dataset.map((item) => Object.assign(item, defaultOptions))

lib/plausible/stats/table_decider.ex

@@ -7,7 +7,9 @@ defmodule Plausible.Stats.TableDecider do
   use Plausible
 
   import Enum, only: [empty?: 1]
-  import Plausible.Stats.Filters, only: [dimensions_used_in_filters: 1]
+
+  import Plausible.Stats.Filters,
+    only: [dimensions_used_in_filters: 1, filtering_on_dimension?: 2]
 
   alias Plausible.Stats.{Query, QueryError}
 
@@ -146,7 +148,11 @@ defmodule Plausible.Stats.TableDecider do
   # :TRICKY: For time:minute dimension we prefer sessions over events as there
   # might be minutes where no events occurred but the session was active.
   defp metric_partitioner(query, metric) when metric in [:visitors, :visits] do
-    if "time:minute" in query.dimensions, do: :session, else: :either
+    if "time:minute" in query.dimensions and not filtering_on_dimension?(query, "event:goal") do
+      :session
+    else
+      :either
+    end
   end
 
   defp metric_partitioner(_, :conversion_rate), do: :either

lib/plausible_web/controllers/api/stats_controller.ex

@@ -723,7 +723,7 @@ defmodule PlausibleWeb.Api.StatsController do
     else
       json(conn, %{
         results: pages,
-        meta: Map.merge(meta, Stats.Breakdown.formatted_date_ranges(query)),
+        meta: Map.new(meta.values) |> Map.merge(Stats.Breakdown.formatted_date_ranges(query)),
         skip_imported_reason: meta[:imports_skip_reason]
       })
     end

test/plausible/stats/query/query_test.exs

@@ -317,4 +317,55 @@ defmodule Plausible.Stats.QueryTest do
              ]
     end
   end
+
+  describe "group_conversion_rate with time:minute and time:hour dimensions" do
+    test "unique conversions are not smeared when querying visitors without conversion_rate",
+         %{site: site} do
+      insert(:goal, site: site, event_name: "Signup")
+
+      populate_stats(site, [
+        build(:pageview, user_id: 1, timestamp: ~N[2021-01-01 00:00:00]),
+        build(:event, name: "Signup", user_id: 1, timestamp: ~N[2021-01-01 00:05:00]),
+        build(:pageview, user_id: 2, timestamp: ~N[2021-01-01 00:00:00])
+      ])
+
+      {:ok, query} =
+        QueryBuilder.build(site, %ParsedQueryParams{
+          metrics: [:visitors],
+          input_date_range: {:datetime_range, ~U[2021-01-01 00:00:00Z], ~U[2021-01-01 00:10:00Z]},
+          dimensions: ["time:minute"],
+          filters: [[:is, "event:goal", ["Signup"]]],
+          skip_goal_existence_check: true
+        })
+
+      %Stats.QueryResult{results: results} = Stats.query(site, query)
+
+      assert [%{dimensions: ["2021-01-01 00:05:00"], metrics: [1]}] = results
+    end
+
+    test "unique conversions are not smeared across all session minutes via timeSlots",
+         %{site: site} do
+      insert(:goal, site: site, event_name: "Signup")
+
+      populate_stats(site, [
+        build(:pageview, user_id: 1, timestamp: ~N[2021-01-01 00:00:00]),
+        build(:event, name: "Signup", user_id: 1, timestamp: ~N[2021-01-01 00:05:00]),
+        build(:pageview, user_id: 2, timestamp: ~N[2021-01-01 00:00:00]),
+        build(:pageview, user_id: 3, timestamp: ~N[2021-01-01 00:05:00])
+      ])
+
+      {:ok, query} =
+        QueryBuilder.build(site, %ParsedQueryParams{
+          metrics: [:visitors, :group_conversion_rate],
+          input_date_range: {:datetime_range, ~U[2021-01-01 00:00:00Z], ~U[2021-01-01 00:10:00Z]},
+          dimensions: ["time:minute"],
+          filters: [[:is, "event:goal", ["Signup"]]],
+          skip_goal_existence_check: true
+        })
+
+      %Stats.QueryResult{results: results} = Stats.query(site, query)
+
+      assert [%{dimensions: ["2021-01-01 00:05:00"], metrics: [1, 50.0]}] = results
+    end
+  end
 end

test/plausible_web/controllers/api/stats_controller/pages_test.exs

@@ -657,6 +657,8 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
                  "percentage" => 100.0
                }
              ]
+
+      assert json_response(conn, 200)["meta"] == %{"date_range_label" => "1 Jan 2021"}
     end
 
     test "returns top pages with :not_member filter on custom pageview props including (none) value",
@@ -2212,6 +2214,11 @@ defmodule PlausibleWeb.Api.StatsController.PagesTest do
                  }
                }
              ]
+
+      assert json_response(conn, 200)["meta"] == %{
+               "date_range_label" => "2 Jan 2021",
+               "comparison_date_range_label" => "1 Jan 2021"
+             }
     end
 
     on_ee do