Extend dropdown to display additional option info

Use this to display folder information when setting the folder on an
item.

modules/webapp/src/main/elm/Comp/AddressForm.elm

@@ -49,7 +49,7 @@ emptyModel =
     , city = ""
     , country =
         Comp.Dropdown.makeSingleList
-            { makeOption = \c -> { value = c.code, text = c.label }
+            { makeOption = \c -> { value = c.code, text = c.label, additional = "" }
             , placeholder = "Select Country"
             , options = countries
             , selected = Nothing

modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm

@@ -43,6 +43,7 @@ init settings =
                 \l ->
                     { value = Data.Language.toIso3 l
                     , text = Data.Language.toName l
+                    , additional = ""
                     }
             , placeholder = ""
             , options = Data.Language.all

modules/webapp/src/main/elm/Comp/ContactField.elm

@@ -32,6 +32,7 @@ emptyModel =
                 \ct ->
                     { value = Data.ContactType.toString ct
                     , text = Data.ContactType.toString ct
+                    , additional = ""
                     }
             , placeholder = ""
             , options = Data.ContactType.all

modules/webapp/src/main/elm/Comp/Dropdown.elm

@@ -8,6 +8,8 @@ module Comp.Dropdown exposing
     , makeMultiple
     , makeSingle
     , makeSingleList
+    , mkOption
+    , setMkOption
     , update
     , view
     )
@@ -27,9 +29,15 @@ import Util.List
 type alias Option =
     { value : String
     , text : String
+    , additional : String
     }
 
 
+mkOption : String -> String -> Option
+mkOption value text =
+    Option value text ""
+
+
 type alias Item a =
     { value : a
     , option : Option
@@ -63,6 +71,11 @@ type alias Model a =
     }
 
 
+setMkOption : (a -> Option) -> Model a -> Model a
+setMkOption mkopt model =
+    { model | makeOption = mkopt }
+
+
 makeModel :
     { multiple : Bool
     , searchable : Int -> Bool
@@ -508,4 +521,7 @@ renderOption item =
         , onClick (AddItem item)
         ]
         [ text item.option.text
+        , span [ class "small-info right-float" ]
+            [ text item.option.additional
+            ]
         ]

modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm

@@ -51,7 +51,12 @@ emptyModel =
     , replyTo = Nothing
     , sslType =
         Comp.Dropdown.makeSingleList
-            { makeOption = \s -> { value = Data.SSLType.toString s, text = Data.SSLType.label s }
+            { makeOption =
+                \s ->
+                    { value = Data.SSLType.toString s
+                    , text = Data.SSLType.label s
+                    , additional = ""
+                    }
             , placeholder = ""
             , options = Data.SSLType.all
             , selected = Just Data.SSLType.None
@@ -74,7 +79,12 @@ init ems =
     , replyTo = ems.replyTo
     , sslType =
         Comp.Dropdown.makeSingleList
-            { makeOption = \s -> { value = Data.SSLType.toString s, text = Data.SSLType.label s }
+            { makeOption =
+                \s ->
+                    { value = Data.SSLType.toString s
+                    , text = Data.SSLType.label s
+                    , additional = ""
+                    }
             , placeholder = ""
             , options = Data.SSLType.all
             , selected =

modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm

@@ -47,7 +47,12 @@ emptyModel =
     , password = Nothing
     , sslType =
         Comp.Dropdown.makeSingleList
-            { makeOption = \s -> { value = Data.SSLType.toString s, text = Data.SSLType.label s }
+            { makeOption =
+                \s ->
+                    { value = Data.SSLType.toString s
+                    , text = Data.SSLType.label s
+                    , additional = ""
+                    }
             , placeholder = ""
             , options = Data.SSLType.all
             , selected = Just Data.SSLType.None
@@ -68,7 +73,12 @@ init ems =
     , password = ems.imapPassword
     , sslType =
         Comp.Dropdown.makeSingleList
-            { makeOption = \s -> { value = Data.SSLType.toString s, text = Data.SSLType.label s }
+            { makeOption =
+                \s ->
+                    { value = Data.SSLType.toString s
+                    , text = Data.SSLType.label s
+                    , additional = ""
+                    }
             , placeholder = ""
             , options = Data.SSLType.all
             , selected =

modules/webapp/src/main/elm/Comp/ItemDetail.elm

@@ -74,6 +74,7 @@ type alias Model =
     , concPersonModel : Comp.Dropdown.Model IdName
     , concEquipModel : Comp.Dropdown.Model IdName
     , folderModel : Comp.Dropdown.Model IdName
+    , allFolders : List FolderItem
     , nameModel : String
     , notesModel : Maybe String
     , notesField : NotesField
@@ -130,6 +131,36 @@ isEditNotes field =
             False
 
 
+mkFolderOption : Flags -> List FolderItem -> IdName -> Comp.Dropdown.Option
+mkFolderOption flags allFolders idref =
+    let
+        folder =
+            List.filter (\e -> e.id == idref.id) allFolders
+                |> List.head
+
+        isMember =
+            folder
+                |> Maybe.map .isMember
+                |> Maybe.withDefault False
+
+        isOwner =
+            Maybe.map .owner folder
+                |> Maybe.map .name
+                |> (==) (Maybe.map .user flags.account)
+
+        adds =
+            if isOwner then
+                "owner"
+
+            else if isMember then
+                "member"
+
+            else
+                ""
+    in
+    { value = idref.id, text = idref.name, additional = adds }
+
+
 emptyModel : Model
 emptyModel =
     { item = Api.Model.ItemDetail.empty
@@ -143,6 +174,7 @@ emptyModel =
                 \entry ->
                     { value = Data.Direction.toString entry
                     , text = Data.Direction.toString entry
+                    , additional = ""
                     }
             , options = Data.Direction.all
             , placeholder = "Choose a direction…"
@@ -150,29 +182,30 @@ emptyModel =
             }
     , corrOrgModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = ""
             }
     , corrPersonModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = ""
             }
     , concPersonModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = ""
             }
     , concEquipModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = ""
             }
     , folderModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = ""
             }
+    , allFolders = []
     , nameModel = ""
     , notesModel = Nothing
     , notesField = ViewNotes
@@ -885,12 +918,24 @@ update key flags next msg model =
 
         GetFolderResp (Ok fs) ->
             let
+                model_ =
+                    { model
+                        | allFolders = fs.items
+                        , folderModel =
+                            Comp.Dropdown.setMkOption
+                                (mkFolderOption flags fs.items)
+                                model.folderModel
+                    }
+
+                mkIdName fitem =
+                    IdName fitem.id fitem.name
+
                 opts =
                     fs.items
-                        |> List.map (\e -> IdName e.id e.name)
+                        |> List.map mkIdName
                         |> Comp.Dropdown.SetOptions
             in
-            update key flags next (FolderDropdownMsg opts) model
+            update key flags next (FolderDropdownMsg opts) model_
 
         GetFolderResp (Err _) ->
             noSub ( model, Cmd.none )
@@ -1450,29 +1495,33 @@ update key flags next msg model =
                     noSub ( { model | attachRename = Nothing }, Cmd.none )
 
         EditAttachNameResp (Ok res) ->
-            case model.attachRename of
+            if res.success then
-                Just m ->
+                case model.attachRename of
-                    let
+                    Just m ->
-                        changeName a =
+                        let
-                            if a.id == m.id then
+                            changeName a =
-                                { a | name = Util.Maybe.fromString m.newName }
+                                if a.id == m.id then
+                                    { a | name = Util.Maybe.fromString m.newName }
 
-                            else
+                                else
-                                a
+                                    a
 
-                        changeItem i =
+                            changeItem i =
-                            { i | attachments = List.map changeName i.attachments }
+                                { i | attachments = List.map changeName i.attachments }
-                    in
+                        in
-                    noSub
+                        noSub
-                        ( { model
+                            ( { model
-                            | attachRename = Nothing
+                                | attachRename = Nothing
-                            , item = changeItem model.item
+                                , item = changeItem model.item
-                          }
+                              }
-                        , Cmd.none
+                            , Cmd.none
-                        )
+                            )
 
-                Nothing ->
+                    Nothing ->
-                    noSub ( model, Cmd.none )
+                        noSub ( model, Cmd.none )
+
+            else
+                noSub ( model, Cmd.none )
 
         EditAttachNameResp (Err _) ->
             noSub ( model, Cmd.none )
@@ -2129,7 +2178,7 @@ renderEditForm settings model =
                 ]
     in
     div [ class "ui attached segment" ]
-        [ div [ class "ui form" ]
+        [ div [ class "ui form warning" ]
             [ div [ class "field" ]
                 [ label []
                     [ Icons.tagsIcon "grey"
@@ -2156,6 +2205,18 @@ renderEditForm settings model =
                     , text "Folder"
                     ]
                 , Html.map FolderDropdownMsg (Comp.Dropdown.view settings model.folderModel)
+                , div
+                    [ classList
+                        [ ( "ui warning message", True )
+                        , ( "hidden", isFolderMember model )
+                        ]
+                    ]
+                    [ Markdown.toHtml [] """
+You are **not a member** of this folder. This item will be **hidden**
+from any search now. Use a folder where you are a member of to make this
+item visible. This message will disappear then.
+                      """
+                    ]
                 ]
             , div [ class "field" ]
                 [ label []
@@ -2482,3 +2543,22 @@ renderEditAttachmentName model attach =
 
         Nothing ->
             span [ class "invisible hidden" ] []
+
+
+isFolderMember : Model -> Bool
+isFolderMember model =
+    let
+        selected =
+            Comp.Dropdown.getSelected model.folderModel
+                |> List.head
+                |> Maybe.map .id
+
+        findFolder id =
+            List.filter (\e -> e.id == id) model.allFolders
+                |> List.head
+
+        folder =
+            Maybe.andThen findFolder selected
+    in
+    Maybe.map .isMember folder
+        |> Maybe.withDefault True

modules/webapp/src/main/elm/Comp/ItemMail.elm

@@ -61,7 +61,7 @@ emptyModel : Model
 emptyModel =
     { connectionModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \a -> { value = a, text = a }
+            { makeOption = \a -> { value = a, text = a, additional = "" }
             , placeholder = "Select connection..."
             }
     , subject = ""
@@ -124,7 +124,7 @@ update flags msg model =
 
                 cm =
                     Comp.Dropdown.makeSingleList
-                        { makeOption = \a -> { value = a, text = a }
+                        { makeOption = \a -> { value = a, text = a, additional = "" }
                         , placeholder = "Select Connection..."
                         , options = names
                         , selected = List.head names

modules/webapp/src/main/elm/Comp/NotificationForm.elm

@@ -139,7 +139,7 @@ init flags =
     ( { settings = Api.Model.NotificationSettings.empty
       , connectionModel =
             Comp.Dropdown.makeSingle
-                { makeOption = \a -> { value = a, text = a }
+                { makeOption = \a -> { value = a, text = a, additional = "" }
                 , placeholder = "Select connection..."
                 }
       , tagInclModel = Util.Tag.makeDropdownModel
@@ -290,7 +290,7 @@ update flags msg model =
 
                 cm =
                     Comp.Dropdown.makeSingleList
-                        { makeOption = \a -> { value = a, text = a }
+                        { makeOption = \a -> { value = a, text = a, additional = "" }
                         , placeholder = "Select Connection..."
                         , options = names
                         , selected = List.head names

modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm

@@ -129,7 +129,7 @@ init flags =
     ( { settings = Api.Model.ScanMailboxSettings.empty
       , connectionModel =
             Comp.Dropdown.makeSingle
-                { makeOption = \a -> { value = a, text = a }
+                { makeOption = \a -> { value = a, text = a, additional = "" }
                 , placeholder = "Select connection..."
                 }
       , enabled = False
@@ -260,7 +260,7 @@ update flags msg model =
 
                 cm =
                     Comp.Dropdown.makeSingleList
-                        { makeOption = \a -> { value = a, text = a }
+                        { makeOption = \a -> { value = a, text = a, additional = "" }
                         , placeholder = "Select Connection..."
                         , options = names
                         , selected = List.head names

modules/webapp/src/main/elm/Comp/SearchMenu.elm

@@ -74,6 +74,7 @@ init =
                 \entry ->
                     { value = Data.Direction.toString entry
                     , text = Data.Direction.toString entry
+                    , additional = ""
                     }
             , options = Data.Direction.all
             , placeholder = "Choose a direction…"
@@ -83,25 +84,25 @@ init =
         Comp.Dropdown.makeModel
             { multiple = False
             , searchable = \n -> n > 5
-            , makeOption = \e -> { value = e.id, text = e.name }
+            , makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , labelColor = \_ -> \_ -> ""
             , placeholder = "Choose an organization"
             }
     , corrPersonModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = "Choose a person"
             }
     , concPersonModel =
         Comp.Dropdown.makeSingle
-            { makeOption = \e -> { value = e.id, text = e.name }
+            { makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , placeholder = "Choose a person"
             }
     , concEquipmentModel =
         Comp.Dropdown.makeModel
             { multiple = False
             , searchable = \n -> n > 5
-            , makeOption = \e -> { value = e.id, text = e.name }
+            , makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , labelColor = \_ -> \_ -> ""
             , placeholder = "Choose an equipment"
             }
@@ -109,7 +110,7 @@ init =
         Comp.Dropdown.makeModel
             { multiple = False
             , searchable = \n -> n > 5
-            , makeOption = \e -> { value = e.id, text = e.name }
+            , makeOption = \e -> { value = e.id, text = e.name, additional = "" }
             , labelColor = \_ -> \_ -> ""
             , placeholder = "Only items in folder"
             }

modules/webapp/src/main/elm/Comp/UserForm.elm

@@ -41,6 +41,7 @@ emptyModel =
                 \s ->
                     { value = Data.UserState.toString s
                     , text = Data.UserState.toString s
+                    , additional = ""
                     }
             , placeholder = ""
             , options = Data.UserState.all
@@ -98,7 +99,12 @@ update _ msg model =
             let
                 state =
                     Comp.Dropdown.makeSingleList
-                        { makeOption = \s -> { value = Data.UserState.toString s, text = Data.UserState.toString s }
+                        { makeOption =
+                            \s ->
+                                { value = Data.UserState.toString s
+                                , text = Data.UserState.toString s
+                                , additional = ""
+                                }
                         , placeholder = ""
                         , options = Data.UserState.all
                         , selected =

modules/webapp/src/main/elm/Util/Tag.elm

@@ -10,7 +10,7 @@ makeDropdownModel =
     Comp.Dropdown.makeModel
         { multiple = True
         , searchable = \n -> n > 5
-        , makeOption = \tag -> { value = tag.id, text = tag.name }
+        , makeOption = \tag -> { value = tag.id, text = tag.name, additional = "" }
         , labelColor =
             \tag ->
                 \settings ->