refactor(builds): repo actions menu cancel working

go-vela · Feb 7, 2024 · 6be7031 · 6be7031
1 parent db9f35d
commit 6be7031
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 15 deletions.
diff --git a/src/elm/Api/Operations.elm b/src/elm/Api/Operations.elm
@@ -9,6 +9,7 @@ module Api.Operations exposing
     , addRepoSchedule
     , addRepoSecret
     , addSharedSecret
+    , cancelBuild
     , chownRepo
     , deleteOrgSecret
     , deleteRepoSchedule
@@ -307,6 +308,27 @@ restartBuild baseUrl session options =
         |> withAuth session
 
 
+cancelBuild :
+    String
+    -> Session
+    ->
+        { a
+            | org : String
+            , repo : String
+            , buildNumber : String
+        }
+    -> Request Vela.Build
+cancelBuild baseUrl session options =
+    delete baseUrl
+        (Api.Endpoint.CancelBuild
+            options.org
+            options.repo
+            options.buildNumber
+        )
+        Vela.decodeBuild
+        |> withAuth session
+
+
 {-| getRepoDeployments : retrieves deployments for a repo
 -}
 getRepoDeployments :

diff --git a/src/elm/Components/Build.elm b/src/elm/Components/Build.elm
@@ -247,6 +247,7 @@ viewActionsMenu :
     { msgs :
         { showHideActionsMenus : Maybe Int -> Maybe Bool -> msg
         , restartBuild : { org : String, repo : String, buildNumber : String } -> msg
+        , cancelBuild : { org : String, repo : String, buildNumber : String } -> msg
         }
     , build : Vela.Build
     , showActionsMenus : List Int
@@ -319,8 +320,12 @@ viewActionsMenu props =
                         [ a
                             [ href "#"
                             , class "menu-item"
-
-                            -- , Util.onClickPreventDefault <| props.msgs.cancelBuild org repo <| String.fromInt build.number
+                            , Util.onClickPreventDefault <|
+                                props.msgs.cancelBuild
+                                    { org = org
+                                    , repo = repo
+                                    , buildNumber = String.fromInt props.build.number
+                                    }
                             , Util.testAttribute "cancel-build"
                             ]
                             [ text "Cancel Build"

diff --git a/src/elm/Components/Builds.elm b/src/elm/Components/Builds.elm
@@ -49,7 +49,7 @@ import Vela
 type alias Msgs msg =
     { approveBuild : Vela.Org -> Vela.Repo -> Vela.BuildNumber -> msg
     , restartBuild : { org : Vela.Org, repo : Vela.Repo, buildNumber : Vela.BuildNumber } -> msg
-    , cancelBuild : Vela.Org -> Vela.Repo -> Vela.BuildNumber -> msg
+    , cancelBuild : { org : Vela.Org, repo : Vela.Repo, buildNumber : Vela.BuildNumber } -> msg
     , showHideActionsMenus : Maybe Int -> Maybe Bool -> msg
     }
 

diff --git a/src/elm/Effect.elm b/src/elm/Effect.elm
@@ -9,7 +9,7 @@ module Effect exposing
     , sendCmd, sendMsg
     , pushRoute, replaceRoute, loadExternalUrl
     , map, toCmd
-    , addAlertError, addAlertSuccess, addDeployment, addOrgSecret, addRepoSchedule, addRepoSecret, addSharedSecret, alertsUpdate, chownRepo, clearRedirect, deleteOrgSecret, deleteRepoSchedule, deleteRepoSecret, deleteSharedSecret, disableRepo, downloadFile, enableRepo, expandPipelineConfig, finishAuthentication, focusOn, getBuild, getBuildGraph, getBuildServiceLog, getBuildServices, getBuildStepLog, getBuildSteps, getCurrentUser, getOrgBuilds, getOrgRepos, getOrgSecret, getOrgSecrets, getPipelineConfig, getPipelineTemplates, getRepo, getRepoBuilds, getRepoBuildsShared, getRepoDeployments, getRepoHooks, getRepoHooksShared, getRepoSchedule, getRepoSchedules, getRepoSecret, getRepoSecrets, getSharedSecret, getSharedSecrets, handleHttpError, logout, pushPath, redeliverHook, repairRepo, replacePath, replaceRouteRemoveTabHistorySkipDomFocus, restartBuild, setRedirect, setTheme, updateFavicon, updateFavorites, updateOrgSecret, updateRepo, updateRepoSchedule, updateRepoSecret, updateSharedSecret
+    , addAlertError, addAlertSuccess, addDeployment, addOrgSecret, addRepoSchedule, addRepoSecret, addSharedSecret, alertsUpdate, cancelBuild, chownRepo, clearRedirect, deleteOrgSecret, deleteRepoSchedule, deleteRepoSecret, deleteSharedSecret, disableRepo, downloadFile, enableRepo, expandPipelineConfig, finishAuthentication, focusOn, getBuild, getBuildGraph, getBuildServiceLog, getBuildServices, getBuildStepLog, getBuildSteps, getCurrentUser, getOrgBuilds, getOrgRepos, getOrgSecret, getOrgSecrets, getPipelineConfig, getPipelineTemplates, getRepo, getRepoBuilds, getRepoBuildsShared, getRepoDeployments, getRepoHooks, getRepoHooksShared, getRepoSchedule, getRepoSchedules, getRepoSecret, getRepoSecrets, getSharedSecret, getSharedSecrets, handleHttpError, logout, pushPath, redeliverHook, repairRepo, replacePath, replaceRouteRemoveTabHistorySkipDomFocus, restartBuild, setRedirect, setTheme, updateFavicon, updateFavorites, updateOrgSecret, updateRepo, updateRepoSchedule, updateRepoSecret, updateSharedSecret
     )
 
 {-|
@@ -454,6 +454,16 @@ restartBuild options =
     SendSharedMsg <| Shared.Msg.RestartBuild options
 
 
+cancelBuild :
+    { org : String
+    , repo : String
+    , buildNumber : String
+    }
+    -> Effect msg
+cancelBuild options =
+    SendSharedMsg <| Shared.Msg.CancelBuild options
+
+
 addDeployment :
     { baseUrl : String
     , session : Auth.Session.Session

diff --git a/src/elm/Pages/Org_/Builds.elm b/src/elm/Pages/Org_/Builds.elm
@@ -106,7 +106,7 @@ type Msg
     | GotoPage Int
     | ApproveBuild Vela.Org Vela.Repo Vela.BuildNumber
     | RestartBuild { org : Vela.Org, repo : Vela.Repo, buildNumber : Vela.BuildNumber }
-    | CancelBuild Vela.Org Vela.Repo Vela.BuildNumber
+    | CancelBuild { org : Vela.Org, repo : Vela.Repo, buildNumber : Vela.BuildNumber }
     | ShowHideActionsMenus (Maybe Int) (Maybe Bool)
     | FilterByEvent (Maybe String)
     | ShowHideFullTimestamps
@@ -178,7 +178,7 @@ update shared route msg model =
             in
             ( model, Effect.none )
 
-        CancelBuild _ _ _ ->
+        CancelBuild _ ->
             ( model, Effect.none )
 
         ShowHideActionsMenus build show ->
@@ -304,6 +304,7 @@ view shared route model =
                         { msgs =
                             { showHideActionsMenus = ShowHideActionsMenus
                             , restartBuild = RestartBuild
+                            , cancelBuild = CancelBuild
                             }
                         , build = options.build
                         , showActionsMenus = model.showActionsMenus

diff --git a/src/elm/Pages/Org_/Repo_.elm b/src/elm/Pages/Org_/Repo_.elm
@@ -109,7 +109,7 @@ type Msg
     | GotoPage Int
     | ApproveBuild Vela.Org Vela.Repo Vela.BuildNumber
     | RestartBuild { org : Vela.Org, repo : Vela.Repo, buildNumber : Vela.BuildNumber }
-    | CancelBuild Vela.Org Vela.Repo Vela.BuildNumber
+    | CancelBuild { org : Vela.Org, repo : Vela.Repo, buildNumber : Vela.BuildNumber }
     | ShowHideActionsMenus (Maybe Int) (Maybe Bool)
     | FilterByEvent (Maybe String)
     | ShowHideFullTimestamps
@@ -205,18 +205,18 @@ update shared route msg model =
                 }
             )
 
-        -- RestartBuild _ ->
-        --     let
-        --         _ =
-        --             Debug.log "restart build clicked" ""
-        --     in
-        --     ( model, Effect.none )
-        CancelBuild _ _ _ ->
+        CancelBuild options ->
             let
                 _ =
                     Debug.log "cancel build clicked" ""
             in
-            ( model, Effect.none )
+            ( model
+            , Effect.cancelBuild
+                { org = options.org
+                , repo = options.repo
+                , buildNumber = options.buildNumber
+                }
+            )
 
         ShowHideActionsMenus build show ->
             let
@@ -343,6 +343,7 @@ view shared route model =
                         { msgs =
                             { showHideActionsMenus = ShowHideActionsMenus
                             , restartBuild = RestartBuild
+                            , cancelBuild = CancelBuild
                             }
                         , build = options.build
                         , showActionsMenus = model.showActionsMenus

diff --git a/src/elm/Shared.elm b/src/elm/Shared.elm
@@ -553,6 +553,34 @@ update route msg model =
                     , Effect.handleHttpError { httpError = error }
                     )
 
+        Shared.Msg.CancelBuild options ->
+            let
+                _ =
+                    Debug.log "cancel a build" options
+            in
+            ( model
+            , Api.try
+                (Shared.Msg.CancelBuildResponse options)
+                (Api.Operations.cancelBuild model.velaAPIBaseURL model.session options)
+                |> Effect.sendCmd
+            )
+
+        Shared.Msg.CancelBuildResponse options response ->
+            case response of
+                Ok _ ->
+                    let
+                        canceledBuild =
+                            "Build " ++ String.join "/" [ options.org, options.repo, options.buildNumber ]
+                    in
+                    ( model
+                    , Effect.addAlertSuccess { content = canceledBuild ++ " canceled.", addToastIfUnique = True }
+                    )
+
+                Err error ->
+                    ( model
+                    , Effect.handleHttpError { httpError = error }
+                    )
+
         -- HOOKS
         Shared.Msg.GetRepoHooks options ->
             ( model

diff --git a/src/elm/Shared/Msg.elm b/src/elm/Shared/Msg.elm
@@ -52,6 +52,8 @@ type Msg
       -- BUILD
     | RestartBuild { org : String, repo : String, buildNumber : String }
     | RestartBuildResponse { org : String, repo : String, buildNumber : String } (Result (Http.Detailed.Error String) ( Http.Metadata, Vela.Build ))
+    | CancelBuild { org : String, repo : String, buildNumber : String }
+    | CancelBuildResponse { org : String, repo : String, buildNumber : String } (Result (Http.Detailed.Error String) ( Http.Metadata, Vela.Build ))
       -- HOOKS
     | GetRepoHooks { org : String, repo : String, pageNumber : Maybe Int, perPage : Maybe Int, maybeEvent : Maybe String }
     | GetRepoHooksResponse (Result (Http.Detailed.Error String) ( Http.Metadata, List Vela.Hook ))