d4f26f5156
Some checks failed
Release & Docker / release (push) Has been cancelled
* feat(approval): make the approval card collapsible (#3515) Adds a collapse toggle to the approval card header so users can shrink it to a thin header strip and keep the tool-call rationale/transcript above readable. Full ARIA (aria-expanded/controls/label), chevron swap, and transcript reflow that preserves near-bottom scroll. Closes #3007. Co-authored-by: Rod Boev <rod.boev@gmail.com> * docs(changelog): v0.51.288 — Release JD (stage-r24) * fix(approval): clear collapsed state for a distinct queued approval (#3515) Codex regression-gate finding: showApprovalCard's sameApproval check didn't include approval_id and didn't clear .collapsed in the !sameApproval branch, so a NEW/parallel approval arriving while the card was already collapsed could render collapsed with its command + action buttons hidden. Add approval_id to the signature; clear .collapsed for a distinct approval before syncing. +2 regression tests. --------- Co-authored-by: Rod Boev <rod.boev@gmail.com> Co-authored-by: nesquena-hermes <[email protected]>
99 lines
3.6 KiB
Python
99 lines
3.6 KiB
Python
from pathlib import Path
|
|
|
|
|
|
ROOT = Path(__file__).resolve().parent.parent
|
|
MESSAGES_JS = (ROOT / "static" / "messages.js").read_text(encoding="utf-8")
|
|
STYLE_CSS = (ROOT / "static" / "style.css").read_text(encoding="utf-8")
|
|
INDEX_HTML = (ROOT / "static" / "index.html").read_text(encoding="utf-8")
|
|
|
|
|
|
def _compact(text: str) -> str:
|
|
return "".join(text.split())
|
|
|
|
|
|
def test_toggle_approval_card_collapsed_defined():
|
|
assert "function toggleApprovalCardCollapsed(" in MESSAGES_JS
|
|
|
|
|
|
def test_sync_approval_collapse_button_defined():
|
|
assert "function _syncApprovalCollapseButton(" in MESSAGES_JS
|
|
|
|
|
|
def test_sync_approval_transcript_space_defined():
|
|
assert "function _syncApprovalTranscriptSpace(" in MESSAGES_JS
|
|
|
|
|
|
def test_approval_collapsed_toggle_in_messages_js():
|
|
compact_js = _compact(MESSAGES_JS)
|
|
assert 'card.classList.toggle("collapsed",collapsed)' in compact_js
|
|
|
|
|
|
def test_approval_collapsed_cleared_in_hide():
|
|
# hideApprovalCard must reset collapse state so next approval opens expanded
|
|
compact_js = _compact(MESSAGES_JS)
|
|
assert 'card.classList.remove("collapsed")' in compact_js
|
|
|
|
|
|
def test_approval_signature_includes_approval_id():
|
|
# A distinct queued approval must be distinguishable by approval_id so a new
|
|
# pending approval is not treated as the same one (which would inherit a
|
|
# prior collapsed state). (#3515 gate finding)
|
|
compact_js = _compact(MESSAGES_JS)
|
|
assert "approval_id:pending.approval_id||null" in compact_js
|
|
|
|
|
|
def test_fresh_approval_renders_expanded():
|
|
# In showApprovalCard's !sameApproval branch the collapsed class must be
|
|
# cleared so a freshly displayed approval never hides its command/buttons.
|
|
compact_js = _compact(MESSAGES_JS)
|
|
marker = "if(!sameApproval){"
|
|
idx = compact_js.find(marker)
|
|
assert idx != -1, "expected the !sameApproval branch in showApprovalCard"
|
|
# the collapsed-clear must appear within the branch body (before its closing brace)
|
|
branch = compact_js[idx: idx + 400]
|
|
assert 'card.classList.remove("collapsed")' in branch, (
|
|
"a distinct approval must clear .collapsed inside the !sameApproval branch"
|
|
)
|
|
|
|
|
|
def test_messages_approval_open_in_css():
|
|
assert ".messages.approval-open" in STYLE_CSS
|
|
|
|
|
|
def test_messages_approval_collapsed_in_css():
|
|
assert ".messages.approval-collapsed" in STYLE_CSS
|
|
|
|
|
|
def test_approval_dock_height_padding_in_css():
|
|
compact_css = _compact(STYLE_CSS)
|
|
assert "padding-bottom:var(--approval-dock-height,72px)" in compact_css
|
|
|
|
|
|
def test_approval_card_collapsed_header_margin_in_css():
|
|
assert ".approval-card.collapsed .approval-header" in STYLE_CSS
|
|
|
|
|
|
def test_approval_card_collapsed_desc_hidden_in_css():
|
|
assert ".approval-card.collapsed .approval-desc" in STYLE_CSS
|
|
|
|
|
|
def test_approval_collapse_button_in_html():
|
|
assert 'id="approvalCollapse"' in INDEX_HTML
|
|
|
|
|
|
def test_approval_collapse_aria_expanded_in_html():
|
|
assert 'aria-expanded="true"' in INDEX_HTML
|
|
|
|
|
|
def test_approval_collapse_onclick_in_html():
|
|
assert 'onclick="toggleApprovalCardCollapsed()"' in INDEX_HTML
|
|
|
|
|
|
def test_sync_approval_transcript_space_called_in_show_and_hide():
|
|
# Must be called from both showApprovalCard and hideApprovalCard
|
|
compact_js = _compact(MESSAGES_JS)
|
|
assert compact_js.count("_syncApprovalTranscriptSpace(") >= 3 # show, hide, toggle
|
|
assert "_syncApprovalTranscriptSpace(null)" in MESSAGES_JS
|
|
# show mirrors the merged clarify card: mark visible first, then sync immediately so the transcript reserves space on first paint
|
|
assert 'card.classList.add("visible");_syncApprovalCollapseButton(card);_syncApprovalTranscriptSpace(card,{immediate:true})' in compact_js
|