Don't filter action runs based on state (#24711)

We should just show all runs. This removes the filtering altogether.

- Replaces https://github.com/go-gitea/gitea/pull/24553

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/be4fb69a-ea84-44bb-9606-65a0626be721)

![image](https://github.com/go-gitea/gitea/assets/20454870/68942224-e519-43f1-87fe-f3cffef5879a)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/b3c3b200-ad44-4163-86ec-44a76362eae6)

---------

Signed-off-by: Yarden Shoham <git@yardenshoham.com>

diff --git a/models/actions/run_list.go b/models/actions/run_list.go
index 18790db525e5afb70e5a9d95fef6aa5294e90cdd..56de8eb9169cf095c9078fdd63887e5273d261fa 100644 (file)
--- 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 0385c28c4d8a86d6ece24c4b3cffe90c65cd9de8..906a32dc2d73da5029610c30b63b02c11ec7ea27 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3421,8 +3421,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 2e3a8976b09b78eb121e0b4c714ee296b6c4f090..87ff07d5ebf21f4aafe1818ef7f6e113e1cd890d 100644 (file)
--- 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"
@@ -138,37 +137,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())
@@ -189,7 +157,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 2885aa0fbfc926452771a18a785d1811ab4758b9..ca97b67faaa073eafef10968c8f71780522eba5a 100644 (file)
--- 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 (file)
index 6874115..0000000
--- 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 caa14b339051c81130a616cabfc13b2a30ce00d1..fdef2e6446c4fb24fb84b96adbb82faa18df59ec 100644 (file)
--- 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">