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
Refine ComboBox.StaticSearch (#3172)
Vini Brasil60e418b35778
diff --git a/lib/plausible_web/live/components/combo_box.ex b/lib/plausible_web/live/components/combo_box.exindex e54d3ab99f..2e747658d0 100644--- a/lib/plausible_web/live/components/combo_box.ex+++ b/lib/plausible_web/live/components/combo_box.ex@@ -252,16 +252,15 @@ defmodule PlausibleWeb.Live.Components.ComboBox dosocketend- if input_len > 0 do- suggestions =- input- |> suggest_mod.suggest(options)- |> Enum.take(suggestions_limit(socket.assigns))-- {:noreply, assign(socket, %{suggestions: suggestions})}- else- {:noreply, socket}- end+ suggestions =+ if input_len > 0 do+ suggest_mod.suggest(input, options)+ else+ options+ end+ |> Enum.take(suggestions_limit(socket.assigns))++ {:noreply, assign(socket, %{suggestions: suggestions})}enddefp do_select(socket, submit_value, display_value) dodiff --git a/lib/plausible_web/live/components/combo_box/static_search.ex b/lib/plausible_web/live/components/combo_box/static_search.exindex c11def88a2..4db7860bfd 100644--- a/lib/plausible_web/live/components/combo_box/static_search.ex+++ b/lib/plausible_web/live/components/combo_box/static_search.ex@@ -11,25 +11,28 @@ defmodule PlausibleWeb.Live.Components.ComboBox.StaticSearch do@spec suggest(String.t(), [{any(), any()}]) :: [{any(), any()}]def suggest(input, options) do- input_len = String.length(input)-options- |> Enum.reject(fn {_, value} ->- input_len > String.length(to_string(value))- end)- |> Enum.sort_by(- fn {_, value} ->- if to_string(value) == input do- 3- else- value = to_string(value)- input = String.downcase(input)- value = String.downcase(value)- weight = if String.contains?(value, input), do: 1, else: 0- weight + String.jaro_distance(value, input)- end- end,- :desc- )+ |> Enum.map(fn {_, value} = option -> {option, weight(value, input)} end)+ |> Enum.reject(fn {_option, weight} -> weight < 0.6 end)+ |> Enum.sort_by(fn {_option, weight} -> weight end, :desc)+ |> Enum.map(fn {option, _weight} -> option end)+ end++ defp weight(value, input) do+ value = to_string(value)++ case {value, input} do+ {value, input} when value == input ->+ 3++ {value, input} when byte_size(input) > byte_size(value) ->+ 0++ {value, input} ->+ input = String.downcase(input)+ value = String.downcase(value)+ weight = if String.contains?(value, input), do: 1, else: 0+ weight + String.jaro_distance(value, input)+ endendenddiff --git a/test/plausible_web/live/components/combo_box/static_search_test.exs b/test/plausible_web/live/components/combo_box/static_search_test.exsindex cf90403888..7e0f2a6bb2 100644--- a/test/plausible_web/live/components/combo_box/static_search_test.exs+++ b/test/plausible_web/live/components/combo_box/static_search_test.exs@@ -24,9 +24,12 @@ defmodule PlausibleWeb.Live.Components.ComboBox.StaticSearchTest dotest "allows fuzzy matching" dooptions = fake_options(["/url/0xC0FFEE", "/url/0xDEADBEEF", "/url/other"])+ assert [{_, "/url/0xC0FFEE"}] = StaticSearch.suggest("0x FF", options)+ end- assert [{_, "/url/0xC0FFEE"}, {_, "/url/0xDEADBEEF"}, {_, "/url/other"}] =- StaticSearch.suggest("0x FF", options)+ test "filters out bad matches" do+ options = fake_options(["OS", "Version", "Logged In"])+ assert [] = StaticSearch.suggest("cow", options)endenddiff --git a/test/plausible_web/live/components/combo_box_test.exs b/test/plausible_web/live/components/combo_box_test.exsindex 6d91ffe4b2..5f40277163 100644--- a/test/plausible_web/live/components/combo_box_test.exs+++ b/test/plausible_web/live/components/combo_box_test.exs@@ -191,6 +191,14 @@ defmodule PlausibleWeb.Live.Components.ComboBoxTest dorefute element_exists?(doc, suggestion_li(8))refute element_exists?(doc, suggestion_li(9))end++ test "clearing search input resets to all options", %{conn: conn} do+ {:ok, lv, _html} = live_isolated(conn, SampleView, session: %{})+ type_into_combo(lv, "test-component", "Echo me")+ doc = type_into_combo(lv, "test-component", "")++ for i <- 1..7, do: assert(element_exists?(doc, suggestion_li(i)))+ endenddescribe "creatable integration" dodiff --git a/test/plausible_web/live/funnel_settings/form_test.exs b/test/plausible_web/live/funnel_settings/form_test.exsindex bcc27c5a8b..49b399fa44 100644--- a/test/plausible_web/live/funnel_settings/form_test.exs+++ b/test/plausible_web/live/funnel_settings/form_test.exs@@ -56,9 +56,6 @@ defmodule PlausibleWeb.Live.FunnelSettings.FormTest dodoc = type_into_combo(lv, 2, "another")refute text_of_element(doc, "ul#dropdown-step-1 li") =~ "Another World"-- assert text_of_element(doc, "ul#dropdown-step-2 li") =~ "Hello World"- assert text_of_element(doc, "ul#dropdown-step-2 li") =~ "Plausible"refute text_of_element(doc, "ul#dropdown-step-2 li") =~ "Another World"end