From 15801ccb07555e311f8bd860fcd702c1b9e09ee6 Mon Sep 17 00:00:00 2001 From: Jason Woltje Date: Thu, 19 Nov 2026 17:50:47 -0600 Subject: [PATCH] fix(webui): settings-s4: Model setup shows one primary button: a submit there reads as a plain button unless display.js marks it primary, so Finish sign-in and Check and add no longer look primary beside the card's own; the sign-in row wraps with a gap at 390; the test counts primaries by their drawn fill, and checks one primary while signing in and with the key form open (#1873, lane settings-s4) --- packages/webui/src/public/shell.css | 3 +++ packages/webui/tests/settings-s4-browser.test.mjs | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/webui/src/public/shell.css b/packages/webui/src/public/shell.css index a7f1a2cb8..d9d19bd92 100644 --- a/packages/webui/src/public/shell.css +++ b/packages/webui/src/public/shell.css @@ -291,6 +291,9 @@ button:disabled,[aria-disabled=true]{cursor:not-allowed} .settings-content input:disabled,.settings-content select:disabled,.settings-content textarea:disabled{background:var(--raised);border-color:var(--line);color:var(--muted)} .settings-content button,.settings-content summary{min-height:44px;min-width:44px;border:1px solid var(--border);border-radius:var(--r);background:var(--surface);color:var(--text);padding:8px 18px;font:inherit;cursor:pointer} .settings-content button[type=submit]{background:var(--accent-fill);color:var(--on-accent);border-color:var(--accent-fill)} +/* #1873 settings slice 4: Model setup has at most one primary button, which display.js marks .primary; its other submits read as plain buttons. */ +.settings-content .model-setup button[type=submit]:not(.primary){background:var(--surface);color:var(--text);border-color:var(--border)} +#proxy-signin .form-foot{display:flex;flex-wrap:wrap;align-items:center;gap:var(--gap,12px)} .settings-content :is(button,input,select,textarea,a,summary):focus-visible,#settings-nav a:focus-visible,#settings-nav select:focus-visible,#settings-disclosure:focus-visible{outline:2px solid var(--focus);outline-offset:2px} .settings-segments{display:inline-flex;max-width:100%;border:1px solid var(--border);border-radius:var(--r);overflow:hidden} .settings-segments label{position:relative;display:block} diff --git a/packages/webui/tests/settings-s4-browser.test.mjs b/packages/webui/tests/settings-s4-browser.test.mjs index e72e290a6..bef18796c 100644 --- a/packages/webui/tests/settings-s4-browser.test.mjs +++ b/packages/webui/tests/settings-s4-browser.test.mjs @@ -172,7 +172,10 @@ const running = { ...installed, unit: { ...installed.unit, active: 'active', pid const config = { send: true, devOwner: true, proxyAdmin: true, proxyAdminSend: true }; const accounts = list => ({ 'GET /api/proxy/accounts': { body: { accounts: list } }, 'GET /api/proxy/keys': { body: { keys: [] } } }); const admin = b => b.evaluate('window.__writes.filter(w => w.path.startsWith("/api/proxy/admin/")).map(w => w.path.slice(17))'); -const primaries = b => b.evaluate('[...document.querySelectorAll(".settings-content .primary, #proxy-setup .primary")].filter(e => e.checkVisibility()).map(e => e.id || e.textContent)'); +// A primary button is one drawn with the accent fill, whatever its class: a submit is drawn that way too. +const primaries = b => b.evaluate(`(() => { const host = document.querySelector(".model-setup"), probe = document.createElement("button"); probe.className = "btn primary"; host.append(probe); + const fill = getComputedStyle(probe).backgroundColor; probe.remove(); + return [...host.querySelectorAll("button, a")].filter(e => e.checkVisibility() && getComputedStyle(e).backgroundColor === fill).map(e => e.id || e.textContent); })()`); const STEP3 = '#setup-step-organizations [data-step-summary]'; // The status the page reads follows the writes it has made, as the host's would. @@ -257,10 +260,13 @@ test('settings-s4: accounts read as rows with kind and health, the provider pick // The provider picks how to add: a sign-in for a subscription, Check and add for an API key. await b.evaluate('(() => { document.querySelector("#proxy-add-box").open = true; const s = document.querySelector("#proxy-provider"); s.value = "z.ai"; s.dispatchEvent(new Event("change")); return true; })()'); assert.deepEqual(await b.evaluate('[document.querySelector("#proxy-login-go").checkVisibility(), document.querySelector("#proxy-apikey").checkVisibility(), document.querySelector("#proxy-apikey button[type=submit]").textContent]'), [false, true, 'Check and add']); + assert.ok((await primaries(b)).length <= 1, 'one primary button with the key form open'); await b.evaluate('(() => { const s = document.querySelector("#proxy-provider"); s.value = "codex"; s.dispatchEvent(new Event("change")); return true; })()'); assert.equal(await b.evaluate('document.querySelector("#proxy-login-go").textContent'), 'Sign in to ChatGPT / Codex'); await b.evaluate('(() => { const s = document.querySelector("#proxy-provider"); s.value = "claude"; s.dispatchEvent(new Event("change")); document.querySelector("#proxy-login-start").requestSubmit(); return true; })()'); await wait('!document.querySelector("#proxy-signin").hidden'); + assert.ok((await primaries(b)).length <= 1, 'one primary button while signing in'); + assert.equal(await b.evaluate('getComputedStyle(document.querySelector("#proxy-login-submit button[type=submit]")).backgroundColor === getComputedStyle(document.querySelector("#proxy-login-cancel")).backgroundColor'), true, 'Finish sign-in is a plain button'); assert.equal(await b.evaluate('document.querySelector("#proxy-login-return summary").textContent'), 'The sign-in tab did not come back'); assert.equal(await b.evaluate('document.querySelector("#proxy-login-cancel").disabled'), false); // Paste-back: the address from a tab that did not come back goes to login/submit and the box is cleared.