@leftoff/cli 0.8.8 → 0.8.9

package/ui/prs.js

@@ -89,11 +89,13 @@ function sessionLinks(r, opts) {
 
 // One PR row on the PRs tab. 0.8.5: tap the row to expand it in place
 // (`open`, with `detail` as /v1/prs/detail answered: { loading } | { ok, detail } | { ok: false, code }).
-export function prRowHtml(r, { team = false, now = Date.now(), mayEdit = true, sessionAction = null, showMachine = false, open = false, detail = null } = {}) {
+export function prRowHtml(r, { team = false, now = Date.now(), mayEdit = true, sessionAction = null, showMachine = false, open = false, detail = null, me = null } = {}) {
   const p = r.pr || {}
   const url = safeUrl(p.url)
+  // 0.8.9: what the checks and review chips don't already say (a conflict, your review)
+  const bwhy = r.bucketWhy !== undefined ? r.bucketWhy : prBucket(p, me).why
   const line1 = '<span class="pr-num">#' + esc(p.number) + '</span>' + stateHtml(p.state) + checksHtml(p.checks) +
-    (r.attention && r.attention !== 'Checks failing' ? '<span class="pr-att">' + esc(r.attention) + '</span>' : p.review && REVIEW[p.review] && (p.state === 'open' || p.state === 'draft') ? '<span class="pr-review ' + esc(p.review) + '">' + REVIEW[p.review] + '</span>' : '')
+    (bwhy === 'Merge conflict' || bwhy === 'Your review' ? '<span class="pr-att">' + esc(bwhy) + '</span>' : p.review && REVIEW[p.review] && (p.state === 'open' || p.state === 'draft') ? '<span class="pr-review ' + esc(p.review) + '">' + REVIEW[p.review] + '</span>' : '')
   const when = p.state === 'merged' && p.mergedAt ? 'merged ' + shortAgo(p.mergedAt, now) + ' ago' : p.updatedAt ? 'updated ' + shortAgo(p.updatedAt, now) + ' ago' : ''
   const meta = team
     ? [p.repo, p.author ? '@' + p.author : '', p.branch || '', when].filter(Boolean)
@@ -134,7 +136,7 @@ export function prDetailHtml(p, st, { now = Date.now() } = {}) {
       return '<li class="' + esc(c.state) + '"><span class="pd-ic" aria-hidden="true">' + (c.state === 'failed' ? '✕' : '◌') + '</span>' + (u ? '<a href="' + esc(u) + '" target="_blank" rel="noopener noreferrer">' + name + ' ↗</a>' : name) + '<span class="pd-st">' + (c.state === 'failed' ? 'failed' : 'running') + '</span></li>'
     }).join('') + '</ul>' : '') + (passed ? '<div class="pd-pass">✓ ' + passed + (bad.length ? ' passed' : passed === 1 ? ' check passed' : ' checks passed') + '</div>' : '') + '</div>'
   }
-  const rv = REVIEW[d.review] || (d.state === 'open' ? 'No review yet' : '')
+  const rv = REVIEW[d.review] || (d.review === 'none' && d.state === 'open' ? 'No review required' : d.state === 'open' ? 'No review yet' : '')
   const who = (d.reviews || []).map((r) => esc('@' + r.author) + ' ' + esc(REVIEW_STATE[r.state] || r.state))
   if (rv || who.length || (d.reviewRequested || []).length) {
     h += '<div class="pd-sec"><div class="pd-h">Review</div><div class="pd-review">' + (rv ? '<span class="pr-review ' + esc(d.review || '') + '">' + esc(rv) + '</span>' : '') +
@@ -154,20 +156,63 @@ export function prDetailHtml(p, st, { now = Date.now() } = {}) {
   return h + '</div>'
 }
 
+// ---------------------------------------------------------------- 0.8.9: buckets
+
+// What an open PR is waiting on, in one of four buckets (idea: "merge ready /
+// needs fix / waiting on others"), from the fields gh already gives us:
+//   review   Your review: you're a requested reviewer and it isn't yours
+//   fix      Needs fix: a check failing, changes requested, or a merge conflict
+//   ready    Merge ready: not a draft, approved or no review required, every
+//            check passed (or none), and GitHub says it merges cleanly
+//   waiting  Waiting on others: everything else (review pending, checks
+//            running, a draft, or anything we can't tell yet)
+// Anything unknown (no mergeable from an older daemon, GitHub still working
+// it out, no check list) lands in waiting, never in ready. Merged and closed
+// PRs keep their state. -> { bucket, why }
+export const PR_BUCKETS = [['review', 'Your review'], ['fix', 'Needs fix'], ['ready', 'Merge ready'], ['waiting', 'Waiting on others'], ['merged', 'Merged'], ['closed', 'Closed']]
+const sameUser = (a, b) => !!a && !!b && String(a).toLowerCase() === String(b).toLowerCase()
+export function prBucket(pr, me = null) {
+  if (!pr || typeof pr !== 'object') return { bucket: 'waiting', why: null }
+  if (pr.state === 'merged') return { bucket: 'merged', why: null }
+  if (pr.state === 'closed') return { bucket: 'closed', why: null }
+  const ck = pr.checks && typeof pr.checks === 'object' ? pr.checks : null
+  if (me && !sameUser(pr.author, me) && (pr.reviewRequested || []).some((x) => sameUser(x, me))) return { bucket: 'review', why: 'Your review' }
+  if (ck && ck.failed > 0) return { bucket: 'fix', why: 'Checks failing' }
+  if (pr.review === 'changes_requested') return { bucket: 'fix', why: 'Changes requested' }
+  if (pr.mergeable === 'conflicting') return { bucket: 'fix', why: 'Merge conflict' }
+  if (pr.state === 'draft') return { bucket: 'waiting', why: 'Draft' }
+  if (pr.state !== 'open') return { bucket: 'waiting', why: null }
+  if (!ck || ck.unknown || !Number.isFinite(ck.total)) return { bucket: 'waiting', why: null }
+  if (ck.pending > 0) return { bucket: 'waiting', why: 'Checks running' }
+  if (pr.review === 'review_required') return { bucket: 'waiting', why: 'Review pending' }
+  if (pr.review !== 'approved' && pr.review !== 'none') return { bucket: 'waiting', why: null }
+  if (pr.mergeable !== 'mergeable') return { bucket: 'waiting', why: null }
+  return { bucket: 'ready', why: null }
+}
+// A row's bucket: what the daemon worked out, else (an older daemon) worked out here.
+export function bucketOf(r, me = null) {
+  if (r && PR_BUCKETS.some(([k]) => k === r.bucket)) return r.bucket
+  return prBucket(r && r.pr, me).bucket
+}
+
 // ---------------------------------------------------------------- 0.8.5: filters
 
-// The page's filter, from the hash (#/prs?view=team&repo=web&state=open&checks=failing&q=search).
-export const PR_STATES = [['attention', 'Needs attention'], ['open', 'Open'], ['draft', 'Draft'], ['merged', 'Merged'], ['closed', 'Closed']]
-export const PR_CHECKS = [['failing', 'Checks failing'], ['passing', 'Checks passing']]
+// The page's filter, from the hash (#/prs?view=team&repo=web&state=ready&q=search).
+// 0.8.9: `state` is a bucket (PR_BUCKETS). Links from 0.8.5 still open:
+// state=attention or checks=failing -> Needs fix, state=draft -> Waiting on
+// others, state=open and checks=passing -> no filter.
+export const PR_STATES = PR_BUCKETS
 export const QUIET_DAYS = 14
+const LEGACY_STATE = { attention: 'fix', draft: 'waiting' }
 const splitList = (v) => String(v || '').split(',').map((x) => x.trim()).filter(Boolean)
 export function readPrFilter(params) {
   const p = typeof params === 'string' ? new URLSearchParams(params.replace(/^.*\?/, '')) : (params || new URLSearchParams())
-  const state = p.get('state'), checks = p.get('checks')
+  let state = p.get('state')
+  state = PR_BUCKETS.some(([k]) => k === state) ? state : LEGACY_STATE[state] || null
+  if (!state && p.get('checks') === 'failing') state = 'fix'
   return {
     repos: [...new Set(p.getAll('repo').flatMap(splitList))],
-    state: PR_STATES.some(([k]) => k === state) ? state : null,
-    checks: PR_CHECKS.some(([k]) => k === checks) ? checks : null,
+    state,
     q: String(p.get('q') || '').slice(0, 200),
   }
 }
@@ -176,11 +221,10 @@ export function prsHash(view, f = {}) {
   if (view === 'team') parts.push('view=team')
   if (f.repos && f.repos.length) parts.push('repo=' + f.repos.map((r) => encodeURIComponent(r).replace(/%2F/gi, '/')).join(','))
   if (f.state) parts.push('state=' + f.state)
-  if (f.checks) parts.push('checks=' + f.checks)
   if (f.q && f.q.trim()) parts.push('q=' + encodeURIComponent(f.q.trim()))
   return '#/prs' + (parts.length ? '?' + parts.join('&') : '')
 }
-export const prFilterActive = (f) => !!(f && ((f.repos && f.repos.length) || f.state || f.checks || (f.q && f.q.trim())))
+export const prFilterActive = (f) => !!(f && ((f.repos && f.repos.length) || f.state || (f.q && f.q.trim())))
 
 // Every row, flat: the daemon's `rows`, or an older daemon's groups.
 export function prRows(d) {
@@ -192,13 +236,8 @@ export function prRows(d) {
 }
 const lastAt = (pr) => Math.max(Date.parse(pr.updatedAt || '') || 0, Date.parse(pr.mergedAt || '') || 0)
 export const isQuiet = (r, now = Date.now()) => { const t = lastAt(r.pr || {}); return !!t && now - t >= QUIET_DAYS * 864e5 }
-export function prStateOf(r) { return r.attention && (r.pr.state === 'open' || r.pr.state === 'draft') ? 'attention' : r.pr.state }
-export function inPrState(r, state) { return !state || (state === 'attention' ? !!r.attention && (r.pr.state === 'open' || r.pr.state === 'draft') : r.pr.state === state) }
-export function inPrChecks(r, checks) {
-  const c = r.pr.checks || {}
-  if (!checks) return true
-  return checks === 'failing' ? c.failed > 0 : c.total > 0 && !c.failed && !c.pending
-}
+export function prStateOf(r, me = null) { return bucketOf(r, me) }
+export function inPrState(r, state, me = null) { return !state || bucketOf(r, me) === state }
 export function inPrSearch(r, q) {
   const words = String(q || '').toLowerCase().split(/\s+/).filter(Boolean)
   if (!words.length) return true
@@ -215,17 +254,18 @@ export function inPrRepos(r, repos, labels = null) {
   const key = r.pr.repo || 'no-repo'
   return repos.some((t) => repoMatches({ repoKey: key, repoLabel: labels ? labels.get(key) : null }, t))
 }
-export function filterPrRows(rows, f = {}, { skip = null } = {}) {
+export function filterPrRows(rows, f = {}, { skip = null, me = null } = {}) {
   const labels = labelRepos(rows.map((r) => r.pr.repo || 'no-repo'))
-  return rows.filter((r) => (skip === 'repos' || inPrRepos(r, f.repos, labels)) && (skip === 'state' || inPrState(r, f.state)) && (skip === 'checks' || inPrChecks(r, f.checks)) && inPrSearch(r, f.q))
+  return rows.filter((r) => (skip === 'repos' || inPrRepos(r, f.repos, labels)) && (skip === 'state' || inPrState(r, f.state, me)) && inPrSearch(r, f.q))
 }
-// Groups, newest first in each; anything with no activity for 14+ days in Quiet.
-export function groupPrRows(rows, { now = Date.now() } = {}) {
-  const g = Object.fromEntries(PR_STATES.map(([k]) => [k, []]))
+// Groups (0.8.9: the buckets), newest first in each; anything with no
+// activity for 14+ days in Quiet.
+export function groupPrRows(rows, { now = Date.now(), me = null } = {}) {
+  const g = Object.fromEntries(PR_BUCKETS.map(([k]) => [k, []]))
   const quiet = []
-  for (const r of rows) { if (isQuiet(r, now)) quiet.push(r); else (g[prStateOf(r)] || (g[prStateOf(r)] = [])).push(r) }
+  for (const r of rows) { if (isQuiet(r, now)) quiet.push(r); else g[bucketOf(r, me)].push(r) }
   const by = (a, b) => lastAt(b.pr) - lastAt(a.pr)
-  const out = PR_STATES.map(([key, label]) => ({ key, label, rows: g[key].sort(by) })).filter((x) => x.rows.length)
+  const out = PR_BUCKETS.map(([key, label]) => ({ key, label, rows: g[key].sort(by) })).filter((x) => x.rows.length)
   return { groups: out, quiet: quiet.sort(by) }
 }
 
@@ -238,12 +278,13 @@ function fchip({ on, count, label, attrs, cls = '' }) {
 
 // The chip rows and the grouped list (repainted as you type in the search box).
 export function prsBodyHtml(d, { view = 'mine', now = Date.now(), mayEdit = true, sessionAction = null, filter = {}, open = null, details = null, quietOpen = false } = {}) {
-  const f = { repos: [], state: null, checks: null, q: '', ...filter }
+  const f = { repos: [], state: null, q: '', ...filter }
   const all = prRows(d)
+  const me = d.me || null
   let h = ''
   if (all.length) {
     // Repos: All, then by latest activity; a chosen one always shows, first and removable.
-    const repoCount = filterPrRows(all, f, { skip: 'repos' })
+    const repoCount = filterPrRows(all, f, { skip: 'repos', me })
     let chips = prRepoChips(all, { countIn: repoCount })
     for (const tok of f.repos) if (!chips.some((c) => chipSelected([tok], c))) chips.push({ key: tok, label: tok, count: 0, total: 0, last: 0 })
     chips = orderSelectedFirst(chips, f.repos)
@@ -251,23 +292,26 @@ export function prsBodyHtml(d, { view = 'mine', now = Date.now(), mayEdit = true
       h += chipRow('Filter by repo', [fchip({ on: !f.repos.length, count: repoCount.length, label: 'All', cls: 'all', attrs: 'data-action="prs-filter" data-k="repo" data-v=""' })]
         .concat(chips.map((c) => fchip({ on: chipSelected(f.repos, c), count: c.count, label: c.label, attrs: 'data-action="prs-filter" data-k="repo" data-v="' + esc(c.label) + '" data-key="' + esc(c.key) + '" title="' + esc(c.key + ' · shift- or ⌘-click to pick several') + '"' }))), 'prs-repos')
     }
-    const stCount = filterPrRows(all, f, { skip: 'state' }), ckCount = filterPrRows(all, f, { skip: 'checks' })
-    const sts = PR_STATES.map(([k, l]) => ({ k: 'state', v: k, l, n: stCount.filter((r) => inPrState(r, k)).length, on: f.state === k }))
-    const cks = PR_CHECKS.map(([k, l]) => ({ k: 'checks', v: k, l, n: ckCount.filter((r) => inPrChecks(r, k)).length, on: f.checks === k }))
-    const both = [...sts, ...cks]
-    const ordered = [...both.filter((x) => x.on), ...both.filter((x) => !x.on && (x.n || x.k === 'state'))]
-    h += chipRow('Filter by state and checks', ordered.map((x) => fchip({ on: x.on, count: x.n, label: x.l, cls: x.k === 'checks' ? 'ck' : '', attrs: 'data-action="prs-filter" data-k="' + x.k + '" data-v="' + x.v + '"' })), 'prs-states')
+    // 0.8.9: one row of buckets. The four open ones always show (dimmed at 0,
+    // after the rest), Merged and Closed only when there are some; a chosen
+    // one comes first.
+    const stCount = filterPrRows(all, f, { skip: 'state', me })
+    const bs = PR_BUCKETS.map(([k, l]) => ({ v: k, l, n: stCount.filter((r) => bucketOf(r, me) === k).length, on: f.state === k }))
+    const shown = bs.filter((x) => !x.on && (x.n || ['review', 'fix', 'ready', 'waiting'].includes(x.v)) && !(x.v === 'review' && !x.n && !me))
+    // the ones with PRs lead, so on a phone the empty ones are what scrolls off
+    const ordered = [...bs.filter((x) => x.on), ...shown.filter((x) => x.n), ...shown.filter((x) => !x.n)]
+    h += chipRow('Filter by what each PR is waiting on', ordered.map((x) => fchip({ on: x.on, count: x.n, label: x.l, cls: 'b-' + x.v, attrs: 'data-action="prs-filter" data-k="state" data-v="' + x.v + '"' })), 'prs-states prs-buckets')
   }
-  const rows = filterPrRows(all, f)
-  const { groups, quiet } = groupPrRows(rows, { now })
+  const rows = filterPrRows(all, f, { me })
+  const { groups, quiet } = groupPrRows(rows, { now, me })
   const showMachine = !!d.multiMachine
-  const rowOpts = (r) => ({ team: view === 'team', now, mayEdit, sessionAction, showMachine, open: !!(open && open.has(r.pr.url)), detail: details ? details[r.pr.url] : null })
+  const rowOpts = (r) => ({ team: view === 'team', now, mayEdit, sessionAction, showMachine, me, open: !!(open && open.has(r.pr.url)), detail: details ? details[r.pr.url] : null })
   if (!all.length) {
     h += '<div class="empty">' + (d.loading ? 'Loading pull requests…' : view === 'team' ? (d.repos && d.repos.length ? 'No open PRs in ' + esc(d.repos.join(', ')) + '.' : 'None of your sessions are in a GitHub repo yet.') : 'No PRs linked to your sessions yet. They link on their own when a session runs gh pr create, works on a branch with an open PR, or you paste a PR’s link in it.') + '</div>'
   } else if (!rows.length) {
     h += '<div class="empty">No PRs match. <button type="button" class="linkish" data-action="prs-clear">Clear filters</button></div>'
   } else {
-    for (const g of groups) h += '<section class="prgroup' + (g.key === 'attention' ? ' attention' : '') + '" data-group="' + g.key + '"><h2>' + esc(g.label) + ' <span class="count">' + g.rows.length + '</span></h2>' + g.rows.map((r) => prRowHtml(r, rowOpts(r))).join('') + '</section>'
+    for (const g of groups) h += '<section class="prgroup b-' + g.key + (g.key === 'fix' || g.key === 'review' ? ' attention' : '') + '" data-group="' + g.key + '"><h2>' + esc(g.label) + ' <span class="count">' + g.rows.length + '</span></h2>' + g.rows.map((r) => prRowHtml(r, rowOpts(r))).join('') + '</section>'
     if (quiet.length) h += '<details class="prgroup quiet" data-group="quiet"' + (quietOpen || !groups.length ? ' open' : '') + '><summary><h2>Quiet <span class="count">' + quiet.length + '</span> <span class="faint qhint">no activity for ' + QUIET_DAYS + '+ days</span></h2></summary>' + quiet.map((r) => prRowHtml(r, rowOpts(r))).join('') + '</details>'
   }
   if (view === 'team' && (d.failed || []).length) h += '<div class="hint">Couldn’t load ' + esc(d.failed.join(', ')) + ' right now.</div>'