fix(filter): change pull -> pull_request (#112)

Co-authored-by: Jordan Brockopp <[email protected]>
go-vela · Feb 18, 2020 · c31a3a3 · c31a3a3
1 parent c8db7bf
commit c31a3a3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/cypress/fixtures/builds_pull.json b/cypress/fixtures/builds_pull.json
@@ -4,7 +4,7 @@
     "repo_id": 1,
     "number": 2,
     "parent": 1,
-    "event": "pull",
+    "event": "pull_request",
     "status": "success",
     "error": "unable to retrieve repo secret docker_username: unable to get secret repo/vela/ui/docker_username from native service: record not found",
     "enqueued": 1572980376,
@@ -31,7 +31,7 @@
     "repo_id": 1,
     "number": 3,
     "parent": 1,
-    "event": "pull",
+    "event": "pull_request",
     "status": "failure",
     "error": "unable to retrieve repo secret docker_username: unable to get secret repo/vela/ui/docker_username from native service: record not found",
     "enqueued": 1572980376,

diff --git a/cypress/integration/builds.spec.js b/cypress/integration/builds.spec.js
@@ -191,7 +191,7 @@ context('Builds', () => {
     });
 
     it('should only show two pull events', () => {
-      cy.get('[data-test=build-filter-pull]').click({ force: true });
+      cy.get('[data-test=build-filter-pull_request]').click({ force: true });
       cy.get('[data-test=build]')
         .should('be.visible')
         .should('have.length', 2);

diff --git a/src/elm/Main.elm b/src/elm/Main.elm
@@ -1440,7 +1440,7 @@ viewBuildsFilter shouldRender org repo maybeEvent =
     let
         eventEnum : List String
         eventEnum =
-            [ "all", "push", "pull", "tag", "deploy" ]
+            [ "all", "push", "pull_request", "tag", "deploy" ]
 
         eventToMaybe : String -> Maybe Event
         eventToMaybe event =
@@ -1471,13 +1471,7 @@ viewBuildsFilter shouldRender org repo maybeEvent =
                                 [ class "form-label"
                                 , for <| "filter-" ++ e
                                 ]
-                                [ text <|
-                                    if e == "pull" then
-                                        "pull request"
-
-                                    else
-                                        e
-                                ]
+                                [ text <| String.replace "_" " " e ]
                             ]
                     )
                     eventEnum

diff --git a/src/elm/Pages/Build.elm b/src/elm/Pages/Build.elm
@@ -154,11 +154,7 @@ viewPreview now org repo build =
             [ buildStatusToIcon build.status ]
 
         commit =
-            [ if build.event == "pull" then
-                text "pull request"
-
-              else
-                text build.event
+            [ text <| String.replace "_" " " build.event
             , text " ("
             , a [ href build.source ] [ text <| trimCommitHash build.commit ]
             , text <| ")"

diff --git a/src/scss/_main.scss b/src/scss/_main.scss
@@ -1319,7 +1319,7 @@ nav {
   // TODO: revisit the following
   .form-control .form-label::before,
   .form-control .form-label::after {
-    top: auto;
+    top: 2px;
   }
 
   @media only screen and (max-width: 40em) {