Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/added-abandoned-leaderboards.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Show abandoned PR counts in the dashboard and contribute landing leaderboards without changing contributor rankings ([#15796](https://github.com/hivecommons/hive/issues/15796)).
19 changes: 12 additions & 7 deletions src/pkg/dashboard/contribute_landing.go
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ code{background:var(--surface-0);padding:var(--sp-1) var(--sp-4);border-radius:v
.effective-link{color:var(--cc-accent);text-decoration:none}
.effective-link:hover{text-decoration:underline}
.effective-section-title{padding:var(--sp-5) var(--sp-7) var(--sp-3);color:var(--text-muted);font-size:var(--fs-xs);text-transform:uppercase;letter-spacing:.08em;font-weight:700}
.lb-row{display:grid;grid-template-columns:56px 1fr 120px 70px 70px 80px 72px;align-items:center;gap:var(--sp-4);padding:10px 20px;border-bottom:1px solid var(--line-subtle);font-size:.85rem}
.lb-row{display:grid;grid-template-columns:56px 1fr 120px 70px 70px 80px 72px 90px;align-items:center;gap:var(--sp-4);padding:10px 20px;border-bottom:1px solid var(--line-subtle);font-size:.85rem}
.lb-row:last-child{border-bottom:none}
/* Subtle self-highlight for the logged-in viewer's own row: a faint tint + a left
accent border, professional not loud. Readability preserved. */
Expand Down Expand Up @@ -1539,10 +1539,10 @@ select.admin-act{min-width:0;max-width:100%%}
/* Slightly tighter card-internal gutters on the densest rows. */
.clanker-row,.lb-row,.cc-q-item,.cc-tg-item,.cc-tg-head{padding-left:14px;padding-right:14px}

/* Leaderboard: 56px/1fr/120px/70px/70px/80px/72px cannot fit, so the seven cells reflow
/* Leaderboard: the eight desktop cells reflow
onto three lines — rank + contributor, then tier + the three counts, then
the sparkline — instead of scrolling sideways. Placement is by child
position because .lb-head and the body rows emit the same seven children in
the sparkline + abandoned count — instead of scrolling sideways. Placement is by child
position because .lb-head and the body rows emit the same eight children in
the same order, so the header keeps sitting over the column it labels. The
stat tracks stay fixed rem widths for exactly that reason: auto would size
per row and the header would drift out of alignment with the numbers. */
Expand All @@ -1553,7 +1553,8 @@ select.admin-act{min-width:0;max-width:100%%}
.lb-row>:nth-child(4){grid-column:3;grid-row:2}
.lb-row>:nth-child(5){grid-column:4;grid-row:2}
.lb-row>:nth-child(6){grid-column:5;grid-row:2}
.lb-row>:nth-child(7){grid-column:1/-1;grid-row:3;text-align:left}
.lb-row>:nth-child(7){grid-column:1/3;grid-row:3;text-align:left}
.lb-row>:nth-child(8){grid-column:3/-1;grid-row:3}
/* The uppercase, letter-spaced header labels are the widest thing in the stat
tracks; drop them a notch so "Findings" fits 3.4rem. */
.lb-head .lb-stat,.lb-head .lb-rank{font-size:var(--fs-2xs)}
Expand Down Expand Up @@ -3269,6 +3270,7 @@ function lbRow(e,rank){
var tier=tierBadge(e.trust_tier,'tier-lb');
var done=(e.tasks_completed||0);
var failed=(e.tasks_failed||0);
var abandoned=(e.abandoned||0);
var findings=(e.findings||0);
// Subtle self-highlight: the viewer's OWN row (username match, case-insensitive,
// humans only — never an agent) gets .lb-row--me + a small "you" chip. Anonymous
Expand Down Expand Up @@ -3304,6 +3306,7 @@ function lbRow(e,rank){
// per_user_done, matched on github_username via data-user. Empty until metrics
// load (renders a flat baseline), never fabricated.
+'<div class="lb-spark" data-user="'+esc(uname)+'"></div>'
+'<div class="lb-stat">'+abandoned+'</div>'
+'</div>';
}
function opsLeaderboardTrendValue(username){
Expand Down Expand Up @@ -3337,7 +3340,8 @@ function renderLeaderboard(contribs){
{key:'done',type:'number',value:function(r){return r.entry.tasks_completed;}},
{key:'failed',type:'number',value:function(r){return r.entry.tasks_failed;}},
{key:'findings',type:'number',value:function(r){return r.entry.findings;}},
{key:'trend',type:'number',value:function(r){return opsLeaderboardTrendValue(r.entry.github_username);}}
{key:'trend',type:'number',value:function(r){return opsLeaderboardTrendValue(r.entry.github_username);}},
{key:'abandoned',type:'number',value:function(r){return r.entry.abandoned||0;}}
];
var rankedRows=contribs.map(function(e,i){return{entry:e,rank:Number(e.rank||0)||i+1};});
var sortable=opsSortableTable('leaderboard',{rows:rankedRows,columns:lbColumns});
Expand All @@ -3348,7 +3352,8 @@ function renderLeaderboard(contribs){
'<div class="lb-stat lb-primary" aria-sort="'+sortable.ariaSort('done')+'">'+sortable.header('done','Done')+'</div>'+
'<div class="lb-stat" aria-sort="'+sortable.ariaSort('failed')+'">'+sortable.header('failed','Failed')+'</div>'+
'<div class="lb-stat" aria-sort="'+sortable.ariaSort('findings')+'">'+sortable.header('findings','Findings')+'</div>'+
'<div class="lb-stat" aria-sort="'+sortable.ariaSort('trend')+'">'+sortable.header('trend','Trend')+'</div></div>';
'<div class="lb-stat" aria-sort="'+sortable.ariaSort('trend')+'">'+sortable.header('trend','Trend')+'</div>'+
'<div class="lb-stat" aria-sort="'+sortable.ariaSort('abandoned')+'">'+sortable.header('abandoned','Abandoned')+'</div></div>';
var i;
for(i=0;i<sortable.rows.length;i++){html+=lbRow(sortable.rows[i].entry,sortable.rows[i].rank);}
el.innerHTML=html;
Expand Down
2 changes: 2 additions & 0 deletions src/pkg/dashboard/contribute_leaderboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type LeaderboardEntry struct {
TrustTier string `json:"trust_tier"`
TasksCompleted int `json:"tasks_completed"`
TasksFailed int `json:"tasks_failed"`
Abandoned int `json:"abandoned"`
Findings int `json:"findings,omitempty"`
RegisteredAt string `json:"registered_at"`
Team *ContributorTeamMetadata `json:"team,omitempty"`
Expand Down Expand Up @@ -65,6 +66,7 @@ func buildLeaderboardWithInputs(inputs achievement2Inputs) []LeaderboardEntry {
TrustTier: p.TrustTier,
TasksCompleted: p.TasksCompleted,
TasksFailed: p.TasksFailed,
Abandoned: p.Abandoned,
RegisteredAt: p.RegisteredAt,
Team: team,
EquippedTitle: p.EquippedTitle,
Expand Down
118 changes: 118 additions & 0 deletions src/pkg/dashboard/contribute_leaderboard_abandoned_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
package dashboard

import (
"encoding/json"
"net/http/httptest"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
)

func TestLeaderboardAPIAbandoned(t *testing.T) {
s := newDossierTestServer(t)
// Seed persisted profiles, as written by adoption accounting. Keep this
// reader test independent of the accounting writer's reconciliation rules.
// Include contributor IDs so listContributorProfiles accepts both records.
if err := os.MkdirAll(getContributorsDir(), 0o755); err != nil {
t.Fatal(err)
}
for name, profile := range map[string]string{
"alice": `{"github_username":"alice","contributor_id":"c-alice","trust_tier":"contributor","total_tasks_completed":10,"abandoned":7}`,
"bob": `{"github_username":"bob","contributor_id":"c-bob","trust_tier":"contributor","total_tasks_completed":5}`,
} {
if err := os.WriteFile(filepath.Join(getContributorsDir(), name+".json"), []byte(profile), 0o600); err != nil {
t.Fatal(err)
}
}
w := httptest.NewRecorder()
s.handleLeaderboardAPI(w, httptest.NewRequest("GET", "/api/leaderboard", nil))
var body struct {
Leaderboard []struct {
Username string `json:"github_username"`
Rank int `json:"rank"`
Abandoned *int `json:"abandoned"`
} `json:"leaderboard"`
}
if err := json.Unmarshal(w.Body.Bytes(), &body); err != nil {
t.Fatal(err)
}
if len(body.Leaderboard) != 2 {
t.Fatalf("unexpected leaderboard: %s", w.Body.String())
}
for i, want := range []int{7, 0} {
row := body.Leaderboard[i]
if row.Abandoned == nil || *row.Abandoned != want || row.Rank != i+1 {
t.Fatalf("row %d: %+v; want abandoned=%d and unchanged rank", i, row, want)
}
}
if body.Leaderboard[0].Username != "alice" {
t.Fatalf("ranking must remain based on completed tasks: %s", w.Body.String())
}
}

func TestLeaderboardAbandonedRendering(t *testing.T) {
landing := renderContributePage(t)
dashboard, err := os.ReadFile("static/index.html")
if err != nil {
t.Fatal(err)
}
// These assertions still run on CI workers without Node.
for _, want := range []string{"sortable.header('abandoned','Abandoned')", "var abandoned=(e.abandoned||0);", ".lb-row>:nth-child(8){grid-column:3/-1;grid-row:3}"} {
if !strings.Contains(landing, want) {
t.Errorf("landing missing %q", want)
}
}
for _, want := range []string{">Abandoned</th>", "${e.abandoned || 0}"} {
if !strings.Contains(string(dashboard), want) {
t.Errorf("dashboard missing %q", want)
}
}
node, err := exec.LookPath("node")
if err != nil {
t.Skip("node is required for rendering assertions")
}
// Run the shipped renderers with a minimal DOM, rather than a parallel
// implementation of the rendering logic.
common := `
const assert = require('node:assert/strict');
const panel = {innerHTML:''};
const document = {getElementById:()=>panel};
function esc(s){return String(s);}
function tierBadge(){return '';}
function socialShareControls(){return '';}
function ccRenderLeaderboardSparklines(){}
var ccMeUsername='', lbLastData, ccMetrics=null;
function opsSortableTable(id,opts){return {rows:opts.rows,ariaSort:()=> 'none',header:(key,label)=>label};}
const entries=[{github_username:'alice',rank:1,tasks_completed:10,tasks_failed:2,abandoned:7},
{github_username:'bob',rank:2,tasks_completed:5}];
`
landingJS := common + extractJSFunc(t, landing, "function lbRow(e,rank){") + "\n" +
extractJSFunc(t, landing, "function renderLeaderboard(contribs){") + `
renderLeaderboard(entries);
assert.match(panel.innerHTML, /Abandoned/);
assert.match(lbRow(entries[0],1), /<div class="lb-stat">7<\/div><\/div>$/);
assert.match(lbRow(entries[1],2), /<div class="lb-stat">0<\/div><\/div>$/);
`
dashboardJS := common + `
const CONTRIBUTOR_AVATAR_PX=32;
function linkedAvatar(){return '';}
function trustTierBadge(){return '';}
function setIfChanged(el,html){el.innerHTML=html;}
` + extractJSFunc(t, string(dashboard), "function renderLeaderboard(entries) {") + `
renderLeaderboard(entries);
assert.match(panel.innerHTML, />Abandoned<\/th>/);
const rows=panel.innerHTML.match(/<tbody>([\s\S]*)<\/tbody>/)[1].split('</tr>').filter(r=>r.trim());
assert.equal(rows.length,2);
assert.match(rows[0], />7<\/td>\s*$/);
assert.match(rows[1], />0<\/td>\s*$/);
`
for name, script := range map[string]string{"landing": landingJS, "dashboard": dashboardJS} {
t.Run(name, func(t *testing.T) {
if out, err := exec.Command(node, "-e", script).CombinedOutput(); err != nil {
t.Fatalf("rendering failed: %v\n%s", err, out)
}
})
}
}
2 changes: 2 additions & 0 deletions src/pkg/dashboard/contribute_profiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ type ContributorProfile struct {
LastActive string `json:"last_active,omitempty"`
LastCompletedTask *WSTaskAssign `json:"last_completed_task,omitempty"`
RateLimits ContributorRateLimits `json:"rate_limits"`
// Abandoned counts this contributor's PRs adopted by the hive, once per PR.
Abandoned int `json:"abandoned"`
// LabelInterests is the contributor's OPT-IN list of GitHub issue labels they
// want to help with (issue #2637) — e.g. a contributor with an NVIDIA machine
// subscribes to "nvidia" so nvidia-labelled work surfaces first for them. It is
Expand Down
2 changes: 2 additions & 0 deletions src/pkg/dashboard/static-src/js/contributors.js
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@
<td style="padding:var(--sp-4) var(--sp-5)">${trustTierBadge(e.trust_tier)}</td>
<td style="padding:var(--sp-4) var(--sp-5);text-align:right">${e.tasks_completed || 0}</td>
<td style="padding:var(--sp-4) var(--sp-5);text-align:right;color:${(e.tasks_failed || 0) > 0 ? 'var(--red)' : 'var(--muted)'}">${e.tasks_failed || 0}</td>
<td style="padding:var(--sp-4) var(--sp-5);text-align:right">${e.abandoned || 0}</td>
</tr>`;
}).join('');
setIfChanged(panel, `<div style="background:var(--card-bg);border:1px solid var(--border);border-radius:8px;overflow:hidden">
Expand All @@ -460,6 +461,7 @@
<th style="padding:var(--sp-4) var(--sp-5);text-align:left;color:var(--muted);font-weight:600">Tier</th>
<th style="padding:var(--sp-4) var(--sp-5);text-align:right;color:var(--muted);font-weight:600">Completed</th>
<th style="padding:var(--sp-4) var(--sp-5);text-align:right;color:var(--muted);font-weight:600">Failed</th>
<th style="padding:var(--sp-4) var(--sp-5);text-align:right;color:var(--muted);font-weight:600">Abandoned</th>
</tr></thead>
<tbody>${rows}</tbody>
</table>
Expand Down
2 changes: 2 additions & 0 deletions src/pkg/dashboard/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40587,6 +40587,7 @@ <h3 class="modal-h">How Agents Use Knowledge (Priming)</h3>
<td style="padding:var(--sp-4) var(--sp-5)">${trustTierBadge(e.trust_tier)}</td>
<td style="padding:var(--sp-4) var(--sp-5);text-align:right">${e.tasks_completed || 0}</td>
<td style="padding:var(--sp-4) var(--sp-5);text-align:right;color:${(e.tasks_failed || 0) > 0 ? 'var(--red)' : 'var(--muted)'}">${e.tasks_failed || 0}</td>
<td style="padding:var(--sp-4) var(--sp-5);text-align:right">${e.abandoned || 0}</td>
</tr>`;
}).join('');
setIfChanged(panel, `<div style="background:var(--card-bg);border:1px solid var(--border);border-radius:8px;overflow:hidden">
Expand All @@ -40598,6 +40599,7 @@ <h3 class="modal-h">How Agents Use Knowledge (Priming)</h3>
<th style="padding:var(--sp-4) var(--sp-5);text-align:left;color:var(--muted);font-weight:600">Tier</th>
<th style="padding:var(--sp-4) var(--sp-5);text-align:right;color:var(--muted);font-weight:600">Completed</th>
<th style="padding:var(--sp-4) var(--sp-5);text-align:right;color:var(--muted);font-weight:600">Failed</th>
<th style="padding:var(--sp-4) var(--sp-5);text-align:right;color:var(--muted);font-weight:600">Abandoned</th>
</tr></thead>
<tbody>${rows}</tbody>
</table>
Expand Down
Loading