From d37bd75debd26aaace16d01f2a9f2fa6a03cb6bd Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 8 Dec 2024 11:31:44 -0800
Subject: [PATCH 1/6] Detect whether action view branch was deleted

---
 routers/web/repo/actions/view.go         | 11 +++++++++++
 web_src/js/components/RepoActionView.vue |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index 73c6e54fbf50a..9a40c8fa2984c 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -19,6 +19,7 @@ import (
 
 	actions_model "code.gitea.io/gitea/models/actions"
 	"code.gitea.io/gitea/models/db"
+	git_model "code.gitea.io/gitea/models/git"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -236,6 +237,16 @@ func ViewPost(ctx *context_module.Context) {
 		Name: run.PrettyRef(),
 		Link: run.RefLink(),
 	}
+	refName := git.RefName(run.Ref)
+	if refName.IsBranch() {
+		b, err := git_model.GetBranch(ctx, ctx.Repo.Repository.ID, refName.ShortName())
+		if err != nil && !git_model.IsErrBranchNotExist(err) {
+			log.Error("GetBranch: %v", err)
+		} else if git_model.IsErrBranchNotExist(err) || (b != nil && b.IsDeleted) {
+			branch.Link = "" // remove the link of branch if it doesn't exist'
+		}
+	}
+
 	resp.State.Run.Commit = ViewCommit{
 		ShortSha: base.ShortSha(run.CommitSHA),
 		Link:     fmt.Sprintf("%s/commit/%s", run.Repo.Link(), run.CommitSHA),
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index eecbf7ef55936..b813ba37b237e 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -409,7 +409,12 @@ export function initRepositoryActionView() {
           <a class="muted" :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
         </template>
         <span class="ui label tw-max-w-full" v-if="run.commit.shortSHA">
-          <a class="gt-ellipsis" :href="run.commit.branch.link">{{ run.commit.branch.name }}</a>
+          <template v-if="run.commit.branch.link">
+            <a class="gt-ellipsis" :href="run.commit.branch.link" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</a>
+          </template>
+          <template v-else>
+            <span class="gt-ellipsis tw-line-through" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</span>
+          </template>
         </span>
       </div>
     </div>

From 2b6a605aec4c83c1ff1e9dfb056edff54fd17381 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 9 Dec 2024 20:17:59 -0800
Subject: [PATCH 2/6] Don't remove the link but add isDeleted

---
 routers/web/repo/actions/view.go         | 7 ++++---
 web_src/js/components/RepoActionView.vue | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index 9a40c8fa2984c..b711038da065a 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -137,8 +137,9 @@ type ViewUser struct {
 }
 
 type ViewBranch struct {
-	Name string `json:"name"`
-	Link string `json:"link"`
+	Name      string `json:"name"`
+	Link      string `json:"link"`
+	IsDeleted bool   `json:"isDeleted"`
 }
 
 type ViewJobStep struct {
@@ -243,7 +244,7 @@ func ViewPost(ctx *context_module.Context) {
 		if err != nil && !git_model.IsErrBranchNotExist(err) {
 			log.Error("GetBranch: %v", err)
 		} else if git_model.IsErrBranchNotExist(err) || (b != nil && b.IsDeleted) {
-			branch.Link = "" // remove the link of branch if it doesn't exist'
+			branch.IsDeleted = true
 		}
 	}
 
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index b813ba37b237e..c67122603b938 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -409,11 +409,11 @@ export function initRepositoryActionView() {
           <a class="muted" :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
         </template>
         <span class="ui label tw-max-w-full" v-if="run.commit.shortSHA">
-          <template v-if="run.commit.branch.link">
-            <a class="gt-ellipsis" :href="run.commit.branch.link" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</a>
+          <template v-if="run.commit.branch.isDeleted">
+            <span class="gt-ellipsis tw-line-through" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</span>
           </template>
           <template v-else>
-            <span class="gt-ellipsis tw-line-through" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</span>
+            <a class="gt-ellipsis" :href="run.commit.branch.link" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</a>
           </template>
         </span>
       </div>

From 890863fe36138c17784530e3a7315944a95651e2 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 9 Dec 2024 21:35:49 -0800
Subject: [PATCH 3/6] Add deleted mark for branches in action list

---
 models/actions/run.go                 |  1 +
 routers/web/repo/actions/actions.go   | 41 +++++++++++++++++++++++++++
 templates/repo/actions/runs_list.tmpl |  8 ++++--
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/models/actions/run.go b/models/actions/run.go
index 732fb48bb9a61..f40bc1eb3db1a 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -37,6 +37,7 @@ type ActionRun struct {
 	TriggerUser       *user_model.User       `xorm:"-"`
 	ScheduleID        int64
 	Ref               string `xorm:"index"` // the commit/tag/… that caused the run
+	IsRefDeleted      bool   `xorm:"-"`
 	CommitSHA         string
 	IsForkPullRequest bool                         // If this is triggered by a PR from a forked repository or an untrusted user, we need to check if it is approved and limit permissions when running the workflow.
 	NeedApproval      bool                         // may need approval if it's a fork pull request
diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go
index ad16b9fb4e4d5..3a318513d4436 100644
--- a/routers/web/repo/actions/actions.go
+++ b/routers/web/repo/actions/actions.go
@@ -245,6 +245,11 @@ func List(ctx *context.Context) {
 		return
 	}
 
+	if err := loadIsRefDeleted(ctx, runs); err != nil {
+		ctx.ServerError("LoadIsRefDeleted", err)
+		return
+	}
+
 	ctx.Data["Runs"] = runs
 
 	actors, err := actions_model.GetActors(ctx, ctx.Repo.Repository.ID)
@@ -267,6 +272,42 @@ func List(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplListActions)
 }
 
+// loadIsRefDeleted loads the IsRefDeleted field for each run in the list.
+// TODO: move this function to models/actions/run_list.go but now it will result in a circular import.
+func loadIsRefDeleted(ctx *context.Context, runs actions_model.RunList) error {
+	branchRuns := make(map[string][]*actions_model.ActionRun)
+	branches := make(container.Set[string], len(runs))
+	for _, run := range runs {
+		refName := git.RefName(run.Ref)
+		if refName.IsBranch() {
+			branchName := refName.ShortName()
+			branchRuns[branchName] = append(branchRuns[branchName], run)
+			branches.Add(branchName)
+		}
+	}
+	if len(branches) == 0 {
+		return nil
+	}
+	var branchInfos []*git_model.Branch
+	if err := db.GetEngine(ctx).Where("repo_id = ?", ctx.Repo.Repository.ID).
+		In("name", branches.Values()).Find(&branchInfos); err != nil {
+		return err
+	}
+	for branch, branchRun := range branchRuns {
+		exist := false
+		for _, branchInfo := range branchInfos {
+			if branchInfo.Name == branch {
+				exist = !branchInfo.IsDeleted
+				break
+			}
+		}
+		for _, br := range branchRun {
+			br.IsRefDeleted = !exist
+		}
+	}
+	return nil
+}
+
 type WorkflowDispatchInput struct {
 	Name        string   `yaml:"name"`
 	Description string   `yaml:"description"`
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 5537e9e617215..aa8984198bda2 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -28,9 +28,13 @@
 			</div>
 			<div class="flex-item-trailing">
 				{{if .RefLink}}
-					<a class="ui label run-list-ref gt-ellipsis" href="{{.RefLink}}">{{.PrettyRef}}</a>
+					{{if .IsRefDeleted}}
+						<span class="ui label run-list-ref gt-ellipsis tw-line-through" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</span>
+					{{else}}
+						<a class="ui label run-list-ref gt-ellipsis" href="{{.RefLink}}" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</a>
+					{{end}}
 				{{else}}
-					<span class="ui label run-list-ref gt-ellipsis">{{.PrettyRef}}</span>
+					<span class="ui label run-list-ref gt-ellipsis" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</span>
 				{{end}}
 				<div class="run-list-item-right">
 					<div class="run-list-meta">{{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}</div>

From affe773c148d65cf0a41391946a8aa68e9798cc5 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 9 Dec 2024 22:25:46 -0800
Subject: [PATCH 4/6] Make the code simpler

---
 models/git/branch.go                |  7 +++++++
 routers/web/repo/actions/actions.go | 18 ++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/models/git/branch.go b/models/git/branch.go
index ba1ada5517dc0..0fbf23c3d90a5 100644
--- a/models/git/branch.go
+++ b/models/git/branch.go
@@ -174,6 +174,13 @@ func GetBranches(ctx context.Context, repoID int64, branchNames []string) ([]*Br
 	return branches, db.GetEngine(ctx).Where("repo_id=?", repoID).In("name", branchNames).Find(&branches)
 }
 
+func GetExistBranches(ctx context.Context, repoID int64, branchNames []string) ([]*Branch, error) {
+	branches := make([]*Branch, 0, len(branchNames))
+	return branches, db.GetEngine(ctx).Where("repo_id=?", repoID).
+		And("is_deleted=?", false).
+		In("name", branchNames).Find(&branches)
+}
+
 func AddBranches(ctx context.Context, branches []*Branch) error {
 	for _, branch := range branches {
 		if _, err := db.GetEngine(ctx).Insert(branch); err != nil {
diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go
index 3a318513d4436..3d4f3c81fd7fe 100644
--- a/routers/web/repo/actions/actions.go
+++ b/routers/web/repo/actions/actions.go
@@ -281,6 +281,7 @@ func loadIsRefDeleted(ctx *context.Context, runs actions_model.RunList) error {
 		refName := git.RefName(run.Ref)
 		if refName.IsBranch() {
 			branchName := refName.ShortName()
+			run.IsRefDeleted = true // assume it's deleted then if it's found in the database it's not deleted
 			branchRuns[branchName] = append(branchRuns[branchName], run)
 			branches.Add(branchName)
 		}
@@ -288,21 +289,14 @@ func loadIsRefDeleted(ctx *context.Context, runs actions_model.RunList) error {
 	if len(branches) == 0 {
 		return nil
 	}
-	var branchInfos []*git_model.Branch
-	if err := db.GetEngine(ctx).Where("repo_id = ?", ctx.Repo.Repository.ID).
-		In("name", branches.Values()).Find(&branchInfos); err != nil {
+	branchInfos, err := git_model.GetExistBranches(ctx, ctx.Repo.Repository.ID, branches.Values())
+	if err != nil {
 		return err
 	}
-	for branch, branchRun := range branchRuns {
-		exist := false
-		for _, branchInfo := range branchInfos {
-			if branchInfo.Name == branch {
-				exist = !branchInfo.IsDeleted
-				break
-			}
-		}
+	for _, branchInfo := range branchInfos {
+		branchRun := branchRuns[branchInfo.Name]
 		for _, br := range branchRun {
-			br.IsRefDeleted = !exist
+			br.IsRefDeleted = false
 		}
 	}
 	return nil

From 3a0676099d4035fb79cc604517e39110ab01a7c4 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 10 Dec 2024 09:55:28 -0800
Subject: [PATCH 5/6] Don't return 500 even if load isdelete failed

---
 routers/web/repo/actions/actions.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go
index 3d4f3c81fd7fe..df685f5209ace 100644
--- a/routers/web/repo/actions/actions.go
+++ b/routers/web/repo/actions/actions.go
@@ -246,8 +246,7 @@ func List(ctx *context.Context) {
 	}
 
 	if err := loadIsRefDeleted(ctx, runs); err != nil {
-		ctx.ServerError("LoadIsRefDeleted", err)
-		return
+		log.Error("LoadIsRefDeleted", err)
 	}
 
 	ctx.Data["Runs"] = runs

From de6160a8aac5d5434fb4f484b733b292adf4a8ae Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 11 Dec 2024 11:06:49 -0800
Subject: [PATCH 6/6] Follow feedbacks

---
 models/git/branch.go                     | 21 ++++++++++++++-------
 routers/web/repo/actions/actions.go      | 18 ++++++++----------
 services/repository/branch.go            |  2 +-
 templates/repo/actions/runs_list.tmpl    | 10 +++-------
 web_src/js/components/RepoActionView.vue |  8 ++------
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/models/git/branch.go b/models/git/branch.go
index 0fbf23c3d90a5..e683ce47e657e 100644
--- a/models/git/branch.go
+++ b/models/git/branch.go
@@ -12,6 +12,7 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
@@ -169,16 +170,22 @@ func GetBranch(ctx context.Context, repoID int64, branchName string) (*Branch, e
 	return &branch, nil
 }
 
-func GetBranches(ctx context.Context, repoID int64, branchNames []string) ([]*Branch, error) {
+func GetBranches(ctx context.Context, repoID int64, branchNames []string, includeDeleted bool) ([]*Branch, error) {
 	branches := make([]*Branch, 0, len(branchNames))
-	return branches, db.GetEngine(ctx).Where("repo_id=?", repoID).In("name", branchNames).Find(&branches)
+
+	sess := db.GetEngine(ctx).Where("repo_id=?", repoID).In("name", branchNames)
+	if !includeDeleted {
+		sess.And("is_deleted=?", false)
+	}
+	return branches, sess.Find(&branches)
 }
 
-func GetExistBranches(ctx context.Context, repoID int64, branchNames []string) ([]*Branch, error) {
-	branches := make([]*Branch, 0, len(branchNames))
-	return branches, db.GetEngine(ctx).Where("repo_id=?", repoID).
-		And("is_deleted=?", false).
-		In("name", branchNames).Find(&branches)
+func BranchesToNamesSet(branches []*Branch) container.Set[string] {
+	names := make(container.Set[string], len(branches))
+	for _, branch := range branches {
+		names.Add(branch.Name)
+	}
+	return names
 }
 
 func AddBranches(ctx context.Context, branches []*Branch) error {
diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go
index df685f5209ace..7ed37ea26b2d1 100644
--- a/routers/web/repo/actions/actions.go
+++ b/routers/web/repo/actions/actions.go
@@ -274,28 +274,26 @@ func List(ctx *context.Context) {
 // loadIsRefDeleted loads the IsRefDeleted field for each run in the list.
 // TODO: move this function to models/actions/run_list.go but now it will result in a circular import.
 func loadIsRefDeleted(ctx *context.Context, runs actions_model.RunList) error {
-	branchRuns := make(map[string][]*actions_model.ActionRun)
 	branches := make(container.Set[string], len(runs))
 	for _, run := range runs {
 		refName := git.RefName(run.Ref)
 		if refName.IsBranch() {
-			branchName := refName.ShortName()
-			run.IsRefDeleted = true // assume it's deleted then if it's found in the database it's not deleted
-			branchRuns[branchName] = append(branchRuns[branchName], run)
-			branches.Add(branchName)
+			branches.Add(refName.ShortName())
 		}
 	}
 	if len(branches) == 0 {
 		return nil
 	}
-	branchInfos, err := git_model.GetExistBranches(ctx, ctx.Repo.Repository.ID, branches.Values())
+
+	branchInfos, err := git_model.GetBranches(ctx, ctx.Repo.Repository.ID, branches.Values(), false)
 	if err != nil {
 		return err
 	}
-	for _, branchInfo := range branchInfos {
-		branchRun := branchRuns[branchInfo.Name]
-		for _, br := range branchRun {
-			br.IsRefDeleted = false
+	branchSet := git_model.BranchesToNamesSet(branchInfos)
+	for _, run := range runs {
+		refName := git.RefName(run.Ref)
+		if refName.IsBranch() && !branchSet.Contains(run.Ref) {
+			run.IsRefDeleted = true
 		}
 	}
 	return nil
diff --git a/services/repository/branch.go b/services/repository/branch.go
index 508817c83e6c9..3a95aab264981 100644
--- a/services/repository/branch.go
+++ b/services/repository/branch.go
@@ -305,7 +305,7 @@ func SyncBranchesToDB(ctx context.Context, repoID, pusherID int64, branchNames,
 	}
 
 	return db.WithTx(ctx, func(ctx context.Context) error {
-		branches, err := git_model.GetBranches(ctx, repoID, branchNames)
+		branches, err := git_model.GetBranches(ctx, repoID, branchNames, true)
 		if err != nil {
 			return fmt.Errorf("git_model.GetBranches: %v", err)
 		}
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index aa8984198bda2..fa1adb3e3ba2e 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -27,14 +27,10 @@
 				</div>
 			</div>
 			<div class="flex-item-trailing">
-				{{if .RefLink}}
-					{{if .IsRefDeleted}}
-						<span class="ui label run-list-ref gt-ellipsis tw-line-through" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</span>
-					{{else}}
-						<a class="ui label run-list-ref gt-ellipsis" href="{{.RefLink}}" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</a>
-					{{end}}
+				{{if .IsRefDeleted}}
+					<span class="ui label run-list-ref gt-ellipsis tw-line-through" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</span>
 				{{else}}
-					<span class="ui label run-list-ref gt-ellipsis" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</span>
+					<a class="ui label run-list-ref gt-ellipsis" href="{{.RefLink}}" data-tooltip-content="{{.PrettyRef}}">{{.PrettyRef}}</a>
 				{{end}}
 				<div class="run-list-item-right">
 					<div class="run-list-meta">{{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}</div>
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index ff78b6d417eef..eece2efaf868f 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -429,12 +429,8 @@ export function initRepositoryActionView() {
           <a class="muted" :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
         </template>
         <span class="ui label tw-max-w-full" v-if="run.commit.shortSHA">
-          <template v-if="run.commit.branch.isDeleted">
-            <span class="gt-ellipsis tw-line-through" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</span>
-          </template>
-          <template v-else>
-            <a class="gt-ellipsis" :href="run.commit.branch.link" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</a>
-          </template>
+          <span v-if="run.commit.branch.isDeleted" class="gt-ellipsis tw-line-through" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</span>
+          <a v-else class="gt-ellipsis" :href="run.commit.branch.link" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</a>
         </span>
       </div>
     </div>