From ce3b71a87f98f06c41e2afee32ee034edc6a0cfa Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 13:50:02 +0800 Subject: [PATCH 01/25] add actors dropdown --- models/actions/run_list.go | 8 +++++++ options/locale/locale_en-US.ini | 4 ++++ routers/web/repo/actions/actions.go | 30 +++++++++++++++++++++++++-- templates/repo/actions/list.tmpl | 27 ++++++++++++++++++++++-- templates/repo/actions/runs_list.tmpl | 5 +++++ 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 56de8eb9169cf..e81d72c2194ac 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -25,6 +25,14 @@ func (runs RunList) GetUserIDs() []int64 { return ids.Values() } +// GetActors returns a slice of Actors +func (runs RunList) GetActors(ctx context.Context) (map[int64]*user_model.User, error) { + actorIDs := runs.GetUserIDs() + actors := make(map[int64]*user_model.User, len(actorIDs)) + err := db.GetEngine(ctx).In("id", actorIDs).Find(&actors) + return actors, err +} + func (runs RunList) GetRepoIDs() []int64 { ids := make(container.Set[int64], len(runs)) for _, run := range runs { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 25456d0493426..f93aecf8f248e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3457,6 +3457,10 @@ runs.commit = Commit runs.pushed_by = Pushed by runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s runs.no_matching_runner_helper = No matching runner: %s +runs.actor = Actor +runs.actors_no_select = All actors +runs.no_results = No results matched. +runs.no_runs = The workflow has no runs yet. need_approval_desc = Need approval to run workflows for fork pull request. diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 10acb468542ea..8a4ef322217b8 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -5,6 +5,7 @@ package actions import ( "bytes" + "fmt" "net/http" actions_model "code.gitea.io/gitea/models/actions" @@ -125,8 +126,12 @@ func List(ctx *context.Context) { } workflow := ctx.FormString("workflow") + actorID := ctx.FormInt64("actor") ctx.Data["CurWorkflow"] = workflow - + ctx.Data["CurActor"] = actorID + if actorID > 0 { + ctx.Data["IsFiltered"] = true + } opts := actions_model.FindRunOptions{ ListOptions: db.ListOptions{ Page: page, @@ -134,6 +139,7 @@ func List(ctx *context.Context) { }, RepoID: ctx.Repo.Repository.ID, WorkflowFileName: workflow, + TriggerUserID: actorID, } runs, total, err := actions_model.FindRuns(ctx, opts) @@ -151,11 +157,31 @@ func List(ctx *context.Context) { return } - ctx.Data["Runs"] = runs + allRunsOpts := actions_model.FindRunOptions{ + ListOptions: db.ListOptions{ + ListAll: true, + }, + RepoID: ctx.Repo.Repository.ID, + } + allRuns, _, err := actions_model.FindRuns(ctx, allRunsOpts) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + actors, err := allRuns.GetActors(ctx) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.Data["Runs"] = runs + ctx.Data["Actors"] = actors pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) pager.AddParamString("workflow", workflow) + pager.AddParamString("actor", fmt.Sprint(actorID)) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplListActions) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index ca97b67faaa07..36147e2b4d7b9 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -5,10 +5,10 @@
- {{.locale.Tr "actions.runs.all_workflows"}} + {{.locale.Tr "actions.runs.all_workflows"}}
{{range .workflows}} - {{.Entry.Name}} + {{.Entry.Name}} {{if .ErrMsg}} {{svg "octicon-alert" 16 "text red"}} @@ -19,6 +19,29 @@
+
+ +
+ + {{.locale.Tr "actions.runs.actor"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ + {{.locale.Tr "actions.runs.actors_no_select"}} + + {{range .Actors}} + + {{avatar $.Context . 20}} {{.GetDisplayName}} + + {{end}} +
+
+
{{template "repo/actions/runs_list" .}}
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 5f444f31f910b..5ba27f1817502 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,4 +1,9 @@
+ {{if and (eq (len .Runs) 0) $.IsFiltered }} +
{{.locale.Tr "actions.runs.no_results"}}
+ {{else if eq (len .Runs) 0}} +
{{.locale.Tr "actions.runs.no_runs"}}
+ {{end}} {{range .Runs}}
  • From 5b6e7f2fbf7b0f21129834c90c47164dec1af9f5 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 14:02:42 +0800 Subject: [PATCH 02/25] update --- routers/web/repo/actions/actions.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 8a4ef322217b8..3f511b0f3ab68 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -157,6 +157,8 @@ func List(ctx *context.Context) { return } + ctx.Data["Runs"] = runs + allRunsOpts := actions_model.FindRunOptions{ ListOptions: db.ListOptions{ ListAll: true, @@ -175,9 +177,8 @@ func List(ctx *context.Context) { ctx.Error(http.StatusInternalServerError, err.Error()) return } - - ctx.Data["Runs"] = runs ctx.Data["Actors"] = actors + pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) pager.AddParamString("workflow", workflow) From 2fe81fd5c54b05104bec033162380cd34d915e48 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 16:00:55 +0800 Subject: [PATCH 03/25] add status dropdown --- models/actions/run_list.go | 26 ++++++++++++++++++++++++ options/locale/locale_en-US.ini | 2 ++ routers/web/repo/actions/actions.go | 8 +++++++- templates/repo/actions/list.tmpl | 31 ++++++++++++++++++++++++----- 4 files changed, 61 insertions(+), 6 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index e81d72c2194ac..c6a523534ef90 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -41,6 +41,28 @@ func (runs RunList) GetRepoIDs() []int64 { return ids.Values() } +type StatusInfo struct { + Status int + DisplayedStatus string +} + +// GetStatuses returns a slice of statuses +func (runs RunList) GetStatuses(ctx context.Context) []StatusInfo { + statuses := make(container.Set[int], len(runs)) + statusInfos := make([]StatusInfo, 0, len(runs)) + for _, run := range runs { + if statuses.Contains(int(run.Status)) { + continue + } + statuses.Add(int(run.Status)) + statusInfos = append(statusInfos, StatusInfo{ + Status: int(run.Status), + DisplayedStatus: run.Status.String(), + }) + } + return statusInfos +} + func (runs RunList) LoadTriggerUser(ctx context.Context) error { userIDs := runs.GetUserIDs() users := make(map[int64]*user_model.User, len(userIDs)) @@ -79,6 +101,7 @@ type FindRunOptions struct { WorkflowFileName string TriggerUserID int64 Approved bool // not util.OptionalBool, it works only when it's true + Status Status } func (opts FindRunOptions) toConds() builder.Cond { @@ -98,6 +121,9 @@ func (opts FindRunOptions) toConds() builder.Cond { if opts.Approved { cond = cond.And(builder.Gt{"approved_by": 0}) } + if opts.Status > StatusUnknown { + cond = cond.And(builder.Eq{"status": opts.Status}) + } return cond } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f93aecf8f248e..5f6c9a09b1d9c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3458,7 +3458,9 @@ runs.pushed_by = Pushed by runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s runs.no_matching_runner_helper = No matching runner: %s runs.actor = Actor +runs.status = Status runs.actors_no_select = All actors +runs.status_no_select = All status runs.no_results = No results matched. runs.no_runs = The workflow has no runs yet. diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 3f511b0f3ab68..bdefc3126af74 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -127,9 +127,11 @@ func List(ctx *context.Context) { workflow := ctx.FormString("workflow") actorID := ctx.FormInt64("actor") + status := ctx.FormInt("status") ctx.Data["CurWorkflow"] = workflow ctx.Data["CurActor"] = actorID - if actorID > 0 { + ctx.Data["CurStatus"] = status + if actorID > 0 || status > int(actions_model.StatusUnknown) { ctx.Data["IsFiltered"] = true } opts := actions_model.FindRunOptions{ @@ -140,6 +142,7 @@ func List(ctx *context.Context) { RepoID: ctx.Repo.Repository.ID, WorkflowFileName: workflow, TriggerUserID: actorID, + Status: actions_model.Status(status), } runs, total, err := actions_model.FindRuns(ctx, opts) @@ -178,11 +181,14 @@ func List(ctx *context.Context) { return } ctx.Data["Actors"] = actors + statusInfos := allRuns.GetStatuses(ctx) + ctx.Data["StatusInfos"] = statusInfos pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) pager.AddParamString("workflow", workflow) pager.AddParamString("actor", fmt.Sprint(actorID)) + pager.AddParamString("status", fmt.Sprint(status)) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplListActions) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 36147e2b4d7b9..809d53e6632c4 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -5,10 +5,10 @@
    - {{.locale.Tr "actions.runs.all_workflows"}} + {{.locale.Tr "actions.runs.all_workflows"}}
    {{range .workflows}} - {{.Entry.Name}} + {{.Entry.Name}} {{if .ErrMsg}} {{svg "octicon-alert" 16 "text red"}} @@ -19,7 +19,7 @@
    -
    +
    @@ -31,16 +31,37 @@ {{svg "octicon-search" 16}}
    -     + {{.locale.Tr "actions.runs.actors_no_select"}} {{range .Actors}} - + {{avatar $.Context . 20}} {{.GetDisplayName}} {{end}}
    + +
    + + {{.locale.Tr "actions.runs.status"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
    +
    + {{svg "octicon-search" 16}} + +
    + + {{.locale.Tr "actions.runs.status_no_select"}} + + {{range .StatusInfos}} + + {{.DisplayedStatus}} + + {{end}} +
    +
    {{template "repo/actions/runs_list" .}}
    From 15b0681e5fdffa3d71975f68d4e87a0259ffde9b Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 16:05:25 +0800 Subject: [PATCH 04/25] rename --- models/actions/run_list.go | 4 ++-- routers/web/repo/actions/actions.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index c6a523534ef90..5b0f0b37a459c 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -46,8 +46,8 @@ type StatusInfo struct { DisplayedStatus string } -// GetStatuses returns a slice of statuses -func (runs RunList) GetStatuses(ctx context.Context) []StatusInfo { +// GetStatusInfos returns a slice of StatusInfo +func (runs RunList) GetStatusInfos(ctx context.Context) []StatusInfo { statuses := make(container.Set[int], len(runs)) statusInfos := make([]StatusInfo, 0, len(runs)) for _, run := range runs { diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index bdefc3126af74..6d31a6b65481e 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -181,7 +181,7 @@ func List(ctx *context.Context) { return } ctx.Data["Actors"] = actors - statusInfos := allRuns.GetStatuses(ctx) + statusInfos := allRuns.GetStatusInfos(ctx) ctx.Data["StatusInfos"] = statusInfos pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) From 5e71a9ce8bbc7fcb6086afa5ac9a21b9ee8e9dfe Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 16:25:49 +0800 Subject: [PATCH 05/25] update styles --- templates/repo/actions/list.tmpl | 4 ++-- templates/repo/actions/runs_list.tmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 809d53e6632c4..ed0da28c48783 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -19,9 +19,9 @@
    • -
    +
    -
    +
    {{.locale.Tr "actions.runs.actor"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 5ba27f1817502..9cb169af03315 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,8 +1,8 @@
    {{if and (eq (len .Runs) 0) $.IsFiltered }} -
    {{.locale.Tr "actions.runs.no_results"}}
    +
    {{.locale.Tr "actions.runs.no_results"}}
    {{else if eq (len .Runs) 0}} -
    {{.locale.Tr "actions.runs.no_runs"}}
    +
    {{.locale.Tr "actions.runs.no_runs"}}
    {{end}} {{range .Runs}}
  • From df63901fd197bc6124239a675dcd11e896ecd006 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 16:55:35 +0800 Subject: [PATCH 06/25] comment --- routers/web/repo/actions/actions.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 6d31a6b65481e..17a8999282493 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -162,6 +162,7 @@ func List(ctx *context.Context) { ctx.Data["Runs"] = runs + // Get all runs under the repo to get all actors and statuses allRunsOpts := actions_model.FindRunOptions{ ListOptions: db.ListOptions{ ListAll: true, @@ -181,6 +182,7 @@ func List(ctx *context.Context) { return } ctx.Data["Actors"] = actors + statusInfos := allRuns.GetStatusInfos(ctx) ctx.Data["StatusInfos"] = statusInfos From 397822947077312c3096d81f0ec9613f365f7651 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 17:56:55 +0800 Subject: [PATCH 07/25] adjust styles --- routers/web/repo/actions/actions.go | 1 + templates/repo/actions/list.tmpl | 2 +- templates/repo/actions/runs_list.tmpl | 9 +++++---- web_src/css/repo.css | 7 +++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 17a8999282493..2b139151b8a4c 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -134,6 +134,7 @@ func List(ctx *context.Context) { if actorID > 0 || status > int(actions_model.StatusUnknown) { ctx.Data["IsFiltered"] = true } + opts := actions_model.FindRunOptions{ ListOptions: db.ListOptions{ Page: page, diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index ed0da28c48783..3683d826b5222 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
    +
    {{template "repo/header" .}}
    diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 9cb169af03315..bde4ecd175e43 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,8 +1,9 @@
    - {{if and (eq (len .Runs) 0) $.IsFiltered }} -
    {{.locale.Tr "actions.runs.no_results"}}
    - {{else if eq (len .Runs) 0}} -
    {{.locale.Tr "actions.runs.no_runs"}}
    + {{if eq (len .Runs) 0 }} +
    + {{svg "octicon-no-entry" 32}} +

    {{if $.IsFiltered}}{{.locale.Tr "actions.runs.no_results"}}{{else}}{{.locale.Tr "actions.runs.no_runs"}}{{end}}

    +
    {{end}} {{range .Runs}}
  • diff --git a/web_src/css/repo.css b/web_src/css/repo.css index c476fab1b59d8..15f9352681157 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1876,12 +1876,15 @@ flex: 1 } -.repository.packages .empty { + +.repository.packages .empty, +.repository.actions .empty { padding-top: 70px; padding-bottom: 100px; } -.repository.packages .empty .svg { +.repository.packages .empty .svg, +.repository.actions .empty .svg { height: 48px; } From a63641291e00b713c8fdf1c298ac84e0e4f2db9d Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 7 Jun 2023 18:33:21 +0800 Subject: [PATCH 08/25] fix --- templates/repo/actions/runs_list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index bde4ecd175e43..1b527f7e8c2c6 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,5 +1,5 @@
    - {{if eq (len .Runs) 0 }} + {{if eq (len .Runs) 0}}
    {{svg "octicon-no-entry" 32}}

    {{if $.IsFiltered}}{{.locale.Tr "actions.runs.no_results"}}{{else}}{{.locale.Tr "actions.runs.no_runs"}}{{end}}

    From c2fe4b10a7f626d2f4dabf8ab03ebcd57d1ece60 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 8 Jun 2023 18:24:44 +0800 Subject: [PATCH 09/25] modify status --- models/actions/run_list.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 5b0f0b37a459c..10da8193e494a 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -48,16 +48,11 @@ type StatusInfo struct { // GetStatusInfos returns a slice of StatusInfo func (runs RunList) GetStatusInfos(ctx context.Context) []StatusInfo { - statuses := make(container.Set[int], len(runs)) - statusInfos := make([]StatusInfo, 0, len(runs)) - for _, run := range runs { - if statuses.Contains(int(run.Status)) { - continue - } - statuses.Add(int(run.Status)) + statusInfos := make([]StatusInfo, 0, 7) + for s := StatusSuccess; s <= StatusBlocked; s++ { statusInfos = append(statusInfos, StatusInfo{ - Status: int(run.Status), - DisplayedStatus: run.Status.String(), + Status: int(s), + DisplayedStatus: s.String(), }) } return statusInfos From 423fc6290b2f5a264c1eb28b573993b03bad6fd1 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 8 Jun 2023 18:29:25 +0800 Subject: [PATCH 10/25] modify --- models/actions/run_list.go | 17 ----------------- routers/web/repo/actions/actions.go | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 10da8193e494a..5898a39bcd5ef 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -41,23 +41,6 @@ func (runs RunList) GetRepoIDs() []int64 { return ids.Values() } -type StatusInfo struct { - Status int - DisplayedStatus string -} - -// GetStatusInfos returns a slice of StatusInfo -func (runs RunList) GetStatusInfos(ctx context.Context) []StatusInfo { - statusInfos := make([]StatusInfo, 0, 7) - for s := StatusSuccess; s <= StatusBlocked; s++ { - statusInfos = append(statusInfos, StatusInfo{ - Status: int(s), - DisplayedStatus: s.String(), - }) - } - return statusInfos -} - func (runs RunList) LoadTriggerUser(ctx context.Context) error { userIDs := runs.GetUserIDs() users := make(map[int64]*user_model.User, len(userIDs)) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 2b139151b8a4c..1fb602c9317d5 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -52,6 +52,23 @@ func MustEnableActions(ctx *context.Context) { } } +type StatusInfo struct { + Status int + DisplayedStatus string +} + +// getStatusInfos returns a slice of StatusInfo +func getStatusInfos(ctx *context.Context) []StatusInfo { + statusInfos := make([]StatusInfo, 0, 7) + for s := actions_model.StatusSuccess; s <= actions_model.StatusBlocked; s++ { + statusInfos = append(statusInfos, StatusInfo{ + Status: int(s), + DisplayedStatus: s.String(), + }) + } + return statusInfos +} + func List(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsActions"] = true @@ -184,8 +201,7 @@ func List(ctx *context.Context) { } ctx.Data["Actors"] = actors - statusInfos := allRuns.GetStatusInfos(ctx) - ctx.Data["StatusInfos"] = statusInfos + ctx.Data["StatusInfos"] = getStatusInfos(ctx) pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) From 3c0a2c7df049ef3e79e13c1c9ba2d792ac8f1608 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 09:35:38 +0800 Subject: [PATCH 11/25] update available status --- routers/web/repo/actions/actions.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 1fb602c9317d5..d8aa4812ac2d1 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -59,8 +59,10 @@ type StatusInfo struct { // getStatusInfos returns a slice of StatusInfo func getStatusInfos(ctx *context.Context) []StatusInfo { - statusInfos := make([]StatusInfo, 0, 7) - for s := actions_model.StatusSuccess; s <= actions_model.StatusBlocked; s++ { + // same as those in aggregateJobStatus + allStatus := []actions_model.Status{actions_model.StatusSuccess, actions_model.StatusFailure, actions_model.StatusWaiting, actions_model.StatusRunning} + statusInfos := make([]StatusInfo, 0, 4) + for _, s := range allStatus { statusInfos = append(statusInfos, StatusInfo{ Status: int(s), DisplayedStatus: s.String(), From 9a0c12fe0bf412454ff4c9d3a879f9302b7e2951 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 10:18:01 +0800 Subject: [PATCH 12/25] use join --- models/actions/run_list.go | 18 ++++++++++-------- routers/web/repo/actions/actions.go | 16 +--------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 5898a39bcd5ef..12d762eb4ed56 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -25,14 +25,6 @@ func (runs RunList) GetUserIDs() []int64 { return ids.Values() } -// GetActors returns a slice of Actors -func (runs RunList) GetActors(ctx context.Context) (map[int64]*user_model.User, error) { - actorIDs := runs.GetUserIDs() - actors := make(map[int64]*user_model.User, len(actorIDs)) - err := db.GetEngine(ctx).In("id", actorIDs).Find(&actors) - return actors, err -} - func (runs RunList) GetRepoIDs() []int64 { ids := make(container.Set[int64], len(runs)) for _, run := range runs { @@ -118,3 +110,13 @@ func FindRuns(ctx context.Context, opts FindRunOptions) (RunList, int64, error) func CountRuns(ctx context.Context, opts FindRunOptions) (int64, error) { return db.GetEngine(ctx).Where(opts.toConds()).Count(new(ActionRun)) } + +// GetActors returns a slice of Actors +func GetActors(ctx context.Context) (map[int64]*user_model.User, error) { + actors := make(map[int64]*user_model.User, 10) + err := db.GetEngine(ctx). + Table("user"). + Join("INNER", "action_run", "`action_run`.trigger_user_id = `user`.id"). + Find(&actors) + return actors, err +} diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index d8aa4812ac2d1..3369635b63160 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -182,21 +182,7 @@ func List(ctx *context.Context) { ctx.Data["Runs"] = runs - // Get all runs under the repo to get all actors and statuses - allRunsOpts := actions_model.FindRunOptions{ - ListOptions: db.ListOptions{ - ListAll: true, - }, - RepoID: ctx.Repo.Repository.ID, - } - - allRuns, _, err := actions_model.FindRuns(ctx, allRunsOpts) - if err != nil { - ctx.Error(http.StatusInternalServerError, err.Error()) - return - } - - actors, err := allRuns.GetActors(ctx) + actors, err := actions_model.GetActors(ctx) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return From f5f206eec2ade2a96c64ca310a077654d267d1b2 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 10:23:19 +0800 Subject: [PATCH 13/25] move funx --- models/actions/run_list.go | 19 +++++++++++++++++++ routers/web/repo/actions/actions.go | 21 +-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 12d762eb4ed56..51aeadf45b807 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -111,6 +111,25 @@ func CountRuns(ctx context.Context, opts FindRunOptions) (int64, error) { return db.GetEngine(ctx).Where(opts.toConds()).Count(new(ActionRun)) } +type StatusInfo struct { + Status int + DisplayedStatus string +} + +// GetStatusInfos returns a slice of StatusInfo +func GetStatusInfos(ctx context.Context) []StatusInfo { + // same as those in aggregateJobStatus + allStatus := []Status{StatusSuccess, StatusFailure, StatusWaiting, StatusRunning} + statusInfos := make([]StatusInfo, 0, 4) + for _, s := range allStatus { + statusInfos = append(statusInfos, StatusInfo{ + Status: int(s), + DisplayedStatus: s.String(), + }) + } + return statusInfos +} + // GetActors returns a slice of Actors func GetActors(ctx context.Context) (map[int64]*user_model.User, error) { actors := make(map[int64]*user_model.User, 10) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 3369635b63160..61c2ee070d72b 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -52,25 +52,6 @@ func MustEnableActions(ctx *context.Context) { } } -type StatusInfo struct { - Status int - DisplayedStatus string -} - -// getStatusInfos returns a slice of StatusInfo -func getStatusInfos(ctx *context.Context) []StatusInfo { - // same as those in aggregateJobStatus - allStatus := []actions_model.Status{actions_model.StatusSuccess, actions_model.StatusFailure, actions_model.StatusWaiting, actions_model.StatusRunning} - statusInfos := make([]StatusInfo, 0, 4) - for _, s := range allStatus { - statusInfos = append(statusInfos, StatusInfo{ - Status: int(s), - DisplayedStatus: s.String(), - }) - } - return statusInfos -} - func List(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("actions.actions") ctx.Data["PageIsActions"] = true @@ -189,7 +170,7 @@ func List(ctx *context.Context) { } ctx.Data["Actors"] = actors - ctx.Data["StatusInfos"] = getStatusInfos(ctx) + ctx.Data["StatusInfos"] = actions_model.GetStatusInfos(ctx) pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) From 7825f9b1f8891aaa2733225eda6bd52696fc3d1b Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 11:31:44 +0800 Subject: [PATCH 14/25] update --- models/actions/run_list.go | 4 +++- routers/web/repo/actions/actions.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 51aeadf45b807..2da8c3ca5f67d 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -131,11 +131,13 @@ func GetStatusInfos(ctx context.Context) []StatusInfo { } // GetActors returns a slice of Actors -func GetActors(ctx context.Context) (map[int64]*user_model.User, error) { +func GetActors(ctx context.Context, repoID int64) (map[int64]*user_model.User, error) { actors := make(map[int64]*user_model.User, 10) err := db.GetEngine(ctx). Table("user"). Join("INNER", "action_run", "`action_run`.trigger_user_id = `user`.id"). + And("`action_run`.repo_id = ?", repoID). + OrderBy("`user`.name ASC"). Find(&actors) return actors, err } diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 61c2ee070d72b..1554efd2ab4ab 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -163,7 +163,7 @@ func List(ctx *context.Context) { ctx.Data["Runs"] = runs - actors, err := actions_model.GetActors(ctx) + actors, err := actions_model.GetActors(ctx, ctx.Repo.Repository.ID) if err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return From 2ce76db796c878d805a7cc2e5b90edd68308d474 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 13:43:11 +0800 Subject: [PATCH 15/25] update builder --- models/actions/run_list.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 2da8c3ca5f67d..24eac3b287a0e 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -131,13 +131,13 @@ func GetStatusInfos(ctx context.Context) []StatusInfo { } // GetActors returns a slice of Actors -func GetActors(ctx context.Context, repoID int64) (map[int64]*user_model.User, error) { - actors := make(map[int64]*user_model.User, 10) - err := db.GetEngine(ctx). - Table("user"). - Join("INNER", "action_run", "`action_run`.trigger_user_id = `user`.id"). - And("`action_run`.repo_id = ?", repoID). - OrderBy("`user`.name ASC"). +func GetActors(ctx context.Context, repoID int64) ([]*user_model.User, error) { + actors := make([]*user_model.User, 0, 10) + + return actors, db.GetEngine(ctx).Where(builder.In("id", builder.Select("`user`.id").From("`user`"). + Join("INNER", "`action_run`", "`action_run`.trigger_user_id = `user`.id"). + And(builder.Eq{"`action_run`.repo_id": repoID}))). + Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). + OrderBy(user_model.GetOrderByName()). Find(&actors) - return actors, err } From 1a17a7a04951419b04e95d5d2ec86a6b69509a8a Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 14:18:32 +0800 Subject: [PATCH 16/25] make self on top --- routers/web/repo/actions/actions.go | 3 ++- routers/web/repo/helper.go | 2 +- routers/web/repo/helper_test.go | 6 +++--- routers/web/repo/issue.go | 6 +++--- routers/web/repo/pull.go | 2 +- routers/web/repo/release.go | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 1554efd2ab4ab..aa275380f6b67 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/web/repo" "code.gitea.io/gitea/services/convert" "github.com/nektos/act/pkg/model" @@ -168,7 +169,7 @@ func List(ctx *context.Context) { ctx.Error(http.StatusInternalServerError, err.Error()) return } - ctx.Data["Actors"] = actors + ctx.Data["Actors"] = repo.MakeSelfOnTop(ctx, actors) ctx.Data["StatusInfos"] = actions_model.GetStatusInfos(ctx) diff --git a/routers/web/repo/helper.go b/routers/web/repo/helper.go index 6f9ca4874b002..fb5ada1bdb476 100644 --- a/routers/web/repo/helper.go +++ b/routers/web/repo/helper.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/modules/context" ) -func makeSelfOnTop(ctx *context.Context, users []*user.User) []*user.User { +func MakeSelfOnTop(ctx *context.Context, users []*user.User) []*user.User { if ctx.Doer != nil { sort.Slice(users, func(i, j int) bool { if users[i].ID == users[j].ID { diff --git a/routers/web/repo/helper_test.go b/routers/web/repo/helper_test.go index e9ab44fe69f95..226e2e81f4dde 100644 --- a/routers/web/repo/helper_test.go +++ b/routers/web/repo/helper_test.go @@ -13,15 +13,15 @@ import ( ) func TestMakeSelfOnTop(t *testing.T) { - users := makeSelfOnTop(&context.Context{}, []*user.User{{ID: 2}, {ID: 1}}) + users := MakeSelfOnTop(&context.Context{}, []*user.User{{ID: 2}, {ID: 1}}) assert.Len(t, users, 2) assert.EqualValues(t, 2, users[0].ID) - users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 1}}, []*user.User{{ID: 2}, {ID: 1}}) + users = MakeSelfOnTop(&context.Context{Doer: &user.User{ID: 1}}, []*user.User{{ID: 2}, {ID: 1}}) assert.Len(t, users, 2) assert.EqualValues(t, 1, users[0].ID) - users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 2}}, []*user.User{{ID: 2}, {ID: 1}}) + users = MakeSelfOnTop(&context.Context{Doer: &user.User{ID: 2}}, []*user.User{{ID: 2}, {ID: 1}}) assert.Len(t, users, 2) assert.EqualValues(t, 2, users[0].ID) } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 9f087edc72d5f..d8b815b6e3757 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -312,7 +312,7 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti ctx.ServerError("GetRepoAssignees", err) return } - ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) + ctx.Data["Assignees"] = MakeSelfOnTop(ctx, assigneeUsers) handleTeamMentions(ctx) if ctx.Written() { @@ -508,7 +508,7 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R ctx.ServerError("GetRepoAssignees", err) return } - ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) + ctx.Data["Assignees"] = MakeSelfOnTop(ctx, assigneeUsers) handleTeamMentions(ctx) } @@ -3475,7 +3475,7 @@ func IssuePosters(ctx *context.Context) { } } - posters = makeSelfOnTop(ctx, posters) + posters = MakeSelfOnTop(ctx, posters) resp := &userSearchResponse{} resp.Results = make([]*userSearchInfo, len(posters)) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 09dbc23eac2cc..5af916b5378ec 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -810,7 +810,7 @@ func ViewPullFiles(ctx *context.Context) { ctx.ServerError("GetRepoAssignees", err) return } - ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) + ctx.Data["Assignees"] = MakeSelfOnTop(ctx, assigneeUsers) handleTeamMentions(ctx) if ctx.Written() { diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index afba1f18bfe69..5fddddb344080 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -349,7 +349,7 @@ func NewRelease(ctx *context.Context) { ctx.ServerError("GetRepoAssignees", err) return } - ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) + ctx.Data["Assignees"] = MakeSelfOnTop(ctx, assigneeUsers) upload.AddUploadContext(ctx, "release") ctx.HTML(http.StatusOK, tplReleaseNew) @@ -517,7 +517,7 @@ func EditRelease(ctx *context.Context) { ctx.ServerError("GetRepoAssignees", err) return } - ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers) + ctx.Data["Assignees"] = MakeSelfOnTop(ctx, assigneeUsers) ctx.HTML(http.StatusOK, tplReleaseNew) } From ac5313539a8b92f102878e8134f76a2aef73e8d8 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 14:22:29 +0800 Subject: [PATCH 17/25] rename --- models/actions/run_list.go | 10 +++++----- routers/web/repo/actions/actions.go | 2 +- templates/repo/actions/list.tmpl | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index 24eac3b287a0e..b34624cb9fc54 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -116,18 +116,18 @@ type StatusInfo struct { DisplayedStatus string } -// GetStatusInfos returns a slice of StatusInfo -func GetStatusInfos(ctx context.Context) []StatusInfo { +// GetStatusInfoList returns a slice of StatusInfo +func GetStatusInfoList(ctx context.Context) []StatusInfo { // same as those in aggregateJobStatus allStatus := []Status{StatusSuccess, StatusFailure, StatusWaiting, StatusRunning} - statusInfos := make([]StatusInfo, 0, 4) + statusInfoList := make([]StatusInfo, 0, 4) for _, s := range allStatus { - statusInfos = append(statusInfos, StatusInfo{ + statusInfoList = append(statusInfoList, StatusInfo{ Status: int(s), DisplayedStatus: s.String(), }) } - return statusInfos + return statusInfoList } // GetActors returns a slice of Actors diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index aa275380f6b67..54d4135e6fbd0 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -171,7 +171,7 @@ func List(ctx *context.Context) { } ctx.Data["Actors"] = repo.MakeSelfOnTop(ctx, actors) - ctx.Data["StatusInfos"] = actions_model.GetStatusInfos(ctx) + ctx.Data["StatusInfoList"] = actions_model.GetStatusInfoList(ctx) pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 3683d826b5222..76cbbd1ab8554 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -42,7 +42,7 @@
    -
    +
    {{.locale.Tr "actions.runs.status"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -55,7 +55,7 @@ {{.locale.Tr "actions.runs.status_no_select"}} - {{range .StatusInfos}} + {{range .StatusInfoList}} {{.DisplayedStatus}} From 9aad8e8b4ef8486f816c8684eefe7808b6832e38 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 9 Jun 2023 14:31:50 +0800 Subject: [PATCH 18/25] remove disable for status --- templates/repo/actions/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 76cbbd1ab8554..0249ed0141f7a 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -42,7 +42,7 @@
    -
    +
    {{.locale.Tr "actions.runs.status"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} From 8bb267abf162709d1412c8595f2731726b57acdc Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 12 Jun 2023 11:29:18 +0800 Subject: [PATCH 19/25] add comment and cur to all href --- routers/web/repo/actions/actions.go | 2 ++ templates/repo/actions/list.tmpl | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index 54d4135e6fbd0..e1e07b5a72966 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -130,6 +130,8 @@ func List(ctx *context.Context) { actorID := ctx.FormInt64("actor") status := ctx.FormInt("status") ctx.Data["CurWorkflow"] = workflow + // if status or actor query param is not given to frontend href, (href="//actions") + // they will be 0 by default, which indicates get all status or actors ctx.Data["CurActor"] = actorID ctx.Data["CurStatus"] = status if actorID > 0 || status > int(actions_model.StatusUnknown) { diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 0249ed0141f7a..e36b558a03311 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -5,7 +5,7 @@
    - {{.locale.Tr "actions.runs.all_workflows"}} + {{.locale.Tr "actions.runs.all_workflows"}}
    {{range .workflows}} {{.Entry.Name}} @@ -31,7 +31,7 @@ {{svg "octicon-search" 16}}
    - + {{.locale.Tr "actions.runs.actors_no_select"}} {{range .Actors}} @@ -52,7 +52,7 @@ {{svg "octicon-search" 16}}
    - + {{.locale.Tr "actions.runs.status_no_select"}} {{range .StatusInfoList}} From a0408692d787ebd2bed6e2eaa960420bc2de5e0f Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 14 Jun 2023 14:52:24 +0800 Subject: [PATCH 20/25] fix --- templates/package/shared/list.tmpl | 2 +- templates/repo/actions/list.tmpl | 22 +++++++++------------- templates/repo/actions/runs_list.tmpl | 2 +- web_src/css/repo.css | 5 ----- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 707fbe357fbb8..5ac5baf0f1224 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -38,7 +38,7 @@ {{else}} {{if not .HasPackages}}
    - {{svg "octicon-package" 32}} + {{svg "octicon-package" 48}}

    {{.locale.Tr "packages.empty"}}

    {{if and .Repository .CanWritePackages}} {{$packagesUrl := URLJoin .Owner.HomeLink "-" "packages"}} diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index e36b558a03311..e5f1aa09cf513 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -5,7 +5,7 @@
    - {{.locale.Tr "actions.runs.all_workflows"}} + {{.locale.Tr "actions.runs.all_workflows"}}
    {{range .workflows}} {{.Entry.Name}} @@ -22,16 +22,14 @@
    - - {{.locale.Tr "actions.runs.actor"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - + {{.locale.Tr "actions.runs.actor"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{svg "octicon-search" 16}} + {{svg "octicon-search" 16}}
    -     + {{.locale.Tr "actions.runs.actors_no_select"}} {{range .Actors}} @@ -43,16 +41,14 @@
    - - {{.locale.Tr "actions.runs.status"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - + {{.locale.Tr "actions.runs.status"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{svg "octicon-search" 16}} + {{svg "octicon-search" 16}}
    - + {{.locale.Tr "actions.runs.status_no_select"}} {{range .StatusInfoList}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 1b527f7e8c2c6..bfd5aabe55b3a 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,7 +1,7 @@
    {{if eq (len .Runs) 0}}
    - {{svg "octicon-no-entry" 32}} + {{svg "octicon-no-entry" 48}}

    {{if $.IsFiltered}}{{.locale.Tr "actions.runs.no_results"}}{{else}}{{.locale.Tr "actions.runs.no_runs"}}{{end}}

    {{end}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 15f9352681157..8eb1065946e33 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1883,11 +1883,6 @@ padding-bottom: 100px; } -.repository.packages .empty .svg, -.repository.actions .empty .svg { - height: 48px; -} - .repository.packages .file-size { white-space: nowrap; } From 082fb495f2aa2462bb60ccc4b849e4a4230dcadd Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 14 Jun 2023 18:33:15 +0200 Subject: [PATCH 21/25] Update templates/repo/actions/list.tmpl --- templates/repo/actions/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index e5f1aa09cf513..7dd2f534f64b2 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -21,7 +21,7 @@
    -
    +
    {{.locale.Tr "actions.runs.actor"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    From 75e46169dfc194436f2eab146cc16b8bd4a2edcb Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 14 Jun 2023 18:34:09 +0200 Subject: [PATCH 22/25] Update templates/repo/actions/list.tmpl --- templates/repo/actions/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 7dd2f534f64b2..a9b6329435755 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -26,7 +26,7 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{svg "octicon-search" 16}} + {{svg "octicon-search"}}
    From 04791cd57afd8a134b90089e8ce6c0f79707f11b Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 14 Jun 2023 18:34:34 +0200 Subject: [PATCH 23/25] Update templates/repo/actions/list.tmpl --- templates/repo/actions/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index a9b6329435755..46cbb3467089b 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -45,7 +45,7 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
    - {{svg "octicon-search" 16}} + {{svg "octicon-search"}}
    From 592c8c3cf8b161ec2ab765b510f9f7ead46bc7d7 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 15 Jun 2023 10:50:21 +0800 Subject: [PATCH 24/25] update getactors --- models/actions/run_list.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/actions/run_list.go b/models/actions/run_list.go index b34624cb9fc54..29ab193d57f3e 100644 --- a/models/actions/run_list.go +++ b/models/actions/run_list.go @@ -134,9 +134,9 @@ func GetStatusInfoList(ctx context.Context) []StatusInfo { func GetActors(ctx context.Context, repoID int64) ([]*user_model.User, error) { actors := make([]*user_model.User, 0, 10) - return actors, db.GetEngine(ctx).Where(builder.In("id", builder.Select("`user`.id").From("`user`"). - Join("INNER", "`action_run`", "`action_run`.trigger_user_id = `user`.id"). - And(builder.Eq{"`action_run`.repo_id": repoID}))). + return actors, db.GetEngine(ctx).Where(builder.In("id", builder.Select("`action_run`.trigger_user_id").From("`action_run`"). + GroupBy("`action_run`.trigger_user_id"). + Where(builder.Eq{"`action_run`.repo_id": repoID}))). Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar"). OrderBy(user_model.GetOrderByName()). Find(&actors) From 002b59254ea371fb819c033a606947a4d592f456 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 19 Jun 2023 09:29:04 +0800 Subject: [PATCH 25/25] remove line --- web_src/css/repo.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 8eb1065946e33..b2174f3e58a89 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1876,7 +1876,6 @@ flex: 1 } - .repository.packages .empty, .repository.actions .empty { padding-top: 70px;