Add effects for status APIs

inbucket · Sep 12, 2020 · c74bb6e · c74bb6e
1 parent de0d7cc
commit c74bb6e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/ui/src/Effect.elm b/ui/src/Effect.elm
@@ -5,6 +5,8 @@ module Effect exposing
     , disableRouting
     , enableRouting
     , getGreeting
+    , getServerConfig
+    , getServerMetrics
     , map
     , none
     , perform
@@ -13,6 +15,8 @@ module Effect exposing
     )
 
 import Api
+import Data.Metrics exposing (Metrics)
+import Data.ServerConfig exposing (ServerConfig)
 import Data.Session as Session exposing (Session)
 
 
@@ -26,6 +30,8 @@ type Effect msg
 
 type ApiEffect msg
     = GetGreeting (Api.DataResult msg String)
+    | GetServerConfig (Api.DataResult msg ServerConfig)
+    | GetServerMetrics (Api.DataResult msg Metrics)
 
 
 type SessionEffect
@@ -70,6 +76,12 @@ mapApi f effect =
         GetGreeting result ->
             GetGreeting <| result >> f
 
+        GetServerConfig result ->
+            GetServerConfig <| result >> f
+
+        GetServerMetrics result ->
+            GetServerMetrics <| result >> f
+
 
 {-| Applies an effect by updating the session and/or producing a Cmd.
 -}
@@ -87,15 +99,28 @@ perform ( session, effect ) =
         Command cmd ->
             ( session, cmd )
 
-        SessionEffect sessionEffect ->
-            effectSession ( session, sessionEffect )
-
         ApiEffect apiEffect ->
             performApi ( session, apiEffect )
 
+        SessionEffect sessionEffect ->
+            performSession ( session, sessionEffect )
+
+
+performApi : ( Session, ApiEffect msg ) -> ( Session, Cmd msg )
+performApi ( session, effect ) =
+    case effect of
+        GetGreeting toMsg ->
+            ( session, Api.getGreeting session toMsg )
+
+        GetServerConfig toMsg ->
+            ( session, Api.getServerConfig session toMsg )
 
-effectSession : ( Session, SessionEffect ) -> ( Session, Cmd msg )
-effectSession ( session, effect ) =
+        GetServerMetrics toMsg ->
+            ( session, Api.getServerMetrics session toMsg )
+
+
+performSession : ( Session, SessionEffect ) -> ( Session, Cmd msg )
+performSession ( session, effect ) =
     case effect of
         RecentAdd mailbox ->
             ( Session.addRecent mailbox session, Cmd.none )
@@ -113,13 +138,6 @@ effectSession ( session, effect ) =
             ( Session.enableRouting session, Cmd.none )
 
 
-performApi : ( Session, ApiEffect msg ) -> ( Session, Cmd msg )
-performApi ( session, effect ) =
-    case effect of
-        GetGreeting toMsg ->
-            ( session, Api.getGreeting session toMsg )
-
-
 
 -- EFFECT CONSTRUCTORS
 
@@ -161,6 +179,16 @@ getGreeting toMsg =
     ApiEffect (GetGreeting toMsg)
 
 
+getServerConfig : Api.DataResult msg ServerConfig -> Effect msg
+getServerConfig toMsg =
+    ApiEffect (GetServerConfig toMsg)
+
+
+getServerMetrics : Api.DataResult msg Metrics -> Effect msg
+getServerMetrics toMsg =
+    ApiEffect (GetServerMetrics toMsg)
+
+
 {-| Wrap a Cmd into an Effect. This is a temporary function to aid in the transition to the effect
 pattern.
 -}

diff --git a/ui/src/Page/Status.elm b/ui/src/Page/Status.elm
@@ -1,6 +1,5 @@
 module Page.Status exposing (Model, Msg, init, subscriptions, update, view)
 
-import Api
 import Data.Metrics exposing (Metrics)
 import Data.ServerConfig exposing (ServerConfig)
 import Data.Session exposing (Session)
@@ -85,7 +84,7 @@ init session =
       }
     , Effect.batch
         [ Task.perform Tick Time.now |> Effect.wrap
-        , Api.getServerConfig session ServerConfigLoaded |> Effect.wrap
+        , Effect.getServerConfig ServerConfigLoaded
         ]
     )
 
@@ -132,8 +131,7 @@ update msg model =
 
         Tick time ->
             ( { model | now = time }
-            , Api.getServerMetrics model.session MetricsReceived
-                |> Effect.wrap
+            , Effect.getServerMetrics MetricsReceived
             )