add quick approve button

Zettat123 · Zettat123 · commit 482f22d5fe11 · 2025-10-15T21:38:25.000-06:00
diff --git a/models/git/commit_status.go b/models/git/commit_status.go
@@ -211,21 +211,26 @@ func (status *CommitStatus) LocaleString(lang translation.Locale) string {
 
 // HideActionsURL set `TargetURL` to an empty string if the status comes from Gitea Actions
 func (status *CommitStatus) HideActionsURL(ctx context.Context) {
+	if status.CreatedByGiteaActions(ctx) {
+		status.TargetURL = ""
+	}
+}
+
+// CreatedByGiteaActions returns true if the commit status is created by Gitea Actions
+func (status *CommitStatus) CreatedByGiteaActions(ctx context.Context) bool {
 	if status.RepoID == 0 {
-		return
+		return false
 	}
 
 	if status.Repo == nil {
 		if err := status.loadRepository(ctx); err != nil {
 			log.Error("loadRepository: %v", err)
-			return
+			return false
 		}
 	}
 
 	prefix := status.Repo.Link() + "/actions"
-	if strings.HasPrefix(status.TargetURL, prefix) {
-		status.TargetURL = ""
-	}
+	return strings.HasPrefix(status.TargetURL, prefix)
 }
 
 // CalcCommitStatus returns commit status state via some status, the commit statues should order by id desc
diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
@@ -605,33 +605,53 @@ func Cancel(ctx *context_module.Context) {
 func Approve(ctx *context_module.Context) {
 	runIndex := getRunIndex(ctx)
 
-	current, jobs := getRunJobs(ctx, runIndex, -1)
+	approveRuns(ctx, []int64{runIndex})
 	if ctx.Written() {
 		return
 	}
-	run := current.Run
+
+	ctx.JSONOK()
+}
+
+func approveRuns(ctx *context_module.Context, runIndexes []int64) {
 	doer := ctx.Doer
+	repo := ctx.Repo.Repository
 
-	var updatedJobs []*actions_model.ActionRunJob
+	updatedJobs := make([]*actions_model.ActionRunJob, 0)
+	runMap := make(map[int64]*actions_model.ActionRun, len(runIndexes))
+	runJobs := make(map[int64][]*actions_model.ActionRunJob, len(runIndexes))
 
 	err := db.WithTx(ctx, func(ctx context.Context) (err error) {
-		run.NeedApproval = false
-		run.ApprovedBy = doer.ID
-		if err := actions_model.UpdateRun(ctx, run, "need_approval", "approved_by"); err != nil {
-			return err
-		}
-		for _, job := range jobs {
-			job.Status, err = actions_service.PrepareToStartJobWithConcurrency(ctx, job)
+		for _, runIndex := range runIndexes {
+			run, err := actions_model.GetRunByIndex(ctx, repo.ID, runIndex)
+			if err != nil {
+				return err
+			}
+			runMap[run.ID] = run
+			run.Repo = repo
+			run.NeedApproval = false
+			run.ApprovedBy = doer.ID
+			if err := actions_model.UpdateRun(ctx, run, "need_approval", "approved_by"); err != nil {
+				return err
+			}
+			jobs, err := actions_model.GetRunJobsByRunID(ctx, run.ID)
 			if err != nil {
 				return err
 			}
-			if job.Status == actions_model.StatusWaiting {
-				n, err := actions_model.UpdateRunJob(ctx, job, nil, "status")
+			runJobs[run.ID] = jobs
+			for _, job := range jobs {
+				job.Status, err = actions_service.PrepareToStartJobWithConcurrency(ctx, job)
 				if err != nil {
 					return err
 				}
-				if n > 0 {
-					updatedJobs = append(updatedJobs, job)
+				if job.Status == actions_model.StatusWaiting {
+					n, err := actions_model.UpdateRunJob(ctx, job, nil, "status")
+					if err != nil {
+						return err
+					}
+					if n > 0 {
+						updatedJobs = append(updatedJobs, job)
+					}
 				}
 			}
 		}
@@ -642,7 +662,9 @@ func Approve(ctx *context_module.Context) {
 		return
 	}
 
-	actions_service.CreateCommitStatusForRunJobs(ctx, current.Run, jobs...)
+	for runID, run := range runMap {
+		actions_service.CreateCommitStatusForRunJobs(ctx, run, runJobs[runID]...)
+	}
 
 	if len(updatedJobs) > 0 {
 		job := updatedJobs[0]
@@ -653,8 +675,6 @@ func Approve(ctx *context_module.Context) {
 		_ = job.LoadAttributes(ctx)
 		notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)
 	}
-
-	ctx.JSONOK()
 }
 
 func Delete(ctx *context_module.Context) {
@@ -817,6 +837,43 @@ func ArtifactsDownloadView(ctx *context_module.Context) {
 	}
 }
 
+func ApproveAllChecks(ctx *context_module.Context) {
+	repo := ctx.Repo.Repository
+	sha := ctx.FormString("sha")
+	redirect := ctx.FormString("redirect")
+
+	commitStatuses, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptionsAll)
+	if err != nil {
+		ctx.ServerError("GetLatestCommitStatus", err)
+		return
+	}
+	runs, _, err := actions_service.GetRunsAndJobsFromCommitStatuses(ctx, commitStatuses)
+	if err != nil {
+		ctx.ServerError("GetRunsAndJobsFromCommitStatuses", err)
+		return
+	}
+
+	runIndexes := make([]int64, 0, len(runs))
+	for _, run := range runs {
+		if run.NeedApproval {
+			runIndexes = append(runIndexes, run.Index)
+		}
+	}
+
+	if len(runIndexes) == 0 {
+		ctx.Redirect(redirect)
+		return
+	}
+
+	approveRuns(ctx, runIndexes)
+	if ctx.Written() {
+		return
+	}
+
+	ctx.Flash.Success("Successfully approved all pending checks")
+	ctx.Redirect(redirect)
+}
+
 func DisableWorkflowFile(ctx *context_module.Context) {
 	disableOrEnableWorkflowFile(ctx, false)
 }
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -38,6 +38,7 @@ import (
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/utils"
 	shared_user "code.gitea.io/gitea/routers/web/shared/user"
+	actions_service "code.gitea.io/gitea/services/actions"
 	asymkey_service "code.gitea.io/gitea/services/asymkey"
 	"code.gitea.io/gitea/services/automerge"
 	"code.gitea.io/gitea/services/context"
@@ -455,6 +456,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 		ctx.ServerError(fmt.Sprintf("GetRefCommitID(%s)", pull.GetGitHeadRefName()), err)
 		return nil
 	}
+	ctx.Data["SHA"] = sha
 
 	commitStatuses, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptionsAll)
 	if err != nil {
@@ -465,6 +467,16 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 		git_model.CommitStatusesHideActionsURL(ctx, commitStatuses)
 	}
 
+	runs, _, err := actions_service.GetRunsAndJobsFromCommitStatuses(ctx, commitStatuses)
+	for _, run := range runs {
+		if run.NeedApproval {
+			ctx.Data["RequireApproval"] = true
+		}
+	}
+	if ctx.Data["RequireApproval"] == true {
+		ctx.Data["CanApprove"] = ctx.Repo.CanWrite(unit.TypeActions)
+	}
+
 	if len(commitStatuses) > 0 {
 		ctx.Data["LatestCommitStatuses"] = commitStatuses
 		ctx.Data["LatestCommitStatus"] = git_model.CalcCommitStatus(commitStatuses)
diff --git a/routers/web/web.go b/routers/web/web.go
@@ -1459,6 +1459,7 @@ func registerWebRoutes(m *web.Router) {
 		m.Post("/enable", reqRepoAdmin, actions.EnableWorkflowFile)
 		m.Post("/run", reqRepoActionsWriter, actions.Run)
 		m.Get("/workflow-dispatch-inputs", reqRepoActionsWriter, actions.WorkflowDispatchInputs)
+		m.Post("/approve-all-checks", reqRepoActionsWriter, actions.ApproveAllChecks)
 
 		m.Group("/runs/{run}", func() {
 			m.Combo("").
diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go
@@ -8,7 +8,9 @@ import (
 	"errors"
 	"fmt"
 	"path"
+	"regexp"
 	"strconv"
+	"strings"
 
 	actions_model "code.gitea.io/gitea/models/actions"
 	"code.gitea.io/gitea/models/db"
@@ -52,6 +54,74 @@ func CreateCommitStatusForRunJobs(ctx context.Context, run *actions_model.Action
 	}
 }
 
+func GetRunsAndJobsFromCommitStatuses(ctx context.Context, statuses []*git_model.CommitStatus) ([]*actions_model.ActionRun, []*actions_model.ActionRunJob, error) {
+	jobMap := make(map[int64]*actions_model.ActionRunJob)
+	runMap := make(map[int64]*actions_model.ActionRun)
+	jobsMap := make(map[int64][]*actions_model.ActionRunJob)
+	for _, status := range statuses {
+		if !status.CreatedByGiteaActions(ctx) {
+			continue
+		}
+		runIndex, jobIndex, err := getActionRunAndJobIndexFromCommitStatus(ctx, status)
+		if err != nil {
+			return nil, nil, fmt.Errorf("getActionRunAndJobIndexFromCommitStatus: %w", err)
+		}
+		run, ok := runMap[runIndex]
+		if !ok {
+			run, err = actions_model.GetRunByIndex(ctx, status.RepoID, runIndex)
+			if err != nil {
+				return nil, nil, fmt.Errorf("GetRunByIndex: %w", err)
+			}
+			runMap[runIndex] = run
+		}
+		jobs, ok := jobsMap[runIndex]
+		if !ok {
+			jobs, err = actions_model.GetRunJobsByRunID(ctx, run.ID)
+			if err != nil {
+				return nil, nil, fmt.Errorf("GetRunJobByIndex: %w", err)
+			}
+			jobsMap[runIndex] = jobs
+		}
+		if jobIndex < 0 || jobIndex >= int64(len(jobs)) {
+			return nil, nil, fmt.Errorf("job index %d out of range for run %d", jobIndex, runIndex)
+		}
+		job := jobs[jobIndex]
+		jobMap[job.ID] = job
+	}
+	runs := make([]*actions_model.ActionRun, 0, len(runMap))
+	for _, run := range runMap {
+		runs = append(runs, run)
+	}
+	jobs := make([]*actions_model.ActionRunJob, 0, len(jobMap))
+	for _, job := range jobMap {
+		jobs = append(jobs, job)
+	}
+	return runs, jobs, nil
+}
+
+func getActionRunAndJobIndexFromCommitStatus(ctx context.Context, status *git_model.CommitStatus) (int64, int64, error) {
+	actionsLink, _ := strings.CutPrefix(status.TargetURL, status.Repo.Link()+"/actions/")
+	// actionsLink should be like "runs/<run_index>/jobs/<job_index>"
+
+	re := regexp.MustCompile(`runs/(\d+)/jobs/(\d+)`)
+	matches := re.FindStringSubmatch(actionsLink)
+
+	if len(matches) != 3 {
+		return 0, 0, fmt.Errorf("%s is not a Gitea Actions link", status.TargetURL)
+	}
+
+	runIndex, err := strconv.ParseInt(matches[1], 10, 64)
+	if err != nil {
+		return 0, 0, fmt.Errorf("parse run index: %w", err)
+	}
+	jobIndex, err := strconv.ParseInt(matches[2], 10, 64)
+	if err != nil {
+		return 0, 0, fmt.Errorf("parse job index: %w", err)
+	}
+
+	return runIndex, jobIndex, nil
+}
+
 func getCommitStatusEventNameAndCommitID(run *actions_model.ActionRun) (event, commitID string, _ error) {
 	switch run.Event {
 	case webhook_module.HookEventPush:
diff --git a/templates/repo/issue/view_content/pull_merge_box.tmpl b/templates/repo/issue/view_content/pull_merge_box.tmpl
@@ -34,6 +34,11 @@
 			"MissingRequiredChecks" .MissingRequiredChecks
 			"ShowHideChecks" true
 			"is_context_required" .is_context_required
+			"SHA" .SHA
+			"RequireApproval" .RequireApproval
+			"CanApprove" .CanApprove
+			"RepoLink" .RepoLink
+			"IssueLink" .Issue.Link
 		)}}
 		</div>
 		{{end}}
diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl
@@ -23,14 +23,23 @@
 			{{ctx.Locale.Tr "repo.pulls.status_checking"}}
 		{{end}}
 
-		{{if .ShowHideChecks}}
 		<div class="ui right">
-			<button class="commit-status-hide-checks btn interact-fg"
-			data-show-all="{{ctx.Locale.Tr "repo.pulls.status_checks_show_all"}}"
-			data-hide-all="{{ctx.Locale.Tr "repo.pulls.status_checks_hide_all"}}">
-			{{ctx.Locale.Tr "repo.pulls.status_checks_hide_all"}}</button>
+			{{if and .RequireApproval .CanApprove}}
+				<form method="post" action="{{.RepoLink}}/actions/approve-all-checks?redirect={{.IssueLink}}">
+					{{ctx.RootData.CsrfTokenHtml}}
+					<input type="hidden" name="sha" value="{{.SHA}}">
+					<button type="submit" class="ui small tiny compact button primary">
+						Approve workflows to run
+					</button>				
+				</form>
+			{{end}}
+			{{if .ShowHideChecks}}
+				<button class="commit-status-hide-checks btn interact-fg"
+				data-show-all="{{ctx.Locale.Tr "repo.pulls.status_checks_show_all"}}"
+				data-hide-all="{{ctx.Locale.Tr "repo.pulls.status_checks_hide_all"}}">
+				{{ctx.Locale.Tr "repo.pulls.status_checks_hide_all"}}</button>
+			{{end}}
 		</div>
-		{{end}}
 	</div>
 
 	<div class="commit-status-list">
