From 348fd50297e9c76337770c27afa76ccbe88200b5 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Fri, 14 Jan 2022 23:49:08 +0100
Subject: [PATCH] Improve selecting tags in the dropdown a bit

This is some low hanging fruit, related to #573, #960. At least we see
now the category and the filter is applied to it as well.
---
 modules/webapp/src/main/elm/Comp/Dropdown.elm | 29 +++++++++++++++++--
 modules/webapp/src/main/elm/Util/Tag.elm      | 14 +++++----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/modules/webapp/src/main/elm/Comp/Dropdown.elm b/modules/webapp/src/main/elm/Comp/Dropdown.elm
index f8e039b7..49b0b0cc 100644
--- a/modules/webapp/src/main/elm/Comp/Dropdown.elm
+++ b/modules/webapp/src/main/elm/Comp/Dropdown.elm
@@ -62,6 +62,7 @@ type alias Model a =
     , menuOpen : Bool
     , filterString : String
     , searchable : Int -> Bool
+    , searchWithAdditional : Bool
     }
 
 
@@ -77,6 +78,7 @@ makeModel input =
     , available = []
     , menuOpen = False
     , filterString = ""
+    , searchWithAdditional = False
     }
 
 
@@ -465,6 +467,29 @@ view2 cfg settings model =
         viewSingle2 cfg settings model
 
 
+searchInValueOnly : ViewSettings a -> (a -> String)
+searchInValueOnly cfg =
+    cfg.makeOption >> .text
+
+
+searchInValueAdditional : ViewSettings a -> (a -> String)
+searchInValueAdditional cfg =
+    let
+        combine item =
+            item.text ++ " " ++ item.additional |> String.trim
+    in
+    cfg.makeOption >> combine
+
+
+searchIn : Model a -> ViewSettings a -> (a -> String)
+searchIn model cfg =
+    if model.searchWithAdditional then
+        searchInValueAdditional cfg
+
+    else
+        searchInValueOnly cfg
+
+
 viewSingle2 : ViewSettings a -> UiSettings -> Model a -> Html (Msg a)
 viewSingle2 cfg settings model =
     let
@@ -527,7 +552,7 @@ viewSingle2 cfg settings model =
             , input
                 [ type_ "text"
                 , placeholder cfg.placeholder
-                , onInput (Filter (cfg.makeOption >> .text))
+                , onInput (Filter (searchIn model cfg))
                 , value model.filterString
                 , class "inline-block border-0 px-0 w-full py-0 focus:ring-0 "
                 , class cfg.style.input
@@ -603,7 +628,7 @@ viewMultiple2 cfg settings model =
             , input
                 [ type_ "text"
                 , placeholder cfg.placeholder
-                , onInput (Filter (cfg.makeOption >> .text))
+                , onInput (Filter (searchIn model cfg))
                 , value model.filterString
                 , class "inline-flex w-16 border-0 px-0 focus:ring-0 h-6"
                 , class cfg.style.input
diff --git a/modules/webapp/src/main/elm/Util/Tag.elm b/modules/webapp/src/main/elm/Util/Tag.elm
index 1529184f..d670b577 100644
--- a/modules/webapp/src/main/elm/Util/Tag.elm
+++ b/modules/webapp/src/main/elm/Util/Tag.elm
@@ -22,15 +22,19 @@ import Util.List
 
 makeDropdownModel : Comp.Dropdown.Model Tag
 makeDropdownModel =
-    Comp.Dropdown.makeModel
-        { multiple = True
-        , searchable = \n -> n > 0
-        }
+    let
+        init =
+            Comp.Dropdown.makeModel
+                { multiple = True
+                , searchable = \n -> n > 0
+                }
+    in
+    { init | searchWithAdditional = True }
 
 
 tagSettings : String -> DS.DropdownStyle -> Comp.Dropdown.ViewSettings Tag
 tagSettings placeholder ds =
-    { makeOption = \tag -> { text = tag.name, additional = "" }
+    { makeOption = \tag -> { text = tag.name, additional = Maybe.withDefault "" tag.category }
     , labelColor =
         \tag ->
             \settings ->