TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-07-04 16:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify search bar and search menu

Browse Source 
The functionality of the search bar is now in the search menu, too.
The search menu shows one input field for "textual search", which is
either the fulltext search (if enabled) or a basic search in various
names.
This commit is contained in:
Eike Kettner
2020-12-05 22:38:27 +01:00
parent 5882405f30
commit 2aed7ba142
4 changed files with 233 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/webapp/src/main/elm/Page/Home/View.elm
View File

@ -285,12 +285,8 @@ viewSearchBar flags model =
(searchTypeString model.searchTypeDropdownValue)
searchInput =
case model.searchTypeDropdownValue of
BasicSearch ->
model.searchMenuModel.allNameModel
ContentOnlySearch ->
model.contentOnlySearch
Comp.SearchMenu.textSearchString
model.searchMenuModel.textSearchModel
searchTypeClass =
if flags.config.fullTextSearchEnabled then
@ -328,7 +324,7 @@ viewSearchBar flags model =
, href "#"
, onClick (DoSearch model.searchTypeDropdownValue)
]
(if hasMoreSearch model && model.searchTypeDropdownValue == BasicSearch then
(if hasMoreSearch model then
[ i [ class "icons search-corner-icons" ]
[ i [ class "tiny blue circle icon" ] []
]
@ -339,7 +335,14 @@ viewSearchBar flags model =
)
, input
[ type_ "text"
, placeholder "Quick Search …"
, placeholder
(case model.searchTypeDropdownValue of
ContentOnlySearch ->
"Content search…"
BasicSearch ->
"Search in names…"
)
, onInput SetBasicSearch
, Util.Html.onKeyUpCode KeyUpSearchbarMsg
, Maybe.map value searchInput
@ -381,12 +384,7 @@ hasMoreSearch model =
Comp.SearchMenu.getItemSearch model.searchMenuModel
is_ =
case model.lastSearchType of
BasicSearch ->
{ is | allNames = Nothing }
ContentOnlySearch ->
Api.Model.ItemSearch.empty
{ is | allNames = Nothing, fullText = Nothing }
in
is_ /= Api.Model.ItemSearch.empty