From 57404dcf8b2cdaa8f5ed49e8ed602f35bcba07d2 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sun, 14 May 2023 11:06:52 +0000
Subject: [PATCH 1/2] Don't filter action runs based on state
We should just show all runs by default. This removes the filtering altogether.
Signed-off-by: Yarden Shoham <git@yardenshoham.com>
---
models/actions/run_list.go | 10 --------
options/locale/locale_en-US.ini | 2 --
routers/web/repo/actions/actions.go | 33 ---------------------------
templates/repo/actions/list.tmpl | 5 ----
templates/repo/actions/openclose.tmpl | 10 --------
templates/repo/actions/runs_list.tmpl | 2 +-
6 files changed, 1 insertion(+), 61 deletions(-)
delete mode 100644 templates/repo/actions/openclose.tmpl
diff --git a/models/actions/run_list.go b/models/actions/run_list.go
index 18790db525e5a..56de8eb9169cf 100644
--- a/models/actions/run_list.go
+++ b/models/actions/run_list.go
@@ -10,7 +10,6 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/container"
- "code.gitea.io/gitea/modules/util"
"xorm.io/builder"
)
@@ -69,7 +68,6 @@ type FindRunOptions struct {
db.ListOptions
RepoID int64
OwnerID int64
- IsClosed util.OptionalBool
WorkflowFileName string
TriggerUserID int64
Approved bool // not util.OptionalBool, it works only when it's true
@@ -83,14 +81,6 @@ func (opts FindRunOptions) toConds() builder.Cond {
if opts.OwnerID > 0 {
cond = cond.And(builder.Eq{"owner_id": opts.OwnerID})
}
- if opts.IsClosed.IsFalse() {
- cond = cond.And(builder.Eq{"status": StatusWaiting}.Or(
- builder.Eq{"status": StatusRunning}))
- } else if opts.IsClosed.IsTrue() {
- cond = cond.And(
- builder.Neq{"status": StatusWaiting}.And(
- builder.Neq{"status": StatusRunning}))
- }
if opts.WorkflowFileName != "" {
cond = cond.And(builder.Eq{"workflow_id": opts.WorkflowFileName})
}
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 18b8bffe4a635..faedbc4ddc6fc 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3419,8 +3419,6 @@ runners.version = Version
runners.reset_registration_token_success = Runner registration token reset successfully
runs.all_workflows = All Workflows
-runs.open_tab = %d Open
-runs.closed_tab = %d Closed
runs.commit = Commit
runs.pushed_by = Pushed by
runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s
diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go
index 8a44e836c5045..a2f3c7af2488e 100644
--- a/routers/web/repo/actions/actions.go
+++ b/routers/web/repo/actions/actions.go
@@ -16,7 +16,6 @@ import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
- "code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/convert"
"github.com/nektos/act/pkg/model"
@@ -143,37 +142,6 @@ func List(ctx *context.Context) {
WorkflowFileName: workflow,
}
- // open counts
- opts.IsClosed = util.OptionalBoolFalse
- numOpenRuns, err := actions_model.CountRuns(ctx, opts)
- if err != nil {
- ctx.Error(http.StatusInternalServerError, err.Error())
- return
- }
- ctx.Data["NumOpenActionRuns"] = numOpenRuns
-
- // closed counts
- opts.IsClosed = util.OptionalBoolTrue
- numClosedRuns, err := actions_model.CountRuns(ctx, opts)
- if err != nil {
- ctx.Error(http.StatusInternalServerError, err.Error())
- return
- }
- ctx.Data["NumClosedActionRuns"] = numClosedRuns
-
- opts.IsClosed = util.OptionalBoolNone
- isShowClosed := ctx.FormString("state") == "closed"
- if len(ctx.FormString("state")) == 0 && numOpenRuns == 0 && numClosedRuns != 0 {
- isShowClosed = true
- }
-
- if isShowClosed {
- opts.IsClosed = util.OptionalBoolTrue
- ctx.Data["IsShowClosed"] = true
- } else {
- opts.IsClosed = util.OptionalBoolFalse
- }
-
runs, total, err := actions_model.FindRuns(ctx, opts)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
@@ -194,7 +162,6 @@ func List(ctx *context.Context) {
pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5)
pager.SetDefaultParams(ctx)
pager.AddParamString("workflow", workflow)
- pager.AddParamString("state", ctx.FormString("state"))
ctx.Data["Page"] = pager
ctx.HTML(http.StatusOK, tplListActions)
diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl
index 2885aa0fbfc92..ca97b67faaa07 100644
--- a/templates/repo/actions/list.tmpl
+++ b/templates/repo/actions/list.tmpl
@@ -19,11 +19,6 @@
</div>
</div>
<div class="twelve wide column content">
- <div class="ui stackable grid">
- <div class="six wide column">
- {{template "repo/actions/openclose" .}}
- </div>
- </div>
{{template "repo/actions/runs_list" .}}
</div>
</div>
diff --git a/templates/repo/actions/openclose.tmpl b/templates/repo/actions/openclose.tmpl
deleted file mode 100644
index 6874115a19ff9..0000000000000
--- a/templates/repo/actions/openclose.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="small-menu-items ui compact tiny menu">
- <a class="{{if not .IsShowClosed}}active {{end}}item" href="{{$.Link}}?workflow={{.CurWorkflow}}&state=open">
- {{svg "octicon-issue-opened" 16 "gt-mr-3"}}
- {{.locale.Tr "actions.runs.open_tab" $.NumOpenActionRuns}}
- </a>
- <a class="{{if .IsShowClosed}}active {{end}}item" href="{{$.Link}}?workflow={{.CurWorkflow}}&state=closed">
- {{svg "octicon-issue-closed" 16 "gt-mr-3"}}
- {{.locale.Tr "actions.runs.closed_tab" $.NumClosedActionRuns}}
- </a>
-</div>
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index caa14b339051c..fdef2e6446c4f 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -1,4 +1,4 @@
-<div class="issue list">
+<div class="issue list gt-m-0">
{{range .Runs}}
<li class="item gt-df gt-py-3 gt-ab">
<div class="issue-item-left gt-df gt-mr-2">
From 7cf22c1facbea713386e8c458780d6280aa549c4 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Sun, 14 May 2023 12:44:33 +0000
Subject: [PATCH 2/2] Rebuild