improve ui

Author: Zettat123

options/locale/locale_en-US.ini

@@ -1970,6 +1970,8 @@ pulls.status_checks_details = Details
 pulls.status_checks_hide_all = Hide all checks
 pulls.status_checks_show_all = Show all checks
 pulls.status_checks_approve_all = Approve all workflows
+pulls.status_checks_need_approvals = %d workflow awaiting approval
+pulls.status_checks_need_approvals_helper = The workflow will only run after approval from the repository maintainer.
 pulls.update_branch = Update branch by merge
 pulls.update_branch_rebase = Update branch by rebase
 pulls.update_branch_success = Branch update was successful

routers/web/repo/pull.go

@@ -313,11 +313,11 @@ func prepareMergedViewPullInfo(ctx *context.Context, issue *issues_model.Issue)
 }
 
 type pullCommitStatusCheckData struct {
-	MissingRequiredChecks []string          // list of missing required checks
-	IsContextRequired     func(string) bool // function to check whether a context is required
-	RequireApproval       bool              // whether approval is required for workflow runs
-	CanApprove            bool              // whether the user can approve workflow runs
-	ApproveLink           string            // link to approve all checks
+	MissingRequiredChecks   []string          // list of missing required checks
+	IsContextRequired       func(string) bool // function to check whether a context is required
+	RequireApprovalRunCount int               // number of workflow runs that require approval
+	CanApprove              bool              // whether the user can approve workflow runs
+	ApproveLink             string            // link to approve all checks
 }
 
 // prepareViewPullInfo show meta information for a pull request preview page
@@ -486,11 +486,10 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 	}
 	for _, run := range runs {
 		if run.NeedApproval {
-			statusCheckData.RequireApproval = true
-			break
+			statusCheckData.RequireApprovalRunCount++
 		}
 	}
-	if statusCheckData.RequireApproval {
+	if statusCheckData.RequireApprovalRunCount > 0 {
 		statusCheckData.CanApprove = ctx.Repo.CanWrite(unit.TypeActions)
 	}
 

templates/repo/pulls/status.tmpl

@@ -22,20 +22,31 @@
 			{{ctx.Locale.Tr "repo.pulls.status_checking"}}
 		{{end}}
 
+		{{if .ShowHideChecks}}
 		<div class="ui right">
-			{{if and $statusCheckData $statusCheckData.RequireApproval $statusCheckData.CanApprove}}
-				<button class="ui basic small compact button link-action" data-url="{{$statusCheckData.ApproveLink}}">
+			<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>
+		</div>
+		{{end}}
+	</div>
+
+	{{if and $statusCheckData (gt $statusCheckData.RequireApprovalRunCount 0)}}
+		<div class="ui attached segment tw-flex tw-items-center tw-justify-between" id="approve-status-checks">
+			<div>
+				<strong>
+					{{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals" $statusCheckData.RequireApprovalRunCount}}
+				</strong>
+				<p>{{ctx.Locale.Tr "repo.pulls.status_checks_need_approvals_helper"}}</p>
+			</div>
+			{{if $statusCheckData.CanApprove}}
+				<button class="ui basic button link-action" data-url="{{$statusCheckData.ApproveLink}}">
 					{{ctx.Locale.Tr "repo.pulls.status_checks_approve_all"}}
 				</button>
 			{{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>
-	</div>
+	{{end}}
 
 	<div class="commit-status-list">
 		{{range .CommitStatuses}}

tests/integration/actions_approve_test.go

@@ -112,13 +112,13 @@ jobs:
 		req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d", baseRepo.OwnerName, baseRepo.Name, apiPull.Index))
 		resp = user4Session.MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
-		assert.Zero(t, htmlDoc.doc.Find(".commit-status-header button.link-action").Length())
+		assert.Zero(t, htmlDoc.doc.Find("#approve-status-checks button.link-action").Length())
 
 		// user2 can see the approve button
 		req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d", baseRepo.OwnerName, baseRepo.Name, apiPull.Index))
 		resp = user2Session.MakeRequest(t, req, http.StatusOK)
 		htmlDoc = NewHTMLParser(t, resp.Body)
-		dataURL, exist := htmlDoc.doc.Find(".commit-status-header button.link-action").Attr("data-url")
+		dataURL, exist := htmlDoc.doc.Find("#approve-status-checks button.link-action").Attr("data-url")
 		assert.True(t, exist)
 		assert.Equal(t,
 			fmt.Sprintf("%s/actions/approve-all-checks?commit_id=%s",