Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b0c060efae |
@@ -107,6 +107,7 @@ type PullRequest struct {
|
|||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
RepoOwner string `json:"-"` // populated after fetch
|
RepoOwner string `json:"-"` // populated after fetch
|
||||||
RepoName string `json:"-"` // populated after fetch
|
RepoName string `json:"-"` // populated after fetch
|
||||||
|
ReviewState string `json:"-"` // aggregated review state: "approved", "changes_requested", "pending", or ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// TriageItem represents an item in the triage queue.
|
// TriageItem represents an item in the triage queue.
|
||||||
@@ -944,6 +945,74 @@ func (c *Client) RenderMarkdown(ctx context.Context, token, text string) (string
|
|||||||
return string(rendered), nil
|
return string(rendered), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Review represents a single review on a pull request.
|
||||||
|
type Review struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Body string `json:"body"`
|
||||||
|
State string `json:"state"` // "APPROVED", "REQUEST_CHANGES", "COMMENT", "PENDING"
|
||||||
|
User struct {
|
||||||
|
Login string `json:"login"`
|
||||||
|
} `json:"user"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPullReviewState fetches reviews for a PR and returns the aggregate state.
|
||||||
|
// Priority: changes_requested > approved > pending > "" (no reviews).
|
||||||
|
func (c *Client) GetPullReviewState(ctx context.Context, token, owner, repo string, index int64) string {
|
||||||
|
path := fmt.Sprintf("/repos/%s/%s/pulls/%d/reviews?limit=50", owner, repo, index)
|
||||||
|
resp, err := c.doRequest(ctx, token, http.MethodGet, path, nil)
|
||||||
|
if err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
var reviews []Review
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&reviews); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(reviews) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Aggregate: last non-comment review per user wins, then pick the "worst" state.
|
||||||
|
userState := make(map[string]string)
|
||||||
|
for _, r := range reviews {
|
||||||
|
switch r.State {
|
||||||
|
case "APPROVED", "REQUEST_CHANGES":
|
||||||
|
userState[r.User.Login] = r.State
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(userState) == 0 {
|
||||||
|
return "pending"
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, s := range userState {
|
||||||
|
if s == "REQUEST_CHANGES" {
|
||||||
|
return "changes_requested"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "approved"
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnrichPullsWithReviewState fetches review state for each PR concurrently.
|
||||||
|
func (c *Client) EnrichPullsWithReviewState(ctx context.Context, token string, pulls []PullRequest) {
|
||||||
|
sem := make(chan struct{}, c.maxConcurrent)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
for i := range pulls {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(idx int) {
|
||||||
|
defer wg.Done()
|
||||||
|
sem <- struct{}{}
|
||||||
|
defer func() { <-sem }()
|
||||||
|
|
||||||
|
pulls[idx].ReviewState = c.GetPullReviewState(ctx, token, pulls[idx].RepoOwner, pulls[idx].RepoName, pulls[idx].Number)
|
||||||
|
}(i)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
// priorityScore returns a numeric score for sorting (lower = higher priority).
|
// priorityScore returns a numeric score for sorting (lower = higher priority).
|
||||||
func priorityScore(labels []string) int {
|
func priorityScore(labels []string) int {
|
||||||
for _, l := range labels {
|
for _, l := range labels {
|
||||||
|
|||||||
@@ -412,6 +412,10 @@ func (h *Handler) ListPulls(w http.ResponseWriter, r *http.Request) {
|
|||||||
if result.HasMore {
|
if result.HasMore {
|
||||||
data.NextPage = page + 1
|
data.NextPage = page + 1
|
||||||
}
|
}
|
||||||
|
// Enrich PRs with review state for status icons.
|
||||||
|
if len(data.Pulls) > 0 {
|
||||||
|
h.Client.EnrichPullsWithReviewState(r.Context(), token, data.Pulls)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
|
<span class="label" style="color:#{{.Color}};border:1px solid #{{.Color}}">{{.Name}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .Assignee}}
|
{{if .Assignee}}
|
||||||
<img src="{{.Assignee.AvatarURL}}" alt="{{.Assignee.Login}}" class="avatar" title="Assigned to {{.Assignee.Login}}">
|
<span>{{.Assignee.Login}}</span>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,7 +12,13 @@
|
|||||||
{{end}}
|
{{end}}
|
||||||
<span class="diff-add">+{{.Additions}}</span>
|
<span class="diff-add">+{{.Additions}}</span>
|
||||||
<span class="diff-del">-{{.Deletions}}</span>
|
<span class="diff-del">-{{.Deletions}}</span>
|
||||||
{{if .Mergeable}}<span style="color:var(--accent-green);font-size:0.7rem;">mergeable</span>{{end}}
|
{{if eq .ReviewState "approved"}}<span class="review-badge review-approved" title="Approved">✓</span>
|
||||||
|
{{else if eq .ReviewState "changes_requested"}}<span class="review-badge review-changes" title="Changes requested">✗</span>
|
||||||
|
{{else if eq .ReviewState "pending"}}<span class="review-badge review-pending" title="Awaiting review">⏲</span>
|
||||||
|
{{end}}
|
||||||
|
{{if .Mergeable}}<span class="merge-badge merge-ready" title="Ready to merge">▶ Ready</span>
|
||||||
|
{{else}}<span class="merge-badge merge-conflicts" title="Has conflicts or not mergeable">Conflicts</span>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|||||||
@@ -419,6 +419,29 @@ a:active {
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Review status badges */
|
||||||
|
.review-badge {
|
||||||
|
font-size: 0.7rem;
|
||||||
|
font-weight: 600;
|
||||||
|
padding: 1px 4px;
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
.review-approved { color: var(--accent-green); }
|
||||||
|
.review-changes { color: var(--accent-red); }
|
||||||
|
.review-pending { color: var(--accent-yellow); }
|
||||||
|
|
||||||
|
/* Merge status badges */
|
||||||
|
.merge-badge {
|
||||||
|
font-size: 0.65rem;
|
||||||
|
font-weight: 600;
|
||||||
|
padding: 1px 5px;
|
||||||
|
border-radius: var(--radius-pill);
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
.merge-ready { color: var(--accent-green); border: 1px solid var(--accent-green); }
|
||||||
|
.merge-conflicts { color: var(--accent-red); border: 1px solid var(--accent-red); }
|
||||||
|
|
||||||
/* Empty state */
|
/* Empty state */
|
||||||
.empty {
|
.empty {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user