From 5206166cce1560a18b8c35ad1ca8f2af10d0a10d Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Sun, 19 Feb 2023 22:20:17 +0100
Subject: [PATCH 1/9] feat: search for users in search bar

---
 lib/haj/accounts.ex                           | 20 +++--
 lib/haj_web/components/layouts.ex             |  2 +-
 lib/haj_web/components/layouts/live.html.heex | 45 +++++-----
 lib/haj_web/live/nav_live.ex                  |  8 +-
 lib/haj_web/live/search_component.ex          | 83 +++++++++++++++++++
 ...230219172426_add_search_index_to_users.exs | 25 ++++++
 6 files changed, 153 insertions(+), 30 deletions(-)
 create mode 100644 lib/haj_web/live/search_component.ex
 create mode 100644 priv/repo/migrations/20230219172426_add_search_index_to_users.exs

diff --git a/lib/haj/accounts.ex b/lib/haj/accounts.ex
index a5979ef..2fd439b 100644
--- a/lib/haj/accounts.ex
+++ b/lib/haj/accounts.ex
@@ -153,15 +153,25 @@ defmodule Haj.Accounts do
   end
 
   @doc """
-  Searches for users based on a search phrase
+  Searches for users based on a search phrase.
   """
   def search_users(search_phrase) do
     query =
       from u in User,
-        where:
-          fragment("SIMILARITY(?,?) > 0.3", u.first_name, ^search_phrase) or
-            fragment("SIMILARITY(?,?) > 0.3", u.last_name, ^search_phrase),
-        order_by: fragment("LEVENSHTEIN(? || ?,?)", u.first_name, u.last_name, ^search_phrase)
+        where: fragment("? <% ?", ^search_phrase, u.full_name),
+        order_by: {:desc, fragment("? <% ?", ^search_phrase, u.full_name)}
+
+    Repo.all(query)
+  end
+
+  @doc """
+  Searches for spex users based on a search phrase, only returns users that have been part of a spex.
+  """
+  def search_spex_users(search_phrase) do
+    query =
+      from u in User,
+        where: fragment("? <% ?", ^search_phrase, u.full_name) and u.role != :none,
+        order_by: {:desc, fragment("? <% ?", ^search_phrase, u.full_name)}
 
     Repo.all(query)
   end
diff --git a/lib/haj_web/components/layouts.ex b/lib/haj_web/components/layouts.ex
index ce1c7ce..8f537d0 100644
--- a/lib/haj_web/components/layouts.ex
+++ b/lib/haj_web/components/layouts.ex
@@ -84,7 +84,7 @@ defmodule HajWeb.Layouts do
       >
         Mina uppgifter
       </.link>
-      <.link class="px-4 py-2 border-b hover:bg-burgandy-500 hover:text-white rounded-b-md">
+      <.link class="px-4 py-2 border-b hover:bg-burgandy-500 hover:text-white">
         Inställningar
       </.link>
       <.link
diff --git a/lib/haj_web/components/layouts/live.html.heex b/lib/haj_web/components/layouts/live.html.heex
index 812c12d..836d706 100644
--- a/lib/haj_web/components/layouts/live.html.heex
+++ b/lib/haj_web/components/layouts/live.html.heex
@@ -21,7 +21,7 @@
     </div>
     <nav class="px-4 pt-6">
       <%= if @current_user do %>
-        <.sidebar_nav_links current_user={@current_user} active_tab={@active_tab}/>
+        <.sidebar_nav_links current_user={@current_user} active_tab={@active_tab} />
       <% end %>
     </nav>
   </div>
@@ -45,7 +45,7 @@
     <div class="h-0 flex-1 flex flex-col overflow-y-auto">
       <nav class="px-4">
         <%= if @current_user do %>
-          <.sidebar_nav_links current_user={@current_user} active_tab={@active_tab}/>
+          <.sidebar_nav_links current_user={@current_user} active_tab={@active_tab} />
         <% end %>
       </nav>
     </div>
@@ -60,23 +60,30 @@
         </button>
       </div>
 
-      <div class="ml-auto flex flex-row items-center space-x-4">
-        <.icon name={:magnifying_glass} outline class="h-8 w-8 text-gray-700" />
-        <div class="relative h-8 w-8">
-          <span class="absolute top-0.5 right-0.5 w-2.5 h-2.5 rounded-full bg-burgandy-500">
-          </span>
-          <.icon name={:bell} outline class="h-8 w-8 text-gray-700" />
-        </div>
-        <div class="relative flex flex-row items-center">
-          <button role="button" phx-click={show("#user-dropdown")}>
-            <img
-              src={"https://zfinger.datasektionen.se/user/#{@current_user.username}/image/100"}
-              class="h-10 w-10 rounded-full object-cover object-top border-2 border-gray-300"
-            />
-          </button>
-          <div id="user-dropdown" class="absolute top-12 right-0 w-48 z-10" style="display: none;">
-            <div class="fixed inset-0" phx-click={JS.hide(to: "#user-dropdown")} />
-            <.user_dropdown user={@current_user} />
+      <div class="ml-4 w-full flex flex-row items-center justify-end space-x-4">
+      
+        <.live_component module={HajWeb.SearchComponent} id="search" />
+        <div id="tobar-right" class="flex flex-row items-center space-x-4">
+          <div class="relative h-8 w-8">
+            <span class="absolute top-0.5 right-0.5 w-2.5 h-2.5 rounded-full bg-burgandy-500">
+            </span>
+            <.icon name={:bell} outline class="h-8 w-8 text-gray-700" />
+          </div>
+          <div class="relative flex flex-row items-center">
+            <button role="button" phx-click={show("#user-dropdown")}>
+              <img
+                src={"https://zfinger.datasektionen.se/user/#{@current_user.username}/image/100"}
+                class="h-10 w-10 rounded-full object-cover object-top border-2 border-gray-300"
+              />
+            </button>
+            <div
+              id="user-dropdown"
+              class="absolute top-12 right-0 w-48 z-10"
+              style="display: none;"
+            >
+              <div class="fixed inset-0" phx-click={JS.hide(to: "#user-dropdown")} />
+              <.user_dropdown user={@current_user} />
+            </div>
           </div>
         </div>
       </div>
diff --git a/lib/haj_web/live/nav_live.ex b/lib/haj_web/live/nav_live.ex
index 78039e9..4ac6474 100644
--- a/lib/haj_web/live/nav_live.ex
+++ b/lib/haj_web/live/nav_live.ex
@@ -1,18 +1,16 @@
 defmodule HajWeb.Nav do
+  use HajWeb, :component
+
   alias HajWeb.UserLive
   alias HajWeb.GroupLive
   alias HajWeb.GroupsLive
   alias HajWeb.MembersLive
   alias HajWeb.DashboardLive
-  import Phoenix.LiveView
-  use Phoenix.Component
 
-  @spec on_mount(:default, any, any, Phoenix.LiveView.Socket.t()) ::
-          {:cont, Phoenix.LiveView.Socket.t()}
   def on_mount(:default, _params, _session, socket) do
     {:cont,
      socket
-     |> attach_hook(:active_tab, :handle_params, &set_active_tab/3)}
+     |> Phoenix.LiveView.attach_hook(:active_tab, :handle_params, &set_active_tab/3)}
   end
 
   defp set_active_tab(params, _url, socket) do
diff --git a/lib/haj_web/live/search_component.ex b/lib/haj_web/live/search_component.ex
new file mode 100644
index 0000000..4fecd8b
--- /dev/null
+++ b/lib/haj_web/live/search_component.ex
@@ -0,0 +1,83 @@
+defmodule HajWeb.SearchComponent do
+  use HajWeb, :live_component
+  alias Haj.Accounts
+
+  def mount(socket) do
+    {:ok, assign(socket, query: "", results: [])}
+  end
+
+  def handle_event("search", %{"search_form" => %{"q" => q}}, socket) do
+    results = Accounts.search_spex_users(q)
+
+    {:noreply, assign(socket, query: q, results: results)}
+  end
+
+  def render(assigns) do
+    ~H"""
+    <div class="flex flex-grow md:flex-grow-0 md:w-80 lg:w-96 flex-row justify-end">
+      <.icon
+        name={:magnifying_glass}
+        outline
+        class="h-8 w-8 text-gray-700"
+        phx-click={open_search()}
+        id="search-icon"
+      />
+
+      <div id="search-form" class="w-full flex flex-row items-center gap-2" style="display: none;">
+        <div class="w-full relative">
+          <.form :let={f} for={:search_form} phx-change="search" phx-target={@myself} class="w-full">
+            <%= text_input(f, :q,
+              value: @query,
+              phx_debounce: 500,
+              placeholder: "Sök",
+              class:
+                "rounded-lg text-sm h-10 w-full focus:outline-none focus:ring-2 focus:ring-burgandy-700/80 focus:border-none"
+            ) %>
+            <.icon
+              name={:x_mark}
+              outline
+              class="absolute right-2 top-2 h-6 w-6 text-gray-600"
+              phx-click={close_search()}
+            />
+          </.form>
+          <%= if @results != [] do %>
+            <div
+              id="search-results"
+              class="absolute top-12 left-0 right-0 flex flex-col bg-white rounded-lg border shadow-sm z-10"
+            >
+              <%= for result <- @results do %>
+                <.link
+                  navigate={~p"/live/user/#{result.username}"}
+                  class="last:border-none border-b py-2 px-3 text-base hover:bg-gray-50"
+                >
+                  <div><%= full_name(result) %></div>
+                  <div class="text-gray-600 text-sm">Person</div>
+                </.link>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+    """
+  end
+
+  defp open_search() do
+    JS.hide(to: "#search-icon")
+    |> JS.show(
+      to: "#search-form",
+      transition:
+        {"transition-all transform ease-out duration-300", "opacity-50 translate-x-4",
+         "opacity-100 translate-x-0"},
+      display: "flex"
+    )
+    |> JS.focus(to: "#search-form input")
+    |> JS.add_class("hidden xs:flex", to: "#tobar-right")
+  end
+
+  defp close_search() do
+    JS.hide(to: "#search-form")
+    |> JS.show(to: "#search-icon")
+    |> JS.remove_class("hidden xs:flex", to: "#tobar-right")
+  end
+end
diff --git a/priv/repo/migrations/20230219172426_add_search_index_to_users.exs b/priv/repo/migrations/20230219172426_add_search_index_to_users.exs
new file mode 100644
index 0000000..31f8b70
--- /dev/null
+++ b/priv/repo/migrations/20230219172426_add_search_index_to_users.exs
@@ -0,0 +1,25 @@
+defmodule Haj.Repo.Migrations.AddSearchIndexToUsers do
+  use Ecto.Migration
+
+  def up do
+    execute("""
+      ALTER TABLE users
+        ADD COLUMN full_name TEXT
+        GENERATED ALWAYS AS (first_name || ' ' || last_name) STORED;
+    """)
+
+    execute("""
+      CREATE INDEX users_name_gin_trgm_idx ON users USING GIN (full_name gin_trgm_ops);
+    """)
+  end
+
+  def down do
+    execute("""
+      DROP INDEX users_name_gin_trgm_idx;
+    """)
+
+    execute("""
+      ALTER TABLE users DROP COLUMN full_name;
+    """)
+  end
+end

From 30f1e313200df99964704b953b748eb2a3587a9c Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Sun, 19 Feb 2023 22:32:02 +0100
Subject: [PATCH 2/9] fix: closing search clears results

---
 lib/haj_web/live/search_component.ex | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/haj_web/live/search_component.ex b/lib/haj_web/live/search_component.ex
index 4fecd8b..4d02549 100644
--- a/lib/haj_web/live/search_component.ex
+++ b/lib/haj_web/live/search_component.ex
@@ -12,6 +12,10 @@ defmodule HajWeb.SearchComponent do
     {:noreply, assign(socket, query: q, results: results)}
   end
 
+  def handle_event("clear", _params, socket) do
+    {:noreply, assign(socket, query: "", results: [])}
+  end
+
   def render(assigns) do
     ~H"""
     <div class="flex flex-grow md:flex-grow-0 md:w-80 lg:w-96 flex-row justify-end">
@@ -25,7 +29,15 @@ defmodule HajWeb.SearchComponent do
 
       <div id="search-form" class="w-full flex flex-row items-center gap-2" style="display: none;">
         <div class="w-full relative">
-          <.form :let={f} for={:search_form} phx-change="search" phx-target={@myself} class="w-full">
+          <.form
+            :let={f}
+            for={:search_form}
+            phx-change="search"
+            phx-target={@myself}
+            class="w-full"
+            onkeydown="return event.key != 'Enter';"
+            autocomplete={:off}
+          >
             <%= text_input(f, :q,
               value: @query,
               phx_debounce: 500,
@@ -37,7 +49,7 @@ defmodule HajWeb.SearchComponent do
               name={:x_mark}
               outline
               class="absolute right-2 top-2 h-6 w-6 text-gray-600"
-              phx-click={close_search()}
+              phx-click={close_search(@myself)}
             />
           </.form>
           <%= if @results != [] do %>
@@ -75,9 +87,10 @@ defmodule HajWeb.SearchComponent do
     |> JS.add_class("hidden xs:flex", to: "#tobar-right")
   end
 
-  defp close_search() do
+  defp close_search(target) do
     JS.hide(to: "#search-form")
     |> JS.show(to: "#search-icon")
     |> JS.remove_class("hidden xs:flex", to: "#tobar-right")
+    |> JS.push("clear", target: target)
   end
 end

From a4840571a41ef895843090a44f67a0220baabdaf Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Mon, 20 Feb 2023 10:43:16 +0100
Subject: [PATCH 3/9] fix: hover in sidebar

---
 lib/haj_web/components/layouts.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/haj_web/components/layouts.ex b/lib/haj_web/components/layouts.ex
index 8f537d0..bffacdd 100644
--- a/lib/haj_web/components/layouts.ex
+++ b/lib/haj_web/components/layouts.ex
@@ -46,9 +46,9 @@ defmodule HajWeb.Layouts do
     ~H"""
     <.link
       navigate={@navigate}
-      class={"text-white group flex items-center px-2 py-2 rounded-md #{if @active, do: "bg-burgandy-600"}"}
+      class={"text-white hover:text-burgandy-700 hover:bg-burgandy-50 flex items-center px-2 py-2 rounded-md #{if @active, do: "bg-burgandy-600"}"}
     >
-      <.icon name={@icon_name} solid class=" mr-3 flex-shrink-0 h-6 w-6" />
+      <.icon name={@icon_name} solid class="mr-3 flex-shrink-0 h-6 w-6" />
       <%= @title %>
     </.link>
     """
@@ -59,7 +59,7 @@ defmodule HajWeb.Layouts do
     ~H"""
     <.link
       navigate={@navigate}
-      class={"text-burgandy-100 flex items-center pl-11 px-2 py-2 rounded-md #{if @active, do: "bg-burgandy-600"}"}
+      class={"text-burgandy-100 hover:text-burgandy-700 hover:bg-burgandy-50 flex items-center pl-11 px-2 py-2 rounded-md #{if @active, do: "bg-burgandy-600"}"}
     >
       <%= @title %>
     </.link>

From 52ac744fa2d5b4968492210f2afb924cda0b759a Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Mon, 20 Feb 2023 10:45:03 +0100
Subject: [PATCH 4/9] fix: sidebar animation flicker

---
 lib/haj_web/components/live_helpers.ex | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/haj_web/components/live_helpers.ex b/lib/haj_web/components/live_helpers.ex
index ef8ef01..bc33ff7 100644
--- a/lib/haj_web/components/live_helpers.ex
+++ b/lib/haj_web/components/live_helpers.ex
@@ -86,7 +86,11 @@ defmodule HajWeb.LiveHelpers do
 
   def show_mobile_sidebar(js \\ %JS{}) do
     js
-    |> JS.show(to: "#mobile-sidebar-container", transition: "fade-in", time: 100)
+    |> JS.show(
+      to: "#mobile-sidebar-container",
+      transition: {"transition fade-in duration-300", "opacity-0", "opacity-100"},
+      time: 300
+    )
     |> JS.show(
       to: "#mobile-sidebar",
       display: "flex",

From 940846e76e4e12fa83797a73bef9e76c34146757 Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Mon, 20 Feb 2023 10:45:36 +0100
Subject: [PATCH 5/9] feat: searchbar now looks better on mobile

---
 lib/haj_web/components/layouts/live.html.heex |  7 ++--
 lib/haj_web/live/search_component.ex          | 34 +++++++++----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/lib/haj_web/components/layouts/live.html.heex b/lib/haj_web/components/layouts/live.html.heex
index 836d706..8c3dba9 100644
--- a/lib/haj_web/components/layouts/live.html.heex
+++ b/lib/haj_web/components/layouts/live.html.heex
@@ -60,8 +60,7 @@
         </button>
       </div>
 
-      <div class="ml-4 w-full flex flex-row items-center justify-end space-x-4">
-      
+      <div class="w-full flex flex-row items-center justify-end space-x-4">
         <.live_component module={HajWeb.SearchComponent} id="search" />
         <div id="tobar-right" class="flex flex-row items-center space-x-4">
           <div class="relative h-8 w-8">
@@ -70,10 +69,10 @@
             <.icon name={:bell} outline class="h-8 w-8 text-gray-700" />
           </div>
           <div class="relative flex flex-row items-center">
-            <button role="button" phx-click={show("#user-dropdown")}>
+            <button role="button" phx-click={show("#user-dropdown")} class="group">
               <img
                 src={"https://zfinger.datasektionen.se/user/#{@current_user.username}/image/100"}
-                class="h-10 w-10 rounded-full object-cover object-top border-2 border-gray-300"
+                class="h-10 w-10 rounded-full object-cover object-top border-2 border-gray-300 group-hover:brightness-95"
               />
             </button>
             <div
diff --git a/lib/haj_web/live/search_component.ex b/lib/haj_web/live/search_component.ex
index 4d02549..4777e16 100644
--- a/lib/haj_web/live/search_component.ex
+++ b/lib/haj_web/live/search_component.ex
@@ -18,14 +18,19 @@ defmodule HajWeb.SearchComponent do
 
   def render(assigns) do
     ~H"""
-    <div class="flex flex-grow md:flex-grow-0 md:w-80 lg:w-96 flex-row justify-end">
-      <.icon
-        name={:magnifying_glass}
-        outline
-        class="h-8 w-8 text-gray-700"
-        phx-click={open_search()}
-        id="search-icon"
-      />
+    <div class="flex flex-grow md:flex-grow-0 md:w-80 lg:w-96 flex-row items-center justify-end gap-4">
+      <button phx-click={open_search()} id="search-icon" class="text-gray-700 hover:text-gray-500">
+        <.icon name={:magnifying_glass} outline class="h-8 w-8" />
+      </button>
+
+      <button
+        phx-click={close_search(@myself)}
+        id="close-search-icon"
+        class="text-gray-700 hover:text-gray-500"
+        style="display: none;"
+      >
+        <.icon name={:x_mark} outline class="h-8 w-8" />
+      </button>
 
       <div id="search-form" class="w-full flex flex-row items-center gap-2" style="display: none;">
         <div class="w-full relative">
@@ -45,12 +50,6 @@ defmodule HajWeb.SearchComponent do
               class:
                 "rounded-lg text-sm h-10 w-full focus:outline-none focus:ring-2 focus:ring-burgandy-700/80 focus:border-none"
             ) %>
-            <.icon
-              name={:x_mark}
-              outline
-              class="absolute right-2 top-2 h-6 w-6 text-gray-600"
-              phx-click={close_search(@myself)}
-            />
           </.form>
           <%= if @results != [] do %>
             <div
@@ -78,18 +77,19 @@ defmodule HajWeb.SearchComponent do
     JS.hide(to: "#search-icon")
     |> JS.show(
       to: "#search-form",
-      transition:
-        {"transition-all transform ease-out duration-300", "opacity-50 translate-x-4",
-         "opacity-100 translate-x-0"},
       display: "flex"
     )
+    |> JS.add_class("hidden md:block", to: "#show-mobile-sidebar")
+    |> JS.show(to: "#close-search-icon")
     |> JS.focus(to: "#search-form input")
     |> JS.add_class("hidden xs:flex", to: "#tobar-right")
   end
 
   defp close_search(target) do
     JS.hide(to: "#search-form")
+    |> JS.hide(to: "#close-search-icon")
     |> JS.show(to: "#search-icon")
+    |> JS.remove_class("hidden md:block", to: "#show-mobile-sidebar")
     |> JS.remove_class("hidden xs:flex", to: "#tobar-right")
     |> JS.push("clear", target: target)
   end

From 4e94be0db0192e46f77ae81d12715107c22e72c6 Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Mon, 20 Feb 2023 23:05:26 +0100
Subject: [PATCH 6/9] bumped phoenix version

---
 lib/haj_web/components/core_components.ex |  2 +-
 lib/haj_web/live/applications_live.ex     |  2 +-
 lib/haj_web/live/apply_live.ex            |  2 +-
 lib/haj_web/live/group_admin_live.ex      |  5 +++--
 lib/haj_web/live/members_live.ex          |  2 +-
 mix.exs                                   |  2 +-
 mix.lock                                  | 14 +++++++-------
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/haj_web/components/core_components.ex b/lib/haj_web/components/core_components.ex
index a482227..e328fa7 100644
--- a/lib/haj_web/components/core_components.ex
+++ b/lib/haj_web/components/core_components.ex
@@ -171,7 +171,7 @@ defmodule HajWeb.CoreComponents do
 
   ## Examples
 
-      <.simple_form :let={f} for={:user} phx-change="validate" phx-submit="save">
+      <.simple_form :let={f} as={:user} phx-change="validate" phx-submit="save">
         <.input field={{f, :email}} label="Email"/>
         <.input field={{f, :username}} label="Username" />
         <:actions>
diff --git a/lib/haj_web/live/applications_live.ex b/lib/haj_web/live/applications_live.ex
index 988be99..72e8361 100644
--- a/lib/haj_web/live/applications_live.ex
+++ b/lib/haj_web/live/applications_live.ex
@@ -35,7 +35,7 @@ defmodule HajWeb.ApplicationsLive do
     <div class="flex flex-col py-2 mb-2 gap-2 md:flex-row md:items-center border-burgandy-500 border-b-2">
       <div class="uppercase font-bold">Filtrera</div>
 
-      <.form :let={f} for={:filter} phx-change="filter" class="w-full md:w-auto">
+      <.form :let={f} as={:filter} phx-change="filter" class="w-full md:w-auto">
         <%= select(f, :show_group, group_options(@show.show_groups),
           class: "h-full w-full",
           prompt: "Alla grupper"
diff --git a/lib/haj_web/live/apply_live.ex b/lib/haj_web/live/apply_live.ex
index 363a190..7f62a90 100644
--- a/lib/haj_web/live/apply_live.ex
+++ b/lib/haj_web/live/apply_live.ex
@@ -208,7 +208,7 @@ defmodule HajWeb.ApplyLive do
 
       <.form
         :let={f}
-        for={:application}
+        as={:application}
         phx-submit="apply"
         class="flex flex-col gap-1 mt-4 md:flex-[1] md:mt-0"
       >
diff --git a/lib/haj_web/live/group_admin_live.ex b/lib/haj_web/live/group_admin_live.ex
index 805c5a2..646a490 100644
--- a/lib/haj_web/live/group_admin_live.ex
+++ b/lib/haj_web/live/group_admin_live.ex
@@ -122,13 +122,14 @@ defmodule HajWeb.GroupAdminLive do
       Välj vilken typ av medlem (chef/gruppis), sök på användare och lägg sedan till!
     </p>
     <div class="flex flex-row items-stretch gap-2">
-      <.form :let={f} for={:role_form} phx-change="update_role">
+      <.form :let={f} as={:role_form} phx-change="update_role">
         <%= select(f, :role, @roles, class: "h-full", value: @role) %>
       </.form>
 
       <.form
         :let={f}
-        for={:search_form}
+        for={%{}}
+        as={:search_form}
         phx-change="suggest"
         phx-submit="add"
         autocomplete={:off}
diff --git a/lib/haj_web/live/members_live.ex b/lib/haj_web/live/members_live.ex
index 1df9774..d7c83eb 100644
--- a/lib/haj_web/live/members_live.ex
+++ b/lib/haj_web/live/members_live.ex
@@ -48,7 +48,7 @@ defmodule HajWeb.MembersLive do
     ~H"""
     <.form
       :let={f}
-      for={:search_form}
+      as={:search_form}
       phx-change="filter"
       phx-no-submit
       autocomplete={:off}
diff --git a/mix.exs b/mix.exs
index fd0afac..1abda81 100644
--- a/mix.exs
+++ b/mix.exs
@@ -32,7 +32,7 @@ defmodule Haj.MixProject do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.7.0-rc.0", override: true},
+      {:phoenix, "~> 1.7.0-rc.3", override: true},
       {:phoenix_view, "~> 2.0"},
       {:phoenix_ecto, "~> 4.4"},
       {:ecto_sql, "~> 3.6"},
diff --git a/mix.lock b/mix.lock
index 2ce7458..54946f2 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,6 +1,6 @@
 %{
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
-  "castore": {:hex, :castore, "0.1.18", "deb5b9ab02400561b6f5708f3e7660fc35ca2d51bfc6a940d2f513f89c2975fc", [:mix], [], "hexpm", "61bbaf6452b782ef80b33cdb45701afbcf0a918a45ebe7e73f1130d661e66a06"},
+  "castore": {:hex, :castore, "1.0.0", "c25cd0794c054ebe6908a86820c8b92b5695814479ec95eeff35192720b71eec", [:mix], [], "hexpm", "577d0e855983a97ca1dfa33cbb8a3b6ece6767397ffb4861514343b078fc284b"},
   "certifi": {:hex, :certifi, "2.9.0", "6f2a475689dd47f19fb74334859d460a2dc4e3252a3324bd2111b8f0429e7e21", [:rebar3], [], "hexpm", "266da46bdb06d6c6d35fde799bcb28d36d985d424ad7c08b5bb48f5b5cdd4641"},
   "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
   "cowboy": {:hex, :cowboy, "2.9.0", "865dd8b6607e14cf03282e10e934023a1bd8be6f6bacf921a7e2a96d800cd452", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde"},
@@ -34,14 +34,14 @@
   "nimble_parsec": {:hex, :nimble_parsec, "1.2.3", "244836e6e3f1200c7f30cb56733fd808744eca61fd182f731eac4af635cc6d0b", [:mix], [], "hexpm", "c8d789e39b9131acf7b99291e93dae60ab48ef14a7ee9d58c6964f59efb570b0"},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
-  "phoenix": {:hex, :phoenix, "1.7.0-rc.0", "8e328572f496b5170e879da94baa57c5f878f354d50eac052c9a7c6d57c2cf54", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.4", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "ed503f6c55184afc0a453e44e6ab2a09f014f59b7fdd682313fdc52ec2f82859"},
+  "phoenix": {:hex, :phoenix, "1.7.0-rc.3", "603e2f637df9967a8b147a058db828d374be58e2cafecf63a4aaf67db22844c4", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.4", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "ae651c301167b8d43a16bd80bd62466cd1f7af1189dd65cbacf37ee3c99e6752"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"},
-  "phoenix_html": {:hex, :phoenix_html, "3.2.0", "1c1219d4b6cb22ac72f12f73dc5fad6c7563104d083f711c3fcd8551a1f4ae11", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "36ec97ba56d25c0136ef1992c37957e4246b649d620958a1f9fa86165f8bc54f"},
+  "phoenix_html": {:hex, :phoenix_html, "3.3.0", "bf451c71ebdaac8d2f40d3b703435e819ccfbb9ff243140ca3bd10c155f134cc", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "272c5c1533499f0132309936c619186480bafcc2246588f99a69ce85095556ef"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.7.2", "97cc4ff2dba1ebe504db72cb45098cb8e91f11160528b980bd282cc45c73b29c", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.18.3", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.3.3", "3a53772a6118d5679bf50fc1670505a290e32a1d195df9e069d8c53ab040c054", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "766796676e5f558dbae5d1bdb066849673e956005e3730dfd5affd7a6da4abac"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.3", "2e3d009422addf8b15c3dccc65ce53baccbe26f7cfd21d264680b5867789a9c1", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c8845177a866e017dcb7083365393c8f00ab061b8b6b2bda575891079dce81b2"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.18.15", "58137e648fca9da56d6e931c9c3001f895ff090291052035f395bc958b82f1a5", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "888dd8ea986bebbda741acc65aef788c384d13db91fea416461b2e96aa06a193"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.1", "ba04e489ef03763bf28a17eb2eaddc2c20c6d217e2150a61e3298b0f4c2012b5", [:mix], [], "hexpm", "81367c6d1eea5878ad726be80808eb5a787a23dee699f96e72b1109c57cdd8d9"},
-  "phoenix_template": {:hex, :phoenix_template, "1.0.0", "c57bc5044f25f007dc86ab21895688c098a9f846a8dda6bc40e2d0ddc146e38f", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "1b066f99a26fd22064c12b2600a9a6e56700f591bf7b20b418054ea38b4d4357"},
+  "phoenix_template": {:hex, :phoenix_template, "1.0.1", "85f79e3ad1b0180abb43f9725973e3b8c2c3354a87245f91431eec60553ed3ef", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"},
   "phoenix_view": {:hex, :phoenix_view, "2.0.2", "6bd4d2fd595ef80d33b439ede6a19326b78f0f1d8d62b9a318e3d9c1af351098", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}], "hexpm", "a929e7230ea5c7ee0e149ffcf44ce7cf7f4b6d2bfe1752dd7c084cdff152d36f"},
   "plug": {:hex, :plug, "1.14.0", "ba4f558468f69cbd9f6b356d25443d0b796fbdc887e03fa89001384a9cac638f", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "bf020432c7d4feb7b3af16a0c2701455cbbbb95e5b6866132cb09eb0c29adc14"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.0", "d1cf12ff96a1ca4f52207c5271a6c351a4733f413803488d75b70ccf44aebec2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "073cf20b753ce6682ed72905cd62a2d4bd9bad1bf9f7feb02a1b8e525bd94fa6"},
@@ -51,10 +51,10 @@
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"},
   "swoosh": {:hex, :swoosh, "1.8.2", "af9a22ab2c0d20b266f61acca737fa11a121902de9466a39e91bacdce012101c", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "d058ba750eafadb6c09a84a352c14c5d1eeeda6e84945fcc95785b7f3067b7db"},
   "tailwind": {:hex, :tailwind, "0.1.9", "25ba09d42f7bfabe170eb67683a76d6ec2061952dc9bd263a52a99ba3d24bd4d", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}], "hexpm", "9213f87709c458aaec313bb5f2df2b4d2cedc2b630e4ae821bf3c54c47a56d0b"},
-  "telemetry": {:hex, :telemetry, "1.1.0", "a589817034a27eab11144ad24d5c0f9fab1f58173274b1e9bae7074af9cbee51", [:rebar3], [], "hexpm", "b727b2a1f75614774cff2d7565b64d0dfa5bd52ba517f16543e6fc7efcc0df48"},
+  "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
   "websock": {:hex, :websock, "0.4.3", "184ac396bdcd3dfceb5b74c17d221af659dd559a95b1b92041ecb51c9b728093", [:mix], [], "hexpm", "5e4dd85f305f43fd3d3e25d70bec4a45228dfed60f0f3b072d8eddff335539cf"},
-  "websock_adapter": {:hex, :websock_adapter, "0.4.4", "c87202c8e42c3fb6943ce48f00e9c19caa4dbeae34c58e3827e382aef522b10f", [:mix], [{:bandit, "~> 0.5.9", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14.0", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.4.3", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "7192eea9f822f24d3731c28934a6ad92d782f9acf815d34f72c84f1d994c6e86"},
+  "websock_adapter": {:hex, :websock_adapter, "0.4.5", "30038a3715067f51a9580562c05a3a8d501126030336ffc6edb53bf57d6d2d26", [:mix], [{:bandit, "~> 0.6", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.4", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "1d9812dc7e703c205049426fd4fe0852a247a825f91b099e53dc96f68bafe4c8"},
 }

From a1a20e112c7895c7ea7e2158200910c2a19f47c8 Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Mon, 20 Feb 2023 23:07:13 +0100
Subject: [PATCH 7/9] feat: search for groups

---
 lib/haj/spex.ex                      | 32 +++++++++++++++++++---------
 lib/haj_web/live/search_component.ex | 24 ++++++++++++++++-----
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/lib/haj/spex.ex b/lib/haj/spex.ex
index c8a87db..d9ac647 100644
--- a/lib/haj/spex.ex
+++ b/lib/haj/spex.ex
@@ -486,11 +486,9 @@ defmodule Haj.Spex do
         join: gm in assoc(sg, :group_memberships),
         join: u in assoc(gm, :user),
         where:
-          sg.show_id == ^show_id and
-            (fragment("SIMILARITY(?, ?) > 0.3", u.first_name, ^search_phrase) or
-               fragment("SIMILARITY(?, ?) > 0.3", u.last_name, ^search_phrase) or
-               fragment("SIMILARITY(?, ?) > 0.3", u.username, ^search_phrase)),
-        order_by: fragment("LEVENSHTEIN(? || ?,?)", u.first_name, u.last_name, ^search_phrase),
+          fragment("? <% ?", ^search_phrase, u.full_name) and
+            sg.show_id == ^show_id,
+        order_by: {:desc, fragment("? <% ?", ^search_phrase, u.full_name)},
         select: u,
         distinct: u
 
@@ -506,14 +504,28 @@ defmodule Haj.Spex do
         join: gm in assoc(sg, :group_memberships),
         join: u in assoc(gm, :user),
         where:
-          sg.id == ^show_group_id and
-            (fragment("SIMILARITY(?, ?) > 0.3", u.first_name, ^search_phrase) or
-               fragment("SIMILARITY(?, ?) > 0.3", u.last_name, ^search_phrase) or
-               fragment("SIMILARITY(?, ?) > 0.3", u.username, ^search_phrase)),
-        order_by: fragment("LEVENSHTEIN(? || ?,?)", u.first_name, u.last_name, ^search_phrase),
+          fragment("? <% ?", ^search_phrase, u.full_name) and
+            sg.id == ^show_group_id,
+        order_by: {:desc, fragment("? <% ?", ^search_phrase, u.full_name)},
         select: u,
         distinct: u
 
     Repo.all(query)
   end
+
+  @doc """
+  Searches for a showgroup based on a search phrase for a given show
+  """
+  def search_show_groups(show_id, search_phrase) do
+    query =
+      from sg in ShowGroup,
+        join: g in assoc(sg, :group),
+        where:
+          sg.show_id == ^show_id and
+            fragment("? % ?", g.name, ^search_phrase),
+        order_by: fragment("? % ?", g.name, ^search_phrase),
+        preload: [:group]
+
+    Repo.all(query)
+  end
 end
diff --git a/lib/haj_web/live/search_component.ex b/lib/haj_web/live/search_component.ex
index 4777e16..fbde1d6 100644
--- a/lib/haj_web/live/search_component.ex
+++ b/lib/haj_web/live/search_component.ex
@@ -1,13 +1,18 @@
 defmodule HajWeb.SearchComponent do
   use HajWeb, :live_component
   alias Haj.Accounts
+  alias Haj.Spex
 
   def mount(socket) do
     {:ok, assign(socket, query: "", results: [])}
   end
 
   def handle_event("search", %{"search_form" => %{"q" => q}}, socket) do
-    results = Accounts.search_spex_users(q)
+    current_spex = Spex.current_spex()
+
+    results =
+      Accounts.search_spex_users(q) ++
+        Spex.search_show_groups(current_spex.id, q)
 
     {:noreply, assign(socket, query: q, results: results)}
   end
@@ -36,7 +41,7 @@ defmodule HajWeb.SearchComponent do
         <div class="w-full relative">
           <.form
             :let={f}
-            for={:search_form}
+            as={:search_form}
             phx-change="search"
             phx-target={@myself}
             class="w-full"
@@ -58,11 +63,11 @@ defmodule HajWeb.SearchComponent do
             >
               <%= for result <- @results do %>
                 <.link
-                  navigate={~p"/live/user/#{result.username}"}
+                  navigate={navigate(result)}
                   class="last:border-none border-b py-2 px-3 text-base hover:bg-gray-50"
                 >
-                  <div><%= full_name(result) %></div>
-                  <div class="text-gray-600 text-sm">Person</div>
+                  <div><%= title(result) %></div>
+                  <div class="text-gray-600 text-sm"><%= type(result) %></div>
                 </.link>
               <% end %>
             </div>
@@ -73,6 +78,15 @@ defmodule HajWeb.SearchComponent do
     """
   end
 
+  defp navigate(%Accounts.User{} = user), do: ~p"/live/user/#{user.username}"
+  defp navigate(%Spex.ShowGroup{} = sg), do: ~p"/live/group/#{sg.id}"
+
+  defp title(%Accounts.User{} = user), do: full_name(user)
+  defp title(%Spex.ShowGroup{} = sg), do: sg.group.name
+
+  defp type(%Accounts.User{}), do: "Person"
+  defp type(%Spex.ShowGroup{}), do: "Grupp"
+
   defp open_search() do
     JS.hide(to: "#search-icon")
     |> JS.show(

From 211389a4b3009ad760f13d3a1327b7ae9c8fd494 Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Mon, 20 Feb 2023 23:08:49 +0100
Subject: [PATCH 8/9] fix: new 1.7-rc.3 syntax

---
 lib/haj_web/live/merch_admin_live/index.html.heex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/haj_web/live/merch_admin_live/index.html.heex b/lib/haj_web/live/merch_admin_live/index.html.heex
index d9a7c45..e3539de 100644
--- a/lib/haj_web/live/merch_admin_live/index.html.heex
+++ b/lib/haj_web/live/merch_admin_live/index.html.heex
@@ -1,6 +1,6 @@
 <div class="pb-4 border-b">
   <h3 class="font-bold text-2xl py-2">Administrera merch</h3>
-  <.form :let={f} id="show-form" for={:show} phx-change="select_show" class="">
+  <.form :let={f} id="show-form" as={:show} phx-change="select_show" class="">
     <div class="">
       <%= label(f, :show, "Välj spex",
         class: "block text-sm font-semibold leading-6 text-zinc-800"

From b1b949a159797cf0aabfdf5efd0017614cfab76c Mon Sep 17 00:00:00 2001
From: Adrian Salamon <adr.salamon@gmail.com>
Date: Tue, 21 Feb 2023 20:21:46 +0100
Subject: [PATCH 9/9] fix: search now ranks results in relation to eachother

---
 lib/haj/accounts.ex                  | 14 ++++++++++++--
 lib/haj/accounts/user.ex             |  1 +
 lib/haj/spex.ex                      | 14 ++++++++++++--
 lib/haj_web/live/group_admin_live.ex |  1 +
 lib/haj_web/live/search_component.ex |  7 +++++--
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/lib/haj/accounts.ex b/lib/haj/accounts.ex
index 2fd439b..16456c2 100644
--- a/lib/haj/accounts.ex
+++ b/lib/haj/accounts.ex
@@ -167,12 +167,22 @@ defmodule Haj.Accounts do
   @doc """
   Searches for spex users based on a search phrase, only returns users that have been part of a spex.
   """
-  def search_spex_users(search_phrase) do
-    query =
+  def search_spex_users(search_phrase, options \\ []) do
+    include_rank = Keyword.get(options, :rank, false)
+
+    base_query =
       from u in User,
         where: fragment("? <% ?", ^search_phrase, u.full_name) and u.role != :none,
         order_by: {:desc, fragment("? <% ?", ^search_phrase, u.full_name)}
 
+    query =
+      if include_rank do
+        from u in base_query,
+          select: {u, fragment("word_similarity(?, ?)", ^search_phrase, u.full_name)}
+      else
+        base_query
+      end
+
     Repo.all(query)
   end
 
diff --git a/lib/haj/accounts/user.ex b/lib/haj/accounts/user.ex
index adbb804..76ca382 100644
--- a/lib/haj/accounts/user.ex
+++ b/lib/haj/accounts/user.ex
@@ -7,6 +7,7 @@ defmodule Haj.Accounts.User do
     field :first_name, :string
     field :last_name, :string
     field :username, :string
+    field :full_name, :string
 
     field :google_account, :string
     field :phone, :string
diff --git a/lib/haj/spex.ex b/lib/haj/spex.ex
index d9ac647..1ab381c 100644
--- a/lib/haj/spex.ex
+++ b/lib/haj/spex.ex
@@ -516,8 +516,10 @@ defmodule Haj.Spex do
   @doc """
   Searches for a showgroup based on a search phrase for a given show
   """
-  def search_show_groups(show_id, search_phrase) do
-    query =
+  def search_show_groups(show_id, search_phrase, options \\ []) do
+    include_rank = Keyword.get(options, :rank, false)
+
+    base_query =
       from sg in ShowGroup,
         join: g in assoc(sg, :group),
         where:
@@ -526,6 +528,14 @@ defmodule Haj.Spex do
         order_by: fragment("? % ?", g.name, ^search_phrase),
         preload: [:group]
 
+    query =
+      if include_rank do
+        from [sg, g] in base_query,
+          select: {sg, fragment("similarity(?, ?)", g.name, ^search_phrase)}
+      else
+        base_query
+      end
+
     Repo.all(query)
   end
 end
diff --git a/lib/haj_web/live/group_admin_live.ex b/lib/haj_web/live/group_admin_live.ex
index 646a490..34549d9 100644
--- a/lib/haj_web/live/group_admin_live.ex
+++ b/lib/haj_web/live/group_admin_live.ex
@@ -22,6 +22,7 @@ defmodule HajWeb.GroupAdminLive do
         roles: [:gruppis, :chef],
         role: :gruppis
       )
+      |> assign(:active_tab, nil)
 
     {:ok, socket}
   end
diff --git a/lib/haj_web/live/search_component.ex b/lib/haj_web/live/search_component.ex
index fbde1d6..61e314e 100644
--- a/lib/haj_web/live/search_component.ex
+++ b/lib/haj_web/live/search_component.ex
@@ -10,9 +10,12 @@ defmodule HajWeb.SearchComponent do
   def handle_event("search", %{"search_form" => %{"q" => q}}, socket) do
     current_spex = Spex.current_spex()
 
+    # Sort results based on similarity
     results =
-      Accounts.search_spex_users(q) ++
-        Spex.search_show_groups(current_spex.id, q)
+      (Accounts.search_spex_users(q, rank: true) ++
+         Spex.search_show_groups(current_spex.id, q, rank: true))
+      |> Enum.sort_by(&elem(&1, 1), &>=/2)
+      |> Enum.map(&elem(&1, 0))
 
     {:noreply, assign(socket, query: q, results: results)}
   end