From aba1c03fee56e655faec28cc8d41c8cc02a34a60 Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Fri, 6 Jan 2023 16:29:10 +0800
Subject: [PATCH] feat: improve listing runs

---
 models/actions/run.go                     | 10 ++++++++
 models/actions/task.go                    | 31 +++--------------------
 options/locale/locale_en-US.ini           |  2 +-
 templates/repo/actions/runs_list.tmpl     |  2 +-
 templates/shared/actions/runner_edit.tmpl | 12 ++++-----
 5 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/models/actions/run.go b/models/actions/run.go
index d51bba65ec..1925a6493a 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -51,9 +51,19 @@ func init() {
 }
 
 func (run *ActionRun) HTMLURL() string {
+	if run.Repo == nil {
+		return ""
+	}
 	return fmt.Sprintf("%s/actions/runs/%d", run.Repo.HTMLURL(), run.Index)
 }
 
+func (run *ActionRun) Link() string {
+	if run.Repo == nil {
+		return ""
+	}
+	return fmt.Sprintf("%s/actions/runs/%d", run.Repo.Link(), run.Index)
+}
+
 // LoadAttributes load Repo TriggerUser if not loaded
 func (run *ActionRun) LoadAttributes(ctx context.Context) error {
 	if run == nil {
diff --git a/models/actions/task.go b/models/actions/task.go
index 7253d8796b..19d728f5f4 100644
--- a/models/actions/task.go
+++ b/models/actions/task.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"crypto/subtle"
 	"fmt"
-	"strconv"
 	"time"
 
 	auth_model "code.gitea.io/gitea/models/auth"
@@ -83,40 +82,18 @@ func (task *ActionTask) IsStopped() bool {
 	return task.Stopped > 0
 }
 
-func (task *ActionTask) GetCommitSHA() string {
-	if task.Job == nil {
+func (task *ActionTask) GetRunLink() string {
+	if task.Job == nil || task.Job.Run == nil {
 		return ""
 	}
-	if task.Job.Run == nil {
-		return ""
-	}
-
-	return task.Job.Run.CommitSHA
-}
-
-func (task *ActionTask) GetCommitSHAShort() string {
-	commitSHA := task.GetCommitSHA()
-	if len(commitSHA) > 8 {
-		return commitSHA[:8]
-	}
-	return commitSHA
-}
-
-func (task *ActionTask) GetBuildViewLink() string {
-	if task.Job == nil || task.Job.Run == nil || task.Job.Run.Repo == nil {
-		return ""
-	}
-	return task.Job.Run.Repo.Link() + "/actions/runs/" + strconv.FormatInt(task.ID, 10)
+	return task.Job.Run.Link()
 }
 
 func (task *ActionTask) GetCommitLink() string {
 	if task.Job == nil || task.Job.Run == nil || task.Job.Run.Repo == nil {
 		return ""
 	}
-	if commitSHA := task.GetCommitSHA(); commitSHA != "" {
-		return task.Job.Run.Repo.CommitLink(commitSHA)
-	}
-	return ""
+	return task.Job.Run.Repo.CommitLink(task.CommitSHA)
 }
 
 func (task *ActionTask) GetRepoName() string {
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 0636ffc341..3d057840d4 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3264,7 +3264,7 @@ runners.custom_labels = Custom Labels
 runners.custom_labels_helper = Custom labels are labels that are added manually by an administrator. A comma separates labels, whitespace at the start and end of each label are ignored.
 runners.runner_title = Runner
 runners.task_list = Recent tasks on this runner
-runners.task_list.job = Job
+runners.task_list.run = Run
 runners.task_list.status = Status
 runners.task_list.repository = Repository
 runners.task_list.commit = Commit
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 9f40425e55..2e2e037de0 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -12,7 +12,7 @@
 				</div>
 				<div class="desc issue-item-bottom-row df ac fw my-1">
 					<b>{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}</b>: {{$.locale.Tr "actions.runs.commit"}}
-					<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{SubStr .CommitSHA 0 10}}</a>&nbsp; {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName | Escape}}
+					<a href="{{$.RepoLink}}/commit/{{.CommitSHA}}">{{ShortSha .CommitSHA}}</a>&nbsp; {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName | Escape}}
 				</div>
 			</div>
 			<div class="issue-item-right">
diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl
index 8cc119912c..df267d007e 100644
--- a/templates/shared/actions/runner_edit.tmpl
+++ b/templates/shared/actions/runner_edit.tmpl
@@ -59,7 +59,7 @@
 		<table class="ui very basic striped table unstackable">
 			<thead>
 				<tr>
-					<th>{{.locale.Tr "actions.runners.task_list.job"}}</th>
+					<th>{{.locale.Tr "actions.runners.task_list.run"}}</th>
 					<th>{{.locale.Tr "actions.runners.task_list.status"}}</th>
 					<th>{{.locale.Tr "actions.runners.task_list.repository"}}</th>
 					<th>{{.locale.Tr "actions.runners.task_list.commit"}}</th>
@@ -69,12 +69,12 @@
 			<tbody>
 				{{range .Tasks}}
 				<tr>
-					<td><a href="{{.GetBuildViewLink}}" target="_blank">{{template "shared/actions/runner_id" .ID}}</a></td>
+					<td><a href="{{.GetRunLink}}" target="_blank">{{template "shared/actions/runner_id" .ID}}</a></td>
 					<td><span class="ui label task-status-{{.Status.String}}">{{.Status.LocaleString $.locale}}</span></td>
-					<td>{{.GetRepoName}}</td>
-					<td><strong>
-							<a href="{{.GetCommitLink}}" target="_blank">{{.GetCommitSHAShort}}</a>
-						</strong> </td>
+					<td><a href="{{.GetRepoLink}}" target="_blank">{{.GetRepoName}}</a></td>
+					<td>
+						<strong><a href="{{.GetCommitLink}}" target="_blank">{{ShortSha .CommitSHA}}</a></strong>
+					</td>
 					<td>{{if .IsStopped}}
 						<span>{{TimeSinceUnix .Stopped $.locale}}</span>
 						{{else}}-{{end}}</td>