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

Fix sorting of tags in search menu

Browse Source 
The order of tags is based on their overall counts and doesn't change
when tag association changes (due drag and drop) or the search.
This commit is contained in:
eikek
2022-01-28 00:03:41 +01:00
parent b701d25c77
commit 00b65f664d
4 changed files with 277 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/webapp/src/main/elm/Page/Share/Data.elm
View File

@ -106,7 +106,7 @@ initCmd shareId flags =
type Msg
= VerifyResp (Result Http.Error ShareVerifyResult)
| SearchResp (Result Http.Error ItemLightList)
| StatsResp (Result Http.Error SearchStats)
| StatsResp Bool (Result Http.Error SearchStats)
| PasswordMsg Comp.SharePasswordForm.Msg
| SearchMenuMsg Comp.SearchMenu.Msg
| PowerSearchMsg Comp.PowerSearchInput.Msg

36
modules/webapp/src/main/elm/Page/Share/Update.elm
View File

@ -8,7 +8,6 @@
module Page.Share.Update exposing (UpdateResult, update)
import Api
import Api.Model.ItemQuery
import Comp.ItemCardList
import Comp.LinkTarget exposing (LinkTarget)
import Comp.PowerSearchInput
@ -37,13 +36,6 @@ update flags settings shareId msg model =
case msg of
VerifyResp (Ok res) ->
if res.success then
let
eq =
Api.Model.ItemQuery.empty
iq =
{ eq | withDetails = Just True }
in
noSub
( { model
| pageError = PageErrorNone
@ -51,7 +43,7 @@ update flags settings shareId msg model =
, verifyResult = res
, searchInProgress = True
}
, makeSearchCmd flags model
, makeSearchCmd flags True model
)
else if res.passwordRequired then
@ -82,14 +74,22 @@ update flags settings shareId msg model =
SearchResp (Err err) ->
noSub ( { model | pageError = PageErrorHttp err, searchInProgress = False }, Cmd.none )
StatsResp (Ok stats) ->
StatsResp doInit (Ok stats) ->
let
lm =
if doInit then
Comp.SearchMenu.initFromStats stats
else
Comp.SearchMenu.setFromStats stats
in
update flags
settings
shareId
(SearchMenuMsg (Comp.SearchMenu.setFromStats stats))
(SearchMenuMsg lm)
model
StatsResp (Err err) ->
StatsResp _ (Err err) ->
noSub ( { model | pageError = PageErrorHttp err }, Cmd.none )
PasswordMsg lmsg ->
@ -118,7 +118,7 @@ update flags settings shareId msg model =
( initSearch, searchCmd ) =
if res.stateChange && not model.searchInProgress then
( True, makeSearchCmd flags nextModel )
( True, makeSearchCmd flags False nextModel )
else
( False, Cmd.none )
@ -142,7 +142,7 @@ update flags settings shareId msg model =
( False, Cmd.none )
Comp.PowerSearchInput.SubmitSearch ->
( True, makeSearchCmd flags nextModel )
( True, makeSearchCmd flags False nextModel )
in
{ model = { nextModel | searchInProgress = initSearch }
, cmd = Cmd.batch [ Cmd.map PowerSearchMsg res.cmd, searchCmd ]
@ -207,7 +207,7 @@ update flags settings shareId msg model =
noSub ( { model | contentSearch = Util.Maybe.fromString q }, Cmd.none )
ContentSearchKey (Just Util.Html.Enter) ->
noSub ( model, makeSearchCmd flags model )
noSub ( model, makeSearchCmd flags False model )
ContentSearchKey _ ->
noSub ( model, Cmd.none )
@ -248,8 +248,8 @@ noSub ( m, c ) =
UpdateResult m c Sub.none
makeSearchCmd : Flags -> Model -> Cmd Msg
makeSearchCmd flags model =
makeSearchCmd : Flags -> Bool -> Model -> Cmd Msg
makeSearchCmd flags doInit model =
let
xq =
Q.and
@ -279,7 +279,7 @@ makeSearchCmd flags model =
Api.searchShare flags model.verifyResult.token (request xq) SearchResp
statsCmd =
Api.searchShareStats flags model.verifyResult.token (request xq) StatsResp
Api.searchShareStats flags model.verifyResult.token (request xq) (StatsResp doInit)
in
Cmd.batch [ searchCmd, statsCmd ]