Get test green again after rebasing from master (server still red)

energizedwork · Oct 20, 2017 · 4ce9f6f · 4ce9f6f
1 parent 335f35c
commit 4ce9f6f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Data/DataSource.elm b/src/Data/DataSource.elm
@@ -37,9 +37,9 @@ defaultAttributes =
 
 init : DataSource
 init =
-    DataSource "?" "unknown"
+    DataSource (UUID.UUID "?") "unknown"
 
 
 toChannel : DataSource -> String
 toChannel dataSource =
-    "dataSource:" ++ dataSource.name ++ ":" ++ dataSource.uuid
+    "dataSource:" ++ dataSource.name ++ ":" ++ (UUID.slugToString <| dataSource.uuid)
diff --git a/src/Data/Widget.elm b/src/Data/Widget.elm
@@ -192,6 +192,6 @@ bodyDecoder =
     Decode.map Body Decode.string
 
 
-primaryDataSource : Widget a -> DataSource
+primaryDataSource : Widget -> DataSource
 primaryDataSource widget =
     List.head widget.dataSources |> Maybe.withDefault DataSource.init
diff --git a/src/Views/Widget/Renderers/HeatMap.elm b/src/Views/Widget/Renderers/HeatMap.elm
@@ -14,7 +14,7 @@ import Visualization.Axis as Axis exposing (defaultOptions)
 import Visualization.Scale as Scale exposing (BandConfig, BandScale, ContinuousScale, defaultBandConfig)
 
 
-render : Widget Body -> Table.Data -> Html msg
+render : Widget -> Table.Data -> Html msg
 render widget data =
     case widget.adapter of
         HEAT_MAP ->

diff --git a/src/Views/Widget/Renderers/LineChart.elm b/src/Views/Widget/Renderers/LineChart.elm
@@ -15,7 +15,7 @@ import Visualization.Scale as Scale exposing (BandConfig, BandScale, ContinuousS
 import Visualization.Shape as Shape
 
 
-render : Widget Body -> Table.Data -> Html msg
+render : Widget -> Table.Data -> Html msg
 render widget data =
     case widget.adapter of
         TABLE ->