Merge pull request #5388 from concourse/issue/5384

web: behaviour: fix log highlighting on OneOffBuild page
concourse · Mar 31, 2020 · 810ad39 · 810ad39
2 parents 2d98220 + 2dca729
commit 810ad39
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 0 deletions.
diff --git a/release-notes/v6.0.1.md b/release-notes/v6.0.1.md
@@ -18,3 +18,7 @@
 
 * Fix pipeline tooltips being hidden behind other cards. #5377
 
+#### <sub><sup><a name="5384" href="#5384">:link:</a></sup></sub> fix
+
+* Fix log highlighting on the one-off-build page. Previously, highlighting any log lines would cause the page to reload. #5384
+
diff --git a/web/elm/src/Application/Application.elm b/web/elm/src/Application/Application.elm
@@ -462,6 +462,9 @@ routeMatchesModel route model =
         ( Routes.Build _, SubPage.BuildModel _ ) ->
             True
 
+        ( Routes.OneOffBuild _, SubPage.BuildModel _ ) ->
+            True
+
         ( Routes.Job _, SubPage.JobModel _ ) ->
             True
 

diff --git a/web/elm/src/SubPage/SubPage.elm b/web/elm/src/SubPage/SubPage.elm
@@ -260,6 +260,19 @@ urlUpdate routes =
                                 Nothing
                     }
 
+            Routes.OneOffBuild { id, highlight } ->
+                Build.changeToBuild
+                    { pageType = Build.Header.Models.OneOffBuildPage id
+                    , highlight = highlight
+                    , fromBuildPage =
+                        case routes.from of
+                            Routes.OneOffBuild params ->
+                                Just <| Build.Header.Models.OneOffBuildPage params.id
+
+                            _ ->
+                                Nothing
+                    }
+
             _ ->
                 identity
         )

diff --git a/web/elm/tests/BuildTests.elm b/web/elm/tests/BuildTests.elm
@@ -1264,6 +1264,31 @@ all =
                     |> Tuple.second
                     |> Common.notContains
                         (Effects.FetchJobBuild <| buildParams.id)
+        , test "does not reload one off build page when highlight is modified" <|
+            \_ ->
+                let
+                    buildParams =
+                        { id = 1
+                        , highlight = Routes.HighlightNothing
+                        }
+                in
+                Common.init "/"
+                    |> Application.handleDelivery
+                        (RouteChanged <|
+                            Routes.OneOffBuild
+                                buildParams
+                        )
+                    |> Tuple.first
+                    |> Application.handleDelivery
+                        (RouteChanged <|
+                            Routes.OneOffBuild
+                                { buildParams
+                                    | highlight = Routes.HighlightLine "step" 1
+                                }
+                        )
+                    |> Tuple.second
+                    |> Common.notContains
+                        (Effects.FetchBuild 0 buildParams.id)
         , test "gets current timezone on page load" <|
             \_ ->
                 Application.init