progress or not, depends on your outlook

go-vela · Dec 31, 2024 · f8b1fa6 · f8b1fa6
1 parent 2557666
commit f8b1fa6
Show file tree

Hide file tree

Showing 17 changed files with 361 additions and 36 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
   ui:
     build:
       context: .
-      dockerfile: Dockerfile.local
+      dockerfile: ${VELA_UI_DOCKERFILE:-Dockerfile}
     container_name: ui
     image: ui:local
     networks:
@@ -34,7 +34,7 @@ services:
   # https://go-vela.github.io/docs/administration/server/
   server:
     container_name: server
-    image: target/vela-server:latest
+    image: server:local
     networks:
       - vela
     environment:

diff --git a/src/elm/Api/Endpoint.elm b/src/elm/Api/Endpoint.elm
@@ -28,6 +28,7 @@ type Endpoint
     | Dashboard String
     | Dashboards
     | Deployment Vela.Org Vela.Repo (Maybe String)
+    | DeploymentConfig Vela.Org Vela.Repo (Maybe Vela.Ref)
     | Deployments (Maybe Pagination.Page) (Maybe Pagination.PerPage) Vela.Org Vela.Repo
     | Token
     | Repositories (Maybe Pagination.Page) (Maybe Pagination.PerPage)
@@ -162,6 +163,14 @@ toUrl api endpoint =
                 Nothing ->
                     url api [ "deployments", org, repo ] []
 
+        DeploymentConfig org repo maybeRef ->
+            case maybeRef of
+                Nothing ->
+                    url api ["deployments", org, repo, "config"] []
+
+                Just ref ->
+                    url api ["deployments", org, repo, "config"] [ UB.string "ref" ref ]
+
         Deployments maybePage maybePerPage org repo ->
             url api [ "deployments", org, repo ] <| Pagination.toQueryParams maybePage maybePerPage
 

diff --git a/src/elm/Api/Operations.elm b/src/elm/Api/Operations.elm
@@ -31,6 +31,7 @@ module Api.Operations exposing
     , getCurrentUser
     , getDashboard
     , getDashboards
+    , getDeploymentConfig
     , getOrgBuilds
     , getOrgRepos
     , getOrgSecret
@@ -464,6 +465,28 @@ addDeployment baseUrl session options =
         |> withAuth session
 
 
+{-| getDeploymentConfig : retrieves deployment config for a repo and pipeline ref.
+-}
+getDeploymentConfig :
+    String
+    -> Session
+    ->
+        { a
+            | org : String
+            , repo : String
+            , ref : Maybe String
+        }
+    -> Request Vela.DeploymentConfig
+getDeploymentConfig baseUrl session options =
+    get baseUrl
+        (Api.Endpoint.DeploymentConfig
+            options.org
+            options.repo
+            options.ref
+        )
+        Vela.decodeDeploymentConfig
+        |> withAuth session
+
 {-| getRepoHooks : retrieves hooks for a repo.
 -}
 getRepoHooks :

diff --git a/src/elm/Components/Form.elm b/src/elm/Components/Form.elm
@@ -36,9 +36,12 @@ viewInputSection :
     , wrap_ : Maybe String
     , msg : String -> msg
     , disabled_ : Bool
+    , min : Maybe String
+    , max : Maybe String
+    , required : Bool
     }
     -> Html msg
-viewInputSection { id_, title, subtitle, val, placeholder_, classList_, rows_, wrap_, msg, disabled_ } =
+viewInputSection { id_, title, subtitle, val, placeholder_, classList_, rows_, wrap_, msg, disabled_, min, max, required } =
     let
         target =
             String.join "-" [ "input", id_ ]
@@ -62,6 +65,9 @@ viewInputSection { id_, title, subtitle, val, placeholder_, classList_, rows_, w
             , Maybe.Extra.unwrap Util.attrNone wrap wrap_
             , onInput msg
             , disabled disabled_
+            , Maybe.Extra.unwrap Util.attrNone Html.Attributes.min min
+            , Maybe.Extra.unwrap Util.attrNone Html.Attributes.max max
+            , Html.Attributes.required required
             , Util.testAttribute target
             ]
             []

diff --git a/src/elm/Components/SecretForm.elm b/src/elm/Components/SecretForm.elm
@@ -150,6 +150,9 @@ viewImagesInput { onInput_, addImage, removeImage, images, imageValue, disabled_
                     , wrap_ = Just "soft"
                     , msg = onInput_
                     , disabled_ = disabled_
+                    , min = Nothing
+                    , max = Nothing
+                    , required = False
                     }
                 , button
                     [ class "button"

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, addFavorites, addOrgSecret, addRepoSchedule, addRepoSecret, addSharedSecret, alertsUpdate, approveBuild, cancelBuild, chownRepo, clearRedirect, deleteOrgSecret, deleteRepoSchedule, deleteRepoSecret, deleteSharedSecret, disableRepo, downloadFile, enableRepo, expandPipelineConfig, finishAuthentication, focusOn, getAllBuildServices, getAllBuildSteps, getBuild, getBuildGraph, getBuildServiceLog, getBuildServices, getBuildStepLog, getBuildSteps, getCurrentUser, getCurrentUserShared, getDashboard, getDashboards, getOrgBuilds, getOrgRepos, getOrgSecret, getOrgSecrets, getPipelineConfig, getPipelineTemplates, getRepo, getRepoBuilds, getRepoBuildsShared, getRepoDeployments, getRepoHooks, getRepoHooksShared, getRepoSchedule, getRepoSchedules, getRepoSecret, getRepoSecrets, getSettings, getSharedSecret, getSharedSecrets, getWorkers, handleHttpError, logout, pushPath, redeliverHook, repairRepo, replacePath, replaceRouteRemoveTabHistorySkipDomFocus, restartBuild, setRedirect, setTheme, updateFavicon, updateFavorite, updateOrgSecret, updateRepo, updateRepoHooksShared, updateRepoSchedule, updateRepoSecret, updateSettings, updateSharedSecret, updateSourceReposShared
+    , addAlertError, addAlertSuccess, addDeployment, addFavorites, addOrgSecret, addRepoSchedule, addRepoSecret, addSharedSecret, alertsUpdate, approveBuild, cancelBuild, chownRepo, clearRedirect, deleteOrgSecret, deleteRepoSchedule, deleteRepoSecret, deleteSharedSecret, disableRepo, downloadFile, enableRepo, expandPipelineConfig, finishAuthentication, focusOn, getAllBuildServices, getAllBuildSteps, getBuild, getBuildGraph, getBuildServiceLog, getBuildServices, getBuildStepLog, getBuildSteps, getCurrentUser, getCurrentUserShared, getDashboard, getDashboards, getDeploymentConfig, getOrgBuilds, getOrgRepos, getOrgSecret, getOrgSecrets, getPipelineConfig, getPipelineTemplates, getRepo, getRepoBuilds, getRepoBuildsShared, getRepoDeployments, getRepoHooks, getRepoHooksShared, getRepoSchedule, getRepoSchedules, getRepoSecret, getRepoSecrets, getSettings, getSharedSecret, getSharedSecrets, getWorkers, handleHttpError, logout, pushPath, redeliverHook, repairRepo, replacePath, replaceRouteRemoveTabHistorySkipDomFocus, restartBuild, setRedirect, setTheme, updateFavicon, updateFavorite, updateOrgSecret, updateRepo, updateRepoHooksShared, updateRepoSchedule, updateRepoSecret, updateSettings, updateSharedSecret, updateSourceReposShared
     )
 
 {-|
@@ -592,6 +592,25 @@ addDeployment options =
         )
         |> sendCmd
 
+getDeploymentConfig :
+    { baseUrl : String
+    , session : Auth.Session.Session
+    , onResponse : Result (Http.Detailed.Error String) ( Http.Metadata, Vela.DeploymentConfig ) -> msg
+    , ref : Maybe String
+    , org : String
+    , repo : String
+    }
+    -> Effect msg
+getDeploymentConfig options =
+    Api.try
+        options.onResponse
+        (Api.Operations.getDeploymentConfig
+            options.baseUrl
+            options.session
+            options
+        )
+        |> sendCmd
+
 
 getRepoHooks :
     { baseUrl : String

diff --git a/src/elm/Pages/Dash/Secrets/Engine_/Org/Org_/Add.elm b/src/elm/Pages/Dash/Secrets/Engine_/Org/Org_/Add.elm
@@ -286,6 +286,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = NameOnInput
                             , disabled_ = False
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewTextareaSection
                             { title = Just "Value"

diff --git a/src/elm/Pages/Dash/Secrets/Engine_/Org/Org_/Name_.elm b/src/elm/Pages/Dash/Secrets/Engine_/Org/Org_/Name_.elm
@@ -393,6 +393,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = NameOnInput
                             , disabled_ = True
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewTextareaSection
                             { title = Just "Value"

diff --git a/src/elm/Pages/Dash/Secrets/Engine_/Repo/Org_/Repo_/Add.elm b/src/elm/Pages/Dash/Secrets/Engine_/Repo/Org_/Repo_/Add.elm
@@ -274,6 +274,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = NameOnInput
                             , disabled_ = False
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewTextareaSection
                             { title = Just "Value"

diff --git a/src/elm/Pages/Dash/Secrets/Engine_/Repo/Org_/Repo_/Name_.elm b/src/elm/Pages/Dash/Secrets/Engine_/Repo/Org_/Repo_/Name_.elm
@@ -386,6 +386,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = \_ -> NoOp
                             , disabled_ = True
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewTextareaSection
                             { title = Just "Value"

diff --git a/src/elm/Pages/Dash/Secrets/Engine_/Shared/Org_/Team_/Add.elm b/src/elm/Pages/Dash/Secrets/Engine_/Shared/Org_/Team_/Add.elm
@@ -294,6 +294,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = TeamOnInput
                             , disabled_ = False
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewInputSection
                             { title = Just "Name"
@@ -306,6 +309,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = NameOnInput
                             , disabled_ = False
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewTextareaSection
                             { title = Just "Value"

diff --git a/src/elm/Pages/Dash/Secrets/Engine_/Shared/Org_/Team_/Name_.elm b/src/elm/Pages/Dash/Secrets/Engine_/Shared/Org_/Team_/Name_.elm
@@ -385,6 +385,9 @@ view shared route model =
                             , wrap_ = Nothing
                             , msg = \_ -> NoOp
                             , disabled_ = True
+                            , min = Nothing
+                            , max = Nothing
+                            , required = False
                             }
                         , Components.Form.viewTextareaSection
                             { title = Just "Value"