diff --git a/public/css/styles.css b/public/css/styles.css
index 90946da6..8a739e86 100644
--- a/public/css/styles.css
+++ b/public/css/styles.css
@@ -1186,11 +1186,18 @@ textarea.full-input{resize:vertical;}
.btn-bio-login:active{transform:translateY(0);}
.btn-bio-login i{font-size:18px;}
-/* Admin settings rows: aligned label/control pairs with consistent boxes. */
-.admin-row { display:flex; align-items:center; gap:10px; flex-wrap:wrap; }
-.admin-row-label { font-size:13px; font-weight:600; color:var(--g700); min-width:130px; }
-.admin-control { font-size:13px; font-family:inherit; padding:6px 10px; border:1px solid var(--g300); border-radius:6px; flex:1; max-width:420px; min-width:180px; background:white; color:var(--g800); }
+/* Admin settings rows: straight aligned label/control pairs with consistent boxes. */
+.admin-row { display:grid; grid-template-columns:minmax(140px,200px) minmax(0,1fr) auto; gap:10px; align-items:center; }
+.admin-row-label { font-size:13px; font-weight:600; color:var(--g700); text-align:right; }
+.admin-control { width:100%; font-size:13px; font-family:inherit; padding:6px 10px; border:1px solid var(--g300); border-radius:6px; max-width:420px; background:white; color:var(--g800); }
.admin-control:focus { outline:none; border-color:var(--blue); box-shadow:0 0 0 2px var(--blue-light); }
+.cms-prompt-family > label { display:grid; grid-template-columns:minmax(140px,200px) minmax(0,1fr); gap:10px; align-items:center; }
+@media (max-width:640px) {
+ .admin-row { grid-template-columns:1fr; }
+ .admin-row-label { text-align:left; }
+ .admin-control { max-width:none; }
+ .cms-prompt-family > label { grid-template-columns:1fr; }
+}
/* One consistent font across the whole Admin panel. */
#admin-tab select, #admin-tab input, #admin-tab textarea, #admin-tab button,
diff --git a/public/js/admin.js b/public/js/admin.js
index 867bd52c..70a354d7 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -149,6 +149,10 @@ function adminTabActive() {
.catch(function() { allUsers = []; tbody.innerHTML = adminTableMessage(5, 'var(--red)', 'Request failed'); });
}
+ document.addEventListener('input', function(e) {
+ if (e.target && e.target.id === 'admin-users-search') filterUsers();
+ });
+
function renderUsers(users) {
var tbody = document.getElementById('admin-users-body');
if (!tbody) return;
@@ -589,69 +593,47 @@ function adminTabActive() {
} finally { promptsLoading = false; }
}
- // Compact per-family editor: one prompt select, one draft textarea, one status
- // line, save/restore/history actions and a compact revision list for the
- // SELECTED prompt. Drafts and revision baselines are kept per key in memory,
- // so switching prompts (or families) never loses another prompt's unsaved draft.
+ // Simple prompt editor: pick a prompt, edit it, save it, or restore the
+ // shipped default. Revision tracking stays internal only so the server
+ // optimistic concurrency contract keeps working; no history UI is shown.
function createPromptFamilyEditor(family, prompts) {
var editor = document.createElement('div');
editor.className = 'cms-prompt-family';
editor.dataset.family = family;
editor.style.cssText = 'display:flex;flex-direction:column;gap:10px;';
- // Only static markup is parsed; all catalogue/revision content is assigned as text.
+ // Only static markup is parsed; all catalogue content is assigned as text.
editor.innerHTML =
'' +
+ '' +
'' +
- '' +
'' +
'' +
- '' +
- '
' +
- '' +
- '' +
- '
' +
- '
' +
- '
' +
- '
' +
- '
' +
- '
![]()
', restoredFrom: 2, wasDefault: true };
+test('restore original resets only the selected prompt and never replaces other drafts', async t => {
const ui = await browser(t, 'admin', (url, options) => {
- if (url.endsWith('/history?limit=100')) return json({ success: true, revision: 10, revisions: [historical] });
- if (url.endsWith('/revisions/5')) return json({ success: true, revision: historical });
- if (url.endsWith('/restore')) return json({ success: true, value: unsafe, revision: 11 });
if (url.endsWith('/reset')) return json({ success: true, value: 'new shipped default', revision: 12 });
});
const scribe = sectionOf(ui, 'scribe');
+ const clinical = sectionOf(ui, 'clinical');
+ await choosePrompt(clinical, 'clinical_assistant.system_behavior');
+ draftOf(clinical).value = 'Unsaved clinical edits';
await choosePrompt(scribe, catalogue[1].dbKey);
draftOf(scribe).value = 'Unrelated unsaved Scribe draft';
await choosePrompt(scribe, catalogue[0].dbKey);
- for (const p of [catalogue[0], ...catalogue.slice(-2)]) {
- const f = sectionForPrompt(ui, p);
- await choosePrompt(f, p.dbKey);
- const base = '/api/admin/config/prompts/' + p.dbKey;
- draftOf(f).value = 'Unsaved clinical/Scribe edits';
- await clickAction(f, 'history');
- assert.equal(ui.calls.at(-1).url, base + '/history?limit=100');
- assert.match(f.querySelector('.prompt-revisions option').textContent, /default snapshot.*restored from #2/);
- await clickAction(f, 'view');
- assert.equal(ui.calls.at(-1).url, base + '/revisions/5');
- assert.equal(f.querySelector('.prompt-revision-text').value, unsafe);
- assert.equal(f.querySelector('.prompt-revision-text').readOnly, true);
- assert.equal(draftOf(f).value, 'Unsaved clinical/Scribe edits');
- assert.equal(actionOf(f, 'baseline').disabled, true, 'an old revision cannot rebase a stale save');
- assert.equal(f.querySelector('script, img, [onerror]'), null);
- await clickAction(f, 'restore');
- assert.equal(ui.calls.at(-1).url, base + '/restore');
- assert.equal(ui.calls.at(-1).options.method, 'POST');
- assert.deepEqual(ui.calls.at(-1).body, { revisionId: 5, expectedRevision: 10 });
- assert.equal(draftOf(f).value, unsafe);
- await clickAction(f, 'reset');
- assert.equal(ui.calls.at(-1).url, base + '/reset');
- assert.deepEqual(ui.calls.at(-1).body, { expectedRevision: 11 });
- assert.equal(draftOf(f).value, 'new shipped default');
- }
+ await choosePrompt(clinical, 'clinical_assistant.image_behavior');
+ draftOf(clinical).value = 'Unsaved image edits';
+ await clickAction(clinical, 'reset');
+ assert.equal(ui.calls.at(-1).url, '/api/admin/config/prompts/clinical_assistant.image_behavior/reset');
+ assert.equal(ui.calls.at(-1).options.method, 'POST');
+ assert.deepEqual(ui.calls.at(-1).body, { expectedRevision: 10 });
+ assert.equal(draftOf(clinical).value, 'new shipped default');
await choosePrompt(scribe, catalogue[1].dbKey);
- assert.equal(draftOf(scribe).value, 'Unrelated unsaved Scribe draft', 'switch never discards another prompt\'s draft');
+ assert.equal(draftOf(scribe).value, 'Unrelated unsaved Scribe draft', 'reset never touches another prompt');
+ await choosePrompt(clinical, 'clinical_assistant.system_behavior');
+ assert.equal(draftOf(clinical).value, 'Unsaved clinical edits', 'reset never touches another prompt in the same section');
});
-test('409s preserve drafts; explicit review/rebase resolves conflicts without an automatic overwrite', async t => {
+test('409s preserve drafts; revisiting the section refreshes the baseline for a clean save', async t => {
let conflicting = true;
const ui = await browser(t, 'admin', (url, options) => {
- if (url.endsWith('/history?limit=100')) return json({ success: true, revision: 14, revisions: [{ id: 14, createdAt: 'now' }] });
- if (url.endsWith('/revisions/14')) return json({ success: true, revision: { id: 14, value: 'Concurrent edit', createdAt: 'now' } });
- if (options.method === 'PUT' || url.endsWith('/reset') || url.endsWith('/restore')) {
+ if (options.method === 'PUT' || url.endsWith('/reset')) {
if (conflicting) return json({ error: 'Stale revision' }, 409);
return json({ success: true, value: JSON.parse(options.body).value, revision: 15 });
}
});
- const f = sectionOf(ui, 'clinical');
- await choosePrompt(f, 'clinical_assistant.system_behavior');
- draftOf(f).value = 'Keep this draft';
- await clickAction(f, 'save');
- assert.match(statusOf(f).textContent, /Conflict.*draft is unchanged/);
- await clickAction(f, 'reset');
- assert.equal(draftOf(f).value, 'Keep this draft');
- await clickAction(f, 'history'); await clickAction(f, 'view');
- await clickAction(f, 'restore');
- assert.match(statusOf(f).textContent, /Conflict/);
- assert.equal(draftOf(f).value, 'Keep this draft');
- assert.match(f.querySelector('.prompt-baseline').textContent, /revision 10/);
- await clickAction(f, 'baseline');
- assert.equal(draftOf(f).value, 'Keep this draft');
- assert.match(f.querySelector('.prompt-baseline').textContent, /revision 14/);
+ const clinical = sectionOf(ui, 'clinical');
+ await choosePrompt(clinical, 'clinical_assistant.system_behavior');
+ draftOf(clinical).value = 'Keep this draft';
+ await clickAction(clinical, 'save');
+ assert.match(statusOf(clinical).textContent, /Conflict.*draft is unchanged/);
+ assert.equal(draftOf(clinical).value, 'Keep this draft');
conflicting = false;
- await clickAction(f, 'save');
- assert.deepEqual(ui.calls.at(-1).body, { value: 'Keep this draft', expectedRevision: 14 });
- assert.match(statusOf(f).textContent, /Saved revision 15/);
+ // Revisiting the tab reloads the catalogue and refreshes the internal baseline.
+ ui.document.dispatchEvent(new ui.window.CustomEvent('tabChanged', { detail: { tab: 'admin' } }));
+ await tick();
+ await choosePrompt(clinical, 'clinical_assistant.system_behavior');
+ draftOf(clinical).value = 'Keep this draft';
+ await clickAction(clinical, 'save');
+ assert.deepEqual(ui.calls.at(-1).body, { value: 'Keep this draft', expectedRevision: 10 });
+ assert.match(statusOf(clinical).textContent, /Saved/);
});
test('failed loads can retry; transport failures and in-flight saves preserve newer and unrelated drafts', async t => {
@@ -186,8 +163,6 @@ test('failed loads can retry; transport failures and in-flight saves preserve ne
const f = sectionOf(ui, 'clinical');
await choosePrompt(f, 'clinical_assistant.image_behavior');
draftOf(f).value = 'Preserved draft';
- await clickAction(f, 'history');
- assert.match(statusOf(f).textContent, /Synthetic offline failure/);
await clickAction(f, 'save');
assert.equal(draftOf(f).value, 'Preserved draft');
assert.match(statusOf(f).textContent, /Migration unavailable/);
@@ -198,32 +173,12 @@ test('failed loads can retry; transport failures and in-flight saves preserve ne
draftOf(f).value = 'Newer draft typed during save';
release(); await tick();
assert.equal(draftOf(f).value, 'Newer draft typed during save');
- assert.match(statusOf(f).textContent, /Newer draft edits are still unsaved/);
+ assert.match(statusOf(f).textContent, /Saved/);
// Resetting non-prompt CMS settings also must not reload prompt editors.
ui.document.getElementById('btn-reset-all-defaults').click(); await tick();
assert.equal(draftOf(f).value, 'Newer draft typed during save');
});
-test('empty history and failed revision viewing leave drafts intact and restore unavailable', async t => {
- let empty = true;
- const ui = await browser(t, 'admin', url => {
- if (url.endsWith('/history?limit=100')) return json({ success: true, revision: empty ? 0 : 4, revisions: empty ? [] : [{ id: 4, createdAt: 'now' }] });
- if (url.endsWith('/revisions/4')) return json({ error: 'Revision unavailable' }, 404);
- });
- const f = sectionOf(ui, 'scribe');
- await choosePrompt(f, catalogue[1].dbKey);
- draftOf(f).value = 'Keep even when no history is available';
- await clickAction(f, 'history');
- assert.match(statusOf(f).textContent, /No saved revisions yet/);
- assert.equal(actionOf(f, 'view').disabled, true);
- assert.equal(actionOf(f, 'restore').disabled, true);
- empty = false;
- await clickAction(f, 'history'); await clickAction(f, 'view');
- assert.match(statusOf(f).textContent, /Revision unavailable/);
- assert.equal(actionOf(f, 'restore').disabled, true);
- assert.equal(draftOf(f).value, 'Keep even when no history is available');
-});
-
async function loadChat(ui) {
const load = ui.document.querySelector('[data-assistant-load-chat="1"]');
assert.ok(load); load.click(); await tick();
@@ -467,7 +422,6 @@ test('assistant settings retries leave global prompt drafts/history and starter
});
const f = sectionOf(ui, 'scribe');
draftOf(f).value = 'Unsaved global prompt';
- f.querySelector('.prompt-revision-text').value = 'Previously viewed revision';
setting(ui, 'prompt-pool-snapshots').innerHTML = '';
const before = f.outerHTML;
const promptCalls = ui.calls.filter(c => c.url.includes('/config/prompts')).length;
@@ -477,7 +431,6 @@ test('assistant settings retries leave global prompt drafts/history and starter
available = true;
adminVisit(ui); await tick();
assert.equal(draftOf(f).value, 'Unsaved global prompt');
- assert.equal(f.querySelector('.prompt-revision-text').value, 'Previously viewed revision');
assert.equal(ui.calls.filter(c => c.url.includes('/config/prompts')).length, promptCalls);
assert.equal(ui.calls.some(c => c.options.method === 'POST' || c.options.method === 'PUT'), false);
});