fix(steps): implemented fetch-all for steps (#129)

* implementing getAllSteps for builds with steps > 10 * add pagination wildcard to cypress steps stub
go-vela · Mar 11, 2020 · e10c71f · e10c71f
1 parent 93afdbf
commit e10c71f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -138,7 +138,7 @@ Cypress.Commands.add('stubStepsWithLogs', () => {
   cy.fixture('steps_5.json').as('steps');
   cy.route({
     method: 'GET',
-    url: 'api/v1/repos/*/*/builds/*/steps',
+    url: 'api/v1/repos/*/*/builds/*/steps*',
     status: 200,
     response: '@steps',
   });
@@ -181,7 +181,7 @@ Cypress.Commands.add('stubStepsWithErrorLogs', () => {
   cy.fixture('steps_error.json').as('steps');
   cy.route({
     method: 'GET',
-    url: 'api/v1/repos/*/*/builds/*/steps',
+    url: 'api/v1/repos/*/*/builds/*/steps*',
     status: 200,
     response: '@steps',
   });

diff --git a/src/elm/Api.elm b/src/elm/Api.elm
@@ -12,6 +12,7 @@ module Api exposing
     , getAllBuilds
     , getAllHooks
     , getAllRepositories
+    , getAllSteps
     , getBuild
     , getBuilds
     , getCurrentUser
@@ -490,6 +491,18 @@ getSteps model maybePage maybePerPage org repository buildNumber =
         |> withAuth model.session
 
 
+{-| getAllSteps : used in conjuction with 'tryAll', it retrieves all pages of the resource
+
+    Note: the singular version of the type/decoder is needed in this case as it turns it into a list
+
+-}
+getAllSteps : PartialModel a -> Org -> Repo -> BuildNumber -> Request Step
+getAllSteps model org repository buildNumber =
+    -- we are using the max perPage setting of 100 to reduce the number of calls
+    get model.velaAPI (Endpoint.Steps (Just 1) (Just 100) org repository buildNumber) decodeStep
+        |> withAuth model.session
+
+
 {-| getStep : fetches vela build steps by repository, build number and step number
 -}
 getStep : PartialModel a -> Org -> Repo -> BuildNumber -> StepNumber -> Request Step

diff --git a/src/elm/Main.elm b/src/elm/Main.elm
@@ -2144,7 +2144,7 @@ getBuild model org repo buildNumber =
 
 getAllBuildSteps : Model -> Org -> Repo -> BuildNumber -> FocusFragment -> Cmd Msg
 getAllBuildSteps model org repo buildNumber logFocus =
-    Api.try (StepsResponse org repo buildNumber logFocus) <| Api.getSteps model Nothing Nothing org repo buildNumber
+    Api.tryAll (StepsResponse org repo buildNumber logFocus) <| Api.getAllSteps model org repo buildNumber
 
 
 getBuildStep : Model -> Org -> Repo -> BuildNumber -> StepNumber -> Cmd Msg