mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-04-04 10:29:34 +00:00
Allow to choose from existing tag categories
Also fixes a ui problem with a too long dropdown menu in the small modal popup when adding tags or custom fields in item detail view. Issue: #331
This commit is contained in:
Eike Kettner
parent
5a7d39add6
commit
c87163052b
@ -165,11 +165,11 @@ initTag itemId tm =
|
||||
init itemId (TM tm)
|
||||
|
||||
|
||||
initTagByName : String -> String -> Model
|
||||
initTagByName itemId name =
|
||||
initTagByName : String -> String -> List String -> Model
|
||||
initTagByName itemId name categories =
|
||||
let
|
||||
tm =
|
||||
Comp.TagForm.emptyModel
|
||||
Comp.TagForm.emptyModel categories
|
||||
|
||||
tm_ =
|
||||
{ tm | name = name }
|
||||
|
||||
@ -13,6 +13,7 @@ module Comp.Dropdown exposing
|
||||
, setMkOption
|
||||
, update
|
||||
, view
|
||||
, viewSingle
|
||||
)
|
||||
|
||||
{-| This needs to be rewritten from scratch!
|
||||
@ -252,7 +253,15 @@ filterOptions str list =
|
||||
|
||||
applyFilter : String -> Model a -> Model a
|
||||
applyFilter str model =
|
||||
{ model | filterString = str, available = filterOptions str model.available }
|
||||
let
|
||||
selected =
|
||||
if str /= "" && not model.multiple then
|
||||
[]
|
||||
|
||||
else
|
||||
model.selected
|
||||
in
|
||||
{ model | filterString = str, available = filterOptions str model.available, selected = selected }
|
||||
|
||||
|
||||
makeNextActive : (Int -> Int) -> Model a -> Model a
|
||||
|
||||
@ -98,6 +98,7 @@ type alias Model =
|
||||
, customFieldsModel : Comp.CustomFieldMultiInput.Model
|
||||
, customFieldSavingIcon : Dict String String
|
||||
, customFieldThrottle : Throttle Msg
|
||||
, allTags : List Tag
|
||||
}
|
||||
|
||||
|
||||
@ -202,6 +203,7 @@ emptyModel =
|
||||
, customFieldsModel = Comp.CustomFieldMultiInput.initWith []
|
||||
, customFieldSavingIcon = Dict.empty
|
||||
, customFieldThrottle = Throttle.create 1
|
||||
, allTags = []
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -65,6 +65,7 @@ import Util.Http
|
||||
import Util.List
|
||||
import Util.Maybe
|
||||
import Util.String
|
||||
import Util.Tag
|
||||
|
||||
|
||||
update : Nav.Key -> Flags -> ItemNav -> UiSettings -> Msg -> Model -> UpdateResult
|
||||
@ -588,7 +589,7 @@ update key flags inav settings msg model =
|
||||
tagList =
|
||||
Comp.Dropdown.SetOptions tags.items
|
||||
in
|
||||
update key flags inav settings (TagDropdownMsg tagList) model
|
||||
update key flags inav settings (TagDropdownMsg tagList) { model | allTags = tags.items }
|
||||
|
||||
GetTagsResp (Err _) ->
|
||||
resultModel model
|
||||
@ -1039,9 +1040,13 @@ update key flags inav settings msg model =
|
||||
resultModel model
|
||||
|
||||
StartTagModal ->
|
||||
let
|
||||
cats =
|
||||
Util.Tag.getCategories model.allTags
|
||||
in
|
||||
resultModel
|
||||
{ model
|
||||
| modalEdit = Just (Comp.DetailEdit.initTagByName model.item.id "")
|
||||
| modalEdit = Just (Comp.DetailEdit.initTagByName model.item.id "" cats)
|
||||
}
|
||||
|
||||
StartCorrOrgModal ->
|
||||
|
||||
@ -9,24 +9,38 @@ module Comp.TagForm exposing
|
||||
)
|
||||
|
||||
import Api.Model.Tag exposing (Tag)
|
||||
import Comp.Dropdown
|
||||
import Data.Flags exposing (Flags)
|
||||
import Html exposing (..)
|
||||
import Html.Attributes exposing (..)
|
||||
import Html.Events exposing (onInput)
|
||||
import Util.Maybe
|
||||
|
||||
|
||||
type alias Model =
|
||||
{ tag : Tag
|
||||
, name : String
|
||||
, category : Maybe String
|
||||
, allCategories : List String
|
||||
, catDropdown : Comp.Dropdown.Model String
|
||||
}
|
||||
|
||||
|
||||
emptyModel : Model
|
||||
emptyModel =
|
||||
emptyModel : List String -> Model
|
||||
emptyModel categories =
|
||||
{ tag = Api.Model.Tag.empty
|
||||
, name = ""
|
||||
, category = Nothing
|
||||
, allCategories = categories
|
||||
, catDropdown =
|
||||
let
|
||||
cm =
|
||||
Comp.Dropdown.makeSingleList
|
||||
{ makeOption = \s -> Comp.Dropdown.mkOption s s
|
||||
, placeholder = "Select or define category..."
|
||||
, options = categories
|
||||
, selected = Nothing
|
||||
}
|
||||
in
|
||||
{ cm | searchable = \_ -> True }
|
||||
}
|
||||
|
||||
|
||||
@ -37,26 +51,66 @@ isValid model =
|
||||
|
||||
getTag : Model -> Tag
|
||||
getTag model =
|
||||
Tag model.tag.id model.name model.category 0
|
||||
let
|
||||
cat =
|
||||
Comp.Dropdown.getSelected model.catDropdown
|
||||
|> List.head
|
||||
|> Maybe.withDefault model.catDropdown.filterString
|
||||
in
|
||||
Tag model.tag.id model.name (Util.Maybe.fromString cat) 0
|
||||
|
||||
|
||||
type Msg
|
||||
= SetName String
|
||||
| SetCategory String
|
||||
| SetCategoryOptions (List String)
|
||||
| SetTag Tag
|
||||
| CatMsg (Comp.Dropdown.Msg String)
|
||||
|
||||
|
||||
update : Flags -> Msg -> Model -> ( Model, Cmd Msg )
|
||||
update _ msg model =
|
||||
case msg of
|
||||
SetTag t ->
|
||||
( { model | tag = t, name = t.name, category = t.category }, Cmd.none )
|
||||
let
|
||||
( dm_, cmd_ ) =
|
||||
Comp.Dropdown.update
|
||||
(Comp.Dropdown.SetSelection
|
||||
(List.filterMap identity [ t.category ])
|
||||
)
|
||||
model.catDropdown
|
||||
in
|
||||
( { model | tag = t, name = t.name, catDropdown = dm_ }
|
||||
, Cmd.map CatMsg cmd_
|
||||
)
|
||||
|
||||
SetName n ->
|
||||
( { model | name = n }, Cmd.none )
|
||||
|
||||
SetCategory n ->
|
||||
( { model | category = Just n }, Cmd.none )
|
||||
let
|
||||
( dm_, cmd_ ) =
|
||||
Comp.Dropdown.update (Comp.Dropdown.SetSelection [ n ]) model.catDropdown
|
||||
in
|
||||
( { model | catDropdown = dm_ }, Cmd.map CatMsg cmd_ )
|
||||
|
||||
SetCategoryOptions list ->
|
||||
let
|
||||
( dm_, cmd_ ) =
|
||||
Comp.Dropdown.update
|
||||
(Comp.Dropdown.SetOptions list)
|
||||
model.catDropdown
|
||||
in
|
||||
( { model | catDropdown = dm_ }
|
||||
, Cmd.map CatMsg cmd_
|
||||
)
|
||||
|
||||
CatMsg lm ->
|
||||
let
|
||||
( dm_, cmd_ ) =
|
||||
Comp.Dropdown.update lm model.catDropdown
|
||||
in
|
||||
( { model | catDropdown = dm_ }, Cmd.map CatMsg cmd_ )
|
||||
|
||||
|
||||
view : Model -> Html Msg
|
||||
@ -78,13 +132,8 @@ view model =
|
||||
[]
|
||||
]
|
||||
, div [ class "field" ]
|
||||
[ label [] [ text "Category" ]
|
||||
, input
|
||||
[ type_ "text"
|
||||
, onInput SetCategory
|
||||
, placeholder "Category (optional)"
|
||||
, value (Maybe.withDefault "" model.category)
|
||||
]
|
||||
[]
|
||||
[ label []
|
||||
[ text "Category" ]
|
||||
, Html.map CatMsg (Comp.Dropdown.viewSingle model.catDropdown)
|
||||
]
|
||||
]
|
||||
|
||||
@ -20,6 +20,8 @@ import Html.Events exposing (onClick, onInput, onSubmit)
|
||||
import Http
|
||||
import Util.Http
|
||||
import Util.Maybe
|
||||
import Util.Tag
|
||||
import Util.Update
|
||||
|
||||
|
||||
type alias Model =
|
||||
@ -41,7 +43,7 @@ type ViewMode
|
||||
emptyModel : Model
|
||||
emptyModel =
|
||||
{ tagTableModel = Comp.TagTable.emptyModel
|
||||
, tagFormModel = Comp.TagForm.emptyModel
|
||||
, tagFormModel = Comp.TagForm.emptyModel []
|
||||
, viewMode = Table
|
||||
, formError = Nothing
|
||||
, loading = False
|
||||
@ -110,8 +112,15 @@ update flags msg model =
|
||||
let
|
||||
m2 =
|
||||
{ model | viewMode = Table, loading = False }
|
||||
|
||||
cats =
|
||||
Util.Tag.getCategories tags.items
|
||||
in
|
||||
update flags (TableMsg (Comp.TagTable.SetTags tags.items)) m2
|
||||
Util.Update.andThen1
|
||||
[ update flags (TableMsg (Comp.TagTable.SetTags tags.items))
|
||||
, update flags (FormMsg (Comp.TagForm.SetCategoryOptions cats))
|
||||
]
|
||||
m2
|
||||
|
||||
TagResp (Err _) ->
|
||||
( { model | loading = False }, Cmd.none )
|
||||
|
||||
@ -252,7 +252,12 @@ textarea.markdown-editor {
|
||||
.ui.modal.keep-small {
|
||||
width: 95%;
|
||||
}
|
||||
|
||||
.ui.modal.keep-small .scrolling.content {
|
||||
min-height: 23rem;
|
||||
}
|
||||
.ui.modal.keep-small .scrolling.content .menu.transition.visible {
|
||||
max-height: 11rem;
|
||||
}
|
||||
|
||||
label span.muted {
|
||||
font-size: smaller;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user