ui: Upgrade to elm/http 2.0.0

ui/elm.json

@@ -9,10 +9,10 @@
             "NoRedInk/elm-json-decode-pipeline": "1.0.0",
             "basti1302/elm-human-readable-filesize": "1.1.1",
             "elm/browser": "1.0.1",
-            "elm/core": "1.0.0",
+            "elm/core": "1.0.2",
             "elm/html": "1.0.0",
-            "elm/http": "1.0.0",
+            "elm/http": "2.0.0",
-            "elm/json": "1.0.0",
+            "elm/json": "1.1.2",
             "elm/svg": "1.0.1",
             "elm/time": "1.0.0",
             "elm/url": "1.0.0",
@@ -20,6 +20,8 @@
             "ryannhg/date-format": "2.1.0"
         },
         "indirect": {
+            "elm/bytes": "1.0.3",
+            "elm/file": "1.0.1",
             "elm/regex": "1.0.0",
             "elm/virtual-dom": "1.0.2",
             "myrho/elm-round": "1.0.4"

ui/src/HttpUtil.elm

@@ -3,29 +3,29 @@ module HttpUtil exposing (delete, errorString, patch)
 import Http
 
 
-delete : String -> Http.Request ()
+delete : (Result Http.Error () -> msg) -> String -> Cmd msg
-delete url =
+delete msg url =
     Http.request
         { method = "DELETE"
         , headers = []
         , url = url
         , body = Http.emptyBody
-        , expect = Http.expectStringResponse (\_ -> Ok ())
+        , expect = Http.expectWhatever msg
         , timeout = Nothing
-        , withCredentials = False
+        , tracker = Nothing
         }
 
 
-patch : String -> Http.Body -> Http.Request ()
+patch : (Result Http.Error () -> msg) -> String -> Http.Body -> Cmd msg
-patch url body =
+patch msg url body =
     Http.request
         { method = "PATCH"
         , headers = []
         , url = url
         , body = body
-        , expect = Http.expectStringResponse (\_ -> Ok ())
+        , expect = Http.expectWhatever msg
         , timeout = Nothing
-        , withCredentials = False
+        , tracker = Nothing
         }
 
 
@@ -42,11 +42,7 @@ errorString error =
             "HTTP Network error"
 
         Http.BadStatus res ->
-            "Bad HTTP status: " ++ String.fromInt res.status.code
+            "Bad HTTP status: " ++ String.fromInt res
 
-        Http.BadPayload msg res ->
+        Http.BadBody msg ->
-            "Bad HTTP payload: "
+            "Bad HTTP body: " ++ msg
-                ++ msg
-                ++ " ("
-                ++ String.fromInt res.status.code
-                ++ ")"

ui/src/Page/Home.elm

@@ -29,8 +29,10 @@ init =
 
 cmdGreeting : Cmd Msg
 cmdGreeting =
-    Http.send GreetingResult <|
+    Http.get
-        Http.getString "/serve/greeting"
+        { url = "/serve/greeting"
+        , expect = Http.expectString GreetingResult
+        }
 
 
 

ui/src/Page/Mailbox.elm

@@ -301,8 +301,7 @@ updatePurge model =
         cmd =
             "/api/v1/mailbox/"
                 ++ model.mailboxName
-                |> HttpUtil.delete
+                |> HttpUtil.delete PurgeResult
-                |> Http.send PurgeResult
     in
     case model.state of
         ShowingList list _ ->
@@ -374,8 +373,7 @@ updateDeleteMessage model message =
             "/api/v1/mailbox/" ++ message.mailbox ++ "/" ++ message.id
 
         cmd =
-            HttpUtil.delete url
+            HttpUtil.delete DeleteMessageResult url
-                |> Http.send DeleteMessageResult
 
         filter f messageList =
             { messageList | headers = List.filter f messageList.headers }
@@ -414,8 +412,7 @@ updateMarkMessageSeen model message =
                     -- desired change in the body.
                     Encode.object [ ( "seen", Encode.bool True ) ]
                         |> Http.jsonBody
-                        |> HttpUtil.patch url
+                        |> HttpUtil.patch MarkSeenResult url
-                        |> Http.send MarkSeenResult
 
                 map f messageList =
                     { messageList | headers = List.map f messageList.headers }
@@ -444,8 +441,10 @@ getList mailboxName =
         url =
             "/api/v1/mailbox/" ++ mailboxName
     in
-    Http.get url (Decode.list MessageHeader.decoder)
+    Http.get
-        |> Http.send ListResult
+        { url = url
+        , expect = Http.expectJson ListResult (Decode.list MessageHeader.decoder)
+        }
 
 
 getMessage : String -> MessageID -> Cmd Msg
@@ -454,8 +453,10 @@ getMessage mailboxName id =
         url =
             "/serve/m/" ++ mailboxName ++ "/" ++ id
     in
-    Http.get url Message.decoder
+    Http.get
-        |> Http.send MessageResult
+        { url = url
+        , expect = Http.expectJson MessageResult Message.decoder
+        }
 
 
 

ui/src/Page/Status.elm

@@ -207,8 +207,10 @@ updateRemoteTotal metric value history =
 
 getMetrics : Cmd Msg
 getMetrics =
-    Http.get "/debug/vars" Metrics.decoder
+    Http.get
-        |> Http.send NewMetrics
+        { url = "/debug/vars"
+        , expect = Http.expectJson NewMetrics Metrics.decoder
+        }