From 1b1e52c753403be79ce4e2a4e90d18170c3ef395 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 11:54:04 +0800 Subject: [PATCH 01/49] move secrets to actions(repo) --- routers/web/admin/runners.go | 4 +-- routers/web/repo/runners.go | 28 ++++++++++++------- routers/web/repo/setting_secrets.go | 4 +-- routers/web/web.go | 25 ++++++++--------- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 17 +++++++---- .../settings/{runners.tmpl => actions.tmpl} | 1 + templates/repo/settings/navbar.tmpl | 4 +-- templates/shared/actions/runner_list.tmpl | 6 ++-- templates/shared/secrets/add_list.tmpl | 4 +-- 10 files changed, 54 insertions(+), 41 deletions(-) rename templates/repo/settings/{runners.tmpl => actions.tmpl} (84%) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index a70b53fdcb1cb..5b8658625ddd2 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -15,7 +15,7 @@ import ( ) const ( - tplRunners base.TplName = "admin/runners/base" + tplActions base.TplName = "admin/runners/base" tplRunnerEdit base.TplName = "admin/runners/edit" ) @@ -39,7 +39,7 @@ func Runners(ctx *context.Context) { Filter: ctx.Req.URL.Query().Get("q"), } - actions_shared.RunnersList(ctx, tplRunners, opts) + actions_shared.RunnersList(ctx, tplActions, opts) } // EditRunner show editing runner page diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go index d3dbff17fddba..2c7ceae10675b 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/runners.go @@ -9,18 +9,26 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" + shared "code.gitea.io/gitea/routers/web/shared/secrets" ) const ( - tplRunners = "repo/settings/runners" + tplActions = "repo/settings/actions" tplRunnerEdit = "repo/settings/runner_edit" ) -// Runners render runners page -func Runners(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.runners") - ctx.Data["PageIsSettingsRunners"] = true +// Actions render actions page +func Actions(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageIsSettingsActions"] = true + ctx.Data["DisableSSH"] = setting.SSH.Disabled + + shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) + if ctx.Written() { + return + } page := ctx.FormInt("page") if page <= 1 { @@ -38,7 +46,7 @@ func Runners(ctx *context.Context) { WithAvailable: true, } - actions_shared.RunnersList(ctx, tplRunners, opts) + actions_shared.RunnersList(ctx, tplActions, opts) } func RunnersEdit(ctx *context.Context) { @@ -59,18 +67,18 @@ func RunnersEditPost(ctx *context.Context) { ctx.Data["PageIsSettingsRunners"] = true actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + ctx.Repo.RepoLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } func ResetRunnerRegistrationToken(ctx *context.Context) { actions_shared.RunnerResetRegistrationToken(ctx, 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/runners") + ctx.Repo.RepoLink+"/settings/actions") } // RunnerDeletePost response for deleting runner func RunnerDeletePost(ctx *context.Context) { actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), - ctx.Repo.RepoLink+"/settings/runners", - ctx.Repo.RepoLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + ctx.Repo.RepoLink+"/settings/actions", + ctx.Repo.RepoLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index 57a4c470dd601..78407f1156010 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -34,7 +34,7 @@ func SecretsPost(ctx *context.Context) { ctx, 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/secrets", + ctx.Repo.RepoLink+"/settings/actions", ) } @@ -43,6 +43,6 @@ func DeleteSecret(ctx *context.Context) { ctx, 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/secrets", + ctx.Repo.RepoLink+"/settings/actions", ) } diff --git a/routers/web/web.go b/routers/web/web.go index 779499889fb05..e87786060d833 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1023,12 +1023,6 @@ func RegisterRoutes(m *web.Route) { m.Post("/delete", repo.DeleteDeployKey) }) - m.Group("/secrets", func() { - m.Get("", repo.Secrets) - m.Post("", web.Bind(forms.AddSecretForm{}), repo.SecretsPost) - m.Post("/delete", repo.DeleteSecret) - }) - m.Group("/lfs", func() { m.Get("/", repo.LFSFiles) m.Get("/show/{oid}", repo.LFSFileGet) @@ -1042,13 +1036,18 @@ func RegisterRoutes(m *web.Route) { m.Post("/{lid}/unlock", repo.LFSUnlock) }) }) - - m.Group("/runners", func() { - m.Get("", repo.Runners) - m.Combo("/{runnerid}").Get(repo.RunnersEdit). - Post(web.Bind(forms.EditRunnerForm{}), repo.RunnersEditPost) - m.Post("/{runnerid}/delete", repo.RunnerDeletePost) - m.Get("/reset_registration_token", repo.ResetRunnerRegistrationToken) + m.Group("/actions", func() { + m.Get("", repo.Actions) + m.Group("/runners", func() { + m.Combo("/{runnerid}").Get(repo.RunnersEdit). + Post(web.Bind(forms.EditRunnerForm{}), repo.RunnersEditPost) + m.Post("/{runnerid}/delete", repo.RunnerDeletePost) + m.Get("/reset_registration_token", repo.ResetRunnerRegistrationToken) + }) + m.Group("/secrets", func() { + m.Post("", web.Bind(forms.AddSecretForm{}), repo.SecretsPost) + m.Post("/delete", repo.DeleteSecret) + }) }, actions.MustEnableActions) }, func(ctx *context.Context) { ctx.Data["PageIsSettings"] = true diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index e8eb54e58da48..eaf5f7f9f0ebc 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -36,7 +36,7 @@ {{end}} {{if .EnableActions}} - {{.locale.Tr "actions.runners"}} + {{.locale.Tr "actions.actions"}} {{end}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 7380deff779be..2bd6f303d3783 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -12,9 +12,6 @@ {{.locale.Tr "repo.labels"}} - - {{.locale.Tr "secrets.secrets"}} - {{if .EnableOAuth2}} {{.locale.Tr "settings.applications"}} @@ -26,9 +23,17 @@ {{end}} {{if .EnableActions}} - - {{.locale.Tr "actions.runners"}} - +
+ {{.locale.Tr "actions.actions"}} +
+ + {{.locale.Tr "actions.runners"}} + + + {{.locale.Tr "secrets.secrets"}} + +
+
{{end}} {{.locale.Tr "org.settings.delete"}} diff --git a/templates/repo/settings/runners.tmpl b/templates/repo/settings/actions.tmpl similarity index 84% rename from templates/repo/settings/runners.tmpl rename to templates/repo/settings/actions.tmpl index ab3ad40400d2f..ecd72f3eafcb0 100644 --- a/templates/repo/settings/runners.tmpl +++ b/templates/repo/settings/actions.tmpl @@ -1,5 +1,6 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}}
{{template "shared/actions/runner_list" .}} + {{template "shared/secrets/add_list" .}}
{{template "repo/settings/layout_footer" .}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 081d0c474ec5b..b0cc63cc0a2bc 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -37,8 +37,8 @@ {{end}} {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}} - - {{.locale.Tr "actions.runners"}} + + {{.locale.Tr "actions.actions"}} {{end}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index e738a581c329e..7ee7bb2773a9a 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -25,7 +25,7 @@
- Reset registration token + Reset registration token
@@ -33,7 +33,7 @@
-
+
@@ -72,7 +72,7 @@ {{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .Editable $.RunnerOnwerID $.RunnerRepoID}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index e56ace8fc6e10..87f1e08355388 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -6,7 +6,7 @@
- + {{.CsrfTokenHtml}}
{{.locale.Tr "secrets.description"}} @@ -32,7 +32,7 @@ {{range .Secrets}}
-
From f5737f7ebb83e2851158a2576cb916d2af37a4cd Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 13:57:36 +0800 Subject: [PATCH 02/49] update secretes and runners for org --- routers/web/org/org_runners.go | 8 +++---- routers/web/org/setting_secrets.go | 4 ++-- routers/web/web.go | 26 ++++++++++++----------- templates/org/settings/navbar.tmpl | 6 +++--- templates/repo/settings/navbar.tmpl | 3 --- templates/shared/actions/runner_list.tmpl | 6 +++--- templates/shared/secrets/add_list.tmpl | 4 ++-- 7 files changed, 28 insertions(+), 29 deletions(-) diff --git a/routers/web/org/org_runners.go b/routers/web/org/org_runners.go index f87a506504af9..ec6cdb7e3d7e5 100644 --- a/routers/web/org/org_runners.go +++ b/routers/web/org/org_runners.go @@ -41,7 +41,7 @@ func Runners(ctx *context.Context) { func ResetRunnerRegistrationToken(ctx *context.Context) { actions_shared.RunnerResetRegistrationToken(ctx, ctx.Org.Organization.ID, 0, - ctx.Org.OrgLink+"/settings/runners") + ctx.Org.OrgLink+"/settings/actions/runners") } // RunnersEdit render runner edit page @@ -66,13 +66,13 @@ func RunnersEditPost(ctx *context.Context) { ctx.Data["PageIsOrgSettingsRunners"] = true actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), ctx.Org.Organization.ID, 0, - ctx.Org.OrgLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + ctx.Org.OrgLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } // RunnerDeletePost response for deleting runner func RunnerDeletePost(ctx *context.Context) { actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), - ctx.Org.OrgLink+"/settings/runners", - ctx.Org.OrgLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + ctx.Org.OrgLink+"/settings/actions/runners", + ctx.Org.OrgLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } diff --git a/routers/web/org/setting_secrets.go b/routers/web/org/setting_secrets.go index 580a14015bd9b..43af7fc81d5ef 100644 --- a/routers/web/org/setting_secrets.go +++ b/routers/web/org/setting_secrets.go @@ -35,7 +35,7 @@ func SecretsPost(ctx *context.Context) { ctx, ctx.ContextUser.ID, 0, - ctx.Org.OrgLink+"/settings/secrets", + ctx.Org.OrgLink+"/settings/actions/secrets", ) } @@ -45,6 +45,6 @@ func SecretsDelete(ctx *context.Context) { ctx, ctx.ContextUser.ID, 0, - ctx.Org.OrgLink+"/settings/secrets", + ctx.Org.OrgLink+"/settings/actions/secrets", ) } diff --git a/routers/web/web.go b/routers/web/web.go index e87786060d833..8d98d88bdd5c3 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -842,19 +842,21 @@ func RegisterRoutes(m *web.Route) { m.Post("/initialize", web.Bind(forms.InitializeLabelsForm{}), org.InitializeLabels) }) - m.Group("/runners", func() { - m.Get("", org.Runners) - m.Combo("/{runnerid}").Get(org.RunnersEdit). - Post(web.Bind(forms.EditRunnerForm{}), org.RunnersEditPost) - m.Post("/{runnerid}/delete", org.RunnerDeletePost) - m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken) - }, actions.MustEnableActions) + m.Group("/actions", func() { + m.Group("/runners", func() { + m.Get("", org.Runners) + m.Combo("/{runnerid}").Get(org.RunnersEdit). + Post(web.Bind(forms.EditRunnerForm{}), org.RunnersEditPost) + m.Post("/{runnerid}/delete", org.RunnerDeletePost) + m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken) + }) - m.Group("/secrets", func() { - m.Get("", org.Secrets) - m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost) - m.Post("/delete", org.SecretsDelete) - }) + m.Group("/secrets", func() { + m.Get("", org.Secrets) + m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost) + m.Post("/delete", org.SecretsDelete) + }) + }, actions.MustEnableActions) m.RouteMethods("/delete", "GET,POST", org.SettingsDelete) diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 2bd6f303d3783..f580a52852c4c 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -23,13 +23,13 @@ {{end}} {{if .EnableActions}} -
+
{{.locale.Tr "actions.actions"}}
- + {{.locale.Tr "actions.runners"}} - + {{.locale.Tr "secrets.secrets"}}
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index b0cc63cc0a2bc..4818dc81a7fde 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -28,9 +28,6 @@ {{.locale.Tr "repo.settings.deploy_keys"}} - - {{.locale.Tr "secrets.secrets"}} - {{if .LFSStartServer}} {{.locale.Tr "repo.settings.lfs"}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 7ee7bb2773a9a..c98fdd3052b67 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -25,7 +25,7 @@
- Reset registration token + Reset registration token
@@ -33,7 +33,7 @@
- +
@@ -72,7 +72,7 @@ {{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .Editable $.RunnerOnwerID $.RunnerRepoID}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 87f1e08355388..4eb35b23b30a1 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -6,7 +6,7 @@
- + {{.CsrfTokenHtml}}
{{.locale.Tr "secrets.description"}} @@ -32,7 +32,7 @@ {{range .Secrets}}
-
From 118f1e173495f4e81c9e0a87bc3351b4d3ff5a36 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 14:16:48 +0800 Subject: [PATCH 03/49] modify admin --- routers/web/admin/runners.go | 20 ++++++++++---------- routers/web/repo/runners.go | 2 +- routers/web/web.go | 13 ++++++++----- templates/admin/navbar.tmpl | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 5b8658625ddd2..a530cce5c96c3 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -19,11 +19,11 @@ const ( tplRunnerEdit base.TplName = "admin/runners/edit" ) -// Runners show all the runners -func Runners(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.runners") +// Actions show all settings related to actions +func Actions(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminRunners"] = true + ctx.Data["PageIsSettingsActions"] = true page := ctx.FormInt("page") if page <= 1 { @@ -46,7 +46,7 @@ func Runners(ctx *context.Context) { func EditRunner(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminRunners"] = true + ctx.Data["PageIsSettingsActions"] = true page := ctx.FormInt("page") if page <= 1 { @@ -60,19 +60,19 @@ func EditRunner(ctx *context.Context) { func EditRunnerPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners.edit") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminRunners"] = true + ctx.Data["PageIsSettingsActions"] = true actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), 0, 0, - setting.AppSubURL+"/admin/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + setting.AppSubURL+"/admin/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } // DeleteRunnerPost response for deleting a runner func DeleteRunnerPost(ctx *context.Context) { actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), - setting.AppSubURL+"/admin/runners/", - setting.AppSubURL+"/admin/runners/"+url.PathEscape(ctx.Params(":runnerid")), + setting.AppSubURL+"/admin/actions/", + setting.AppSubURL+"/admin/actions/runners/"+url.PathEscape(ctx.Params(":runnerid")), ) } func ResetRunnerRegistrationToken(ctx *context.Context) { - actions_shared.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/runners/") + actions_shared.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/actions") } diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go index 2c7ceae10675b..0803e83ae667a 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/runners.go @@ -19,7 +19,7 @@ const ( tplRunnerEdit = "repo/settings/runner_edit" ) -// Actions render actions page +// Actions show all settings related to actions func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true diff --git a/routers/web/web.go b/routers/web/web.go index 8d98d88bdd5c3..0f2fdb05706ca 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -651,12 +651,15 @@ func RegisterRoutes(m *web.Route) { } }) - m.Group("/runners", func() { - m.Get("", admin.Runners) - m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) - m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) - m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) + m.Group("/actions", func() { + m.Get("", admin.Actions) + m.Group("/runners", func() { + m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) + m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) + m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) + }) }, actions.MustEnableActions) + }, func(ctx *context.Context) { ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable ctx.Data["EnablePackages"] = setting.Packages.Enabled diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index eaf5f7f9f0ebc..9c20d1b63e823 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -35,7 +35,7 @@ {{end}} {{if .EnableActions}} - + {{.locale.Tr "actions.actions"}} {{end}} From 22f9c76fe7df2cc1dfa0853873a3f51e9cabe79b Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 14:46:16 +0800 Subject: [PATCH 04/49] modify search --- routers/web/admin/runners.go | 6 +++--- routers/web/repo/runners.go | 10 +--------- routers/web/repo/setting_secrets.go | 5 ----- routers/web/web.go | 4 ++-- templates/shared/actions/runner_list.tmpl | 2 +- 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index a530cce5c96c3..86eec28da86a8 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -15,12 +15,12 @@ import ( ) const ( - tplActions base.TplName = "admin/runners/base" + tplRunners base.TplName = "admin/runners/base" tplRunnerEdit base.TplName = "admin/runners/edit" ) // Actions show all settings related to actions -func Actions(ctx *context.Context) { +func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsSettingsActions"] = true @@ -39,7 +39,7 @@ func Actions(ctx *context.Context) { Filter: ctx.Req.URL.Query().Get("q"), } - actions_shared.RunnersList(ctx, tplActions, opts) + actions_shared.RunnersList(ctx, tplRunners, opts) } // EditRunner show editing runner page diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go index 0803e83ae667a..6dff650261c27 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/runners.go @@ -9,9 +9,7 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/setting" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" - shared "code.gitea.io/gitea/routers/web/shared/secrets" ) const ( @@ -20,15 +18,9 @@ const ( ) // Actions show all settings related to actions -func Actions(ctx *context.Context) { +func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true - ctx.Data["DisableSSH"] = setting.SSH.Disabled - - shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) - if ctx.Written() { - return - } page := ctx.FormInt("page") if page <= 1 { diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index 78407f1156010..da796b11ed50f 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -4,8 +4,6 @@ package repo import ( - "net/http" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" @@ -17,7 +15,6 @@ const ( ) func Secrets(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("secrets.secrets") ctx.Data["PageIsSettingsSecrets"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled @@ -25,8 +22,6 @@ func Secrets(ctx *context.Context) { if ctx.Written() { return } - - ctx.HTML(http.StatusOK, tplSecrets) } func SecretsPost(ctx *context.Context) { diff --git a/routers/web/web.go b/routers/web/web.go index 0f2fdb05706ca..c5fcf1f838026 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -652,7 +652,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", admin.Actions) + m.Get("", admin.Runners) m.Group("/runners", func() { m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) @@ -1042,7 +1042,7 @@ func RegisterRoutes(m *web.Route) { }) }) m.Group("/actions", func() { - m.Get("", repo.Actions) + m.Get("", repo.Secrets, repo.Runners) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(repo.RunnersEdit). Post(web.Bind(forms.EditRunnerForm{}), repo.RunnersEditPost) diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index c98fdd3052b67..d623d82e716c7 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -33,7 +33,7 @@
- +
From d20aad6abd0994bfe528acbd3e53e4976f6e0de2 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 14:58:19 +0800 Subject: [PATCH 05/49] modify for user level --- routers/web/admin/runners.go | 2 +- routers/web/repo/setting_secrets.go | 1 - routers/web/user/setting/secrets.go | 8 ++++---- routers/web/web.go | 12 ++++++++---- templates/user/settings/navbar.tmpl | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 86eec28da86a8..f7a9db05e4f18 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -19,7 +19,7 @@ const ( tplRunnerEdit base.TplName = "admin/runners/edit" ) -// Actions show all settings related to actions +// Runners show all the runners func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index da796b11ed50f..8bda31d64f053 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -15,7 +15,6 @@ const ( ) func Secrets(ctx *context.Context) { - ctx.Data["PageIsSettingsSecrets"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index 2314f3694f775..0166491bd3e73 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -17,8 +17,8 @@ const ( ) func Secrets(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("secrets.secrets") - ctx.Data["PageIsSettingsSecrets"] = true + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageIsSettingsActions"] = true shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) if ctx.Written() { @@ -33,7 +33,7 @@ func SecretsPost(ctx *context.Context) { ctx, ctx.Doer.ID, 0, - setting.AppSubURL+"/user/settings/secrets", + setting.AppSubURL+"/user/settings/actions", ) } @@ -42,6 +42,6 @@ func SecretsDelete(ctx *context.Context) { ctx, ctx.Doer.ID, 0, - setting.AppSubURL+"/user/settings/secrets", + setting.AppSubURL+"/user/settings/actions", ) } diff --git a/routers/web/web.go b/routers/web/web.go index c5fcf1f838026..dbe343fe502ac 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -501,11 +501,15 @@ func RegisterRoutes(m *web.Route) { }) m.Post("/chef/regenerate_keypair", user_setting.RegenerateChefKeyPair) }, packagesEnabled) - m.Group("/secrets", func() { + + m.Group("/actions", func() { m.Get("", user_setting.Secrets) - m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) - m.Post("/delete", user_setting.SecretsDelete) - }) + m.Group("/secrets", func() { + m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) + m.Post("/delete", user_setting.SecretsDelete) + }) + }, actions.MustEnableActions) + m.Get("/organization", user_setting.Organization) m.Get("/repos", user_setting.Repos) m.Post("/repos/unadopted", user_setting.AdoptOrDeleteRepository) diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 27ec73c34fb26..4a40092599d55 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -19,8 +19,8 @@ {{.locale.Tr "settings.ssh_gpg_keys"}} - - {{.locale.Tr "secrets.secrets"}} + + {{.locale.Tr "actions.actions"}} {{if .EnablePackages}} From aa381225b0b42c2f27f9cd83d421ef51b69ec668 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 15:07:55 +0800 Subject: [PATCH 06/49] revert comment --- routers/web/repo/runners.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go index 6dff650261c27..27a467c446750 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/runners.go @@ -17,7 +17,7 @@ const ( tplRunnerEdit = "repo/settings/runner_edit" ) -// Actions show all settings related to actions +// Runners render runners page func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true From 02cc857b28e9f6dff847d665f610e966c639cfc8 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 15:20:58 +0800 Subject: [PATCH 07/49] hide user level action if not enabled --- templates/user/settings/navbar.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 4a40092599d55..34d629b7b3184 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -19,9 +19,11 @@ {{.locale.Tr "settings.ssh_gpg_keys"}} + {{if .EnableActions}} {{.locale.Tr "actions.actions"}} + {{end}} {{if .EnablePackages}} {{.locale.Tr "packages.title"}} From 586b3806c3010fd6ab67f36f302ac94c9146ed18 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 15:41:54 +0800 Subject: [PATCH 08/49] secrets management locale --- options/locale/locale_en-US.ini | 1 + templates/shared/secrets/add_list.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 54e041d7854a8..b49e5dc39610f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3356,6 +3356,7 @@ deletion = Remove secret deletion.description = Removing a secret is permanent and cannot be undone. Continue? deletion.success = The secret has been removed. deletion.failed = Failed to remove secret. +management = Secrets Management [actions] actions = Actions diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 4eb35b23b30a1..0236ff32d8b47 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -1,5 +1,5 @@

- {{.locale.Tr "secrets.secrets"}} + {{.locale.Tr "secrets.management"}}
From 17e77c69dbbfff9e2cc1e92bdf0bc692ce5ba7b2 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 17:37:27 +0800 Subject: [PATCH 09/49] refactor names --- .../admin/{runners.go => settings_actions.go} | 13 ++++++++----- routers/web/org/setting.go | 2 ++ routers/web/org/setting_secrets.go | 4 +--- .../{org_runners.go => settings_actions.go} | 15 +++++++++++---- routers/web/repo/setting_secrets.go | 7 +------ .../repo/{runners.go => settings_actions.go} | 14 ++++++++++---- routers/web/shared/actions/runners.go | 13 ++++--------- routers/web/user/setting/actions.go | 19 +++++++++++++++++++ routers/web/user/setting/secrets.go | 14 +------------- routers/web/web.go | 10 +++++----- templates/admin/actions.tmpl | 8 ++++++++ templates/org/settings/actions.tmpl | 18 ++++++++++++++++++ .../settings/{secrets.tmpl => actions.tmpl} | 0 13 files changed, 88 insertions(+), 49 deletions(-) rename routers/web/admin/{runners.go => settings_actions.go} (85%) rename routers/web/org/{org_runners.go => settings_actions.go} (84%) rename routers/web/repo/{runners.go => settings_actions.go} (85%) create mode 100644 routers/web/user/setting/actions.go create mode 100644 templates/admin/actions.tmpl create mode 100644 templates/org/settings/actions.tmpl rename templates/user/settings/{secrets.tmpl => actions.tmpl} (100%) diff --git a/routers/web/admin/runners.go b/routers/web/admin/settings_actions.go similarity index 85% rename from routers/web/admin/runners.go rename to routers/web/admin/settings_actions.go index f7a9db05e4f18..c196faeecb0b2 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/settings_actions.go @@ -4,6 +4,7 @@ package admin import ( + "net/http" "net/url" actions_model "code.gitea.io/gitea/models/actions" @@ -15,12 +16,12 @@ import ( ) const ( - tplRunners base.TplName = "admin/runners/base" + tplActions base.TplName = "admin/actions" tplRunnerEdit base.TplName = "admin/runners/edit" ) -// Runners show all the runners -func Runners(ctx *context.Context) { +// Actions render settings/actions page for admin level +func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsSettingsActions"] = true @@ -39,7 +40,8 @@ func Runners(ctx *context.Context) { Filter: ctx.Req.URL.Query().Get("q"), } - actions_shared.RunnersList(ctx, tplRunners, opts) + actions_shared.RunnersList(ctx, opts) + ctx.HTML(http.StatusOK, tplActions) } // EditRunner show editing runner page @@ -53,7 +55,8 @@ func EditRunner(ctx *context.Context) { page = 1 } - actions_shared.RunnerDetails(ctx, tplRunnerEdit, page, ctx.ParamsInt64(":runnerid"), 0, 0) + actions_shared.RunnerDetails(ctx, page, ctx.ParamsInt64(":runnerid"), 0, 0) + ctx.HTML(http.StatusOK, tplRunnerEdit) } // EditRunnerPost response for editing runner diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index db8fc728dffc7..07ffe38f2ea68 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -37,6 +37,8 @@ const ( tplSettingsHooks base.TplName = "org/settings/hooks" // tplSettingsLabels template path for render labels settings tplSettingsLabels base.TplName = "org/settings/labels" + // tplSettingsActions template path for render actions settings + tplSettingsActions base.TplName = "org/settings/actions" // tplSettingsRunners template path for render runners settings tplSettingsRunners base.TplName = "org/settings/runners" // tplSettingsRunnersEdit template path for render runners edit settings diff --git a/routers/web/org/setting_secrets.go b/routers/web/org/setting_secrets.go index 43af7fc81d5ef..c44c27e5198db 100644 --- a/routers/web/org/setting_secrets.go +++ b/routers/web/org/setting_secrets.go @@ -4,8 +4,6 @@ package org import ( - "net/http" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" shared "code.gitea.io/gitea/routers/web/shared/secrets" @@ -26,7 +24,7 @@ func Secrets(ctx *context.Context) { return } - ctx.HTML(http.StatusOK, tplSettingsSecrets) + // ctx.HTML(http.StatusOK, tplSettingsSecrets) } // SecretsPost add secrets diff --git a/routers/web/org/org_runners.go b/routers/web/org/settings_actions.go similarity index 84% rename from routers/web/org/org_runners.go rename to routers/web/org/settings_actions.go index ec6cdb7e3d7e5..ec87bbb46eb15 100644 --- a/routers/web/org/org_runners.go +++ b/routers/web/org/settings_actions.go @@ -4,6 +4,7 @@ package org import ( + "net/http" "net/url" actions_model "code.gitea.io/gitea/models/actions" @@ -12,11 +13,13 @@ import ( actions_shared "code.gitea.io/gitea/routers/web/shared/actions" ) -// Runners render runners page -func Runners(ctx *context.Context) { +// Actions render settings/actions page for organization level +func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.runners") ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsRunners"] = true + isRunnersPage := ctx.Params(":type") == "runners" + ctx.Data["IsRunnersPage"] = isRunnersPage page := ctx.FormInt("page") if page <= 1 { @@ -34,7 +37,9 @@ func Runners(ctx *context.Context) { WithAvailable: true, } - actions_shared.RunnersList(ctx, tplSettingsRunners, opts) + actions_shared.RunnersList(ctx, opts) + Secrets(ctx) + ctx.HTML(http.StatusOK, tplSettingsActions) } // ResetRunnerRegistrationToken reset runner registration token @@ -54,9 +59,11 @@ func RunnersEdit(ctx *context.Context) { page = 1 } - actions_shared.RunnerDetails(ctx, tplSettingsRunnersEdit, page, + actions_shared.RunnerDetails(ctx, page, ctx.ParamsInt64(":runnerid"), ctx.Org.Organization.ID, 0, ) + + ctx.HTML(http.StatusOK, tplSettingsRunnersEdit) } // RunnersEditPost response for editing runner diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index 8bda31d64f053..219475e273bc0 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -4,17 +4,12 @@ package repo import ( - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -const ( - tplSecrets base.TplName = "repo/settings/secrets" -) - -func Secrets(ctx *context.Context) { +func GetSecrets(ctx *context.Context) { ctx.Data["DisableSSH"] = setting.SSH.Disabled shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) diff --git a/routers/web/repo/runners.go b/routers/web/repo/settings_actions.go similarity index 85% rename from routers/web/repo/runners.go rename to routers/web/repo/settings_actions.go index 27a467c446750..9334a30a1df6a 100644 --- a/routers/web/repo/runners.go +++ b/routers/web/repo/settings_actions.go @@ -4,6 +4,7 @@ package repo import ( + "net/http" "net/url" actions_model "code.gitea.io/gitea/models/actions" @@ -17,8 +18,8 @@ const ( tplRunnerEdit = "repo/settings/runner_edit" ) -// Runners render runners page -func Runners(ctx *context.Context) { +// Actions render settings/actions page for repo level +func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true @@ -38,9 +39,12 @@ func Runners(ctx *context.Context) { WithAvailable: true, } - actions_shared.RunnersList(ctx, tplActions, opts) + actions_shared.RunnersList(ctx, opts) + GetSecrets(ctx) + ctx.HTML(http.StatusOK, tplActions) } +// RunnersEdit render runner edit page func RunnersEdit(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners") ctx.Data["PageIsSettingsRunners"] = true @@ -49,9 +53,11 @@ func RunnersEdit(ctx *context.Context) { page = 1 } - actions_shared.RunnerDetails(ctx, tplRunnerEdit, page, + actions_shared.RunnerDetails(ctx, page, ctx.ParamsInt64(":runnerid"), 0, ctx.Repo.Repository.ID, ) + + ctx.HTML(http.StatusOK, tplRunnerEdit) } func RunnersEditPost(ctx *context.Context) { diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 2c3614cbbcb2a..728f5c4fd76c2 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -10,7 +10,6 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" @@ -18,8 +17,8 @@ import ( "code.gitea.io/gitea/services/forms" ) -// RunnersList render common runners list page -func RunnersList(ctx *context.Context, tplName base.TplName, opts actions_model.FindRunnerOptions) { +// RunnersList prepares data for runners list +func RunnersList(ctx *context.Context, opts actions_model.FindRunnerOptions) { count, err := actions_model.CountRunners(ctx, opts) if err != nil { ctx.ServerError("CountRunners", err) @@ -59,12 +58,10 @@ func RunnersList(ctx *context.Context, tplName base.TplName, opts actions_model. pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) ctx.Data["Page"] = pager - - ctx.HTML(http.StatusOK, tplName) } -// RunnerDetails render runner details page -func RunnerDetails(ctx *context.Context, tplName base.TplName, page int, runnerID, ownerID, repoID int64) { +// RunnerDetails prepares data for runners edit page +func RunnerDetails(ctx *context.Context, page int, runnerID, ownerID, repoID int64) { runner, err := actions_model.GetRunnerByID(ctx, runnerID) if err != nil { ctx.ServerError("GetRunnerByID", err) @@ -111,8 +108,6 @@ func RunnerDetails(ctx *context.Context, tplName base.TplName, page int, runnerI ctx.Data["Tasks"] = tasks pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) ctx.Data["Page"] = pager - - ctx.HTML(http.StatusOK, tplName) } // RunnerDetailsEditPost response for edit runner details diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go new file mode 100644 index 0000000000000..127e108961733 --- /dev/null +++ b/routers/web/user/setting/actions.go @@ -0,0 +1,19 @@ +package setting + +import ( + "net/http" + + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" +) + +const ( + tplSettingsActions base.TplName = "user/settings/actions" +) + +func Actions(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageIsSettingsActions"] = true + GetSecrets(ctx) + ctx.HTML(http.StatusOK, tplSettingsActions) +} diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index 0166491bd3e73..a5215c24b5e4c 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -4,28 +4,16 @@ package setting import ( - "net/http" - - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -const ( - tplSettingsSecrets base.TplName = "user/settings/secrets" -) - -func Secrets(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsSettingsActions"] = true - +func GetSecrets(ctx *context.Context) { shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) if ctx.Written() { return } - - ctx.HTML(http.StatusOK, tplSettingsSecrets) } func SecretsPost(ctx *context.Context) { diff --git a/routers/web/web.go b/routers/web/web.go index dbe343fe502ac..4aa5a4f91ca5f 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -503,7 +503,7 @@ func RegisterRoutes(m *web.Route) { }, packagesEnabled) m.Group("/actions", func() { - m.Get("", user_setting.Secrets) + m.Get("", user_setting.Actions) m.Group("/secrets", func() { m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) m.Post("/delete", user_setting.SecretsDelete) @@ -656,7 +656,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", admin.Runners) + m.Get("", admin.Actions) m.Group("/runners", func() { m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) @@ -850,8 +850,8 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { + m.Get("/{type:runners|secrets}", org.Actions) m.Group("/runners", func() { - m.Get("", org.Runners) m.Combo("/{runnerid}").Get(org.RunnersEdit). Post(web.Bind(forms.EditRunnerForm{}), org.RunnersEditPost) m.Post("/{runnerid}/delete", org.RunnerDeletePost) @@ -859,7 +859,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/secrets", func() { - m.Get("", org.Secrets) + // m.Get("", org.Secrets) m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost) m.Post("/delete", org.SecretsDelete) }) @@ -1046,7 +1046,7 @@ func RegisterRoutes(m *web.Route) { }) }) m.Group("/actions", func() { - m.Get("", repo.Secrets, repo.Runners) + m.Get("", repo.Actions) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(repo.RunnersEdit). Post(web.Bind(forms.EditRunnerForm{}), repo.RunnersEditPost) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl new file mode 100644 index 0000000000000..822e81fcd0900 --- /dev/null +++ b/templates/admin/actions.tmpl @@ -0,0 +1,8 @@ +{{template "base/head" .}} +
+ {{template "admin/navbar" .}} +
+ {{template "shared/actions/runner_list" .}} +
+
+{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl new file mode 100644 index 0000000000000..de401b61acb02 --- /dev/null +++ b/templates/org/settings/actions.tmpl @@ -0,0 +1,18 @@ +{{template "base/head" .}} +
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "base/alert" .}} + {{if .IsRunnersPage}} + {{template "shared/actions/runner_list" (dict "." . "isFromOrg" true)}} + {{else}} + {{template "shared/secrets/add_list" (dict "." . "isFromOrg" true)}} + {{end}} +
+
+
+
+{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/settings/secrets.tmpl b/templates/user/settings/actions.tmpl similarity index 100% rename from templates/user/settings/secrets.tmpl rename to templates/user/settings/actions.tmpl From f3e2fbe5f9086a06e50b9aba329ec4202bb133e2 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 17:49:13 +0800 Subject: [PATCH 10/49] remove unused tmpl and comments --- routers/web/admin/settings_actions.go | 2 +- routers/web/org/setting_secrets.go | 11 ++--------- routers/web/org/settings_actions.go | 4 ++-- routers/web/repo/settings_actions.go | 2 +- routers/web/user/setting/actions.go | 3 +++ templates/admin/actions.tmpl | 2 +- templates/org/settings/actions.tmpl | 2 +- templates/org/settings/runners.tmpl | 5 ----- templates/org/settings/secrets.tmpl | 5 ----- 9 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 templates/org/settings/runners.tmpl delete mode 100644 templates/org/settings/secrets.tmpl diff --git a/routers/web/admin/settings_actions.go b/routers/web/admin/settings_actions.go index c196faeecb0b2..054f1603f018d 100644 --- a/routers/web/admin/settings_actions.go +++ b/routers/web/admin/settings_actions.go @@ -44,7 +44,7 @@ func Actions(ctx *context.Context) { ctx.HTML(http.StatusOK, tplActions) } -// EditRunner show editing runner page +// EditRunner renders runner edit page for admin level func EditRunner(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") ctx.Data["PageIsAdmin"] = true diff --git a/routers/web/org/setting_secrets.go b/routers/web/org/setting_secrets.go index c44c27e5198db..68011e4f80709 100644 --- a/routers/web/org/setting_secrets.go +++ b/routers/web/org/setting_secrets.go @@ -4,17 +4,12 @@ package org import ( - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -const ( - tplSettingsSecrets base.TplName = "org/settings/secrets" -) - -// Secrets render organization secrets page -func Secrets(ctx *context.Context) { +// Prepare Secrets page under org/settings/actions +func PrepareSecrets(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("secrets.secrets") ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsSecrets"] = true @@ -23,8 +18,6 @@ func Secrets(ctx *context.Context) { if ctx.Written() { return } - - // ctx.HTML(http.StatusOK, tplSettingsSecrets) } // SecretsPost add secrets diff --git a/routers/web/org/settings_actions.go b/routers/web/org/settings_actions.go index ec87bbb46eb15..4c7ca92322c45 100644 --- a/routers/web/org/settings_actions.go +++ b/routers/web/org/settings_actions.go @@ -38,7 +38,7 @@ func Actions(ctx *context.Context) { } actions_shared.RunnersList(ctx, opts) - Secrets(ctx) + PrepareSecrets(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } @@ -49,7 +49,7 @@ func ResetRunnerRegistrationToken(ctx *context.Context) { ctx.Org.OrgLink+"/settings/actions/runners") } -// RunnersEdit render runner edit page +// RunnersEdit render runner edit page for organization level func RunnersEdit(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.runners.edit") ctx.Data["PageIsOrgSettings"] = true diff --git a/routers/web/repo/settings_actions.go b/routers/web/repo/settings_actions.go index 9334a30a1df6a..ea07b21c4eaf9 100644 --- a/routers/web/repo/settings_actions.go +++ b/routers/web/repo/settings_actions.go @@ -44,7 +44,7 @@ func Actions(ctx *context.Context) { ctx.HTML(http.StatusOK, tplActions) } -// RunnersEdit render runner edit page +// RunnersEdit renders runner edit page for repository level func RunnersEdit(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners") ctx.Data["PageIsSettingsRunners"] = true diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index 127e108961733..c9acf1b97c89b 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -1,3 +1,6 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + package setting import ( diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 822e81fcd0900..a00a4dbc2615d 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -5,4 +5,4 @@ {{template "shared/actions/runner_list" .}}

-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index de401b61acb02..67536546a52a2 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -15,4 +15,4 @@
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/runners.tmpl deleted file mode 100644 index 86cb1bcd787c3..0000000000000 --- a/templates/org/settings/runners.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}} -
- {{template "shared/actions/runner_list" .}} -
-{{template "org/settings/layout_footer" .}} diff --git a/templates/org/settings/secrets.tmpl b/templates/org/settings/secrets.tmpl deleted file mode 100644 index 68ce415f41f24..0000000000000 --- a/templates/org/settings/secrets.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}} -
- {{template "shared/secrets/add_list" .}} -
-{{template "org/settings/layout_footer" .}} From 8a3af8bd63adb31ccc1364071fdc4d0f92012e9a Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 18:23:57 +0800 Subject: [PATCH 11/49] fix some titles and use PageIsOrgSettings --- routers/web/org/setting.go | 2 -- routers/web/org/setting_secrets.go | 4 ---- routers/web/org/settings_actions.go | 8 ++++++-- templates/org/settings/actions.tmpl | 6 +++--- templates/shared/actions/runner_list.tmpl | 4 ++-- templates/shared/secrets/add_list.tmpl | 4 ++-- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 07ffe38f2ea68..1c02f485702aa 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -39,8 +39,6 @@ const ( tplSettingsLabels base.TplName = "org/settings/labels" // tplSettingsActions template path for render actions settings tplSettingsActions base.TplName = "org/settings/actions" - // tplSettingsRunners template path for render runners settings - tplSettingsRunners base.TplName = "org/settings/runners" // tplSettingsRunnersEdit template path for render runners edit settings tplSettingsRunnersEdit base.TplName = "org/settings/runners_edit" ) diff --git a/routers/web/org/setting_secrets.go b/routers/web/org/setting_secrets.go index 68011e4f80709..254b400ca528b 100644 --- a/routers/web/org/setting_secrets.go +++ b/routers/web/org/setting_secrets.go @@ -10,10 +10,6 @@ import ( // Prepare Secrets page under org/settings/actions func PrepareSecrets(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("secrets.secrets") - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageIsOrgSettingsSecrets"] = true - shared.SetSecretsContext(ctx, ctx.ContextUser.ID, 0) if ctx.Written() { return diff --git a/routers/web/org/settings_actions.go b/routers/web/org/settings_actions.go index 4c7ca92322c45..527da93e5cf44 100644 --- a/routers/web/org/settings_actions.go +++ b/routers/web/org/settings_actions.go @@ -15,11 +15,15 @@ import ( // Actions render settings/actions page for organization level func Actions(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("org.runners") + ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageIsOrgSettingsRunners"] = true isRunnersPage := ctx.Params(":type") == "runners" ctx.Data["IsRunnersPage"] = isRunnersPage + if isRunnersPage { + ctx.Data["PageIsOrgSettingsRunners"] = true + } else { + ctx.Data["PageIsOrgSettingsSecrets"] = true + } page := ctx.FormInt("page") if page <= 1 { diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index 67536546a52a2..26d2e3e064c53 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -5,11 +5,11 @@
{{template "org/settings/navbar" .}}
- {{template "base/alert" .}} {{if .IsRunnersPage}} - {{template "shared/actions/runner_list" (dict "." . "isFromOrg" true)}} + {{template "shared/actions/runner_list" .}} {{else}} - {{template "shared/secrets/add_list" (dict "." . "isFromOrg" true)}} + {{template "base/alert" .}} + {{template "shared/secrets/add_list" .}} {{end}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index d623d82e716c7..023044e0a2b35 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -25,7 +25,7 @@
- Reset registration token + Reset registration token
@@ -72,7 +72,7 @@ {{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .Editable $.RunnerOnwerID $.RunnerRepoID}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 0236ff32d8b47..385cb56bc20ce 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -6,7 +6,7 @@
- + {{.CsrfTokenHtml}}
{{.locale.Tr "secrets.description"}} @@ -32,7 +32,7 @@ {{range .Secrets}}
-
From 177cfa4882eba0b96c57fdbcf17316a59ed8aab5 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 18:36:23 +0800 Subject: [PATCH 12/49] fix lint and use string --- routers/web/org/settings_actions.go | 11 +++++++---- templates/org/settings/actions.tmpl | 10 +++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/routers/web/org/settings_actions.go b/routers/web/org/settings_actions.go index 527da93e5cf44..3bc0e952675dd 100644 --- a/routers/web/org/settings_actions.go +++ b/routers/web/org/settings_actions.go @@ -4,6 +4,7 @@ package org import ( + "fmt" "net/http" "net/url" @@ -17,12 +18,14 @@ import ( func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsOrgSettings"] = true - isRunnersPage := ctx.Params(":type") == "runners" - ctx.Data["IsRunnersPage"] = isRunnersPage - if isRunnersPage { + pageType := ctx.Params(":type") + ctx.Data["PageType"] = pageType + if pageType == "runners" { ctx.Data["PageIsOrgSettingsRunners"] = true - } else { + } else if pageType == "secrets" { ctx.Data["PageIsOrgSettingsSecrets"] = true + } else { + ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) } page := ctx.FormInt("page") diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index 26d2e3e064c53..d99e0b18b8a95 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -5,12 +5,12 @@
{{template "org/settings/navbar" .}}
- {{if .IsRunnersPage}} - {{template "shared/actions/runner_list" .}} - {{else}} + {{if eq .PageType "runners"}} + {{template "shared/actions/runner_list" .}} + {{else if eq .PageType "secrets"}} {{template "base/alert" .}} - {{template "shared/secrets/add_list" .}} - {{end}} + {{template "shared/secrets/add_list" .}} + {{end}}
From 40596aa655f20cda98a82fdad5e30c04dc60263b Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 18:54:45 +0800 Subject: [PATCH 13/49] try adjust error position and pass ResetRegistrationTokenLink --- routers/web/admin/settings_actions.go | 2 ++ routers/web/org/settings_actions.go | 8 +++++--- routers/web/repo/settings_actions.go | 2 ++ routers/web/user/setting/actions.go | 2 ++ templates/shared/actions/runner_list.tmpl | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/routers/web/admin/settings_actions.go b/routers/web/admin/settings_actions.go index 054f1603f018d..d8a9df3168295 100644 --- a/routers/web/admin/settings_actions.go +++ b/routers/web/admin/settings_actions.go @@ -4,6 +4,7 @@ package admin import ( + "fmt" "net/http" "net/url" @@ -25,6 +26,7 @@ func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsSettingsActions"] = true + ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) page := ctx.FormInt("page") if page <= 1 { diff --git a/routers/web/org/settings_actions.go b/routers/web/org/settings_actions.go index 3bc0e952675dd..e85489f6ed936 100644 --- a/routers/web/org/settings_actions.go +++ b/routers/web/org/settings_actions.go @@ -16,17 +16,19 @@ import ( // Actions render settings/actions page for organization level func Actions(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsOrgSettings"] = true pageType := ctx.Params(":type") - ctx.Data["PageType"] = pageType if pageType == "runners" { ctx.Data["PageIsOrgSettingsRunners"] = true } else if pageType == "secrets" { ctx.Data["PageIsOrgSettingsSecrets"] = true } else { ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) + return } + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/reset_registration_token", ctx.Link) + ctx.Data["PageType"] = pageType page := ctx.FormInt("page") if page <= 1 { diff --git a/routers/web/repo/settings_actions.go b/routers/web/repo/settings_actions.go index ea07b21c4eaf9..e0fb87adb00eb 100644 --- a/routers/web/repo/settings_actions.go +++ b/routers/web/repo/settings_actions.go @@ -4,6 +4,7 @@ package repo import ( + "fmt" "net/http" "net/url" @@ -22,6 +23,7 @@ const ( func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true + ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) page := ctx.FormInt("page") if page <= 1 { diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index c9acf1b97c89b..367c0a8de7685 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -4,6 +4,7 @@ package setting import ( + "fmt" "net/http" "code.gitea.io/gitea/modules/base" @@ -17,6 +18,7 @@ const ( func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true + ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) GetSecrets(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 023044e0a2b35..ff70fe29c110e 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -25,7 +25,7 @@
- Reset registration token + Reset registration token
From e7d41b39325063e615e5947d000d8523ea685be0 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 19:20:45 +0800 Subject: [PATCH 14/49] use some format of variable and delete runners/base --- routers/web/admin/settings_actions.go | 6 +++--- templates/admin/navbar.tmpl | 2 +- templates/admin/runners/base.tmpl | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 templates/admin/runners/base.tmpl diff --git a/routers/web/admin/settings_actions.go b/routers/web/admin/settings_actions.go index d8a9df3168295..ff96819df8453 100644 --- a/routers/web/admin/settings_actions.go +++ b/routers/web/admin/settings_actions.go @@ -25,7 +25,7 @@ const ( func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsSettingsActions"] = true + ctx.Data["PageIsAdminActions"] = true ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) page := ctx.FormInt("page") @@ -50,7 +50,7 @@ func Actions(ctx *context.Context) { func EditRunner(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsSettingsActions"] = true + ctx.Data["PageIsAdminActions"] = true page := ctx.FormInt("page") if page <= 1 { @@ -65,7 +65,7 @@ func EditRunner(ctx *context.Context) { func EditRunnerPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.runners.edit") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsSettingsActions"] = true + ctx.Data["PageIsAdminActions"] = true actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), 0, 0, setting.AppSubURL+"/admin/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 9c20d1b63e823..c990204c7bbe0 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -35,7 +35,7 @@ {{end}} {{if .EnableActions}} - + {{.locale.Tr "actions.actions"}} {{end}} diff --git a/templates/admin/runners/base.tmpl b/templates/admin/runners/base.tmpl deleted file mode 100644 index 36495b6a0b942..0000000000000 --- a/templates/admin/runners/base.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}} -
- {{template "shared/actions/runner_list" .}} -
-{{template "admin/layout_footer" .}} From aa6aefb46df5367e020e3292fa68a70bb82ce873 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 20:21:40 +0800 Subject: [PATCH 15/49] change classname and css --- templates/admin/actions.tmpl | 2 +- templates/repo/settings/actions.tmpl | 2 +- templates/user/settings/actions.tmpl | 4 ++-- web_src/css/repository.css | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index a00a4dbc2615d..252ecafc6cb44 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "shared/actions/runner_list" .}} diff --git a/templates/repo/settings/actions.tmpl b/templates/repo/settings/actions.tmpl index ecd72f3eafcb0..65ebc4f5350ef 100644 --- a/templates/repo/settings/actions.tmpl +++ b/templates/repo/settings/actions.tmpl @@ -1,4 +1,4 @@ -{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}} +{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings actions")}}
{{template "shared/actions/runner_list" .}} {{template "shared/secrets/add_list" .}} diff --git a/templates/user/settings/actions.tmpl b/templates/user/settings/actions.tmpl index a831453f2a2e3..ccb3b5937a5c6 100644 --- a/templates/user/settings/actions.tmpl +++ b/templates/user/settings/actions.tmpl @@ -1,5 +1,5 @@ -{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}} -
+{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings actions")}} +
{{template "shared/secrets/add_list" .}}
diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 80e2e1cb8b405..8b25775bb4440 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -2444,7 +2444,7 @@ .settings.webhooks .list > .item:not(:first-child), .settings.githooks .list > .item:not(:first-child), -.settings.runners .list > .item:not(:first-child) { +.settings.actions .list > .item:not(:first-child) { padding: 0.25rem 1rem; margin: 12px -1rem -1rem; } From 74143853024c8cf85a2be2c29f00c7fead4f6f98 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 19 Apr 2023 20:34:11 +0800 Subject: [PATCH 16/49] rename --- routers/web/org/{settings_actions.go => setting_actions.go} | 0 routers/web/repo/{settings_actions.go => setting_actions.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename routers/web/org/{settings_actions.go => setting_actions.go} (100%) rename routers/web/repo/{settings_actions.go => setting_actions.go} (100%) diff --git a/routers/web/org/settings_actions.go b/routers/web/org/setting_actions.go similarity index 100% rename from routers/web/org/settings_actions.go rename to routers/web/org/setting_actions.go diff --git a/routers/web/repo/settings_actions.go b/routers/web/repo/setting_actions.go similarity index 100% rename from routers/web/repo/settings_actions.go rename to routers/web/repo/setting_actions.go From 4674fc5e3950d29ac569171e14231c7349f56c62 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 10:05:18 +0800 Subject: [PATCH 17/49] change ctx data passed to shared templates and add redirext --- routers/web/admin/settings_actions.go | 3 ++- routers/web/org/setting_actions.go | 3 ++- routers/web/repo/setting_actions.go | 3 ++- routers/web/user/setting/actions.go | 3 ++- routers/web/web.go | 4 +++- templates/shared/actions/runner_list.tmpl | 4 ++-- templates/shared/secrets/add_list.tmpl | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/routers/web/admin/settings_actions.go b/routers/web/admin/settings_actions.go index ff96819df8453..ed156c3ce632b 100644 --- a/routers/web/admin/settings_actions.go +++ b/routers/web/admin/settings_actions.go @@ -26,7 +26,8 @@ func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminActions"] = true - ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) + ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) + ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) page := ctx.FormInt("page") if page <= 1 { diff --git a/routers/web/org/setting_actions.go b/routers/web/org/setting_actions.go index e85489f6ed936..95af4f68ea043 100644 --- a/routers/web/org/setting_actions.go +++ b/routers/web/org/setting_actions.go @@ -27,7 +27,8 @@ func Actions(ctx *context.Context) { } ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsOrgSettings"] = true - ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/reset_registration_token", ctx.Link) + ctx.Data["RunnersBaseLink"] = ctx.Link + ctx.Data["SecretsBaseLink"] = ctx.Link ctx.Data["PageType"] = pageType page := ctx.FormInt("page") diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting_actions.go index e0fb87adb00eb..e5a8c85d42df9 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting_actions.go @@ -23,7 +23,8 @@ const ( func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true - ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) + ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) + ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) page := ctx.FormInt("page") if page <= 1 { diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index 367c0a8de7685..2318135810564 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -18,7 +18,8 @@ const ( func Actions(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsSettingsActions"] = true - ctx.Data["ResetRegistrationTokenLink"] = fmt.Sprintf("%s/runners/reset_registration_token", ctx.Link) + ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) + ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) GetSecrets(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } diff --git a/routers/web/web.go b/routers/web/web.go index 4aa5a4f91ca5f..3141f4bac3008 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -850,6 +850,9 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { + m.Get("", func(ctx *context.Context) { + ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/runners") + }) m.Get("/{type:runners|secrets}", org.Actions) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(org.RunnersEdit). @@ -859,7 +862,6 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/secrets", func() { - // m.Get("", org.Secrets) m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost) m.Post("/delete", org.SecretsDelete) }) diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index ff70fe29c110e..fdd419659a147 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -25,7 +25,7 @@
- Reset registration token + Reset registration token
@@ -72,7 +72,7 @@ {{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .Editable $.RunnerOnwerID $.RunnerRepoID}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 385cb56bc20ce..5ec668c8ca9c6 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -6,7 +6,7 @@
- + {{.CsrfTokenHtml}}
{{.locale.Tr "secrets.description"}} @@ -32,7 +32,7 @@ {{range .Secrets}}
-
From 6d5cdd4f0f5f16f54abd6bd940c6911f889431ab Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 10:27:26 +0800 Subject: [PATCH 18/49] fix backend check --- routers/web/web.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/web/web.go b/routers/web/web.go index 3141f4bac3008..1ecf154ddaa78 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -663,7 +663,6 @@ func RegisterRoutes(m *web.Route) { m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) }) }, actions.MustEnableActions) - }, func(ctx *context.Context) { ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable ctx.Data["EnablePackages"] = setting.Packages.Enabled From 99781f29a8a12ba4c5fad36eb76061b72b4e2a6c Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 11:44:23 +0800 Subject: [PATCH 19/49] change alert position --- templates/admin/actions.tmpl | 1 + templates/org/settings/actions.tmpl | 2 +- templates/shared/actions/runner_list.tmpl | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 252ecafc6cb44..1b2f39569e10e 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -2,6 +2,7 @@
{{template "admin/navbar" .}}
+ {{template "base/alert" .}} {{template "shared/actions/runner_list" .}}
diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index d99e0b18b8a95..10da1c4fbe0e4 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -5,10 +5,10 @@
{{template "org/settings/navbar" .}}
+ {{template "base/alert" .}} {{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} {{else if eq .PageType "secrets"}} - {{template "base/alert" .}} {{template "shared/secrets/add_list" .}} {{end}}
diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index fdd419659a147..dd120c9ae2558 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -1,5 +1,4 @@
-

{{.locale.Tr "actions.runners.runner_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
From 88306c054e17b072632b9fb092e56658e48b38f6 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 11:46:07 +0800 Subject: [PATCH 20/49] rename function --- routers/web/repo/setting_actions.go | 2 +- routers/web/repo/setting_secrets.go | 2 +- routers/web/user/setting/actions.go | 2 +- routers/web/user/setting/secrets.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting_actions.go index e5a8c85d42df9..6b73e24db5ddd 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting_actions.go @@ -43,7 +43,7 @@ func Actions(ctx *context.Context) { } actions_shared.RunnersList(ctx, opts) - GetSecrets(ctx) + prepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplActions) } diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index 219475e273bc0..128b693578a14 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -9,7 +9,7 @@ import ( shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -func GetSecrets(ctx *context.Context) { +func prepareSecretsData(ctx *context.Context) { ctx.Data["DisableSSH"] = setting.SSH.Disabled shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index 2318135810564..00d578650f2f4 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -20,6 +20,6 @@ func Actions(ctx *context.Context) { ctx.Data["PageIsSettingsActions"] = true ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) - GetSecrets(ctx) + prepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index a5215c24b5e4c..80e02908d2fbc 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -9,7 +9,7 @@ import ( shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -func GetSecrets(ctx *context.Context) { +func prepareSecretsData(ctx *context.Context) { shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) if ctx.Written() { return From c11963948ffa52029460499dac52a70aaf4cad39 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 11:58:42 +0800 Subject: [PATCH 21/49] use capital and move redirect to function --- routers/web/org/setting_actions.go | 6 +++++- routers/web/org/setting_secrets.go | 2 +- routers/web/repo/setting_actions.go | 2 +- routers/web/repo/setting_secrets.go | 2 +- routers/web/user/setting/actions.go | 2 +- routers/web/user/setting/secrets.go | 2 +- routers/web/web.go | 4 +--- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/routers/web/org/setting_actions.go b/routers/web/org/setting_actions.go index 95af4f68ea043..33756680d2d86 100644 --- a/routers/web/org/setting_actions.go +++ b/routers/web/org/setting_actions.go @@ -48,7 +48,7 @@ func Actions(ctx *context.Context) { } actions_shared.RunnersList(ctx, opts) - PrepareSecrets(ctx) + PrepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } @@ -93,3 +93,7 @@ func RunnerDeletePost(ctx *context.Context) { ctx.Org.OrgLink+"/settings/actions/runners", ctx.Org.OrgLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } + +func RedirectToRunnersSettings(ctx *context.Context) { + ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/runners") +} diff --git a/routers/web/org/setting_secrets.go b/routers/web/org/setting_secrets.go index 254b400ca528b..50d91504b8439 100644 --- a/routers/web/org/setting_secrets.go +++ b/routers/web/org/setting_secrets.go @@ -9,7 +9,7 @@ import ( ) // Prepare Secrets page under org/settings/actions -func PrepareSecrets(ctx *context.Context) { +func PrepareSecretsData(ctx *context.Context) { shared.SetSecretsContext(ctx, ctx.ContextUser.ID, 0) if ctx.Written() { return diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting_actions.go index 6b73e24db5ddd..e065b3cd1caaf 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting_actions.go @@ -43,7 +43,7 @@ func Actions(ctx *context.Context) { } actions_shared.RunnersList(ctx, opts) - prepareSecretsData(ctx) + PrepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplActions) } diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index 128b693578a14..daf335d55a846 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -9,7 +9,7 @@ import ( shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -func prepareSecretsData(ctx *context.Context) { +func PrepareSecretsData(ctx *context.Context) { ctx.Data["DisableSSH"] = setting.SSH.Disabled shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index 00d578650f2f4..f1808b12b9c0f 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -20,6 +20,6 @@ func Actions(ctx *context.Context) { ctx.Data["PageIsSettingsActions"] = true ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) - prepareSecretsData(ctx) + PrepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index 80e02908d2fbc..cb2a27782edad 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -9,7 +9,7 @@ import ( shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -func prepareSecretsData(ctx *context.Context) { +func PrepareSecretsData(ctx *context.Context) { shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) if ctx.Written() { return diff --git a/routers/web/web.go b/routers/web/web.go index 1ecf154ddaa78..4569055714abe 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -849,9 +849,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", func(ctx *context.Context) { - ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/runners") - }) + m.Get("", org.RedirectToRunnersSettings) m.Get("/{type:runners|secrets}", org.Actions) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(org.RunnersEdit). From 4903d7cc92d5c74b9494e0fc5b8d50bc071fddd8 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 14:54:44 +0800 Subject: [PATCH 22/49] rename admin/settings_actions.go and improve org/setting_actions --- .../admin/{settings_actions.go => actions.go} | 0 routers/web/org/setting_actions.go | 40 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) rename routers/web/admin/{settings_actions.go => actions.go} (100%) diff --git a/routers/web/admin/settings_actions.go b/routers/web/admin/actions.go similarity index 100% rename from routers/web/admin/settings_actions.go rename to routers/web/admin/actions.go diff --git a/routers/web/org/setting_actions.go b/routers/web/org/setting_actions.go index 33756680d2d86..2ab32ff634d0e 100644 --- a/routers/web/org/setting_actions.go +++ b/routers/web/org/setting_actions.go @@ -19,36 +19,36 @@ func Actions(ctx *context.Context) { pageType := ctx.Params(":type") if pageType == "runners" { ctx.Data["PageIsOrgSettingsRunners"] = true + ctx.Data["RunnersBaseLink"] = ctx.Link + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } + + opts := actions_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + OwnerID: ctx.Org.Organization.ID, + WithAvailable: true, + } + + actions_shared.RunnersList(ctx, opts) } else if pageType == "secrets" { ctx.Data["PageIsOrgSettingsSecrets"] = true + ctx.Data["SecretsBaseLink"] = ctx.Link + PrepareSecretsData(ctx) } else { ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) return } ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsOrgSettings"] = true - ctx.Data["RunnersBaseLink"] = ctx.Link - ctx.Data["SecretsBaseLink"] = ctx.Link ctx.Data["PageType"] = pageType - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - OwnerID: ctx.Org.Organization.ID, - WithAvailable: true, - } - - actions_shared.RunnersList(ctx, opts) - PrepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplSettingsActions) } From d4acdc845cbb6aca3ac8170958ea33f2a383714b Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 18:35:10 +0800 Subject: [PATCH 23/49] put settings in one folder --- routers/web/org/{ => setting}/setting_actions.go | 0 routers/web/org/{ => setting}/setting_secrets.go | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename routers/web/org/{ => setting}/setting_actions.go (100%) rename routers/web/org/{ => setting}/setting_secrets.go (100%) diff --git a/routers/web/org/setting_actions.go b/routers/web/org/setting/setting_actions.go similarity index 100% rename from routers/web/org/setting_actions.go rename to routers/web/org/setting/setting_actions.go diff --git a/routers/web/org/setting_secrets.go b/routers/web/org/setting/setting_secrets.go similarity index 100% rename from routers/web/org/setting_secrets.go rename to routers/web/org/setting/setting_secrets.go From e849999de0bd3cb4fbc9361729ee0c78f6b610f0 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 20 Apr 2023 18:40:45 +0800 Subject: [PATCH 24/49] rename --- routers/web/org/setting/{setting_actions.go => actions.go} | 0 routers/web/org/setting/{setting_secrets.go => secrets.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename routers/web/org/setting/{setting_actions.go => actions.go} (100%) rename routers/web/org/setting/{setting_secrets.go => secrets.go} (100%) diff --git a/routers/web/org/setting/setting_actions.go b/routers/web/org/setting/actions.go similarity index 100% rename from routers/web/org/setting/setting_actions.go rename to routers/web/org/setting/actions.go diff --git a/routers/web/org/setting/setting_secrets.go b/routers/web/org/setting/secrets.go similarity index 100% rename from routers/web/org/setting/setting_secrets.go rename to routers/web/org/setting/secrets.go From 311e953e4242c2b2a307849578fa66fa91db0d88 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Apr 2023 11:18:50 +0800 Subject: [PATCH 25/49] fix lint --- routers/web/org/setting.go | 4 ---- routers/web/org/setting/actions.go | 8 ++++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 1c02f485702aa..4111b13531510 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -37,10 +37,6 @@ const ( tplSettingsHooks base.TplName = "org/settings/hooks" // tplSettingsLabels template path for render labels settings tplSettingsLabels base.TplName = "org/settings/labels" - // tplSettingsActions template path for render actions settings - tplSettingsActions base.TplName = "org/settings/actions" - // tplSettingsRunnersEdit template path for render runners edit settings - tplSettingsRunnersEdit base.TplName = "org/settings/runners_edit" ) // Settings render the main settings page diff --git a/routers/web/org/setting/actions.go b/routers/web/org/setting/actions.go index 2ab32ff634d0e..0cbdaa6332257 100644 --- a/routers/web/org/setting/actions.go +++ b/routers/web/org/setting/actions.go @@ -10,10 +10,18 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" ) +const ( + // tplSettingsActions template path for render actions settings + tplSettingsActions base.TplName = "org/settings/actions" + // tplSettingsRunnersEdit template path for render runners edit settings + tplSettingsRunnersEdit base.TplName = "org/settings/runners_edit" +) + // Actions render settings/actions page for organization level func Actions(ctx *context.Context) { pageType := ctx.Params(":type") From 0e79e6e3633ed61819349a435e155e04063959b0 Mon Sep 17 00:00:00 2001 From: HesterG Date: Sun, 23 Apr 2023 19:20:31 +0800 Subject: [PATCH 26/49] make repo settings runners/secrets submenus --- routers/web/org/{setting => }/actions.go | 0 routers/web/org/{setting => }/secrets.go | 0 routers/web/repo/setting_actions.go | 54 +++++++++++++++--------- routers/web/repo/setting_secrets.go | 2 +- routers/web/web.go | 3 +- templates/admin/actions.tmpl | 9 ++-- templates/org/settings/actions.tmpl | 25 ++++------- templates/repo/settings/actions.tmpl | 7 ++- templates/repo/settings/navbar.tmpl | 14 ++++-- 9 files changed, 63 insertions(+), 51 deletions(-) rename routers/web/org/{setting => }/actions.go (100%) rename routers/web/org/{setting => }/secrets.go (100%) diff --git a/routers/web/org/setting/actions.go b/routers/web/org/actions.go similarity index 100% rename from routers/web/org/setting/actions.go rename to routers/web/org/actions.go diff --git a/routers/web/org/setting/secrets.go b/routers/web/org/secrets.go similarity index 100% rename from routers/web/org/setting/secrets.go rename to routers/web/org/secrets.go diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting_actions.go index e065b3cd1caaf..dd6b40f1af2ad 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting_actions.go @@ -21,29 +21,37 @@ const ( // Actions render settings/actions page for repo level func Actions(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsSettingsActions"] = true - ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) - ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) + pageType := ctx.Params(":type") + if pageType == "runners" { + ctx.Data["PageIsSettingsRunners"] = true + ctx.Data["RunnersBaseLink"] = ctx.Link + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } + opts := actions_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + RepoID: ctx.Repo.Repository.ID, + WithAvailable: true, + } - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - RepoID: ctx.Repo.Repository.ID, - WithAvailable: true, + actions_shared.RunnersList(ctx, opts) + } else if pageType == "secrets" { + ctx.Data["PageIsSettingsSecrets"] = true + ctx.Data["SecretsBaseLink"] = ctx.Link + PrepareSecretsData(ctx) + } else { + ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) + return } + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageType"] = pageType - actions_shared.RunnersList(ctx, opts) - PrepareSecretsData(ctx) ctx.HTML(http.StatusOK, tplActions) } @@ -74,7 +82,7 @@ func RunnersEditPost(ctx *context.Context) { func ResetRunnerRegistrationToken(ctx *context.Context) { actions_shared.RunnerResetRegistrationToken(ctx, 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions") + ctx.Repo.RepoLink+"/settings/actions/runners") } // RunnerDeletePost response for deleting runner @@ -83,3 +91,7 @@ func RunnerDeletePost(ctx *context.Context) { ctx.Repo.RepoLink+"/settings/actions", ctx.Repo.RepoLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } + +func RedirectToRunnersSettings(ctx *context.Context) { + ctx.Redirect(ctx.Repo.RepoLink + "/settings/actions/runners") +} diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index daf335d55a846..67c413842c4f2 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -23,7 +23,7 @@ func SecretsPost(ctx *context.Context) { ctx, 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions", + ctx.Repo.RepoLink+"/settings/actions/secrets", ) } diff --git a/routers/web/web.go b/routers/web/web.go index 4569055714abe..4e541ed828a95 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1045,7 +1045,8 @@ func RegisterRoutes(m *web.Route) { }) }) m.Group("/actions", func() { - m.Get("", repo.Actions) + m.Get("", repo.RedirectToRunnersSettings) + m.Get("/{type:runners|secrets}", repo.Actions) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(repo.RunnersEdit). Post(web.Bind(forms.EditRunnerForm{}), repo.RunnersEditPost) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 1b2f39569e10e..09b2c9b3b7ff8 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -1,9 +1,6 @@ -{{template "base/head" .}} -
- {{template "admin/navbar" .}} -
+{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +
{{template "base/alert" .}} {{template "shared/actions/runner_list" .}}
-
-{{template "base/footer" .}} +{{template "admin/layout_footer" .}} diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index 10da1c4fbe0e4..f6a52a9d29ab1 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -1,18 +1,9 @@ -{{template "base/head" .}} -
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} -
- {{template "base/alert" .}} - {{if eq .PageType "runners"}} - {{template "shared/actions/runner_list" .}} - {{else if eq .PageType "secrets"}} - {{template "shared/secrets/add_list" .}} - {{end}} -
-
+{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}} +
+ {{if eq .PageType "runners"}} + {{template "shared/actions/runner_list" .}} + {{else if eq .PageType "secrets"}} + {{template "shared/secrets/add_list" .}} + {{end}}
-
-{{template "base/footer" .}} +{{template "org/settings/layout_footer" .}} diff --git a/templates/repo/settings/actions.tmpl b/templates/repo/settings/actions.tmpl index 65ebc4f5350ef..72944234a3e8e 100644 --- a/templates/repo/settings/actions.tmpl +++ b/templates/repo/settings/actions.tmpl @@ -1,6 +1,9 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings actions")}}
- {{template "shared/actions/runner_list" .}} - {{template "shared/secrets/add_list" .}} + {{if eq .PageType "runners"}} + {{template "shared/actions/runner_list" .}} + {{else if eq .PageType "secrets"}} + {{template "shared/secrets/add_list" .}} + {{end}}
{{template "repo/settings/layout_footer" .}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 4818dc81a7fde..c3303b8a8a556 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -34,9 +34,17 @@ {{end}} {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}} - - {{.locale.Tr "actions.actions"}} - +
+ {{.locale.Tr "actions.actions"}} +
+ + {{.locale.Tr "actions.runners"}} + + + {{.locale.Tr "secrets.secrets"}} + +
+
{{end}}
From 42f26c598ab4a339595bf0bb4c6d7ea56e3cf828 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 09:09:14 +0800 Subject: [PATCH 27/49] fix path and lint --- routers/web/org/{ => setting}/actions.go | 2 +- routers/web/org/{ => setting}/secrets.go | 2 +- routers/web/web.go | 17 +++++++++-------- templates/user/settings/actions.tmpl | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) rename routers/web/org/{ => setting}/actions.go (99%) rename routers/web/org/{ => setting}/secrets.go (97%) diff --git a/routers/web/org/actions.go b/routers/web/org/setting/actions.go similarity index 99% rename from routers/web/org/actions.go rename to routers/web/org/setting/actions.go index 0cbdaa6332257..f6ff2093e2d73 100644 --- a/routers/web/org/actions.go +++ b/routers/web/org/setting/actions.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package org +package setting import ( "fmt" diff --git a/routers/web/org/secrets.go b/routers/web/org/setting/secrets.go similarity index 97% rename from routers/web/org/secrets.go rename to routers/web/org/setting/secrets.go index 50d91504b8439..08cac3d579cd8 100644 --- a/routers/web/org/secrets.go +++ b/routers/web/org/setting/secrets.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package org +package setting import ( "code.gitea.io/gitea/modules/context" diff --git a/routers/web/web.go b/routers/web/web.go index 4e541ed828a95..6d10c4e0d54e9 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -35,6 +35,7 @@ import ( "code.gitea.io/gitea/routers/web/healthcheck" "code.gitea.io/gitea/routers/web/misc" "code.gitea.io/gitea/routers/web/org" + org_setting "code.gitea.io/gitea/routers/web/org/setting" "code.gitea.io/gitea/routers/web/repo" "code.gitea.io/gitea/routers/web/repo/actions" "code.gitea.io/gitea/routers/web/user" @@ -849,18 +850,18 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", org.RedirectToRunnersSettings) - m.Get("/{type:runners|secrets}", org.Actions) + m.Get("", org_setting.RedirectToRunnersSettings) + m.Get("/{type:runners|secrets}", org_setting.Actions) m.Group("/runners", func() { - m.Combo("/{runnerid}").Get(org.RunnersEdit). - Post(web.Bind(forms.EditRunnerForm{}), org.RunnersEditPost) - m.Post("/{runnerid}/delete", org.RunnerDeletePost) - m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken) + m.Combo("/{runnerid}").Get(org_setting.RunnersEdit). + Post(web.Bind(forms.EditRunnerForm{}), org_setting.RunnersEditPost) + m.Post("/{runnerid}/delete", org_setting.RunnerDeletePost) + m.Get("/reset_registration_token", org_setting.ResetRunnerRegistrationToken) }) m.Group("/secrets", func() { - m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost) - m.Post("/delete", org.SecretsDelete) + m.Post("", web.Bind(forms.AddSecretForm{}), org_setting.SecretsPost) + m.Post("/delete", org_setting.SecretsDelete) }) }, actions.MustEnableActions) diff --git a/templates/user/settings/actions.tmpl b/templates/user/settings/actions.tmpl index ccb3b5937a5c6..47e4b40a89188 100644 --- a/templates/user/settings/actions.tmpl +++ b/templates/user/settings/actions.tmpl @@ -1,5 +1,5 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings actions")}} -
+
{{template "shared/secrets/add_list" .}}
From 867b373e4956aba4785e338334ba9b75cd1452f4 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 09:42:20 +0800 Subject: [PATCH 28/49] make runner/secrets submenu on user and admin --- routers/web/admin/actions.go | 47 ++++++++++++++--------- routers/web/org/setting/actions.go | 2 - routers/web/repo/setting_actions.go | 2 - routers/web/user/setting/actions.go | 18 +++++++-- routers/web/user/setting/secrets.go | 4 +- routers/web/web.go | 6 ++- templates/admin/actions.tmpl | 3 +- templates/admin/navbar.tmpl | 9 ++++- templates/org/settings/actions.tmpl | 10 ++--- templates/shared/actions/runner_list.tmpl | 4 +- templates/shared/secrets/add_list.tmpl | 4 +- templates/user/settings/actions.tmpl | 2 + templates/user/settings/navbar.tmpl | 9 ++++- 13 files changed, 75 insertions(+), 45 deletions(-) diff --git a/routers/web/admin/actions.go b/routers/web/admin/actions.go index ed156c3ce632b..3a540fa119c29 100644 --- a/routers/web/admin/actions.go +++ b/routers/web/admin/actions.go @@ -23,27 +23,32 @@ const ( // Actions render settings/actions page for admin level func Actions(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminActions"] = true - ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) - ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) + pageType := ctx.Params(":type") + if pageType == "runners" { + ctx.Data["PageIsAdminRunners"] = true + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } + opts := actions_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + } - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), + actions_shared.RunnersList(ctx, opts) + } else { + ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) + return } + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageIsAdmin"] = true + ctx.Data["PageType"] = pageType - actions_shared.RunnersList(ctx, opts) ctx.HTML(http.StatusOK, tplActions) } @@ -74,11 +79,15 @@ func EditRunnerPost(ctx *context.Context) { // DeleteRunnerPost response for deleting a runner func DeleteRunnerPost(ctx *context.Context) { actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), - setting.AppSubURL+"/admin/actions/", + setting.AppSubURL+"/admin/actions/runners", setting.AppSubURL+"/admin/actions/runners/"+url.PathEscape(ctx.Params(":runnerid")), ) } func ResetRunnerRegistrationToken(ctx *context.Context) { - actions_shared.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/actions") + actions_shared.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/actions/runners") +} + +func RedirectToRunnersSettings(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL + "/admin/actions/runners") } diff --git a/routers/web/org/setting/actions.go b/routers/web/org/setting/actions.go index f6ff2093e2d73..a84511107ebd4 100644 --- a/routers/web/org/setting/actions.go +++ b/routers/web/org/setting/actions.go @@ -27,7 +27,6 @@ func Actions(ctx *context.Context) { pageType := ctx.Params(":type") if pageType == "runners" { ctx.Data["PageIsOrgSettingsRunners"] = true - ctx.Data["RunnersBaseLink"] = ctx.Link page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -47,7 +46,6 @@ func Actions(ctx *context.Context) { actions_shared.RunnersList(ctx, opts) } else if pageType == "secrets" { ctx.Data["PageIsOrgSettingsSecrets"] = true - ctx.Data["SecretsBaseLink"] = ctx.Link PrepareSecretsData(ctx) } else { ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting_actions.go index dd6b40f1af2ad..9db3380e02f81 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting_actions.go @@ -24,7 +24,6 @@ func Actions(ctx *context.Context) { pageType := ctx.Params(":type") if pageType == "runners" { ctx.Data["PageIsSettingsRunners"] = true - ctx.Data["RunnersBaseLink"] = ctx.Link page := ctx.FormInt("page") if page <= 1 { page = 1 @@ -43,7 +42,6 @@ func Actions(ctx *context.Context) { actions_shared.RunnersList(ctx, opts) } else if pageType == "secrets" { ctx.Data["PageIsSettingsSecrets"] = true - ctx.Data["SecretsBaseLink"] = ctx.Link PrepareSecretsData(ctx) } else { ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index f1808b12b9c0f..b5ff303e5a7b6 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" ) const ( @@ -16,10 +17,19 @@ const ( ) func Actions(ctx *context.Context) { + pageType := ctx.Params(":type") + if pageType == "secrets" { + ctx.Data["PageIsSettingsSecrets"] = true + PrepareSecretsData(ctx) + } else { + ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) + return + } ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsSettingsActions"] = true - ctx.Data["RunnersBaseLink"] = fmt.Sprintf("%s/runners", ctx.Link) - ctx.Data["SecretsBaseLink"] = fmt.Sprintf("%s/secrets", ctx.Link) - PrepareSecretsData(ctx) + ctx.Data["PageType"] = pageType ctx.HTML(http.StatusOK, tplSettingsActions) } + +func RedirectToRunnersSettings(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets") +} diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index cb2a27782edad..43f1be5167093 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -21,7 +21,7 @@ func SecretsPost(ctx *context.Context) { ctx, ctx.Doer.ID, 0, - setting.AppSubURL+"/user/settings/actions", + setting.AppSubURL+"/user/settings/actions/secrets", ) } @@ -30,6 +30,6 @@ func SecretsDelete(ctx *context.Context) { ctx, ctx.Doer.ID, 0, - setting.AppSubURL+"/user/settings/actions", + setting.AppSubURL+"/user/settings/actions/secrets", ) } diff --git a/routers/web/web.go b/routers/web/web.go index 6d10c4e0d54e9..eac755c1886af 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -504,7 +504,8 @@ func RegisterRoutes(m *web.Route) { }, packagesEnabled) m.Group("/actions", func() { - m.Get("", user_setting.Actions) + m.Get("", user_setting.RedirectToRunnersSettings) + m.Get("/{type:secrets}", user_setting.Actions) m.Group("/secrets", func() { m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) m.Post("/delete", user_setting.SecretsDelete) @@ -657,7 +658,8 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", admin.Actions) + m.Get("", admin.RedirectToRunnersSettings) + m.Get("/{type:runners}", admin.Actions) m.Group("/runners", func() { m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 09b2c9b3b7ff8..2d283d139b5ec 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -1,6 +1,7 @@ {{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}}
- {{template "base/alert" .}} + {{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} + {{end}}
{{template "admin/layout_footer" .}} diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index c990204c7bbe0..c0430c0b542fa 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -35,9 +35,14 @@ {{end}} {{if .EnableActions}} - +
{{.locale.Tr "actions.actions"}} - +
+ + {{.locale.Tr "actions.runners"}} + +
+
{{end}} {{.locale.Tr "admin.config"}} diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index f6a52a9d29ab1..b3b24e05174cb 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -1,9 +1,9 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}}
- {{if eq .PageType "runners"}} - {{template "shared/actions/runner_list" .}} - {{else if eq .PageType "secrets"}} - {{template "shared/secrets/add_list" .}} - {{end}} + {{if eq .PageType "runners"}} + {{template "shared/actions/runner_list" .}} + {{else if eq .PageType "secrets"}} + {{template "shared/secrets/add_list" .}} + {{end}}
{{template "org/settings/layout_footer" .}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index dd120c9ae2558..efacbbad4776b 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -24,7 +24,7 @@
- Reset registration token + Reset registration token

@@ -71,7 +71,7 @@ {{if .LastOnline}}{{TimeSinceUnix .LastOnline $.locale}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .Editable $.RunnerOnwerID $.RunnerRepoID}} - {{svg "octicon-pencil"}} + {{svg "octicon-pencil"}} {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 5ec668c8ca9c6..e743c16f95866 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -6,7 +6,7 @@
- + {{.CsrfTokenHtml}}
{{.locale.Tr "secrets.description"}} @@ -32,7 +32,7 @@ {{range .Secrets}}
-
diff --git a/templates/user/settings/actions.tmpl b/templates/user/settings/actions.tmpl index 47e4b40a89188..4d56523587bc8 100644 --- a/templates/user/settings/actions.tmpl +++ b/templates/user/settings/actions.tmpl @@ -1,6 +1,8 @@ {{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings actions")}}
+ {{if eq .PageType "secrets"}} {{template "shared/secrets/add_list" .}} + {{end}}
{{template "user/settings/layout_footer" .}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 34d629b7b3184..2c0f56d15fa17 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -20,9 +20,14 @@ {{.locale.Tr "settings.ssh_gpg_keys"}} {{if .EnableActions}} - +
{{.locale.Tr "actions.actions"}} - +
+ + {{.locale.Tr "secrets.secrets"}} + +
+
{{end}} {{if .EnablePackages}} From 0a68ddaa81618e65e0f2adc2cd4d8bd5821bb884 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 10:10:24 +0800 Subject: [PATCH 29/49] change actions classname --- templates/admin/actions.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/actions.tmpl b/templates/admin/actions.tmpl index 2d283d139b5ec..9640e0fd1f4c9 100644 --- a/templates/admin/actions.tmpl +++ b/templates/admin/actions.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin config")}} +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin actions")}}
{{if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} From d63330e30f646d1eeb9b9c688a535e1d697c925d Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 10:11:53 +0800 Subject: [PATCH 30/49] fix path --- routers/web/repo/setting_secrets.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting_secrets.go index 67c413842c4f2..54b7bcc8a08f3 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting_secrets.go @@ -32,6 +32,6 @@ func DeleteSecret(ctx *context.Context) { ctx, 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions", + ctx.Repo.RepoLink+"/settings/actions/secrets", ) } From 2019081e62034af14d08fc6231f2aa6e583f3324 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 10:20:53 +0800 Subject: [PATCH 31/49] remove unnecessary change --- templates/shared/actions/runner_list.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index efacbbad4776b..e738a581c329e 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -1,4 +1,5 @@
+

{{.locale.Tr "actions.runners.runner_manage_panel"}} ({{.locale.Tr "admin.total" .Total}})
@@ -24,7 +25,7 @@
- Reset registration token + Reset registration token

From b09c28913e5bc3c58c3409a462d265ff335c4240 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 10:57:44 +0800 Subject: [PATCH 32/49] rename redirect function --- routers/web/admin/actions.go | 2 +- routers/web/org/setting/actions.go | 2 +- routers/web/repo/setting_actions.go | 2 +- routers/web/user/setting/actions.go | 2 +- routers/web/web.go | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/routers/web/admin/actions.go b/routers/web/admin/actions.go index 3a540fa119c29..68a128fe96abb 100644 --- a/routers/web/admin/actions.go +++ b/routers/web/admin/actions.go @@ -88,6 +88,6 @@ func ResetRunnerRegistrationToken(ctx *context.Context) { actions_shared.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/actions/runners") } -func RedirectToRunnersSettings(ctx *context.Context) { +func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/admin/actions/runners") } diff --git a/routers/web/org/setting/actions.go b/routers/web/org/setting/actions.go index a84511107ebd4..2738c896fd74d 100644 --- a/routers/web/org/setting/actions.go +++ b/routers/web/org/setting/actions.go @@ -100,6 +100,6 @@ func RunnerDeletePost(ctx *context.Context) { ctx.Org.OrgLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } -func RedirectToRunnersSettings(ctx *context.Context) { +func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/runners") } diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting_actions.go index 9db3380e02f81..bf9330e12c8ce 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting_actions.go @@ -90,6 +90,6 @@ func RunnerDeletePost(ctx *context.Context) { ctx.Repo.RepoLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) } -func RedirectToRunnersSettings(ctx *context.Context) { +func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(ctx.Repo.RepoLink + "/settings/actions/runners") } diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index b5ff303e5a7b6..99891f7172e63 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -30,6 +30,6 @@ func Actions(ctx *context.Context) { ctx.HTML(http.StatusOK, tplSettingsActions) } -func RedirectToRunnersSettings(ctx *context.Context) { +func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets") } diff --git a/routers/web/web.go b/routers/web/web.go index eac755c1886af..bf0d378587807 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -504,7 +504,7 @@ func RegisterRoutes(m *web.Route) { }, packagesEnabled) m.Group("/actions", func() { - m.Get("", user_setting.RedirectToRunnersSettings) + m.Get("", user_setting.RedirectToDefaultSetting) m.Get("/{type:secrets}", user_setting.Actions) m.Group("/secrets", func() { m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) @@ -658,7 +658,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", admin.RedirectToRunnersSettings) + m.Get("", admin.RedirectToDefaultSetting) m.Get("/{type:runners}", admin.Actions) m.Group("/runners", func() { m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) @@ -852,7 +852,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { - m.Get("", org_setting.RedirectToRunnersSettings) + m.Get("", org_setting.RedirectToDefaultSetting) m.Get("/{type:runners|secrets}", org_setting.Actions) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(org_setting.RunnersEdit). @@ -1048,7 +1048,7 @@ func RegisterRoutes(m *web.Route) { }) }) m.Group("/actions", func() { - m.Get("", repo.RedirectToRunnersSettings) + m.Get("", repo.RedirectToDefaultSetting) m.Get("/{type:runners|secrets}", repo.Actions) m.Group("/runners", func() { m.Combo("/{runnerid}").Get(repo.RunnersEdit). From a75ae882b2a67a694234056db37e089fa5e897c1 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 15:37:04 +0800 Subject: [PATCH 33/49] rename file --- .../{setting_actions.go => setting/actions.go} | 2 +- .../{setting_secrets.go => setting/secrets.go} | 2 +- routers/web/web.go | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) rename routers/web/repo/{setting_actions.go => setting/actions.go} (99%) rename routers/web/repo/{setting_secrets.go => setting/secrets.go} (97%) diff --git a/routers/web/repo/setting_actions.go b/routers/web/repo/setting/actions.go similarity index 99% rename from routers/web/repo/setting_actions.go rename to routers/web/repo/setting/actions.go index bf9330e12c8ce..ade8dfe999eda 100644 --- a/routers/web/repo/setting_actions.go +++ b/routers/web/repo/setting/actions.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package repo +package setting import ( "fmt" diff --git a/routers/web/repo/setting_secrets.go b/routers/web/repo/setting/secrets.go similarity index 97% rename from routers/web/repo/setting_secrets.go rename to routers/web/repo/setting/secrets.go index 54b7bcc8a08f3..e4c0c6a54b607 100644 --- a/routers/web/repo/setting_secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package repo +package setting import ( "code.gitea.io/gitea/modules/context" diff --git a/routers/web/web.go b/routers/web/web.go index bf0d378587807..b25b2eab74c7a 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -38,6 +38,7 @@ import ( org_setting "code.gitea.io/gitea/routers/web/org/setting" "code.gitea.io/gitea/routers/web/repo" "code.gitea.io/gitea/routers/web/repo/actions" + repo_setting "code.gitea.io/gitea/routers/web/repo/setting" "code.gitea.io/gitea/routers/web/user" user_setting "code.gitea.io/gitea/routers/web/user/setting" "code.gitea.io/gitea/routers/web/user/setting/security" @@ -1048,17 +1049,17 @@ func RegisterRoutes(m *web.Route) { }) }) m.Group("/actions", func() { - m.Get("", repo.RedirectToDefaultSetting) - m.Get("/{type:runners|secrets}", repo.Actions) + m.Get("", repo_setting.RedirectToDefaultSetting) + m.Get("/{type:runners|secrets}", repo_setting.Actions) m.Group("/runners", func() { - m.Combo("/{runnerid}").Get(repo.RunnersEdit). - Post(web.Bind(forms.EditRunnerForm{}), repo.RunnersEditPost) - m.Post("/{runnerid}/delete", repo.RunnerDeletePost) - m.Get("/reset_registration_token", repo.ResetRunnerRegistrationToken) + m.Combo("/{runnerid}").Get(repo_setting.RunnersEdit). + Post(web.Bind(forms.EditRunnerForm{}), repo_setting.RunnersEditPost) + m.Post("/{runnerid}/delete", repo_setting.RunnerDeletePost) + m.Get("/reset_registration_token", repo_setting.ResetRunnerRegistrationToken) }) m.Group("/secrets", func() { - m.Post("", web.Bind(forms.AddSecretForm{}), repo.SecretsPost) - m.Post("/delete", repo.DeleteSecret) + m.Post("", web.Bind(forms.AddSecretForm{}), repo_setting.SecretsPost) + m.Post("/delete", repo_setting.DeleteSecret) }) }, actions.MustEnableActions) }, func(ctx *context.Context) { From 244e568df0f049e637cabcf41c49fd0340ed8d1d Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 12:59:34 +0800 Subject: [PATCH 34/49] separate routers for runners and secrets --- routers/web/admin/actions.go | 44 +++++++++++-------------- routers/web/org/setting/actions.go | 51 +++++++++++------------------ routers/web/org/setting/secrets.go | 11 +++++-- routers/web/repo/setting/actions.go | 49 +++++++++++---------------- routers/web/repo/setting/secrets.go | 8 ++++- routers/web/user/setting/actions.go | 17 ---------- routers/web/user/setting/secrets.go | 8 ++++- routers/web/web.go | 10 +++--- 8 files changed, 87 insertions(+), 111 deletions(-) diff --git a/routers/web/admin/actions.go b/routers/web/admin/actions.go index 68a128fe96abb..e4ba424b6f47b 100644 --- a/routers/web/admin/actions.go +++ b/routers/web/admin/actions.go @@ -4,7 +4,6 @@ package admin import ( - "fmt" "net/http" "net/url" @@ -21,33 +20,28 @@ const ( tplRunnerEdit base.TplName = "admin/runners/edit" ) -// Actions render settings/actions page for admin level -func Actions(ctx *context.Context) { - pageType := ctx.Params(":type") - if pageType == "runners" { - ctx.Data["PageIsAdminRunners"] = true - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - } - - actions_shared.RunnersList(ctx, opts) - } else { - ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) - return +// Runners render settings/actions/runners page for admin level +func Runners(ctx *context.Context) { + ctx.Data["PageIsAdminRunners"] = true + page := ctx.FormInt("page") + if page <= 1 { + page = 1 } + + opts := actions_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + } + + actions_shared.RunnersList(ctx, opts) + ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsAdmin"] = true - ctx.Data["PageType"] = pageType + ctx.Data["PageType"] = "runners" ctx.HTML(http.StatusOK, tplActions) } diff --git a/routers/web/org/setting/actions.go b/routers/web/org/setting/actions.go index 2738c896fd74d..938ab561261b2 100644 --- a/routers/web/org/setting/actions.go +++ b/routers/web/org/setting/actions.go @@ -4,7 +4,6 @@ package setting import ( - "fmt" "net/http" "net/url" @@ -22,39 +21,29 @@ const ( tplSettingsRunnersEdit base.TplName = "org/settings/runners_edit" ) -// Actions render settings/actions page for organization level -func Actions(ctx *context.Context) { - pageType := ctx.Params(":type") - if pageType == "runners" { - ctx.Data["PageIsOrgSettingsRunners"] = true - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - OwnerID: ctx.Org.Organization.ID, - WithAvailable: true, - } - - actions_shared.RunnersList(ctx, opts) - } else if pageType == "secrets" { - ctx.Data["PageIsOrgSettingsSecrets"] = true - PrepareSecretsData(ctx) - } else { - ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) - return - } +// Runners render settings/actions/runners page for organization level +func Runners(ctx *context.Context) { + ctx.Data["PageIsOrgSettingsRunners"] = true ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageType"] = pageType + ctx.Data["PageType"] = "runners" + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } + + opts := actions_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + OwnerID: ctx.Org.Organization.ID, + WithAvailable: true, + } + actions_shared.RunnersList(ctx, opts) ctx.HTML(http.StatusOK, tplSettingsActions) } diff --git a/routers/web/org/setting/secrets.go b/routers/web/org/setting/secrets.go index 08cac3d579cd8..1e5fbfb4aa63a 100644 --- a/routers/web/org/setting/secrets.go +++ b/routers/web/org/setting/secrets.go @@ -4,16 +4,23 @@ package setting import ( + "net/http" + "code.gitea.io/gitea/modules/context" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -// Prepare Secrets page under org/settings/actions -func PrepareSecretsData(ctx *context.Context) { +// Secrets render settings/actions/secrets page for organization level +func Secrets(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["PageType"] = "secrets" + ctx.Data["PageIsOrgSettingsSecrets"] = true shared.SetSecretsContext(ctx, ctx.ContextUser.ID, 0) if ctx.Written() { return } + ctx.HTML(http.StatusOK, tplSettingsActions) } // SecretsPost add secrets diff --git a/routers/web/repo/setting/actions.go b/routers/web/repo/setting/actions.go index ade8dfe999eda..bfd9f0fc5c92e 100644 --- a/routers/web/repo/setting/actions.go +++ b/routers/web/repo/setting/actions.go @@ -4,7 +4,6 @@ package setting import ( - "fmt" "net/http" "net/url" @@ -19,37 +18,27 @@ const ( tplRunnerEdit = "repo/settings/runner_edit" ) -// Actions render settings/actions page for repo level -func Actions(ctx *context.Context) { - pageType := ctx.Params(":type") - if pageType == "runners" { - ctx.Data["PageIsSettingsRunners"] = true - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - RepoID: ctx.Repo.Repository.ID, - WithAvailable: true, - } - - actions_shared.RunnersList(ctx, opts) - } else if pageType == "secrets" { - ctx.Data["PageIsSettingsSecrets"] = true - PrepareSecretsData(ctx) - } else { - ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) - return - } +// Runners render settings/actions/runners page for repo level +func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageType"] = pageType + ctx.Data["PageType"] = "runners" + ctx.Data["PageIsSettingsRunners"] = true + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } + opts := actions_model.FindRunnerOptions{ + ListOptions: db.ListOptions{ + Page: page, + PageSize: 100, + }, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + RepoID: ctx.Repo.Repository.ID, + WithAvailable: true, + } + actions_shared.RunnersList(ctx, opts) ctx.HTML(http.StatusOK, tplActions) } diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index e4c0c6a54b607..9b19d1f45502e 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -4,18 +4,24 @@ package setting import ( + "net/http" + "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -func PrepareSecretsData(ctx *context.Context) { +func Secrets(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageType"] = "secrets" + ctx.Data["PageIsSettingsSecrets"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) if ctx.Written() { return } + ctx.HTML(http.StatusOK, tplActions) } func SecretsPost(ctx *context.Context) { diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go index 99891f7172e63..a35298c138cbd 100644 --- a/routers/web/user/setting/actions.go +++ b/routers/web/user/setting/actions.go @@ -4,9 +4,6 @@ package setting import ( - "fmt" - "net/http" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" @@ -16,20 +13,6 @@ const ( tplSettingsActions base.TplName = "user/settings/actions" ) -func Actions(ctx *context.Context) { - pageType := ctx.Params(":type") - if pageType == "secrets" { - ctx.Data["PageIsSettingsSecrets"] = true - PrepareSecretsData(ctx) - } else { - ctx.ServerError("Unknown Page Type", fmt.Errorf("Unknown Actions Settings Type: %s", pageType)) - return - } - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageType"] = pageType - ctx.HTML(http.StatusOK, tplSettingsActions) -} - func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets") } diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index 43f1be5167093..073cf32db5e30 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -4,16 +4,22 @@ package setting import ( + "net/http" + "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) -func PrepareSecretsData(ctx *context.Context) { +func Secrets(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("actions.actions") + ctx.Data["PageType"] = "secrets" + ctx.Data["PageIsSettingsSecrets"] = true shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) if ctx.Written() { return } + ctx.HTML(http.StatusOK, tplSettingsActions) } func SecretsPost(ctx *context.Context) { diff --git a/routers/web/web.go b/routers/web/web.go index b25b2eab74c7a..f9a77631c1e29 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -506,8 +506,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", user_setting.RedirectToDefaultSetting) - m.Get("/{type:secrets}", user_setting.Actions) m.Group("/secrets", func() { + m.Get("", user_setting.Secrets) m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) m.Post("/delete", user_setting.SecretsDelete) }) @@ -660,8 +660,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", admin.RedirectToDefaultSetting) - m.Get("/{type:runners}", admin.Actions) m.Group("/runners", func() { + m.Get("", admin.Runners) m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) @@ -854,8 +854,8 @@ func RegisterRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", org_setting.RedirectToDefaultSetting) - m.Get("/{type:runners|secrets}", org_setting.Actions) m.Group("/runners", func() { + m.Get("", org_setting.Runners) m.Combo("/{runnerid}").Get(org_setting.RunnersEdit). Post(web.Bind(forms.EditRunnerForm{}), org_setting.RunnersEditPost) m.Post("/{runnerid}/delete", org_setting.RunnerDeletePost) @@ -863,6 +863,7 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/secrets", func() { + m.Get("", org_setting.Secrets) m.Post("", web.Bind(forms.AddSecretForm{}), org_setting.SecretsPost) m.Post("/delete", org_setting.SecretsDelete) }) @@ -1050,14 +1051,15 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { m.Get("", repo_setting.RedirectToDefaultSetting) - m.Get("/{type:runners|secrets}", repo_setting.Actions) m.Group("/runners", func() { + m.Get("", repo_setting.Runners) m.Combo("/{runnerid}").Get(repo_setting.RunnersEdit). Post(web.Bind(forms.EditRunnerForm{}), repo_setting.RunnersEditPost) m.Post("/{runnerid}/delete", repo_setting.RunnerDeletePost) m.Get("/reset_registration_token", repo_setting.ResetRunnerRegistrationToken) }) m.Group("/secrets", func() { + m.Get("", repo_setting.Secrets) m.Post("", web.Bind(forms.AddSecretForm{}), repo_setting.SecretsPost) m.Post("/delete", repo_setting.DeleteSecret) }) From a176331491f67eb7c7fc43ef8f51147a1b51aa2d Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 13:15:41 +0800 Subject: [PATCH 35/49] adjust margin-left for vertical sub menu --- web_src/css/base.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_src/css/base.css b/web_src/css/base.css index dc7942e8a2770..3a60a839da37e 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1487,6 +1487,10 @@ img.ui.avatar, box-shadow: none; } +.ui.vertical.menu .item > .menu { + margin-left: 0; +} + /* Override semantic selector '.ui.menu:not(.vertical) .item > .button' */ /* This fixes the commit graph button on the commits page */ /* modal svg icons, copied from fomantic except width and height */ From f0788c6baca0523489e9ac17b76464121e6a0093 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 13:37:27 +0800 Subject: [PATCH 36/49] use helper.css --- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- web_src/css/base.css | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index c0430c0b542fa..f00c76908f27e 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -37,7 +37,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index f580a52852c4c..b46aa9cdb12a3 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index c3303b8a8a556..ba0d5ff0b82f6 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -36,7 +36,7 @@ {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 2c0f56d15fa17..80d2e89a1eec8 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -22,7 +22,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "secrets.secrets"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 3a60a839da37e..dc7942e8a2770 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1487,10 +1487,6 @@ img.ui.avatar, box-shadow: none; } -.ui.vertical.menu .item > .menu { - margin-left: 0; -} - /* Override semantic selector '.ui.menu:not(.vertical) .item > .button' */ /* This fixes the commit graph button on the commits page */ /* modal svg icons, copied from fomantic except width and height */ From fbd07c18ff3fc9377909afee47f21506e070c7ef Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 15:23:24 +0800 Subject: [PATCH 37/49] rename files --- routers/web/admin/{actions.go => runners.go} | 0 .../web/org/setting/{actions.go => runners.go} | 0 .../repo/setting/{actions.go => runners.go} | 0 routers/web/user/setting/actions.go | 18 ------------------ routers/web/user/setting/secrets.go | 9 +++++++++ 5 files changed, 9 insertions(+), 18 deletions(-) rename routers/web/admin/{actions.go => runners.go} (100%) rename routers/web/org/setting/{actions.go => runners.go} (100%) rename routers/web/repo/setting/{actions.go => runners.go} (100%) delete mode 100644 routers/web/user/setting/actions.go diff --git a/routers/web/admin/actions.go b/routers/web/admin/runners.go similarity index 100% rename from routers/web/admin/actions.go rename to routers/web/admin/runners.go diff --git a/routers/web/org/setting/actions.go b/routers/web/org/setting/runners.go similarity index 100% rename from routers/web/org/setting/actions.go rename to routers/web/org/setting/runners.go diff --git a/routers/web/repo/setting/actions.go b/routers/web/repo/setting/runners.go similarity index 100% rename from routers/web/repo/setting/actions.go rename to routers/web/repo/setting/runners.go diff --git a/routers/web/user/setting/actions.go b/routers/web/user/setting/actions.go deleted file mode 100644 index a35298c138cbd..0000000000000 --- a/routers/web/user/setting/actions.go +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package setting - -import ( - "code.gitea.io/gitea/modules/base" - "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/setting" -) - -const ( - tplSettingsActions base.TplName = "user/settings/actions" -) - -func RedirectToDefaultSetting(ctx *context.Context) { - ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets") -} diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index 073cf32db5e30..d990f0c2e38eb 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -6,11 +6,16 @@ package setting import ( "net/http" + "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) +const ( + tplSettingsActions base.TplName = "user/settings/actions" +) + func Secrets(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "secrets" @@ -39,3 +44,7 @@ func SecretsDelete(ctx *context.Context) { setting.AppSubURL+"/user/settings/actions/secrets", ) } + +func RedirectToDefaultSetting(ctx *context.Context) { + ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets") +} From e0b4ec3a424a98da27f8f1f53ba4acc8cdc3e6d8 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 15:40:51 +0800 Subject: [PATCH 38/49] remove some changes --- routers/web/admin/runners.go | 1 + routers/web/org/setting/runners.go | 1 + routers/web/org/setting/secrets.go | 2 ++ routers/web/repo/setting/runners.go | 2 ++ routers/web/repo/setting/secrets.go | 1 + routers/web/shared/actions/runners.go | 1 + routers/web/user/setting/secrets.go | 2 ++ 7 files changed, 10 insertions(+) diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index e4ba424b6f47b..a8067d8e53a64 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -23,6 +23,7 @@ const ( // Runners render settings/actions/runners page for admin level func Runners(ctx *context.Context) { ctx.Data["PageIsAdminRunners"] = true + page := ctx.FormInt("page") if page <= 1 { page = 1 diff --git a/routers/web/org/setting/runners.go b/routers/web/org/setting/runners.go index 938ab561261b2..32440b018b376 100644 --- a/routers/web/org/setting/runners.go +++ b/routers/web/org/setting/runners.go @@ -24,6 +24,7 @@ const ( // Runners render settings/actions/runners page for organization level func Runners(ctx *context.Context) { ctx.Data["PageIsOrgSettingsRunners"] = true + ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageType"] = "runners" diff --git a/routers/web/org/setting/secrets.go b/routers/web/org/setting/secrets.go index 1e5fbfb4aa63a..c3807fc4f7bd5 100644 --- a/routers/web/org/setting/secrets.go +++ b/routers/web/org/setting/secrets.go @@ -16,10 +16,12 @@ func Secrets(ctx *context.Context) { ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageType"] = "secrets" ctx.Data["PageIsOrgSettingsSecrets"] = true + shared.SetSecretsContext(ctx, ctx.ContextUser.ID, 0) if ctx.Written() { return } + ctx.HTML(http.StatusOK, tplSettingsActions) } diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go index bfd9f0fc5c92e..3bdd5156d2370 100644 --- a/routers/web/repo/setting/runners.go +++ b/routers/web/repo/setting/runners.go @@ -23,10 +23,12 @@ func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "runners" ctx.Data["PageIsSettingsRunners"] = true + page := ctx.FormInt("page") if page <= 1 { page = 1 } + opts := actions_model.FindRunnerOptions{ ListOptions: db.ListOptions{ Page: page, diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index 9b19d1f45502e..a21b297b3d5d8 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -21,6 +21,7 @@ func Secrets(ctx *context.Context) { if ctx.Written() { return } + ctx.HTML(http.StatusOK, tplActions) } diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 728f5c4fd76c2..9a50da2b492b4 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -57,6 +57,7 @@ func RunnersList(ctx *context.Context, opts actions_model.FindRunnerOptions) { ctx.Data["RunnerRepoID"] = opts.RepoID pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) + ctx.Data["Page"] = pager } diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index d990f0c2e38eb..1b071fcb07cd5 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -20,10 +20,12 @@ func Secrets(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "secrets" ctx.Data["PageIsSettingsSecrets"] = true + shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) if ctx.Written() { return } + ctx.HTML(http.StatusOK, tplSettingsActions) } From fbeb9abeda842be92c3e404a0c3723ea9af50bd7 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 17:44:24 +0800 Subject: [PATCH 39/49] use variables for colors --- web_src/css/base.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index dc7942e8a2770..dcb9193e4691f 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -793,6 +793,15 @@ a.label, user-select: auto; } +.ui.vertical.menu .item .menu .item { + color: var(--color-text-light-2); +} + +.ui.vertical.menu .item .menu .item:hover, +.ui.vertical.menu .item .menu a.item:hover { + color: var(--color-text-light-1); +} + .ui.menu .item > .svg { margin-right: 0.35em; } @@ -821,7 +830,9 @@ a.label, background: var(--color-active); } -.ui.menu a.item:active { +.ui.menu a.item:active, +.ui.vertical.menu .item .menu .active.item, +.ui.vertical.menu .item .menu .active.item:hover { color: var(--color-text); background: none; } From 38c8818f0a9af9b8cc11bdb9040034e7a924941d Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 18:04:53 +0800 Subject: [PATCH 40/49] use text-indent instead of margin --- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- web_src/css/base.css | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index f00c76908f27e..c0430c0b542fa 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -37,7 +37,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index b46aa9cdb12a3..f580a52852c4c 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index ba0d5ff0b82f6..c3303b8a8a556 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -36,7 +36,7 @@ {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 80d2e89a1eec8..2c0f56d15fa17 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -22,7 +22,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "secrets.secrets"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index dcb9193e4691f..f1f81ffb645a7 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -797,6 +797,10 @@ a.label, color: var(--color-text-light-2); } +.ui.vertical.menu .item .menu a.item { + text-indent: 16px; +} + .ui.vertical.menu .item .menu .item:hover, .ui.vertical.menu .item .menu a.item:hover { color: var(--color-text-light-1); From bf4304878752fc22bef67d3953f6378aaafcb97c Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 18:15:57 +0800 Subject: [PATCH 41/49] use the same rule --- web_src/css/base.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index f1f81ffb645a7..6fb57aa751c36 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -795,9 +795,6 @@ a.label, .ui.vertical.menu .item .menu .item { color: var(--color-text-light-2); -} - -.ui.vertical.menu .item .menu a.item { text-indent: 16px; } From 3d1def213f629a2422bdddf251b2c314888d1516 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 27 Apr 2023 10:40:09 +0800 Subject: [PATCH 42/49] add custom class --- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- web_src/css/base.css | 9 ++++----- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index c0430c0b542fa..b67fe955ab515 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -37,7 +37,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index f580a52852c4c..34c60cecb7cd4 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index c3303b8a8a556..6cbfa3171eff8 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -36,7 +36,7 @@ {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "actions.runners"}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 2c0f56d15fa17..08a98f9d91ac2 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -22,7 +22,7 @@ {{if .EnableActions}}
{{.locale.Tr "actions.actions"}} -
+
{{.locale.Tr "secrets.secrets"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 6fb57aa751c36..2172fc5a42b83 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -793,13 +793,12 @@ a.label, user-select: auto; } -.ui.vertical.menu .item .menu .item { +.ui.vertical.menu .item .menu.g-settings-submenu .item { color: var(--color-text-light-2); text-indent: 16px; } -.ui.vertical.menu .item .menu .item:hover, -.ui.vertical.menu .item .menu a.item:hover { +.ui.vertical.menu .item .menu.g-settings-submenu .item:hover { color: var(--color-text-light-1); } @@ -832,8 +831,8 @@ a.label, } .ui.menu a.item:active, -.ui.vertical.menu .item .menu .active.item, -.ui.vertical.menu .item .menu .active.item:hover { +.ui.vertical.menu .item .menu.g-settings-submenu .active.item, +.ui.vertical.menu .item .menu.g-settings-submenu .active.item:hover { color: var(--color-text); background: none; } From fa112e5bb64885fe9943d57ab08d97895e9a3934 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 27 Apr 2023 14:00:12 +0800 Subject: [PATCH 43/49] use common handlers --- routers/web/admin/runners.go | 75 --------------- routers/web/org/setting/runners.go | 83 ---------------- routers/web/org/setting/secrets.go | 46 --------- routers/web/repo/setting/runners.go | 142 +++++++++++++++++++++++----- routers/web/repo/setting/secrets.go | 99 ++++++++++++++++--- routers/web/user/setting/secrets.go | 39 -------- routers/web/web.go | 76 +++++++-------- 7 files changed, 241 insertions(+), 319 deletions(-) delete mode 100644 routers/web/org/setting/secrets.go diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index a8067d8e53a64..eaa268b4f142a 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -4,85 +4,10 @@ package admin import ( - "net/http" - "net/url" - - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" - actions_shared "code.gitea.io/gitea/routers/web/shared/actions" -) - -const ( - tplActions base.TplName = "admin/actions" - tplRunnerEdit base.TplName = "admin/runners/edit" ) -// Runners render settings/actions/runners page for admin level -func Runners(ctx *context.Context) { - ctx.Data["PageIsAdminRunners"] = true - - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - } - - actions_shared.RunnersList(ctx, opts) - - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageType"] = "runners" - - ctx.HTML(http.StatusOK, tplActions) -} - -// EditRunner renders runner edit page for admin level -func EditRunner(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminActions"] = true - - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - actions_shared.RunnerDetails(ctx, page, ctx.ParamsInt64(":runnerid"), 0, 0) - ctx.HTML(http.StatusOK, tplRunnerEdit) -} - -// EditRunnerPost response for editing runner -func EditRunnerPost(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.runners.edit") - ctx.Data["PageIsAdmin"] = true - ctx.Data["PageIsAdminActions"] = true - actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), 0, 0, - setting.AppSubURL+"/admin/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) -} - -// DeleteRunnerPost response for deleting a runner -func DeleteRunnerPost(ctx *context.Context) { - actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), - setting.AppSubURL+"/admin/actions/runners", - setting.AppSubURL+"/admin/actions/runners/"+url.PathEscape(ctx.Params(":runnerid")), - ) -} - -func ResetRunnerRegistrationToken(ctx *context.Context) { - actions_shared.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/actions/runners") -} - func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/admin/actions/runners") } diff --git a/routers/web/org/setting/runners.go b/routers/web/org/setting/runners.go index 32440b018b376..c3c771036aad7 100644 --- a/routers/web/org/setting/runners.go +++ b/routers/web/org/setting/runners.go @@ -4,92 +4,9 @@ package setting import ( - "net/http" - "net/url" - - actions_model "code.gitea.io/gitea/models/actions" - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" - actions_shared "code.gitea.io/gitea/routers/web/shared/actions" -) - -const ( - // tplSettingsActions template path for render actions settings - tplSettingsActions base.TplName = "org/settings/actions" - // tplSettingsRunnersEdit template path for render runners edit settings - tplSettingsRunnersEdit base.TplName = "org/settings/runners_edit" ) -// Runners render settings/actions/runners page for organization level -func Runners(ctx *context.Context) { - ctx.Data["PageIsOrgSettingsRunners"] = true - - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageType"] = "runners" - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - opts := actions_model.FindRunnerOptions{ - ListOptions: db.ListOptions{ - Page: page, - PageSize: 100, - }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - OwnerID: ctx.Org.Organization.ID, - WithAvailable: true, - } - - actions_shared.RunnersList(ctx, opts) - ctx.HTML(http.StatusOK, tplSettingsActions) -} - -// ResetRunnerRegistrationToken reset runner registration token -func ResetRunnerRegistrationToken(ctx *context.Context) { - actions_shared.RunnerResetRegistrationToken(ctx, - ctx.Org.Organization.ID, 0, - ctx.Org.OrgLink+"/settings/actions/runners") -} - -// RunnersEdit render runner edit page for organization level -func RunnersEdit(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("org.runners.edit") - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageIsOrgSettingsRunners"] = true - page := ctx.FormInt("page") - if page <= 1 { - page = 1 - } - - actions_shared.RunnerDetails(ctx, page, - ctx.ParamsInt64(":runnerid"), ctx.Org.Organization.ID, 0, - ) - - ctx.HTML(http.StatusOK, tplSettingsRunnersEdit) -} - -// RunnersEditPost response for editing runner -func RunnersEditPost(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("org.runners.edit") - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageIsOrgSettingsRunners"] = true - actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), - ctx.Org.Organization.ID, 0, - ctx.Org.OrgLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) -} - -// RunnerDeletePost response for deleting runner -func RunnerDeletePost(ctx *context.Context) { - actions_shared.RunnerDeletePost(ctx, - ctx.ParamsInt64(":runnerid"), - ctx.Org.OrgLink+"/settings/actions/runners", - ctx.Org.OrgLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) -} - func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/runners") } diff --git a/routers/web/org/setting/secrets.go b/routers/web/org/setting/secrets.go deleted file mode 100644 index c3807fc4f7bd5..0000000000000 --- a/routers/web/org/setting/secrets.go +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package setting - -import ( - "net/http" - - "code.gitea.io/gitea/modules/context" - shared "code.gitea.io/gitea/routers/web/shared/secrets" -) - -// Secrets render settings/actions/secrets page for organization level -func Secrets(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageType"] = "secrets" - ctx.Data["PageIsOrgSettingsSecrets"] = true - - shared.SetSecretsContext(ctx, ctx.ContextUser.ID, 0) - if ctx.Written() { - return - } - - ctx.HTML(http.StatusOK, tplSettingsActions) -} - -// SecretsPost add secrets -func SecretsPost(ctx *context.Context) { - shared.PerformSecretsPost( - ctx, - ctx.ContextUser.ID, - 0, - ctx.Org.OrgLink+"/settings/actions/secrets", - ) -} - -// SecretsDelete delete secrets -func SecretsDelete(ctx *context.Context) { - shared.PerformSecretsDelete( - ctx, - ctx.ContextUser.ID, - 0, - ctx.Org.OrgLink+"/settings/actions/secrets", - ) -} diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go index 3bdd5156d2370..4906c291a8a97 100644 --- a/routers/web/repo/setting/runners.go +++ b/routers/web/repo/setting/runners.go @@ -4,25 +4,99 @@ package setting import ( + "errors" "net/http" "net/url" actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/setting" actions_shared "code.gitea.io/gitea/routers/web/shared/actions" ) const ( - tplActions = "repo/settings/actions" - tplRunnerEdit = "repo/settings/runner_edit" + // TODO: Separate secrets from runners when layout is ready + tplRepoRunners base.TplName = "repo/settings/actions" + tplOrgRunners base.TplName = "org/settings/actions" + tplAdminRunners base.TplName = "admin/actions" + tplRepoRunnerEdit base.TplName = "repo/settings/runner_edit" + tplOrgRunnerEdit base.TplName = "org/settings/runners_edit" + tplAdminRunnerEdit base.TplName = "admin/runners/edit" ) +type runnersCtx struct { + OwnerID int64 + RepoID int64 + IsRepo bool + IsOrg bool + IsAdmin bool + RunnersTemplate base.TplName + RunnerEditTemplate base.TplName + RedirectLink string +} + +func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { + if is, ok := ctx.Data["IsRepoSettings"]; ok && is.(bool) { + return &runnersCtx{ + RepoID: ctx.Repo.Repository.ID, + OwnerID: 0, + IsRepo: true, + RunnersTemplate: tplRepoRunners, + RunnerEditTemplate: tplRepoRunnerEdit, + RedirectLink: ctx.Repo.RepoLink + "/settings/actions/runners/", + }, nil + } + + if is, ok := ctx.Data["IsOrgSettings"]; ok && is.(bool) { + return &runnersCtx{ + RepoID: 0, + OwnerID: ctx.Org.Organization.ID, + IsOrg: true, + RunnersTemplate: tplOrgRunners, + RunnerEditTemplate: tplOrgRunnerEdit, + RedirectLink: ctx.Org.OrgLink + "/settings/actions/runners/", + }, nil + } + + if is, ok := ctx.Data["IsAdminSettings"]; ok && is.(bool) { + return &runnersCtx{ + RepoID: 0, + OwnerID: 0, + IsAdmin: true, + RunnersTemplate: tplAdminRunners, + RunnerEditTemplate: tplAdminRunnerEdit, + RedirectLink: setting.AppSubURL + "/admin/actions/runners/", + }, nil + } + + return nil, errors.New("unable to set Runners context") +} + +// preparePageData set data that will be used by frontend navbar templates +func preparePageData(ctx *context.Context, rCtx *runnersCtx) { + if rCtx.IsRepo { + ctx.Data["PageIsSettingsRunners"] = true + } else if rCtx.IsOrg { + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["PageIsOrgSettingsRunners"] = true + } else { + ctx.Data["PageIsAdminRunners"] = true + ctx.Data["PageIsAdmin"] = true + } +} + // Runners render settings/actions/runners page for repo level func Runners(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "runners" - ctx.Data["PageIsSettingsRunners"] = true + + rCtx, err := getRunnersCtx(ctx) + if err != nil { + ctx.ServerError("getRunnersCtx", err) + return + } page := ctx.FormInt("page") if page <= 1 { @@ -34,51 +108,71 @@ func Runners(ctx *context.Context) { Page: page, PageSize: 100, }, - Sort: ctx.Req.URL.Query().Get("sort"), - Filter: ctx.Req.URL.Query().Get("q"), - RepoID: ctx.Repo.Repository.ID, - WithAvailable: true, + Sort: ctx.Req.URL.Query().Get("sort"), + Filter: ctx.Req.URL.Query().Get("q"), + } + if rCtx.IsRepo { + opts.RepoID = rCtx.RepoID + opts.WithAvailable = true + } else if rCtx.IsOrg { + opts.OwnerID = rCtx.OwnerID + opts.WithAvailable = true } - actions_shared.RunnersList(ctx, opts) - ctx.HTML(http.StatusOK, tplActions) + + preparePageData(ctx, rCtx) + ctx.HTML(http.StatusOK, rCtx.RunnersTemplate) } // RunnersEdit renders runner edit page for repository level func RunnersEdit(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.runners") - ctx.Data["PageIsSettingsRunners"] = true + ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") + rCtx, err := getRunnersCtx(ctx) + if err != nil { + ctx.ServerError("getRunnersCtx", err) + return + } + page := ctx.FormInt("page") if page <= 1 { page = 1 } actions_shared.RunnerDetails(ctx, page, - ctx.ParamsInt64(":runnerid"), 0, ctx.Repo.Repository.ID, + ctx.ParamsInt64(":runnerid"), rCtx.OwnerID, rCtx.RepoID, ) - - ctx.HTML(http.StatusOK, tplRunnerEdit) + preparePageData(ctx, rCtx) + ctx.HTML(http.StatusOK, rCtx.RunnerEditTemplate) } func RunnersEditPost(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.runners") - ctx.Data["PageIsSettingsRunners"] = true + rCtx, err := getRunnersCtx(ctx) + if err != nil { + ctx.ServerError("getRunnersCtx", err) + return + } actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), - 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + rCtx.OwnerID, rCtx.RepoID, + rCtx.RedirectLink+url.PathEscape(ctx.Params(":runnerid"))) } func ResetRunnerRegistrationToken(ctx *context.Context) { - actions_shared.RunnerResetRegistrationToken(ctx, - 0, ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions/runners") + rCtx, err := getRunnersCtx(ctx) + if err != nil { + ctx.ServerError("getRunnersCtx", err) + return + } + actions_shared.RunnerResetRegistrationToken(ctx, rCtx.OwnerID, rCtx.RepoID, rCtx.RedirectLink) } // RunnerDeletePost response for deleting runner func RunnerDeletePost(ctx *context.Context) { - actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), - ctx.Repo.RepoLink+"/settings/actions", - ctx.Repo.RepoLink+"/settings/actions/runners/"+url.PathEscape(ctx.Params(":runnerid"))) + rCtx, err := getRunnersCtx(ctx) + if err != nil { + ctx.ServerError("getRunnersCtx", err) + return + } + actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), rCtx.RedirectLink, rCtx.RedirectLink+url.PathEscape(ctx.Params(":runnerid"))) } func RedirectToDefaultSetting(ctx *context.Context) { diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index a21b297b3d5d8..bb385eda1f0ac 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -4,41 +4,116 @@ package setting import ( + "errors" "net/http" + "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" shared "code.gitea.io/gitea/routers/web/shared/secrets" ) +const ( + tplRepoSecrets base.TplName = "repo/settings/actions" + tplOrgSecrets base.TplName = "org/settings/actions" + tplUserSecrets base.TplName = "user/settings/actions" +) + +type secretsCtx struct { + OwnerID int64 + RepoID int64 + IsRepo bool + IsOrg bool + IsUser bool + SecretsTemplate base.TplName + RedirectLink string +} + +func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { + if is, ok := ctx.Data["IsRepoSettings"]; ok && is.(bool) { + return &secretsCtx{ + OwnerID: 0, + RepoID: ctx.Repo.Repository.ID, + IsRepo: true, + SecretsTemplate: tplRepoSecrets, + RedirectLink: ctx.Repo.RepoLink + "/settings/actions/secrets", + }, nil + } + + if is, ok := ctx.Data["IsOrgSettings"]; ok && is.(bool) { + return &secretsCtx{ + OwnerID: ctx.ContextUser.ID, + RepoID: 0, + IsOrg: true, + SecretsTemplate: tplOrgSecrets, + RedirectLink: ctx.Org.OrgLink + "/settings/actions/secrets", + }, nil + } + + if is, ok := ctx.Data["IsUserSettings"]; ok && is.(bool) { + return &secretsCtx{ + OwnerID: ctx.Doer.ID, + RepoID: 0, + IsUser: true, + SecretsTemplate: tplUserSecrets, + RedirectLink: setting.AppSubURL + "/user/settings/actions/secrets", + }, nil + } + + return nil, errors.New("unable to set Secrets context") +} + func Secrets(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "secrets" - ctx.Data["PageIsSettingsSecrets"] = true - ctx.Data["DisableSSH"] = setting.SSH.Disabled - shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) - if ctx.Written() { + sCtx, err := getSecretsCtx(ctx) + if err != nil { + ctx.ServerError("getSecretsCtx", err) return } - ctx.HTML(http.StatusOK, tplActions) + if sCtx.IsRepo { + ctx.Data["PageIsSettingsSecrets"] = true + ctx.Data["DisableSSH"] = setting.SSH.Disabled + } else if sCtx.IsOrg { + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["PageIsOrgSettingsSecrets"] = true + } else { + ctx.Data["PageIsSettingsSecrets"] = true + } + + shared.SetSecretsContext(ctx, sCtx.OwnerID, sCtx.RepoID) + if ctx.Written() { + return + } + ctx.HTML(http.StatusOK, sCtx.SecretsTemplate) } func SecretsPost(ctx *context.Context) { + sCtx, err := getSecretsCtx(ctx) + if err != nil { + ctx.ServerError("getSecretsCtx", err) + return + } shared.PerformSecretsPost( ctx, - 0, - ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions/secrets", + sCtx.OwnerID, + sCtx.RepoID, + sCtx.RedirectLink, ) } -func DeleteSecret(ctx *context.Context) { +func SecretsDelete(ctx *context.Context) { + sCtx, err := getSecretsCtx(ctx) + if err != nil { + ctx.ServerError("getSecretsCtx", err) + return + } shared.PerformSecretsDelete( ctx, - 0, - ctx.Repo.Repository.ID, - ctx.Repo.RepoLink+"/settings/actions/secrets", + sCtx.OwnerID, + sCtx.RepoID, + sCtx.RedirectLink, ) } diff --git a/routers/web/user/setting/secrets.go b/routers/web/user/setting/secrets.go index 1b071fcb07cd5..eb09477bdb005 100644 --- a/routers/web/user/setting/secrets.go +++ b/routers/web/user/setting/secrets.go @@ -4,49 +4,10 @@ package setting import ( - "net/http" - - "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" - shared "code.gitea.io/gitea/routers/web/shared/secrets" -) - -const ( - tplSettingsActions base.TplName = "user/settings/actions" ) -func Secrets(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("actions.actions") - ctx.Data["PageType"] = "secrets" - ctx.Data["PageIsSettingsSecrets"] = true - - shared.SetSecretsContext(ctx, ctx.Doer.ID, 0) - if ctx.Written() { - return - } - - ctx.HTML(http.StatusOK, tplSettingsActions) -} - -func SecretsPost(ctx *context.Context) { - shared.PerformSecretsPost( - ctx, - ctx.Doer.ID, - 0, - setting.AppSubURL+"/user/settings/actions/secrets", - ) -} - -func SecretsDelete(ctx *context.Context) { - shared.PerformSecretsDelete( - ctx, - ctx.Doer.ID, - 0, - setting.AppSubURL+"/user/settings/actions/secrets", - ) -} - func RedirectToDefaultSetting(ctx *context.Context) { ctx.Redirect(setting.AppSubURL + "/user/settings/actions/secrets") } diff --git a/routers/web/web.go b/routers/web/web.go index f9a77631c1e29..1653e724918cd 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -344,6 +344,24 @@ func RegisterRoutes(m *web.Route) { m.Post("/packagist/{id}", web.Bind(forms.NewPackagistHookForm{}), repo.PackagistHooksEditPost) } + addSettingsSecretsRoutes := func() { + m.Group("/secrets", func() { + m.Get("", repo_setting.Secrets) + m.Post("", web.Bind(forms.AddSecretForm{}), repo_setting.SecretsPost) + m.Post("/delete", repo_setting.SecretsDelete) + }) + } + + addSettingsRunnersRoutes := func() { + m.Group("/runners", func() { + m.Get("", repo_setting.Runners) + m.Combo("/{runnerid}").Get(repo_setting.RunnersEdit). + Post(web.Bind(forms.EditRunnerForm{}), repo_setting.RunnersEditPost) + m.Post("/{runnerid}/delete", repo_setting.RunnerDeletePost) + m.Get("/reset_registration_token", repo_setting.ResetRunnerRegistrationToken) + }) + } + // FIXME: not all routes need go through same middleware. // Especially some AJAX requests, we can reduce middleware number to improve performance. // Routers. @@ -506,12 +524,10 @@ func RegisterRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", user_setting.RedirectToDefaultSetting) - m.Group("/secrets", func() { - m.Get("", user_setting.Secrets) - m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost) - m.Post("/delete", user_setting.SecretsDelete) - }) - }, actions.MustEnableActions) + addSettingsSecretsRoutes() + }, actions.MustEnableActions, func(ctx *context.Context) { + ctx.Data["IsUserSettings"] = true + }) m.Get("/organization", user_setting.Organization) m.Get("/repos", user_setting.Repos) @@ -660,13 +676,10 @@ func RegisterRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", admin.RedirectToDefaultSetting) - m.Group("/runners", func() { - m.Get("", admin.Runners) - m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken) - m.Combo("/{runnerid}").Get(admin.EditRunner).Post(web.Bind(forms.EditRunnerForm{}), admin.EditRunnerPost) - m.Post("/{runnerid}/delete", admin.DeleteRunnerPost) - }) - }, actions.MustEnableActions) + addSettingsRunnersRoutes() + }, actions.MustEnableActions, func(ctx *context.Context) { + ctx.Data["IsAdminSettings"] = true + }) }, func(ctx *context.Context) { ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable ctx.Data["EnablePackages"] = setting.Packages.Enabled @@ -854,20 +867,11 @@ func RegisterRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", org_setting.RedirectToDefaultSetting) - m.Group("/runners", func() { - m.Get("", org_setting.Runners) - m.Combo("/{runnerid}").Get(org_setting.RunnersEdit). - Post(web.Bind(forms.EditRunnerForm{}), org_setting.RunnersEditPost) - m.Post("/{runnerid}/delete", org_setting.RunnerDeletePost) - m.Get("/reset_registration_token", org_setting.ResetRunnerRegistrationToken) - }) - - m.Group("/secrets", func() { - m.Get("", org_setting.Secrets) - m.Post("", web.Bind(forms.AddSecretForm{}), org_setting.SecretsPost) - m.Post("/delete", org_setting.SecretsDelete) - }) - }, actions.MustEnableActions) + addSettingsRunnersRoutes() + addSettingsSecretsRoutes() + }, actions.MustEnableActions, func(ctx *context.Context) { + ctx.Data["IsOrgSettings"] = true + }) m.RouteMethods("/delete", "GET,POST", org.SettingsDelete) @@ -1051,19 +1055,11 @@ func RegisterRoutes(m *web.Route) { }) m.Group("/actions", func() { m.Get("", repo_setting.RedirectToDefaultSetting) - m.Group("/runners", func() { - m.Get("", repo_setting.Runners) - m.Combo("/{runnerid}").Get(repo_setting.RunnersEdit). - Post(web.Bind(forms.EditRunnerForm{}), repo_setting.RunnersEditPost) - m.Post("/{runnerid}/delete", repo_setting.RunnerDeletePost) - m.Get("/reset_registration_token", repo_setting.ResetRunnerRegistrationToken) - }) - m.Group("/secrets", func() { - m.Get("", repo_setting.Secrets) - m.Post("", web.Bind(forms.AddSecretForm{}), repo_setting.SecretsPost) - m.Post("/delete", repo_setting.DeleteSecret) - }) - }, actions.MustEnableActions) + addSettingsRunnersRoutes() + addSettingsSecretsRoutes() + }, actions.MustEnableActions, func(ctx *context.Context) { + ctx.Data["IsRepoSettings"] = true + }) }, func(ctx *context.Context) { ctx.Data["PageIsSettings"] = true ctx.Data["LFSStartServer"] = setting.LFS.StartServer From ad374cd8afe36550caa5fedfb69fc4cb63a35b03 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 27 Apr 2023 14:02:33 +0800 Subject: [PATCH 44/49] add TODO --- routers/web/repo/setting/secrets.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index bb385eda1f0ac..cc1a9b76554db 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -14,6 +14,7 @@ import ( ) const ( + // TODO: Separate secrets from runners when layout is ready tplRepoSecrets base.TplName = "repo/settings/actions" tplOrgSecrets base.TplName = "org/settings/actions" tplUserSecrets base.TplName = "user/settings/actions" From 42905d31834652b8a733d2f73c9a3be6c5de034f Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 27 Apr 2023 16:53:22 +0800 Subject: [PATCH 45/49] change conditions --- routers/web/repo/setting/runners.go | 6 +++--- routers/web/repo/setting/secrets.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go index 4906c291a8a97..b008c925a5e9a 100644 --- a/routers/web/repo/setting/runners.go +++ b/routers/web/repo/setting/runners.go @@ -38,7 +38,7 @@ type runnersCtx struct { } func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { - if is, ok := ctx.Data["IsRepoSettings"]; ok && is.(bool) { + if ctx.Data["IsRepoSettings"] == true { return &runnersCtx{ RepoID: ctx.Repo.Repository.ID, OwnerID: 0, @@ -49,7 +49,7 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { }, nil } - if is, ok := ctx.Data["IsOrgSettings"]; ok && is.(bool) { + if ctx.Data["IsOrgSettings"] == true { return &runnersCtx{ RepoID: 0, OwnerID: ctx.Org.Organization.ID, @@ -60,7 +60,7 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { }, nil } - if is, ok := ctx.Data["IsAdminSettings"]; ok && is.(bool) { + if ctx.Data["IsAdminSettings"] == true { return &runnersCtx{ RepoID: 0, OwnerID: 0, diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index cc1a9b76554db..ab4c971ebb1ec 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -31,7 +31,7 @@ type secretsCtx struct { } func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { - if is, ok := ctx.Data["IsRepoSettings"]; ok && is.(bool) { + if ctx.Data["IsRepoSettings"] == true { return &secretsCtx{ OwnerID: 0, RepoID: ctx.Repo.Repository.ID, @@ -41,7 +41,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { }, nil } - if is, ok := ctx.Data["IsOrgSettings"]; ok && is.(bool) { + if ctx.Data["IsOrgSettings"] == true { return &secretsCtx{ OwnerID: ctx.ContextUser.ID, RepoID: 0, @@ -51,7 +51,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { }, nil } - if is, ok := ctx.Data["IsUserSettings"]; ok && is.(bool) { + if ctx.Data["IsUserSettings"] == true { return &secretsCtx{ OwnerID: ctx.Doer.ID, RepoID: 0, From 4cd0166f0af3dd5536f48f8a388f45333eba17ab Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 22:45:42 +0800 Subject: [PATCH 46/49] simplify ctx data --- routers/web/repo/setting/runners.go | 23 +++------- routers/web/repo/setting/secrets.go | 13 ++---- routers/web/repo/webhook.go | 8 ++-- routers/web/web.go | 65 ++++++++++------------------- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 4 +- templates/repo/header.tmpl | 4 +- templates/repo/settings/nav.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 4 +- templates/user/settings/navbar.tmpl | 2 +- 10 files changed, 44 insertions(+), 83 deletions(-) diff --git a/routers/web/repo/setting/runners.go b/routers/web/repo/setting/runners.go index b008c925a5e9a..e8ad6358261c0 100644 --- a/routers/web/repo/setting/runners.go +++ b/routers/web/repo/setting/runners.go @@ -38,7 +38,7 @@ type runnersCtx struct { } func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { - if ctx.Data["IsRepoSettings"] == true { + if ctx.Data["PageIsRepoSettings"] == true { return &runnersCtx{ RepoID: ctx.Repo.Repository.ID, OwnerID: 0, @@ -49,7 +49,7 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { }, nil } - if ctx.Data["IsOrgSettings"] == true { + if ctx.Data["PageIsOrgSettings"] == true { return &runnersCtx{ RepoID: 0, OwnerID: ctx.Org.Organization.ID, @@ -60,7 +60,7 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { }, nil } - if ctx.Data["IsAdminSettings"] == true { + if ctx.Data["PageIsAdmin"] == true { return &runnersCtx{ RepoID: 0, OwnerID: 0, @@ -74,21 +74,9 @@ func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { return nil, errors.New("unable to set Runners context") } -// preparePageData set data that will be used by frontend navbar templates -func preparePageData(ctx *context.Context, rCtx *runnersCtx) { - if rCtx.IsRepo { - ctx.Data["PageIsSettingsRunners"] = true - } else if rCtx.IsOrg { - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageIsOrgSettingsRunners"] = true - } else { - ctx.Data["PageIsAdminRunners"] = true - ctx.Data["PageIsAdmin"] = true - } -} - // Runners render settings/actions/runners page for repo level func Runners(ctx *context.Context) { + ctx.Data["PageIsSharedSettingsRunners"] = true ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "runners" @@ -120,12 +108,12 @@ func Runners(ctx *context.Context) { } actions_shared.RunnersList(ctx, opts) - preparePageData(ctx, rCtx) ctx.HTML(http.StatusOK, rCtx.RunnersTemplate) } // RunnersEdit renders runner edit page for repository level func RunnersEdit(ctx *context.Context) { + ctx.Data["PageIsSharedSettingsRunners"] = true ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") rCtx, err := getRunnersCtx(ctx) if err != nil { @@ -141,7 +129,6 @@ func RunnersEdit(ctx *context.Context) { actions_shared.RunnerDetails(ctx, page, ctx.ParamsInt64(":runnerid"), rCtx.OwnerID, rCtx.RepoID, ) - preparePageData(ctx, rCtx) ctx.HTML(http.StatusOK, rCtx.RunnerEditTemplate) } diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index ab4c971ebb1ec..444f16f86c195 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -31,7 +31,7 @@ type secretsCtx struct { } func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { - if ctx.Data["IsRepoSettings"] == true { + if ctx.Data["PageIsRepoSettings"] == true { return &secretsCtx{ OwnerID: 0, RepoID: ctx.Repo.Repository.ID, @@ -41,7 +41,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { }, nil } - if ctx.Data["IsOrgSettings"] == true { + if ctx.Data["PageIsOrgSettings"] == true { return &secretsCtx{ OwnerID: ctx.ContextUser.ID, RepoID: 0, @@ -51,7 +51,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { }, nil } - if ctx.Data["IsUserSettings"] == true { + if ctx.Data["PageIsUserSettings"] == true { return &secretsCtx{ OwnerID: ctx.Doer.ID, RepoID: 0, @@ -67,6 +67,7 @@ func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { func Secrets(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageType"] = "secrets" + ctx.Data["PageIsSharedSettingsSecrets"] = true sCtx, err := getSecretsCtx(ctx) if err != nil { @@ -75,13 +76,7 @@ func Secrets(ctx *context.Context) { } if sCtx.IsRepo { - ctx.Data["PageIsSettingsSecrets"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled - } else if sCtx.IsOrg { - ctx.Data["PageIsOrgSettings"] = true - ctx.Data["PageIsOrgSettingsSecrets"] = true - } else { - ctx.Data["PageIsSettingsSecrets"] = true } shared.SetSecretsContext(ctx, sCtx.OwnerID, sCtx.RepoID) diff --git a/routers/web/repo/webhook.go b/routers/web/repo/webhook.go index f30588967e836..a21b405c9676e 100644 --- a/routers/web/repo/webhook.go +++ b/routers/web/repo/webhook.go @@ -67,7 +67,7 @@ type ownerRepoCtx struct { // getOwnerRepoCtx determines whether this is a repo, owner, or admin (both default and system) context. func getOwnerRepoCtx(ctx *context.Context) (*ownerRepoCtx, error) { - if is, ok := ctx.Data["IsRepositoryWebhook"]; ok && is.(bool) { + if ctx.Data["PageIsRepoSettings"] == true { return &ownerRepoCtx{ RepoID: ctx.Repo.Repository.ID, Link: path.Join(ctx.Repo.RepoLink, "settings/hooks"), @@ -76,7 +76,7 @@ func getOwnerRepoCtx(ctx *context.Context) (*ownerRepoCtx, error) { }, nil } - if is, ok := ctx.Data["IsOrganizationWebhook"]; ok && is.(bool) { + if ctx.Data["PageIsOrgSettings"] == true { return &ownerRepoCtx{ OwnerID: ctx.ContextUser.ID, Link: path.Join(ctx.Org.OrgLink, "settings/hooks"), @@ -85,7 +85,7 @@ func getOwnerRepoCtx(ctx *context.Context) (*ownerRepoCtx, error) { }, nil } - if is, ok := ctx.Data["IsUserWebhook"]; ok && is.(bool) { + if ctx.Data["PageIsUserSettings"] == true { return &ownerRepoCtx{ OwnerID: ctx.Doer.ID, Link: path.Join(setting.AppSubURL, "/user/settings/hooks"), @@ -94,7 +94,7 @@ func getOwnerRepoCtx(ctx *context.Context) (*ownerRepoCtx, error) { }, nil } - if ctx.Doer.IsAdmin { + if ctx.Data["PageIsAdmin"] == true { return &ownerRepoCtx{ IsAdmin: true, IsSystemWebhook: ctx.Params(":configType") == "system-hooks", diff --git a/routers/web/web.go b/routers/web/web.go index 65e35ecb9af57..a4ef96ecbe0f1 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -95,6 +95,14 @@ func buildAuthGroup() *auth_service.Group { return group } +func ctxDataSet(args ...any) func(ctx *context.Context) { + return func(ctx *context.Context) { + for i := 0; i < len(args); i += 2 { + ctx.Data[args[i].(string)] = args[i+1] + } + } +} + // Routes returns all web routes func Routes(ctx gocontext.Context) *web.Route { routes := web.NewRoute() @@ -465,9 +473,7 @@ func registerRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", user_setting.RedirectToDefaultSetting) addSettingsSecretsRoutes() - }, actions.MustEnableActions, func(ctx *context.Context) { - ctx.Data["IsUserSettings"] = true - }) + }, actions.MustEnableActions) m.Get("/organization", user_setting.Organization) m.Get("/repos", user_setting.Repos) @@ -482,14 +488,8 @@ func registerRoutes(m *web.Route) { m.Post("/replay/{uuid}", repo.ReplayWebhook) }) addWebhookEditRoutes() - }, webhooksEnabled, func(ctx *context.Context) { - ctx.Data["IsUserWebhook"] = true - }) - }, reqSignIn, func(ctx *context.Context) { - ctx.Data["PageIsUserSettings"] = true - ctx.Data["AllThemes"] = setting.UI.Themes - ctx.Data["EnablePackages"] = setting.Packages.Enabled - }) + }, webhooksEnabled) + }, reqSignIn, ctxDataSet("PageIsUserSettings", true, "AllThemes", setting.UI.Themes, "EnablePackages", setting.Packages.Enabled)) m.Group("/user", func() { // r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) @@ -617,13 +617,8 @@ func registerRoutes(m *web.Route) { m.Group("/actions", func() { m.Get("", admin.RedirectToDefaultSetting) addSettingsRunnersRoutes() - }, actions.MustEnableActions, func(ctx *context.Context) { - ctx.Data["IsAdminSettings"] = true }) - }, func(ctx *context.Context) { - ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable - ctx.Data["EnablePackages"] = setting.Packages.Enabled - }, adminReq) + }, adminReq, ctxDataSet("EnableOAuth2", setting.OAuth2.Enable, "EnablePackages", setting.Packages.Enabled)) // ***** END: Admin ***** m.Group("", func() { @@ -747,9 +742,7 @@ func registerRoutes(m *web.Route) { m.Post("/replay/{uuid}", repo.ReplayWebhook) }) addWebhookEditRoutes() - }, webhooksEnabled, func(ctx *context.Context) { - ctx.Data["IsOrganizationWebhook"] = true - }) + }, webhooksEnabled) m.Group("/labels", func() { m.Get("", org.RetrieveLabels, org.Labels) @@ -763,9 +756,7 @@ func registerRoutes(m *web.Route) { m.Get("", org_setting.RedirectToDefaultSetting) addSettingsRunnersRoutes() addSettingsSecretsRoutes() - }, actions.MustEnableActions, func(ctx *context.Context) { - ctx.Data["IsOrgSettings"] = true - }) + }, actions.MustEnableActions) m.RouteMethods("/delete", "GET,POST", org.SettingsDelete) @@ -787,10 +778,7 @@ func registerRoutes(m *web.Route) { m.Post("/rebuild", org.RebuildCargoIndex) }) }, packagesEnabled) - }, func(ctx *context.Context) { - ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable - ctx.Data["EnablePackages"] = setting.Packages.Enabled - }) + }, ctxDataSet("EnableOAuth2", setting.OAuth2.Enable, "EnablePackages", setting.Packages.Enabled, "PageIsOrgSettings", true)) }, context.OrgAssignment(true, true)) }, reqSignIn) // ***** END: Organization ***** @@ -924,9 +912,7 @@ func registerRoutes(m *web.Route) { m.Post("/replay/{uuid}", repo.ReplayWebhook) }) addWebhookEditRoutes() - }, webhooksEnabled, func(ctx *context.Context) { - ctx.Data["IsRepositoryWebhook"] = true - }) + }, webhooksEnabled) m.Group("/keys", func() { m.Combo("").Get(repo.DeployKeys). @@ -951,13 +937,8 @@ func registerRoutes(m *web.Route) { m.Get("", repo_setting.RedirectToDefaultSetting) addSettingsRunnersRoutes() addSettingsSecretsRoutes() - }, actions.MustEnableActions, func(ctx *context.Context) { - ctx.Data["IsRepoSettings"] = true - }) - }, func(ctx *context.Context) { - ctx.Data["PageIsSettings"] = true - ctx.Data["LFSStartServer"] = setting.LFS.StartServer - }) + }, actions.MustEnableActions) + }, ctxDataSet("PageIsRepoSettings", true, "LFSStartServer", setting.LFS.StartServer)) }, reqSignIn, context.RepoAssignment, context.UnitTypes(), reqRepoAdmin, context.RepoRef()) m.Post("/{username}/{reponame}/action/{action}", reqSignIn, context.RepoAssignment, context.UnitTypes(), repo.Action) @@ -1108,9 +1089,8 @@ func registerRoutes(m *web.Route) { m.Get("", repo.TagsList) m.Get(".rss", feedEnabled, repo.TagsListFeedRSS) m.Get(".atom", feedEnabled, repo.TagsListFeedAtom) - }, func(ctx *context.Context) { - ctx.Data["EnableFeed"] = setting.Other.EnableFeed - }, repo.MustBeNotEmpty, reqRepoCodeReader, context.RepoRefByType(context.RepoRefTag, true)) + }, ctxDataSet("EnableFeed", setting.Other.EnableFeed), + repo.MustBeNotEmpty, reqRepoCodeReader, context.RepoRefByType(context.RepoRefTag, true)) m.Post("/tags/delete", repo.DeleteTag, reqSignIn, repo.MustBeNotEmpty, context.RepoMustNotBeArchived(), reqRepoCodeWriter, context.RepoRef()) }, reqSignIn, context.RepoAssignment, context.UnitTypes()) @@ -1123,9 +1103,8 @@ func registerRoutes(m *web.Route) { m.Get("/latest", repo.LatestRelease) m.Get(".rss", feedEnabled, repo.ReleasesFeedRSS) m.Get(".atom", feedEnabled, repo.ReleasesFeedAtom) - }, func(ctx *context.Context) { - ctx.Data["EnableFeed"] = setting.Other.EnableFeed - }, repo.MustBeNotEmpty, reqRepoReleaseReader, context.RepoRefByType(context.RepoRefTag, true)) + }, ctxDataSet("EnableFeed", setting.Other.EnableFeed), + repo.MustBeNotEmpty, reqRepoReleaseReader, context.RepoRefByType(context.RepoRefTag, true)) m.Get("/releases/attachments/{uuid}", repo.GetAttachment, repo.MustBeNotEmpty, reqRepoReleaseReader) m.Group("/releases", func() { m.Get("/new", repo.NewRelease) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index b67fe955ab515..4f6ca4ccd3868 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -38,7 +38,7 @@
{{.locale.Tr "actions.actions"}}
- + {{.locale.Tr "actions.runners"}}
diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 34c60cecb7cd4..dd65cbe19553f 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -26,10 +26,10 @@
{{.locale.Tr "actions.actions"}}
- + {{.locale.Tr "actions.runners"}} - + {{.locale.Tr "secrets.secrets"}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 8a6833f499316..9b3b2ce7948f9 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -237,7 +237,7 @@ {{if .Permission.IsAdmin}}
- + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
@@ -246,7 +246,7 @@ {{else if .Permission.IsAdmin}}
- + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}}
diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 3156d9b159fc8..4a88d69adf5d2 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -13,7 +13,7 @@
  • {{.locale.Tr "repo.settings.githooks"}}
    • {{end}}
  • {{.locale.Tr "repo.settings.deploy_keys"}}
    • -
  • {{.locale.Tr "secrets.secrets"}}
    • +
  • {{.locale.Tr "secrets.secrets"}}
    • diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 6cbfa3171eff8..80e6364db9e96 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -37,10 +37,10 @@
    {{.locale.Tr "actions.actions"}}
    - + {{.locale.Tr "actions.runners"}} - + {{.locale.Tr "secrets.secrets"}}
    diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 08a98f9d91ac2..1e10a2f8c031c 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -23,7 +23,7 @@
    {{.locale.Tr "actions.actions"}}
    - + {{.locale.Tr "secrets.secrets"}}
    From 961d7bc7a145d71413e3f2a4f385e3935c887b0c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 22:50:32 +0800 Subject: [PATCH 47/49] remove unnecessary PageIsAdmin --- routers/web/admin/admin.go | 5 ----- routers/web/admin/applications.go | 5 ----- routers/web/admin/auths.go | 5 ----- routers/web/admin/config.go | 1 - routers/web/admin/emails.go | 1 - routers/web/admin/notice.go | 1 - routers/web/admin/orgs.go | 1 - routers/web/admin/packages.go | 1 - routers/web/admin/repos.go | 2 -- routers/web/admin/users.go | 5 ----- services/auth/middleware.go | 1 - 11 files changed, 28 deletions(-) diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index 9847a6d9236f6..35c387c28bd89 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -113,7 +113,6 @@ func updateSystemStatus() { // Dashboard show admin panel dashboard func Dashboard(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.dashboard") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminDashboard"] = true ctx.Data["Stats"] = activities_model.GetStatistic() ctx.Data["NeedUpdate"] = updatechecker.GetNeedUpdate() @@ -129,7 +128,6 @@ func Dashboard(ctx *context.Context) { func DashboardPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.AdminDashboardForm) ctx.Data["Title"] = ctx.Tr("admin.dashboard") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminDashboard"] = true ctx.Data["Stats"] = activities_model.GetStatistic() updateSystemStatus() @@ -155,7 +153,6 @@ func DashboardPost(ctx *context.Context) { // Monitor show admin monitor page func Monitor(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.monitor") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminMonitor"] = true ctx.Data["Processes"], ctx.Data["ProcessCount"] = process.GetManager().Processes(false, true) ctx.Data["Entries"] = cron.ListTasks() @@ -167,7 +164,6 @@ func Monitor(ctx *context.Context) { // GoroutineStacktrace show admin monitor goroutines page func GoroutineStacktrace(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.monitor") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminMonitor"] = true processStacks, processCount, goroutineCount, err := process.GetManager().ProcessStacktraces(false, false) @@ -202,7 +198,6 @@ func Queue(ctx *context.Context) { return } ctx.Data["Title"] = ctx.Tr("admin.monitor.queue", mq.Name) - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminMonitor"] = true ctx.Data["Queue"] = mq ctx.HTML(http.StatusOK, tplQueue) diff --git a/routers/web/admin/applications.go b/routers/web/admin/applications.go index 745d17ff2a442..7b27524340374 100644 --- a/routers/web/admin/applications.go +++ b/routers/web/admin/applications.go @@ -31,7 +31,6 @@ func newOAuth2CommonHandlers() *user_setting.OAuth2CommonHandlers { // Applications render org applications page (for org, at the moment, there are only OAuth2 applications) func Applications(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("settings.applications") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminApplications"] = true apps, err := auth.GetOAuth2ApplicationsByUserID(ctx, 0) @@ -47,7 +46,6 @@ func Applications(ctx *context.Context) { // ApplicationsPost response for adding an oauth2 application func ApplicationsPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("settings.applications") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminApplications"] = true oa := newOAuth2CommonHandlers() @@ -56,7 +54,6 @@ func ApplicationsPost(ctx *context.Context) { // EditApplication displays the given application func EditApplication(ctx *context.Context) { - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminApplications"] = true oa := newOAuth2CommonHandlers() @@ -66,7 +63,6 @@ func EditApplication(ctx *context.Context) { // EditApplicationPost response for editing oauth2 application func EditApplicationPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("settings.applications") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminApplications"] = true oa := newOAuth2CommonHandlers() @@ -76,7 +72,6 @@ func EditApplicationPost(ctx *context.Context) { // ApplicationsRegenerateSecret handles the post request for regenerating the secret func ApplicationsRegenerateSecret(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("settings") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminApplications"] = true oa := newOAuth2CommonHandlers() diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 6ebd23b7bbd59..b6ea3ff40300a 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -45,7 +45,6 @@ var ( // Authentications show authentication config page func Authentications(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.authentication") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true var err error @@ -89,7 +88,6 @@ var ( // NewAuthSource render adding a new auth source page func NewAuthSource(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.auths.new") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true ctx.Data["type"] = auth.LDAP.Int() @@ -237,7 +235,6 @@ func parseSSPIConfig(ctx *context.Context, form forms.AuthenticationForm) (*sspi func NewAuthSourcePost(ctx *context.Context) { form := *web.GetForm(ctx).(*forms.AuthenticationForm) ctx.Data["Title"] = ctx.Tr("admin.auths.new") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true ctx.Data["CurrentTypeName"] = auth.Type(form.Type).String() @@ -333,7 +330,6 @@ func NewAuthSourcePost(ctx *context.Context) { // EditAuthSource render editing auth source page func EditAuthSource(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.auths.edit") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true ctx.Data["SecurityProtocols"] = securityProtocols @@ -369,7 +365,6 @@ func EditAuthSource(ctx *context.Context) { func EditAuthSourcePost(ctx *context.Context) { form := *web.GetForm(ctx).(*forms.AuthenticationForm) ctx.Data["Title"] = ctx.Tr("admin.auths.edit") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true ctx.Data["SMTPAuths"] = smtp.Authenticators diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 48815dcff8ed5..7460ea24a7456 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -100,7 +100,6 @@ func shadowPassword(provider, cfgItem string) string { // Config show admin config page func Config(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.config") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminConfig"] = true systemSettings, err := system_model.GetAllSettings(ctx) diff --git a/routers/web/admin/emails.go b/routers/web/admin/emails.go index c16158c6ae47f..4618a78c3a7c8 100644 --- a/routers/web/admin/emails.go +++ b/routers/web/admin/emails.go @@ -24,7 +24,6 @@ const ( // Emails show all emails func Emails(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.emails") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminEmails"] = true opts := &user_model.SearchEmailOptions{ diff --git a/routers/web/admin/notice.go b/routers/web/admin/notice.go index f60cf90b3c74a..9e4588dd7579c 100644 --- a/routers/web/admin/notice.go +++ b/routers/web/admin/notice.go @@ -22,7 +22,6 @@ const ( // Notices show notices for admin func Notices(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.notices") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminNotices"] = true total := system_model.CountNotices() diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go index a4eb0af58d0c8..6a3617d67f9bc 100644 --- a/routers/web/admin/orgs.go +++ b/routers/web/admin/orgs.go @@ -21,7 +21,6 @@ const ( // Organizations show all the organizations func Organizations(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.organizations") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminOrganizations"] = true explore.RenderUserSearch(ctx, &user_model.SearchUserOptions{ diff --git a/routers/web/admin/packages.go b/routers/web/admin/packages.go index 88fb47ca01791..4d5987e780b6f 100644 --- a/routers/web/admin/packages.go +++ b/routers/web/admin/packages.go @@ -64,7 +64,6 @@ func Packages(ctx *context.Context) { } ctx.Data["Title"] = ctx.Tr("packages.title") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminPackages"] = true ctx.Data["Query"] = query ctx.Data["PackageType"] = packageType diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index 53b609af966ba..b22546f74994a 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -29,7 +29,6 @@ const ( // Repos show all the repositories func Repos(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.repositories") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRepositories"] = true explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{ @@ -67,7 +66,6 @@ func DeleteRepo(ctx *context.Context) { // UnadoptedRepos lists the unadopted repositories func UnadoptedRepos(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.repositories") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminRepositories"] = true opts := db.ListOptions{ diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 531f14d08627e..2150bc42f7baf 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -37,7 +37,6 @@ const ( // Users show all the users func Users(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.users") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true extraParamStrings := map[string]string{} @@ -80,7 +79,6 @@ func Users(ctx *context.Context) { // NewUser render adding a new user page func NewUser(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.users.new_account") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() @@ -102,7 +100,6 @@ func NewUser(ctx *context.Context) { func NewUserPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.AdminCreateUserForm) ctx.Data["Title"] = ctx.Tr("admin.users.new_account") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() @@ -253,7 +250,6 @@ func prepareUserInfo(ctx *context.Context) *user_model.User { // EditUser show editing user page func EditUser(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.users.edit_account") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DisableRegularOrgCreation"] = setting.Admin.DisableRegularOrgCreation ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations @@ -271,7 +267,6 @@ func EditUser(ctx *context.Context) { func EditUserPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.AdminEditUserForm) ctx.Data["Title"] = ctx.Tr("admin.users.edit_account") - ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() diff --git a/services/auth/middleware.go b/services/auth/middleware.go index b96810f17f6d1..abeafed9cb46f 100644 --- a/services/auth/middleware.go +++ b/services/auth/middleware.go @@ -236,7 +236,6 @@ func VerifyAuthWithOptionsAPI(options *VerifyOptions) func(ctx *context.APIConte }) return } - ctx.Data["PageIsAdmin"] = true } } } From ddd066138aa293b64ca77929be1129ae67d7eead Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 22:53:47 +0800 Subject: [PATCH 48/49] remove g-settings-submenu --- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- web_src/css/base.css | 13 +------------ 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 4f6ca4ccd3868..e8aa3fd123e8e 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -37,7 +37,7 @@ {{if .EnableActions}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "actions.runners"}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index dd65cbe19553f..fa7f1630d6624 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{if .EnableActions}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "actions.runners"}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 80e6364db9e96..bee77c9ec97d0 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -36,7 +36,7 @@ {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "actions.runners"}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 1e10a2f8c031c..0191f94c38f05 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -22,7 +22,7 @@ {{if .EnableActions}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "secrets.secrets"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 2172fc5a42b83..dc7942e8a2770 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -793,15 +793,6 @@ a.label, user-select: auto; } -.ui.vertical.menu .item .menu.g-settings-submenu .item { - color: var(--color-text-light-2); - text-indent: 16px; -} - -.ui.vertical.menu .item .menu.g-settings-submenu .item:hover { - color: var(--color-text-light-1); -} - .ui.menu .item > .svg { margin-right: 0.35em; } @@ -830,9 +821,7 @@ a.label, background: var(--color-active); } -.ui.menu a.item:active, -.ui.vertical.menu .item .menu.g-settings-submenu .active.item, -.ui.vertical.menu .item .menu.g-settings-submenu .active.item:hover { +.ui.menu a.item:active { color: var(--color-text); background: none; } From d0d2e463fd0b6621f383649f3455830b2cfc6dc8 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 23:23:58 +0800 Subject: [PATCH 49/49] sub menu of vertical menu --- templates/admin/navbar.tmpl | 2 +- templates/org/settings/navbar.tmpl | 2 +- templates/repo/settings/navbar.tmpl | 2 +- templates/user/settings/navbar.tmpl | 2 +- web_src/css/base.css | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index e8aa3fd123e8e..51a93bacd7b63 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -37,7 +37,7 @@ {{if .EnableActions}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "actions.runners"}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index fa7f1630d6624..fcce43f914a21 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -25,7 +25,7 @@ {{if .EnableActions}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "actions.runners"}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index bee77c9ec97d0..b1beda7c944c1 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -36,7 +36,7 @@ {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "actions.runners"}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 0191f94c38f05..b79308419bfc6 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -22,7 +22,7 @@ {{if .EnableActions}}
    {{.locale.Tr "actions.actions"}} -
    +
    {{.locale.Tr "secrets.secrets"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index dc7942e8a2770..c7ea0e47c8f21 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -830,6 +830,21 @@ a.label, color: var(--color-text-light-3); } +/* sub menu of vertical menu */ +.ui.vertical.menu .item .menu .item { + color: var(--color-text-light-2); + text-indent: 16px; +} + +.ui.vertical.menu .item .menu .item:hover, +.ui.vertical.menu .item .menu a.item:hover { + color: var(--color-text-light-1); +} + +.ui.vertical.menu .item .menu .active.item { + color: var(--color-text); +} + /* slightly more contrast for filters on issue list */ .ui.ui.menu .dropdown.item.disabled { color: var(--color-text-light-2);