ui: Refactor mailbox header list into State

ui/src/Main.elm

@@ -243,7 +243,7 @@ view model =
         mailbox =
             case model.page of
                 Mailbox subModel ->
-                    subModel.name
+                    subModel.mailboxName
 
                 _ ->
                     ""

ui/src/Page/Mailbox.elm

@@ -25,45 +25,40 @@ type Body
 
 
 type State
-    = NoSelection
+    = LoadingList (Maybe MessageID)
-    | Selected MessageID
+    | ShowingList (List MessageHeader) (Maybe MessageID)
-    | Viewing Visible
+    | LoadingMessage (List MessageHeader) MessageID
-    | Transitioning Visible MessageID
+    | ShowingMessage (List MessageHeader) VisibleMessage
+    | Transitioning (List MessageHeader) VisibleMessage MessageID
 
 
 type alias MessageID =
     String
 
 
-type alias Visible =
+type alias VisibleMessage =
     { message : Message
     , markSeenAt : Maybe Time
     }
 
 
 type alias Model =
-    { name : String
+    { mailboxName : String
     , state : State
-    , headers : List MessageHeader
     , bodyMode : Body
     }
 
 
 init : String -> Maybe MessageID -> Model
-init name selection =
+init mailboxName selection =
-    case selection of
+    Model mailboxName (LoadingList selection) SafeHtmlBody
-        Just id ->
-            Model name (Selected id) [] SafeHtmlBody
-
-        Nothing ->
-            Model name NoSelection [] SafeHtmlBody
 
 
 load : String -> Cmd Msg
-load name =
+load mailboxName =
     Cmd.batch
-        [ Ports.windowTitle (name ++ " - Inbucket")
+        [ Ports.windowTitle (mailboxName ++ " - Inbucket")
-        , getMailbox name
+        , getList mailboxName
         ]
 
 
@@ -74,7 +69,7 @@ load name =
 subscriptions : Model -> Sub Msg
 subscriptions model =
     case model.state of
-        Viewing { message } ->
+        ShowingMessage _ { message } ->
             if message.seen then
                 Sub.none
             else
@@ -93,7 +88,7 @@ type Msg
     | ViewMessage MessageID
     | DeleteMessage Message
     | DeleteMessageResult (Result Http.Error ())
-    | MailboxResult (Result Http.Error (List MessageHeader))
+    | ListResult (Result Http.Error (List MessageHeader))
     | MarkSeenResult (Result Http.Error ())
     | MessageResult (Result Http.Error Message)
     | MessageBody Body
@@ -107,16 +102,16 @@ update session msg model =
         ClickMessage id ->
             ( updateSelected model id
             , Cmd.batch
-                [ Route.newUrl (Route.Message model.name id)
+                [ Route.newUrl (Route.Message model.mailboxName id)
-                , getMessage model.name id
+                , getMessage model.mailboxName id
                 ]
             , Session.DisableRouting
             )
 
         ViewMessage id ->
             ( updateSelected model id
-            , getMessage model.name id
+            , getMessage model.mailboxName id
-            , Session.AddRecent model.name
+            , Session.AddRecent model.mailboxName
             )
 
         DeleteMessage msg ->
@@ -128,20 +123,25 @@ update session msg model =
         DeleteMessageResult (Err err) ->
             ( model, Cmd.none, Session.SetFlash (HttpUtil.errorString err) )
 
-        MailboxResult (Ok headers) ->
+        ListResult (Ok headers) ->
-            let
+            case model.state of
-                newModel =
+                LoadingList selection ->
-                    { model | headers = headers }
+                    let
-            in
+                        newModel =
-                case model.state of
+                            { model | state = ShowingList headers selection }
-                    Selected id ->
+                    in
-                        -- Recurse to select message id.
+                        case selection of
-                        update session (ViewMessage id) newModel
+                            Just id ->
+                                -- Recurse to select message id.
+                                update session (ViewMessage id) newModel
 
-                    _ ->
+                            Nothing ->
-                        ( newModel, Cmd.none, Session.AddRecent model.name )
+                                ( newModel, Cmd.none, Session.AddRecent model.mailboxName )
 
-        MailboxResult (Err err) ->
+                _ ->
+                    ( model, Cmd.none, Session.none )
+
+        ListResult (Err err) ->
             ( model, Cmd.none, Session.SetFlash (HttpUtil.errorString err) )
 
         MarkSeenResult (Ok _) ->
@@ -157,14 +157,31 @@ update session msg model =
                         TextBody
                     else
                         model.bodyMode
+
+                updateMessage list message =
+                    ( { model
+                        | state = ShowingMessage list { message = message, markSeenAt = Nothing }
+                        , bodyMode = bodyMode
+                      }
+                    , Task.perform OpenedTime Time.now
+                    , Session.none
+                    )
             in
-                ( { model
+                case model.state of
-                    | state = Viewing { message = msg, markSeenAt = Nothing }
+                    LoadingList _ ->
-                    , bodyMode = bodyMode
+                        ( model, Cmd.none, Session.none )
-                  }
+
-                , Task.perform OpenedTime Time.now
+                    ShowingList list _ ->
-                , Session.none
+                        updateMessage list msg
-                )
+
+                    LoadingMessage list _ ->
+                        updateMessage list msg
+
+                    ShowingMessage list _ ->
+                        updateMessage list msg
+
+                    Transitioning list _ _ ->
+                        updateMessage list msg
 
         MessageResult (Err err) ->
             ( model, Cmd.none, Session.SetFlash (HttpUtil.errorString err) )
@@ -174,14 +191,14 @@ update session msg model =
 
         OpenedTime time ->
             case model.state of
-                Viewing visible ->
+                ShowingMessage list visible ->
                     if visible.message.seen then
                         ( model, Cmd.none, Session.none )
                     else
                         -- Set delay to report message as seen to backend.
                         ( { model
                             | state =
-                                Viewing
+                                ShowingMessage list
                                     { visible
                                         | markSeenAt = Just (time + (1.5 * Time.second))
                                     }
@@ -195,7 +212,7 @@ update session msg model =
 
         Tick now ->
             case model.state of
-                Viewing { message, markSeenAt } ->
+                ShowingMessage _ { message, markSeenAt } ->
                     case markSeenAt of
                         Just deadline ->
                             if now >= deadline then
@@ -213,22 +230,28 @@ update session msg model =
 updateSelected : Model -> MessageID -> Model
 updateSelected model id =
     case model.state of
-        Viewing visible ->
+        ShowingList list _ ->
+            { model | state = LoadingMessage list id }
+
+        ShowingMessage list visible ->
             -- Use Transitioning state to prevent message flicker.
-            { model | state = Transitioning visible id }
+            { model | state = Transitioning list visible id }
+
+        Transitioning list visible _ ->
+            { model | state = Transitioning list visible id }
 
         _ ->
-            { model | state = Selected id }
+            model
 
 
-getMailbox : String -> Cmd Msg
+getList : String -> Cmd Msg
-getMailbox name =
+getList mailboxName =
     let
         url =
-            "/api/v1/mailbox/" ++ name
+            "/api/v1/mailbox/" ++ mailboxName
     in
         Http.get url (Decode.list MessageHeader.decoder)
-            |> Http.send MailboxResult
+            |> Http.send ListResult
 
 
 deleteMessage : Model -> Message -> ( Model, Cmd Msg, Session.Msg )
@@ -241,20 +264,22 @@ deleteMessage model msg =
             HttpUtil.delete url
                 |> Http.send DeleteMessageResult
     in
-        ( { model
+        case model.state of
-            | state = NoSelection
+            ShowingMessage list _ ->
-            , headers = List.filter (\x -> x.id /= msg.id) model.headers
+                ( { model | state = ShowingList (List.filter (\x -> x.id /= msg.id) list) Nothing }
-          }
+                , cmd
-        , cmd
+                , Session.none
-        , Session.none
+                )
-        )
+
+            _ ->
+                ( model, cmd, Session.none )
 
 
 getMessage : String -> MessageID -> Cmd Msg
-getMessage mailbox id =
+getMessage mailboxName id =
     let
         url =
-            "/serve/m/" ++ mailbox ++ "/" ++ id
+            "/serve/m/" ++ mailboxName ++ "/" ++ id
     in
         Http.get url Message.decoder
             |> Http.send MessageResult
@@ -263,7 +288,7 @@ getMessage mailbox id =
 markMessageSeen : Model -> Message -> ( Model, Cmd Msg, Session.Msg )
 markMessageSeen model message =
     case model.state of
-        Viewing visible ->
+        ShowingMessage list visible ->
             let
                 message =
                     visible.message
@@ -287,12 +312,11 @@ markMessageSeen model message =
             in
                 ( { model
                     | state =
-                        Viewing
+                        ShowingMessage (List.map updateSeen list)
                             { visible
                                 | message = { message | seen = True }
                                 , markSeenAt = Nothing
                             }
-                    , headers = List.map updateSeen model.headers
                   }
                 , command
                 , Session.None
@@ -309,20 +333,36 @@ markMessageSeen model message =
 view : Session -> Model -> Html Msg
 view session model =
     div [ id "page", class "mailbox" ]
-        [ aside [ id "message-list" ] [ messageList model ]
+        [ aside [ id "message-list" ]
+            [ case model.state of
+                LoadingList _ ->
+                    messageList [] Nothing
+
+                ShowingList list selection ->
+                    messageList list selection
+
+                LoadingMessage list selection ->
+                    messageList list (Just selection)
+
+                ShowingMessage list visible ->
+                    messageList list (Just visible.message.id)
+
+                Transitioning list _ selection ->
+                    messageList list (Just selection)
+            ]
         , main_
             [ id "message" ]
             [ case model.state of
-                NoSelection ->
+                ShowingList _ _ ->
                     text
                         ("Select a message on the left,"
                             ++ " or enter a different username into the box on upper right."
                         )
 
-                Viewing { message } ->
+                ShowingMessage _ { message } ->
                     viewMessage message model.bodyMode
 
-                Transitioning { message } _ ->
+                Transitioning _ { message } _ ->
                     viewMessage message model.bodyMode
 
                 _ ->
@@ -331,21 +371,9 @@ view session model =
         ]
 
 
-messageList : Model -> Html Msg
+messageList : List MessageHeader -> Maybe MessageID -> Html Msg
-messageList model =
+messageList list selected =
-    let
+    div [] (List.map (messageChip selected) (List.reverse list))
-        selected =
-            case model.state of
-                Selected id ->
-                    Just id
-
-                Viewing { message } ->
-                    Just message.id
-
-                _ ->
-                    Nothing
-    in
-        div [] (List.map (messageChip selected) (List.reverse model.headers))
 
 
 messageChip : Maybe MessageID -> MessageHeader -> Html Msg