diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.js index 3a18fcd1d..4b0976803 100644 --- a/assets/js/dashboard/stats/conversions/index.js +++ b/assets/js/dashboard/stats/conversions/index.js @@ -8,6 +8,7 @@ import PropBreakdown from './prop-breakdown' import numberFormatter from '../../util/number-formatter' import * as api from '../../api' import * as url from '../../util/url' +import { escapeFilterValue } from '../../util/filters' import LazyLoader from '../../components/lazy-loader' const MOBILE_UPPER_WIDTH = 767 @@ -79,7 +80,7 @@ export default class Conversions extends React.Component { maxWidthDeduction={this.getBarMaxWidth()} plot="unique_conversions" > - {goal.name} + {goal.name}
{numberFormatter(goal.unique_conversions)} diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.js index 300d14493..64bff909f 100644 --- a/assets/js/dashboard/util/filters.js +++ b/assets/js/dashboard/util/filters.js @@ -33,7 +33,7 @@ try { const ESCAPED_PIPE = '\\|' -function escapeFilterValue(value) { +export function escapeFilterValue(value) { return value.replaceAll(NON_ESCAPED_PIPE_REGEX, ESCAPED_PIPE) } diff --git a/lib/plausible/stats/filters.ex b/lib/plausible/stats/filters.ex index 5ac7a8585..1ea60e736 100644 --- a/lib/plausible/stats/filters.ex +++ b/lib/plausible/stats/filters.ex @@ -57,7 +57,7 @@ defmodule Plausible.Stats.Filters do {is_contains, val} = parse_contains_prefix(val) is_list = Regex.match?(@non_escaped_pipe_regex, val) is_wildcard = String.contains?(key, ["page", "goal"]) && String.match?(val, ~r/\*/) - val = if is_list, do: parse_member_list(val), else: val + val = if is_list, do: parse_member_list(val), else: remove_escape_chars(val) val = if key == "goal", do: wrap_goal_value(val), else: val cond do diff --git a/test/plausible/stats/filters_test.exs b/test/plausible/stats/filters_test.exs index 69fe6d4df..356074a6f 100644 --- a/test/plausible/stats/filters_test.exs +++ b/test/plausible/stats/filters_test.exs @@ -74,6 +74,18 @@ defmodule Plausible.Stats.FiltersTest do end end + describe "escaping pipe character" do + test "in simple is filter" do + %{"goal" => ~S(Foo \| Bar)} + |> assert_parsed(%{"event:goal" => {:is, {:event, "Foo | Bar"}}}) + end + + test "in member filter" do + %{"page" => ~S(/|\|)} + |> assert_parsed(%{"event:page" => {:member, ["/", "|"]}}) + end + end + describe "is not filter type" do test "simple is not filter" do %{"page" => "!/"}