diff --git a/tests/test_board_view.py b/tests/test_board_view.py index 04b30ae..fda12d1 100644 --- a/tests/test_board_view.py +++ b/tests/test_board_view.py @@ -613,7 +613,7 @@ def test_drawer_shell_and_markdown_security_contract(): function element(id){ if(!elements.has(id)) elements.set(id, { id, dataset: {}, handlers: {}, attrs: {}, writes: 0, scrollTop: 0, isConnected: true, - classList: {add(){}, remove(){}}, + classList: {values: new Set(), add(){}, remove(){}, toggle(name,on){if(on) this.values.add(name); else this.values.delete(name);}}, set innerHTML(v){this.html=v; this.writes++;}, get innerHTML(){return this.html||'';}, setAttribute(k,v){this.attrs[k]=v;}, getAttribute(k){return this.attrs[k];}, addEventListener(k,v){this.handlers[k]=v;}, focus(){document.activeElement=this;}, @@ -772,9 +772,9 @@ def test_drawer_checks_tab_renders_summary_logs_and_badge(): assert.ok(html.indexOf('evil') < html.indexOf('lint')); // failing first assert.ok(html.indexOf('deploy') < html.indexOf('lint')); assert.ok(html.includes('<b>evil') && !html.includes('evil')); // check name escaped - assert.ok(html.includes('dot fail') && html.includes('dot pass') && html.includes('dot skipped')); + assert.ok(html.includes('pl-dot--error') && html.includes('pl-dot--success') && html.includes('class="pl-dot "')); assert.ok(html.includes('1m 5s')); // duration - assert.ok(element('drawer-tabs').innerHTML.includes('chk-badge">2<')); // fail-count badge + assert.ok(element('drawer-tabs').innerHTML.includes('pl-badge pl-badge--error">2<')); // fail-count badge // Lazily fetch the failure log for run 42. const before = requests.length; bodyClick({'data-run-id':'42'}); @@ -887,9 +887,9 @@ def test_drawer_escapes_checks_and_files_strings_and_tints_diffs(): for fragment in ("esc(c.name", "esc(st.log)", "esc(f.path)", "esc(line)", "esc(c.workflow)"): assert fragment in PAGE - assert "chk-badge" in PAGE # the fail-count badge markup - assert ".dl.add{background:var(--pl-color-success-muted" in PAGE - assert ".dl.del{background:var(--pl-color-danger-muted" in PAGE + assert "pl-badge pl-badge--error" in PAGE # the fail-count badge markup + assert ".dl.add{background:color-mix(in srgb, var(--pl-color-status-success) 15%, transparent)" in PAGE + assert ".dl.del{background:color-mix(in srgb, var(--pl-color-status-error) 15%, transparent)" in PAGE assert ".dl.hunk{color:var(--pl-color-fg-muted)" in PAGE assert 'files: {label: "Files"' in PAGE and "poll: 30000" in PAGE # Files polls no faster than 30s assert "setInterval(pollDrawer, (spec && spec.poll) || 15000)" in PAGE @@ -954,7 +954,7 @@ def test_conversation_timeline_threads_summary_and_polling(): assert.ok(!html.includes('resolved-second')); assert.ok(html.includes('href="https://github.com/o/n/pull/7#comment"')); assert.ok(html.includes('d ago')); - assert.ok(element('drawer-tabs').innerHTML.includes('Conversation1')); + assert.ok(element('drawer-tabs').innerHTML.includes('Conversation1')); bodyClick({'data-thread':'resolved'}); bodyClick({'data-thread':'open'}); assert.ok(element('drawer-body').innerHTML.includes('resolved-first')); @@ -966,7 +966,7 @@ def test_conversation_timeline_threads_summary_and_polling(): assert.ok(html.includes('resolved-second')); assert.ok(!html.includes('thread-last')); assert.equal(element('drawer-body').scrollTop,80); - assert.ok(!element('drawer-tabs').innerHTML.includes('chk-badge')); + assert.ok(!element('drawer-tabs').innerHTML.includes('pl-badge pl-badge--error')); assert.ok(!conversationItem({...c('x'),url:'javascript:alert(1)'}).includes('javascript:')); pollDrawer(); const stale=latest(); selectDrawerTab('overview',false); @@ -1025,7 +1025,7 @@ def test_issue_drawer_escapes_sources_and_renders_linked_pr_chips(): ): assert fragment in PAGE assert 'data-linked-pr="' in PAGE # the linked-PR chip - assert 'class="d-count"' in PAGE # the Comments count badge + assert 'class="pl-badge"' in PAGE # the Comments count badge assert "Open on GitHub ↗" in PAGE assert ".md:not(.md-on){white-space:pre-wrap" in PAGE # escaped fallback preserves whitespace for forbidden in ("markdown-it", "innerHTML = it.body"): @@ -1116,7 +1116,7 @@ def test_issue_drawer_interactions_open_tabs_linked_prs_and_missing_fields(): assert.ok(html.includes('Body truncated')); assert.ok(html.includes('data-linked-pr="34"')); // The Comments tab label carries a live count. - assert.ok(element('drawer-tabs').innerHTML.includes('Comments2')); + assert.ok(element('drawer-tabs').innerHTML.includes('Comments2')); // Arrow keys move across the issue tablist (same keyboard machinery as PR mode). for(const [key,want] of [['ArrowRight','comments'],['ArrowRight','overview'],['End','comments'],['Home','overview']]){ let prevented=false; @@ -1154,7 +1154,7 @@ def test_issue_drawer_interactions_open_tabs_linked_prs_and_missing_fields(): assert.ok(!html.includes('>'+absent+''),absent); assert.ok(!html.includes('Linked pull requests')); assert.ok(element('drawer-meta').innerHTML.includes('>open<')); // plain state pill, no reason - assert.ok(element('drawer-tabs').innerHTML.includes('Comments0')); + assert.ok(element('drawer-tabs').innerHTML.includes('Comments0')); selectDrawerTab('comments',false); await reply(latest(),{number:99,title:'Bare',state:'OPEN',comments:[]}); assert.ok(element('drawer-body').innerHTML.includes('No comments.')); @@ -1211,7 +1211,10 @@ def test_pr_rows_render_a_ci_chip_passed_through_esc(): assert 'CI_SYM = {passing:"✓", failing:"✗", pending:"●"}' in PAGE assert 'of "+total+" "+noun+" failing' in PAGE # the "2 of 9 checks failing" tooltip assert "esc(tip)" in PAGE and "esc(checks.state)" in PAGE # chip strings are escaped - assert ".ci-passing{color:#3fb950}" in PAGE and ".ci-failing{color:#f85149}" in PAGE + assert ( + ".ci-passing{color:var(--pl-color-status-success)}" in PAGE + and ".ci-failing{color:var(--pl-color-status-error)}" in PAGE + ) def test_load_more_grows_to_100_keeps_scroll_and_renders_ci_chip(): @@ -1440,7 +1443,7 @@ def test_every_prose_panel_marked_and_poll_reenhances_only_prose(): (async()=>{ const src='**body** " &'; openDrawer('o/n',7); - const mdSources=html=>[...html.matchAll(/class="pr-body md" data-md="([^"]*)"/g)].map(m=>decode(m[1])); + const mdSources=html=>[...html.matchAll(/class="pr-body md pl-prose" data-md="([^"]*)"/g)].map(m=>decode(m[1])); assert.deepEqual(mdSources(prOverview({body:src,headRefName:src,baseRefName:src})),[src]); assert.deepEqual(mdSources(issueOverview({body:src,milestone:{title:src}})),[src]); assert.deepEqual(mdSources(issueComments({comments:[{body:src},{body:src}]})),[src,src]); @@ -1468,3 +1471,71 @@ def test_every_prose_panel_marked_and_poll_reenhances_only_prose(): })().catch(e=>{console.error(e);process.exitCode=1;}); """ ) + + +def test_board_uses_plugin_kit_components_and_status_tokens(): + import re + + from ghplugin.view import PAGE + + for component in ( + "pl-tabs", + "pl-tab--active", + "pl-badge", + "pl-prose", + "pl-dot", + "pl-link", + "pl-iconbtn", + "pl-btn pl-btn--sm pl-btn--ghost", + ): + assert component in PAGE + for old in ("tabs", "tab", "pill", "d-count", "chk-badge", "dot", "lnk", "dx", "chip", "logbtn"): + assert f'class="{old}"' not in PAGE + assert not re.search(r"\." + re.escape(old) + r"[{.\[:]", PAGE.split("", 1)[0]) + for color in ("#3fb950", "#f85149", "#a371f7", "#d29922"): + assert color not in PAGE + assert "--pl-color-danger" not in PAGE + assert not re.search(r"--pl-color-(?:status-)?(?:success|error|warning|info|danger)-muted", PAGE) + assert PAGE.count('class="pr-body md pl-prose"') == 3 + assert ".md:not(.md-on){white-space:pre-wrap}" in PAGE + + +def test_board_component_variants_and_tab_selection(): + _run_drawer_js( + r""" +(async()=>{ + for(const selected of ['prs','issues']){ + setTab(selected); + for(const name of ['issues','prs']){ + assert.equal(element('t-'+name).attrs['aria-selected'],name===selected); + assert.equal(element('t-'+name).classList.values.has('pl-tab--active'),name===selected); + } + } + openDrawer('o/n',7,element('opener')); + for(const selected of Object.keys(DRAWER_TABS)){ + selectDrawerTab(selected,false); + const html=element('drawer-tabs').innerHTML; + assert.equal((html.match(/pl-tab--active/g)||[]).length,1); + assert.ok(html.includes('id="dtab-'+selected+'" class="pl-tab pl-tab--active" aria-selected="true"')); + } + for(const [state,isDraft,variant] of [ + ['OPEN',false,' pl-badge--success'],['MERGED',false,' pl-badge--info'], + ['CLOSED',false,' pl-badge--info'],['OPEN',true,''], + ]){ + updatePrHeader({state,isDraft}); + assert.ok(element('drawer-meta').innerHTML.includes('class="pl-badge'+variant+'"')); + assert.ok(element('drawer-meta').innerHTML.includes('class="pl-link"')); + const row=prRow({state,isDraft},'o/n'); + const dot=isDraft?'':state==='OPEN'?'pl-dot--success':'pl-dot--info'; + assert.ok(row.includes('class="pl-dot '+dot+'"')); + } + for(const [state,variant] of [['OPEN','success'],['CLOSED','info']]){ + updateIssueHeader({state}); + assert.ok(element('drawer-meta').innerHTML.includes('class="pl-badge pl-badge--'+variant+'"')); + assert.ok(issueRow({state},'o/n').includes('pl-dot--'+variant)); + } + assert.ok(labelPills([{name:''}]).includes('class="pl-badge"><bug>')); + assert.ok(prChecks({checks:[{status:'IN_PROGRESS',name:'pending'}]}).includes('pl-dot--warning')); +})().catch(e=>{console.error(e);process.exitCode=1;}); +""" + ) diff --git a/view.py b/view.py index 2e8f14e..615d2d6 100644 --- a/view.py +++ b/view.py @@ -99,10 +99,6 @@ #wrap{display:flex;flex-direction:column;height:100%;min-height:0} .bar{display:flex;align-items:center;gap:6px;padding:6px 8px;flex-wrap:wrap; border-bottom:var(--pl-border-width,1px) solid var(--pl-color-border)} - .tabs{display:inline-flex;border:1px solid var(--pl-color-border);border-radius:var(--pl-radius,8px);overflow:hidden} - .tab{padding:4px 11px;cursor:pointer;background:transparent;border:0;color:var(--pl-color-fg-muted); - font-size:12px;line-height:1.6;white-space:nowrap} - .tab[aria-selected="true"]{background:var(--pl-color-bg);color:var(--pl-color-fg);font-weight:600} select{background:var(--pl-color-bg);color:var(--pl-color-fg);border:1px solid var(--pl-color-border); border-radius:var(--pl-radius,8px);padding:4px 6px;font-size:12px;max-width:220px} #search{background:var(--pl-color-bg);color:var(--pl-color-fg);border:1px solid var(--pl-color-border); @@ -115,16 +111,13 @@ border-bottom:1px solid var(--pl-color-border)} .row:hover{background:var(--pl-color-bg)} .row .top{display:flex;align-items:baseline;gap:7px} - .dot{width:9px;height:9px;border-radius:50%;flex:none;margin-top:4px;background:var(--pl-color-fg-muted)} - .dot.open{background:#3fb950}.dot.closed{background:#a371f7}.dot.merged{background:#a371f7}.dot.draft{background:var(--pl-color-fg-muted)} .title{font-weight:600;line-height:1.35} .num{color:var(--pl-color-fg-muted);font-weight:400} .meta{margin-top:3px;font-size:11px;color:var(--pl-color-fg-muted);display:flex;gap:6px;flex-wrap:wrap;align-items:center} .cmt{display:inline-flex;align-items:center;gap:3px} - .pill{font-size:10px;padding:1px 7px;border-radius:999px;border:1px solid var(--pl-color-border)} /* CI rollup chip on PR rows (bd-nm78.8) — ✓/✗/● tinted from the list dot palette. */ .ci{font-weight:700;line-height:1;font-size:12px} - .ci-passing{color:#3fb950}.ci-failing{color:#f85149}.ci-pending{color:#d29922} + .ci-passing{color:var(--pl-color-status-success)}.ci-failing{color:var(--pl-color-status-error)}.ci-pending{color:var(--pl-color-status-warning)} .more{padding:10px 12px;text-align:center} .empty,.hint{padding:24px 14px;text-align:center;color:var(--pl-color-fg-muted)} #scrim{display:none;position:fixed;inset:0;background:#0006;z-index:10} @@ -136,42 +129,22 @@ @media(min-width:1000px){#drawer.wide{width:min(780px,96vw)}} .dh{padding:12px;display:flex;align-items:flex-start;gap:8px} .dh h2{font-size:16px;margin:0;overflow-wrap:anywhere;flex:1} - .dx{background:transparent;border:0;color:inherit;cursor:pointer;font-size:18px} #drawer-meta{padding:0 12px 12px;display:flex;gap:12px;align-items:center} #drawer-tabs{padding:0 12px;border-bottom:1px solid var(--pl-color-border)} #drawer-body{padding:12px;overflow:auto;min-height:0;overflow-wrap:anywhere} .pr-body{margin-top:16px;overflow-wrap:anywhere;min-width:0} .md:not(.md-on){white-space:pre-wrap} - .md h1{font-size:18px}.md h2{font-size:16px}.md h3{font-size:14px} - .md h4,.md h5,.md h6{font-size:13px} - .md h1,.md h2,.md h3,.md h4,.md h5,.md h6{margin:12px 0 6px} - .md p{margin:6px 0}.md ul,.md ol{padding-left:24px;margin:6px 0} - .md blockquote{margin:8px 0;padding-left:10px;border-left:3px solid var(--pl-color-border); - color:var(--pl-color-fg-muted)} - .md code,.md pre{font-family:var(--pl-font-mono,ui-monospace,Menlo,monospace); - font-size:12px;background:var(--pl-color-bg-raised);border-radius:var(--pl-radius,8px)} - .md code{padding:1px 4px}.md pre{padding:8px;white-space:pre;overflow-x:auto} - .md pre code{padding:0;overflow-wrap:normal} .md .md-table{overflow-x:auto;margin:8px 0} - .md table{border-collapse:collapse}.md th,.md td{border:1px solid var(--pl-color-border);padding:4px 8px} .conversation-item{padding:10px 0;border-bottom:1px solid var(--pl-color-border)} .thread-hunk{font-family:var(--pl-font-mono,monospace);font-size:11px;white-space:pre-wrap} .pr-facts{display:grid;grid-template-columns:auto 1fr;gap:6px 12px;margin:0} .pr-facts dd{margin:0} - /* Checks + Files tabs (bd-nm78.5) — dots reuse the list palette; diff tints from --pl-* with fallbacks. */ + /* Checks + Files tabs (bd-nm78.5) — dots reuse the list palette; diff tints from --pl-* status tokens. */ .d-sum{font-size:12px;color:var(--pl-color-fg-muted);margin-bottom:10px;display:flex;gap:10px;flex-wrap:wrap;align-items:baseline} .d-sum b{color:var(--pl-color-fg);font-weight:600} - .chk-badge{margin-left:5px;font-size:10px;font-weight:600;padding:0 6px;border-radius:999px; - background:var(--pl-color-danger-muted,#f8514926);color:var(--pl-color-danger,#f85149)} - .dot.pass{background:#3fb950}.dot.fail{background:#f85149}.dot.pending{background:#d29922}.dot.skipped{background:var(--pl-color-fg-muted)} .chk{display:flex;align-items:center;gap:8px;padding:7px 2px;border-bottom:1px solid var(--pl-color-border)} - .chk .dot{margin-top:0} .chk-name{flex:1;overflow-wrap:anywhere} .chk-dur{font-size:11px;color:var(--pl-color-fg-muted);white-space:nowrap} - .lnk{color:var(--pl-color-accent,#2f81f7);text-decoration:none;white-space:nowrap} - .lnk:hover{text-decoration:underline} - .logbtn{background:transparent;border:1px solid var(--pl-color-border);border-radius:var(--pl-radius,8px); - color:inherit;cursor:pointer;font-size:11px;padding:2px 8px;white-space:nowrap} .log{margin:2px 0 10px;padding:8px;border-radius:var(--pl-radius,8px);background:var(--pl-color-bg); font-family:var(--pl-font-mono,ui-monospace,Menlo,monospace);font-size:11px;white-space:pre;overflow-x:auto;max-height:320px} .file{border-bottom:1px solid var(--pl-color-border)} @@ -179,32 +152,26 @@ cursor:pointer;text-align:left;padding:8px 2px;font-size:12px;font-family:inherit} .file-head:hover{background:var(--pl-color-bg)} .fstat{font-family:var(--pl-font-mono,ui-monospace,Menlo,monospace);font-weight:600;width:1.2em;flex:none;text-align:center} - .fstat.added{color:#3fb950}.fstat.deleted{color:#f85149}.fstat.renamed{color:#a371f7}.fstat.modified{color:#d29922} + .fstat.added{color:var(--pl-color-status-success)}.fstat.deleted{color:var(--pl-color-status-error)}.fstat.renamed{color:var(--pl-color-status-info)}.fstat.modified{color:var(--pl-color-status-warning)} .fpath{flex:1;overflow-wrap:anywhere} - .fnum{font-size:11px;white-space:nowrap}.fnum .add{color:#3fb950}.fnum .del{color:#f85149} + .fnum{font-size:11px;white-space:nowrap}.fnum .add{color:var(--pl-color-status-success)}.fnum .del{color:var(--pl-color-status-error)} .diff{margin:0 0 8px;overflow-x:auto;background:var(--pl-color-bg);border-radius:var(--pl-radius,8px)} .dl{font-family:var(--pl-font-mono,ui-monospace,Menlo,monospace);font-size:11px;white-space:pre;padding:0 8px;min-width:max-content} - .dl.add{background:var(--pl-color-success-muted,#3fb95026)} - .dl.del{background:var(--pl-color-danger-muted,#f8514926)} + .dl.add{background:color-mix(in srgb, var(--pl-color-status-success) 15%, transparent)} + .dl.del{background:color-mix(in srgb, var(--pl-color-status-error) 15%, transparent)} .dl.hunk{color:var(--pl-color-fg-muted)} .note{padding:6px 8px 10px;color:var(--pl-color-fg-muted);font-size:12px} /* Issue drawer (bd-nm78.7) — neutral count badge + linked-PR chips. */ - .d-count{margin-left:5px;font-size:10px;font-weight:600;padding:0 6px;border-radius:999px; - background:var(--pl-color-bg);border:1px solid var(--pl-color-border);color:var(--pl-color-fg-muted)} .linked-prs{margin-top:14px} .linked-prs h3{font-size:13px;margin:0 0 6px} - .chip{display:inline-block;margin:0 5px 5px 0;padding:2px 9px;border-radius:999px;cursor:pointer; - font:inherit;font-size:12px;background:var(--pl-color-bg);border:1px solid var(--pl-color-border); - color:var(--pl-color-accent,#2f81f7)} - .chip:hover{text-decoration:underline} __SETUP_CSS__
-
- - +
+ +
@@ -218,9 +185,9 @@
-
+
""" # Splice the shared setup card into both pages — one source, two surfaces. -PAGE = PAGE.replace("__SETUP_CSS__", _SETUP_CSS).replace("__SETUP_JS__", _SETUP_JS) +PAGE = PAGE.replace("__SETUP_CSS__", _SETUP_CSS.replace("#d29922", "var(--pl-color-status-warning)")).replace( + "__SETUP_JS__", _SETUP_JS +) NEW_ISSUE_PAGE = NEW_ISSUE_PAGE.replace("__SETUP_CSS__", _SETUP_CSS).replace("__SETUP_JS__", _SETUP_JS)